~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -74,7 +74,7 @@
74	74	this.copy = this.group = copy;
75	75	//selectees = this.group.selectees;
76	76
77		- SetupMenu2(objEditor);
	77	+ SetupMenu2(this); //objEditor);
78	78	SetupUI2(objEditor);
79	79	objEditor.SetupUI(true);
80	80	SetupViews(objEditor);
..	..	@@ -98,14 +98,14 @@
98	98
99	99	void CloneClipboard(boolean supports)
100	100	{
101		- assert(GrafreeD.clipboard.parent == null);
102		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
103		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
105		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	101	+ assert(Grafreed.clipboard.parent == null);
	102	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	103	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	104	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	105	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	106	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	108	+ Grafreed.clipboard.get(0).parent = keepparent;
109	109	}
110	110
111	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +119,7 @@
119	119	// obj.support = null;
120	120	if (!supports)
121	121	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	122	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	123	obj.parent = parent;
124	124	// obj.support = support;
125	125	// clone.support = support; // aout 2013
..	..	@@ -148,8 +148,130 @@
148	148
149	149	//JTextField nameField;
150	150
151		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
152	152	{
	153	+ Menu menu;
	154	+ oe.menuBar.add(menu = new Menu("Edit"));
	155	+ //editItem = menu.add(new MenuItem("Edit"));
	156	+ //editItem.addActionListener(this);
	157	+
	158	+// undoItem = menu.add(new MenuItem("Undo"));
	159	+// undoItem.addActionListener(this);
	160	+// redoItem = menu.add(new MenuItem("Redo"));
	161	+// redoItem.addActionListener(this);
	162	+// menu.add("-");
	163	+ duplicateItem = menu.add(new MenuItem("Duplicate"));
	164	+ duplicateItem.addActionListener(this);
	165	+ cloneItem = menu.add(new MenuItem("Clone"));
	166	+ cloneItem.addActionListener(this);
	167	+ if (Globals.ADVANCED)
	168	+ {
	169	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	170	+ cloneSupportItem.addActionListener(this);
	171	+ }
	172	+ menu.add("-");
	173	+ cutItem = menu.add(new MenuItem("Cut"));
	174	+ cutItem.addActionListener(this);
	175	+ copyItem = menu.add(new MenuItem("Copy"));
	176	+ copyItem.addActionListener(this);
	177	+ pasteItem = menu.add(new MenuItem("Paste"));
	178	+ pasteItem.addActionListener(this);
	179	+ menu.add("-");
	180	+
	181	+ menu.add("-");
	182	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	183	+ pasteIntoItem.addActionListener(this);
	184	+ pasteLinkItem = menu.add(new MenuItem("Paste link"));
	185	+ pasteLinkItem.addActionListener(this);
	186	+ pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	187	+ pasteCloneItem.addActionListener(this);
	188	+// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	189	+// pasteExpandItem.addActionListener(this);
	190	+ menu.add("-");
	191	+ clearItem = menu.add(new MenuItem("Clear"));
	192	+ clearItem.addActionListener(this);
	193	+
	194	+ if (Globals.ADVANCED)
	195	+ {
	196	+ // Deletes the cameras...
	197	+ clearAllItem = menu.add(new MenuItem("Clear All"));
	198	+ clearAllItem.addActionListener(this);
	199	+ }
	200	+
	201	+ menuBar.add(cameraMenu = new Menu("View"));
	202	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	203	+ //zBufferItem.addActionListener(this);
	204	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	205	+ //normalLensItem.addActionListener(this);
	206	+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
	207	+ revertCameraItem.addActionListener(this);
	208	+
	209	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	210	+ toggleFullScreenItem.addItemListener(this);
	211	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	212	+ cameraMenu.add("-");
	213	+
	214	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	215	+ toggleTextureItem.addItemListener(this);
	216	+ toggleTextureItem.setState(CameraPane.textureon);
	217	+
	218	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	219	+ toggleSwitchItem.addItemListener(this);
	220	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	221	+
	222	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	223	+ toggleHandleItem.addItemListener(this);
	224	+ toggleHandleItem.setState(CameraPane.HANDLES);
	225	+
	226	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	227	+ togglePaintItem.addItemListener(this);
	228	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	229	+
	230	+ if (Globals.ADVANCED)
	231	+ {
	232	+ cameraMenu.add("-");
	233	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	234	+ toggleLiveItem.addItemListener(this);
	235	+ toggleLiveItem.setState(Globals.isLIVE());
	236	+
	237	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	238	+ stepItem.addActionListener(this);
	239	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	240	+ // toggleDLItem.addItemListener(this);
	241	+ // toggleDLItem.setState(false);
	242	+
	243	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	244	+ toggleRenderItem.addItemListener(this);
	245	+ toggleRenderItem.setState(!CameraPane.frozen);
	246	+
	247	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	248	+ toggleDebugItem.addItemListener(this);
	249	+ toggleDebugItem.setState(CameraPane.DEBUG);
	250	+
	251	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	252	+ toggleFrustumItem.addItemListener(this);
	253	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	254	+
	255	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	256	+ toggleFootContactItem.addItemListener(this);
	257	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	258	+
	259	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	260	+ toggleTimelineItem.addItemListener(this);
	261	+ }
	262	+
	263	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	264	+// toggleRootItem.addItemListener(this);
	265	+// toggleRootItem.setState(false);
	266	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	267	+// animationItem.addItemListener(this);
	268	+// animationItem.setState(CameraPane.ANIMATION);
	269	+ cameraMenu.add("-");
	270	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	271	+ editCameraItem.addActionListener(this);
	272	+
	273	+ if (Globals.ADVANCED)
	274	+ {
153	275	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154	276	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155	277	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -161,45 +283,17 @@
161	283	lookAtItem.addActionListener(this);
162	284	//lookFromItem.addActinoListener(this);
163	285	//switchItem.addActionListener(this);
164		- Menu menu;
165		- oe.menuBar.add(menu = new Menu("Edit"));
166		- //editItem = menu.add(new MenuItem("Edit"));
167		- //editItem.addActionListener(this);
168		- duplicateItem = menu.add(new MenuItem("Duplicate"));
169		- duplicateItem.addActionListener(this);
170		- menu.add("-");
171		- cloneItem = menu.add(new MenuItem("Clone"));
172		- cloneItem.addActionListener(this);
173		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174		- cloneSupportItem.addActionListener(this);
175		- menu.add("-");
176		- cutItem = menu.add(new MenuItem("Cut"));
177		- cutItem.addActionListener(this);
178		- copyItem = menu.add(new MenuItem("Copy"));
179		- copyItem.addActionListener(this);
180		- pasteItem = menu.add(new MenuItem("Paste"));
181		- pasteItem.addActionListener(this);
182		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
183		- pasteLinkItem.addActionListener(this);
184		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
185		- pasteCloneItem.addActionListener(this);
186		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
187		-// pasteExpandItem.addActionListener(this);
188		- clearItem = menu.add(new MenuItem("Clear"));
189		- clearItem.addActionListener(this);
190		- clearAllItem = menu.add(new MenuItem("Clear All"));
191		- clearAllItem.addActionListener(this);
192		-
	286	+ }
	287	+
193	288	oe.menuBar.add(menu = new Menu("Setting"));
194		- resetMeshItem = menu.add(new MenuItem("Reset All"));
195		- resetMeshItem.addActionListener(this);
196		- stepAllItem = menu.add(new MenuItem("Step All"));
197		- stepAllItem.addActionListener(this);
	289	+ if (Globals.ADVANCED)
	290	+ {
198	291	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199	292	revertMeshItem.addActionListener(this);
200	293	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201	294	resetreferencesItem.addActionListener(this);
202	295	menu.add("-");
	296	+ }
203	297	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204	298	overwriteGeoItem.addActionListener(this);
205	299	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -211,19 +305,26 @@
211	305	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212	306	overwriteUVItem.addActionListener(this);
213	307	menu.add("-");
	308	+ if (Globals.ADVANCED)
	309	+ {
214	310	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215	311	generateMeshItem.addActionListener(this);
216	312	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217	313	poseMeshItem.addActionListener(this);
218	314	menu.add("-");
	315	+ }
219	316	resetsupportItem = menu.add(new MenuItem("Reset support"));
220	317	resetsupportItem.addActionListener(this);
221	318	linkverticesItem = menu.add(new MenuItem("Link to Support"));
222	319	linkverticesItem.addActionListener(this);
223	320	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224	321	relinkverticesItem.addActionListener(this);
	322	+
	323	+ if (Globals.ADVANCED)
	324	+ {
225	325	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226	326	setMasterItem.addActionListener(this);
	327	+ }
227	328
228	329	oe.menuBar.add(menu = new Menu("Group"));
229	330	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -234,27 +335,32 @@
234	335	frontItem.addActionListener(this);
235	336	compositeItem = menu.add(new MenuItem("Composite"));
236	337	compositeItem.addActionListener(this);
237		- hideItem = menu.add(new MenuItem("Hide"));
	338	+ hideItem = menu.add(new MenuItem("Hidden Group"));
238	339	hideItem.addActionListener(this);
239	340	ungroupItem = menu.add(new MenuItem("Ungroup"));
240	341	ungroupItem.addActionListener(this);
241	342	menu.add("-");
242		- randomItem = menu.add(new MenuItem("Random"));
	343	+ randomItem = menu.add(new MenuItem("Switch node"));
243	344	randomItem.addActionListener(this);
244		- physicsItem = menu.add(new MenuItem("Physics"));
245		- physicsItem.addActionListener(this);
246		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
247		- frameselectorItem.addActionListener(this);
248	345	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249	346	switchGeoItem.addActionListener(this);
250	347	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251	348	switchTransfoItem.addActionListener(this);
252		- morphItem = menu.add(new MenuItem("Morph"));
	349	+ morphItem = menu.add(new MenuItem("Morph Group"));
253	350	morphItem.addActionListener(this);
	351	+
	352	+ if (Globals.ADVANCED)
	353	+ {
	354	+ menu.add("-");
	355	+ physicsItem = menu.add(new MenuItem("Physics"));
	356	+ physicsItem.addActionListener(this);
	357	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	358	+ frameselectorItem.addActionListener(this);
254	359	scriptNodeItem = menu.add(new MenuItem("Script Node"));
255	360	scriptNodeItem.addActionListener(this);
256	361	cameraItem = menu.add(new MenuItem("Camera"));
257	362	cameraItem.addActionListener(this);
	363	+ }
258	364
259	365	oe.menuBar.add(menu = new Menu("Object"));
260	366	textureItem = menu.add(new MenuItem("Texture"));
..	..	@@ -269,21 +375,29 @@
269	375	shadowYItem.addActionListener(this);
270	376	shadowZItem = menu.add(new MenuItem("Shadow Z"));
271	377	shadowZItem.addActionListener(this);
	378	+ if (Globals.ADVANCED)
	379	+ {
	380	+ menu.add("-");
272	381	linkerItem = menu.add(new MenuItem("Linker"));
273	382	linkerItem.addActionListener(this);
274		- templateItem = menu.add(new MenuItem("Template"));
275		- templateItem.addActionListener(this);
276	383	attributeItem = menu.add(new MenuItem("Attribute"));
277	384	attributeItem.addActionListener(this);
	385	+ templateItem = menu.add(new MenuItem("Template"));
	386	+ templateItem.addActionListener(this);
278	387	pointflowItem = menu.add(new MenuItem("Point Flow"));
279	388	pointflowItem.addActionListener(this);
	389	+ }
280	390	menu.add("-");
281	391	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282	392	resetTransformItem.addActionListener(this);
283	393	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284	394	resetCentroidItem.addActionListener(this);
285		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286		- transformgeometryItem.addActionListener(this);
	395	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	396	+ resetCentroidXZItem.addActionListener(this);
	397	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	398	+ transformGeometryItem.addActionListener(this);
	399	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	400	+ transformChildrenItem.addActionListener(this);
287	401
288	402	oe.menuBar.add(menu = new Menu("Geometry"));
289	403	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -294,8 +408,11 @@
294	408	genNormalsCADItem.addActionListener(this);
295	409	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296	410	genNormalsMESHItem.addActionListener(this);
	411	+ if (Globals.ADVANCED)
	412	+ {
297	413	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
298	414	genNormalsMINEItem.addActionListener(this);
	415	+ }
299	416	stripifyItem = menu.add(new MenuItem("Stripify"));
300	417	stripifyItem.addActionListener(this);
301	418	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -317,23 +434,34 @@
317	434	reduce34MeshItem.addActionListener(this);
318	435	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319	436	increaseMeshItem.addActionListener(this);
320		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321		- smoothMeshItem.addActionListener(this);
322	437	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323	438	clipMeshItem.addActionListener(this);
	439	+
	440	+ if (Globals.ADVANCED)
	441	+ {
	442	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	443	+ smoothMeshItem.addActionListener(this);
	444	+ }
324	445
325	446	oe.menuBar.add(menu = new Menu("Attributes"));
326	447	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327	448	clearMaterialsItem.addActionListener(this);
	449	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	450	+ resetAllItem.addActionListener(this);
	451	+ stepAllItem = menu.add(new MenuItem("Step All"));
	452	+ stepAllItem.addActionListener(this);
328	453	menu.add("-");
329	454	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330	455	liveleavesItem.addActionListener(this);
331	456	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332	457	unliveleavesItem.addActionListener(this);
	458	+ if (Globals.ADVANCED)
	459	+ {
333	460	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334	461	supportleavesItem.addActionListener(this);
335	462	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336	463	unsupportleavesItem.addActionListener(this);
	464	+ }
337	465	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338	466	hideleavesItem.addActionListener(this);
339	467	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -377,29 +505,22 @@
377	505	sortbynameItem = menu.add(new MenuItem("Sort by name"));
378	506	sortbynameItem.addActionListener(this);
379	507	menu.add("-");
	508	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	509	+ shareGeometriesItem.addActionListener(this);
	510	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	511	+ mergeGeometriesItem.addActionListener(this);
	512	+ if (Globals.ADVANCED)
	513	+ {
	514	+ // Pretty much the same as duplicate and clone.
380	515	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381	516	extractGeometriesItem.addActionListener(this);
382	517	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383	518	cloneGeometriesItem.addActionListener(this);
384		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
385		- shareGeometriesItem.addActionListener(this);
386		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
387		- mergeGeometriesItem.addActionListener(this);
	519	+ }
388	520
389	521	oe.menuBar.add(menu = new Menu("Insert"));
390	522	buildCreateMenu(menu);
391	523
392		-
393		- oe.menuBar.add(menu = new Menu("Include"));
394		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
395		- importGFDItem.addActionListener(this);
396		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
397		- importVRMLX3DItem.addActionListener(this);
398		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
399		- importOBJItem.addActionListener(this);
400		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
401		- import3DSItem.addActionListener(this);
402		-
403	524	oe.menuBar.add(menu = new Menu("Tools"));
404	525	buildToolsMenu(menu);
405	526	}
..	..	@@ -436,96 +557,108 @@
436	557	*/
437	558	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438	559
439		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
440		- liveCB.setToolTipText("Enabled animation");
	560	+ oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	561	+ undoButton.setToolTipText("Undo changes");
	562	+ undoButton.addActionListener(this);
	563	+
	564	+ oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	565	+ redoButton.setToolTipText("Redo changes");
	566	+ redoButton.addActionListener(this);
	567	+
	568	+ oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	569	+ saveButton.setToolTipText("Save changes");
	570	+ saveButton.addActionListener(this);
	571	+
	572	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	573	+ liveCB.setToolTipText("Enable animation");
441	574	liveCB.addItemListener(this);
442	575
443		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
	576	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	577	+ oneStepButton.setToolTipText("Animate one step forward");
	578	+ oneStepButton.addActionListener(this);
	579	+
	580	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	581	+ fastCB.setToolTipText("Fast mode");
	582	+ fastCB.addItemListener(this);
	583	+
	584	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
444	585	trackCB.setToolTipText("Enable tracking");
445	586	trackCB.addItemListener(this);
446	587
447		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	588	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
448	589	screenfitButton.setToolTipText("Screen fit");
449	590	screenfitButton.addActionListener(this);
450	591
451	592	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
452	593	// screenfitpointButton.addActionListener(this);
453		-// oe.aConstraints.gridx += 1;
454		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
455		- snapobjectButton.addActionListener(this);
456		- snapobjectButton.setToolTipText("Snap Object");
457		- oe.aConstraints.gridx += 1;
458	594
459		- //aConstraints.gridx = 0;
460		- //aConstraints.gridy += 1;
461		- oe.aConstraints.weighty = 0;
462		- oe.aConstraints.gridwidth = 1;
463		-
464		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	595	+ if (Globals.ADVANCED)
	596	+ {
	597	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	598	+ snapobjectButton.addActionListener(this);
	599	+ snapobjectButton.setToolTipText("Snap Object");
	600	+ }
	601	+
	602	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
465	603	flashSelectionButton.setToolTipText("Show selection");
466	604	flashSelectionButton.addActionListener(this);
467	605
468	606	oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
469	607
470		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	608	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
471	609	twoButton.setToolTipText("Show center view only");
472	610	twoButton.addActionListener(this);
473		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	611	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
474	612	fourButton.addActionListener(this);
475	613	fourButton.setToolTipText("Show left panel only");
476		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	614	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
477	615	sixButton.setToolTipText("2-column layout left");
478	616	sixButton.addActionListener(this);
479		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	617	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
480	618	threeButton.setToolTipText("2-column layout right");
481	619	threeButton.addActionListener(this);
482		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	620	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
483	621	sevenButton.setToolTipText("3-column layout");
484	622	sevenButton.addActionListener(this);
485	623	//
486	624
487		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
488		- rootButton.setToolTipText("Edit object in new tab");
	625	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	626	+ rootButton.setToolTipText("Edit selection in new tab");
489	627	rootButton.addActionListener(this);
490		- oe.aConstraints.gridx += 1;
491		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	628	+
	629	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492	630	closeButton.setToolTipText("Close tab");
493	631	closeButton.addActionListener(this);
494	632	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
495	633	//clearButton.addActionListener(this);
496		- oe.aConstraints.gridx += 1;
497	634
498		- oe.aConstraints.gridx = 1; //
499		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	635	+ cGridBag commandsPanel = new cGridBag();
	636	+
	637	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	638	+ editButton.setToolTipText("Edit selection");
500	639	editButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.aConstraints.weighty = 0;
503		- oe.aConstraints.gridwidth = 1;
504	640
505		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	641	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	642	+ uneditButton.setToolTipText("Unedit selection");
506	643	uneditButton.addActionListener(this);
507	644
508		- oe.aConstraints.gridx += 1;
509		- oe.aConstraints.weighty = 0;
510		- oe.aConstraints.gridwidth = 1;
511		-
512		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
513		- clearPanelButton.addActionListener(this);
514		-
515		- oe.aConstraints.gridx += 1;
516		- oe.aConstraints.weighty = 0;
517		- oe.aConstraints.gridwidth = 1;
518		-
519		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	645	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	646	+ allParamsButton.setToolTipText("Edit all params");
520	647	allParamsButton.addActionListener(this);
521	648
522		- oe.aConstraints.gridx += 1;
523		- oe.aConstraints.weighty = 0;
524		- oe.aConstraints.gridwidth = 1;
525		-
526		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	649	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	650	+ clearPanelButton.setToolTipText("Clear edit panel");
	651	+ clearPanelButton.addActionListener(this);
	652	+
	653	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	654	+ unselectButton.setToolTipText("Unselect");
527	655	unselectButton.addActionListener(this);
528	656
	657	+ commandsPanel.preferredHeight = 1;
	658	+
	659	+ oe.treePanel.add(commandsPanel);
	660	+ oe.treePanel.Return();
	661	+
529	662	// oe.aConstraints.gridx += 1;
530	663	// oe.aConstraints.weighty = 0;
531	664	// oe.aConstraints.gridwidth = 1;
..	..	@@ -537,40 +670,37 @@
537	670	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
538	671	// gcButton.addActionListener(this);
539	672
540		- oe.aConstraints.gridx = 0;
541		- oe.aConstraints.gridy += 1;
542		-
543		- //ctrlPanel.add(objList = new List(5, true));
544		- oe.aConstraints.gridwidth = 100;
545		- // oe.aConstraints.gridheight = 100;
546		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
547		- oe.aConstraints.gridheight = 1;
548		- oe.aConstraints.weighty = 0.5;
549		- oe.aConstraints.gridx = 0;
550		- JScrollPane jSP;
	673	+ cGridBag jSPPanel = new cGridBag();
	674	+
	675	+ JScrollPane jSP;
551	676	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
552		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	677	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
553	678	ResetModel();
554		- oe.aConstraints.weighty = 0.5;
555		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
556		- oe.aConstraints.gridy += 1;
557		- oe.aConstraints.gridwidth = 1;
	679	+
	680	+ oe.treePanel.add(jSPPanel);
	681	+ oe.treePanel.Return();
558	682
559		- oe.aConstraints.weighty = 0;
560		- oe.aConstraints.gridwidth = 2;
561		-
562		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
	683	+ cGridBag copyOptionsPanel = new cGridBag();
	684	+
	685	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	686	+ colorCB.setToolTipText("Copy color when dropped");
563	687	colorCB.addItemListener(this);
564		- oe.aConstraints.gridx += 2;
565		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	688	+
	689	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	690	+ materialCB.setToolTipText("Copy material when dropped");
566	691	materialCB.addItemListener(this);
567		- oe.aConstraints.gridx += 2;
568		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	692	+
	693	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	694	+ textureCB.setToolTipText("Copy texture when dropped");
569	695	textureCB.addItemListener(this);
570	696
571		- oe.aConstraints.gridx = 0;
572		- oe.aConstraints.gridy += 1;
	697	+ copyOptionsPanel.preferredHeight = 1;
	698	+ oe.treePanel.add(copyOptionsPanel);
	699	+ oe.treePanel.Return();
573	700
	701	+// mainPanel.setDividerLocation(0.5); //1.0);
	702	+// mainPanel.setResizeWeight(0.5);
	703	+
574	704	//jList.addListSelectionListener(this);
575	705	oe.jTree.addTreeSelectionListener(this);
576	706	//jTree.setRootVisible(false);
..	..	@@ -595,43 +725,35 @@
595	725
596	726	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
597	727	{
598		- //constraints.gridx = 0;
599		- //constraints.gridy = 0;
600		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
601		- fastCB.setToolTipText("Fast mode");
602		- fastCB.addItemListener(this);
603		- //constraints.gridy += 1;
604		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
605		- supportCB.setToolTipText("Enabled rigging");
606		- supportCB.addItemListener(this);
607		-
608		- // constraints.gridy += 1;
609		- // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
610		- // localCB.addItemListener(this);
611		-
612		- //constraints.gridy += 1;
613		- panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
614		- crowdCB.setToolTipText("Used for crowds");
615		- crowdCB.addItemListener(this);
616		-
617		- //constraints.gridy += 1;
618		- panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
619		- smoothCB.setToolTipText("Snapping delay");
620		- smoothCB.addItemListener(this);
621		-
622		- //constraints.gridy += 1;
623		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
624		- slowCB.setToolTipText("Smooth interpolation");
625		- slowCB.addItemListener(this);
626		- //constraints.gridy += 1;
627	728	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
628	729	boxCB.setToolTipText("Display bounding boxes");
629	730	boxCB.addItemListener(this);
630		- //constraints.gridy += 1;
	731	+
631	732	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
632	733	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
633	734	zoomBoxCB.addItemListener(this);
634	735
	736	+ if (true) // Globals.ADVANCED)
	737	+ {
	738	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	739	+ supportCB.setToolTipText("Enable rigging");
	740	+ supportCB.addItemListener(this);
	741	+
	742	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	743	+ // localCB.addItemListener(this);
	744	+
	745	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	746	+ crowdCB.setToolTipText("Used for crowds");
	747	+ crowdCB.addItemListener(this);
	748	+
	749	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	750	+ smoothCB.setToolTipText("Snapping delay");
	751	+ smoothCB.addItemListener(this);
	752	+
	753	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	754	+ slowCB.setToolTipText("Smooth interpolation");
	755	+ slowCB.addItemListener(this);
	756	+
635	757	// constraints.gridy += 1;
636	758	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
637	759	// speakerMocapCB.addItemListener(this);
..	..	@@ -656,14 +778,20 @@
656	778	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
657	779	// debugCB.addItemListener(this);
658	780
659		- //constraints.gridy += 1;
660	781	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
661	782	oeilCB.addItemListener(this);
662	783
663		- //constraints.gridy += 1;
664	784	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
665	785	lookAtCB.setToolTipText("Look-at target");
666	786	lookAtCB.addItemListener(this);
	787	+
	788	+ }
	789	+
	790	+ cGridBag fill = new cGridBag();
	791	+
	792	+ fill.preferredHeight = 200;
	793	+
	794	+ panel.add(fill);
667	795
668	796	}
669	797
..	..	@@ -678,6 +806,7 @@
678	806	buttonGroup.add(radioButton);
679	807	radioButton.doClick();
680	808	}
	809	+
681	810	void SetupViews(ObjEditor oe)
682	811	{
683	812	oe.SetupViews();
..	..	@@ -742,6 +871,7 @@
742	871	} else if(e.getSource() == liveCB)
743	872	{
744	873	cameraView.ToggleLive();
	874	+ refreshContents(false);
745	875	}
746	876	else if(e.getSource() == supportCB)
747	877	{
..	..	@@ -894,7 +1024,9 @@
894	1024	// objEditor.DropFile((java.io.File[]) object, true);
895	1025	// return;
896	1026	// }
897		- if (string.charAt(0) == '/')
	1027	+
	1028	+ // File path for Mac and Windows
	1029	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
898	1030	{
899	1031	// file(s)
900	1032	String[] names = string.split("\n");
..	..	@@ -921,7 +1053,7 @@
921	1053
922	1054	flashIt = false;
923	1055	CameraPane pane = (CameraPane) target;
924		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1056	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
925	1057	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
926	1058
927	1059	if (group.selection.size() == 1)
..	..	@@ -948,11 +1080,11 @@
948	1080	{
949	1081	loadClipboard(true);
950	1082	objEditor.jTree.setSelectionPath(destinationPath);
951		- pasteInto(false);
	1083	+ pasteInto(false, false);
952	1084	} else {
953	1085	loadClipboard(false);
954	1086	objEditor.jTree.setSelectionPath(destinationPath);
955		- pasteInto(false); // true); // ???
	1087	+ pasteInto(false, false); // true); // ???
956	1088	}
957	1089	}
958	1090	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1074,27 +1206,33 @@
1074	1206	kleinItem.addActionListener(this);
1075	1207	particleItem = menu.add(new MenuItem("Particle system"));
1076	1208	particleItem.addActionListener(this);
	1209	+ if (Globals.ADVANCED)
	1210	+ {
1077	1211	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1078	1212	ragdollItem.addActionListener(this);
1079	1213	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1080	1214	ragdoll2Item.addActionListener(this);
	1215	+ }
1081	1216	menu.add("-");
1082		- meshItem = menu.add(new MenuItem("Mesh"));
	1217	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1083	1218	meshItem.addActionListener(this);
1084	1219	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1085	1220	// meshGroupItem.addActionListener(this);
	1221	+ if (Globals.ADVANCED)
	1222	+ {
1086	1223	springItem = menu.add(new MenuItem("Spring"));
1087	1224	springItem.addActionListener(this);
1088	1225	flagItem = menu.add(new MenuItem("Flag"));
1089	1226	flagItem.addActionListener(this);
1090		- bezierItem = menu.add(new MenuItem("Patch"));
1091		- bezierItem.addActionListener(this);
1092		- checkerItem = menu.add(new MenuItem("Checker"));
1093		- checkerItem.addActionListener(this);
1094	1227	blobItem = menu.add(new MenuItem("Blob"));
1095	1228	blobItem.addActionListener(this);
1096	1229	latheItem = menu.add(new MenuItem("Lathe"));
1097	1230	latheItem.addActionListener(this);
	1231	+ }
	1232	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1233	+ bezierItem.addActionListener(this);
	1234	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1235	+ overlayItem.addActionListener(this);
1098	1236	lightItem = menu.add(new MenuItem("Light"));
1099	1237	lightItem.addActionListener(this);
1100	1238	menu.add("-");
..	..	@@ -1104,39 +1242,44 @@
1104	1242	loopItem.addActionListener(this);
1105	1243	doubleItem = menu.add(new MenuItem("Fork"));
1106	1244	doubleItem.addActionListener(this);
	1245	+ if (Globals.ADVANCED)
	1246	+ {
1107	1247	tripleItem = menu.add(new MenuItem("Trident"));
1108	1248	tripleItem.addActionListener(this);
	1249	+ }
1109	1250	}
1110	1251
1111	1252	void buildToolsMenu(Menu menu)
1112	1253	{
1113	1254	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1114	1255	animationItem.addItemListener(this);
1115		- animationItem.setState(CameraPane.ANIMATION);
	1256	+ animationItem.setState(Globals.ANIMATION);
1116	1257
1117	1258	menu.add("-");
1118	1259	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1119	1260	parseverticesItem.addActionListener(this);
1120	1261	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1121	1262	textureFieldItem.addActionListener(this);
1122		- alignItem = menu.add(new MenuItem("Align"));
	1263	+ alignItem = menu.add(new MenuItem("Align Objects"));
1123	1264	alignItem.addActionListener(this);
1124		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1125		- mirrorItem.addActionListener(this);
1126	1265	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1127	1266	reduceMorphItem.addActionListener(this);
1128	1267	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1129	1268	reduce34MorphItem.addActionListener(this);
1130		-
	1269	+ menu.add("-");
1131	1270	menu.add(computeAOItem = new MenuItem("Compute AO"));
1132	1271	computeAOItem.addActionListener(this);
1133		- menu.add("-");
1134	1272
	1273	+ if (Globals.ADVANCED)
	1274	+ {
	1275	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1276	+ mirrorItem.addActionListener(this);
	1277	+ menu.add("-");
1135	1278	menu.add(memoryItem = new MenuItem("Memory Usage"));
1136	1279	memoryItem.addActionListener(this);
1137	1280	menu.add(analyzeItem = new MenuItem("Analyze"));
1138	1281	analyzeItem.addActionListener(this);
1139		- menu.add(dumpItem = new MenuItem("Dump"));
	1282	+ menu.add(dumpItem = new MenuItem("Print"));
1140	1283	dumpItem.addActionListener(this);
1141	1284	// menu.add(pathItem = new MenuItem("From-to path"));
1142	1285	// pathItem.addActionListener(this);
..	..	@@ -1154,6 +1297,7 @@
1154	1297	menu.add("-");
1155	1298	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1156	1299	editScriptItem.addActionListener(this);
	1300	+ }
1157	1301	}
1158	1302
1159	1303	void ScreenFit()
..	..	@@ -1482,9 +1626,9 @@
1482	1626
1483	1627	void Overwrite(int mask)
1484	1628	{
1485		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1629	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1486	1630	{
1487		- Object3D content = GrafreeD.clipboard.get(0);
	1631	+ Object3D content = Grafreed.clipboard.get(0);
1488	1632
1489	1633	if (content instanceof cGroup && ((cGroup)content).transientlink )
1490	1634	content = ((cGroup)content).get(0);
..	..	@@ -1655,7 +1799,7 @@
1655	1799	{
1656	1800	makeSomething(new BezierSurface());
1657	1801	} else
1658		- if (source == checkerItem)
	1802	+ if (source == overlayItem)
1659	1803	{
1660	1804	/*
1661	1805	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1789,23 +1933,6 @@
1789	1933	csg.addChild(child);
1790	1934	child.addChild(csg);
1791	1935	} else
1792		-
1793		- if (source == importGFDItem)
1794		- {
1795		- ImportGFD();
1796		- } else
1797		- if (source == importVRMLX3DItem)
1798		- {
1799		- ImportVRMLX3D();
1800		- } else
1801		- if (source == import3DSItem)
1802		- {
1803		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1804		- } else
1805		- if (source == importOBJItem)
1806		- {
1807		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1808		- } else
1809	1936	if (source == computeAOItem)
1810	1937	{
1811	1938	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1824,7 +1951,7 @@
1824	1951	if (source == invariantsItem)
1825	1952	{
1826	1953	System.out.println("Invariants:");
1827		- GrafreeD.grafreeD.universe.invariants();
	1954	+ Grafreed.grafreeD.universe.invariants();
1828	1955	} else
1829	1956	if (source == memoryItem)
1830	1957	{
..	..	@@ -1842,6 +1969,23 @@
1842	1969	if (source == dumpItem)
1843	1970	{
1844	1971	DumpObject();
	1972	+ } else
	1973	+ if (source == undoButton)
	1974	+ {
	1975	+ Undo();
	1976	+ } else
	1977	+ if (source == redoButton)
	1978	+ {
	1979	+ Redo();
	1980	+ } else
	1981	+ if (source == saveButton)
	1982	+ {
	1983	+ Save();
	1984	+ } else
	1985	+ if (source == oneStepButton)
	1986	+ {
	1987	+ Globals.ONESTEP = true;
	1988	+ cameraView.repaint();
1845	1989	} else
1846	1990	if (source == screenfitButton)
1847	1991	{
..	..	@@ -1892,12 +2036,20 @@
1892	2036	{
1893	2037	loadClipboard(true);
1894	2038	} else
	2039	+ if (source == undoItem)
	2040	+ {
	2041	+ Undo();
	2042	+ } else
	2043	+ if (source == redoItem)
	2044	+ {
	2045	+ Redo();
	2046	+ } else
1895	2047	if (source == duplicateItem)
1896	2048	{
1897		- Object3D keep = GrafreeD.clipboard;
	2049	+ Object3D keep = Grafreed.clipboard;
1898	2050	loadClipboard(false);
1899	2051	paste(false);
1900		- GrafreeD.clipboard = keep;
	2052	+ Grafreed.clipboard = keep;
1901	2053	} else
1902	2054	if (source == cloneItem)
1903	2055	{
..	..	@@ -1915,13 +2067,17 @@
1915	2067	{
1916	2068	paste(false);
1917	2069	} else
	2070	+ if (source == pasteIntoItem)
	2071	+ {
	2072	+ pasteInto(true, false);
	2073	+ } else
1918	2074	if (source == pasteLinkItem)
1919	2075	{
1920		- pasteInto(false);
	2076	+ pasteInto(false, false);
1921	2077	} else
1922	2078	if (source == pasteCloneItem)
1923	2079	{
1924		- pasteInto(true);
	2080	+ pasteInto(true, true);
1925	2081	} else
1926	2082	if (source == pasteExpandItem)
1927	2083	{
..	..	@@ -2113,9 +2269,9 @@
2113	2269	// group.selection.get(0).setMasterThis(content); // should be identity
2114	2270	// refreshContents();
2115	2271	// }
2116		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2272	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2117	2273	{
2118		- Object3D content = GrafreeD.clipboard.get(0);
	2274	+ Object3D content = Grafreed.clipboard.get(0);
2119	2275
2120	2276	if (content instanceof cGroup && ((cGroup)content).transientlink )
2121	2277	content = ((cGroup)content).get(0);
..	..	@@ -2123,11 +2279,11 @@
2123	2279	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2124	2280	for (int i=0; i<group.selection.size(); i++)
2125	2281	{
2126		- boolean random = CameraPane.RANDOM;
2127		- CameraPane.RANDOM = false; // parse all random nodes
	2282	+ boolean random = CameraPane.SWITCH;
	2283	+ CameraPane.SWITCH = false; // parse all random nodes
2128	2284	group.selection.get(i).linkVerticesThis(content);
2129	2285	// group.selection.get(i).setMasterThis(content); // should be identity
2130		- CameraPane.RANDOM = random;
	2286	+ CameraPane.SWITCH = random;
2131	2287	}
2132	2288	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2133	2289	refreshContents();
..	..	@@ -2137,20 +2293,20 @@
2137	2293	{
2138	2294	for (int i=0; i<group.selection.size(); i++)
2139	2295	{
2140		- boolean random = CameraPane.RANDOM;
2141		- CameraPane.RANDOM = false; // parse all random nodes
	2296	+ boolean random = CameraPane.SWITCH;
	2297	+ CameraPane.SWITCH = false; // parse all random nodes
2142	2298	group.selection.get(i).linkVerticesThis(null);
2143		- CameraPane.RANDOM = random;
	2299	+ CameraPane.SWITCH = random;
2144	2300	}
2145	2301
2146	2302	refreshContents();
2147	2303	} else
2148	2304	if (source == relinkverticesItem)
2149	2305	{
2150		- boolean random = CameraPane.RANDOM;
2151		- CameraPane.RANDOM = false; // parse all random nodes
	2306	+ boolean random = CameraPane.SWITCH;
	2307	+ CameraPane.SWITCH = false; // parse all random nodes
2152	2308	group.selection.RelinkToSupport();
2153		- CameraPane.RANDOM = random;
	2309	+ CameraPane.SWITCH = random;
2154	2310
2155	2311	refreshContents();
2156	2312	} else
..	..	@@ -2165,9 +2321,9 @@
2165	2321	} else
2166	2322	if (source == setMasterItem)
2167	2323	{
2168		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2324	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2169	2325	{
2170		- Object3D content = GrafreeD.clipboard.get(0);
	2326	+ Object3D content = Grafreed.clipboard.get(0);
2171	2327
2172	2328	if (content instanceof cGroup && ((cGroup)content).transientlink )
2173	2329	content = ((cGroup)content).get(0);
..	..	@@ -2180,9 +2336,9 @@
2180	2336	{
2181	2337	if (group.selection.size() == 1)
2182	2338	{
2183		- if (GrafreeD.clipboard.size() == 1)
	2339	+ if (Grafreed.clipboard.size() == 1)
2184	2340	{
2185		- Object3D content = GrafreeD.clipboard.get(0);
	2341	+ Object3D content = Grafreed.clipboard.get(0);
2186	2342
2187	2343	if (content instanceof cGroup && ((cGroup)content).transientlink )
2188	2344	content = ((cGroup)content).get(0);
..	..	@@ -2199,7 +2355,7 @@
2199	2355	{
2200	2356	RevertMeshes();
2201	2357	} else
2202		- if (source == resetMeshItem)
	2358	+ if (source == resetAllItem)
2203	2359	{
2204	2360	ResetAll();
2205	2361	} else
..	..	@@ -2248,7 +2404,7 @@
2248	2404	RandomNode random = new RandomNode();
2249	2405	group(random);
2250	2406	if (random.size() > 0)
2251		- random.name = random.get(0).name + "Rnd";
	2407	+ random.name = random.get(0).name + "Switch";
2252	2408	} else
2253	2409	if (source == physicsItem)
2254	2410	{
..	..	@@ -2387,7 +2543,7 @@
2387	2543	} else
2388	2544	if (source == genNormalsMESHItem)
2389	2545	{
2390		- GenNormals(true); // TODO
	2546	+ GenNormalsMESH();
2391	2547	} else
2392	2548	if (source == genNormalsORGANItem)
2393	2549	{
..	..	@@ -2537,9 +2693,13 @@
2537	2693	{
2538	2694	SmoothMesh();
2539	2695	} else
2540		- if (source == transformgeometryItem)
	2696	+ if (source == transformGeometryItem)
2541	2697	{
2542	2698	TransformGeometry();
	2699	+ } else
	2700	+ if (source == transformChildrenItem)
	2701	+ {
	2702	+ TransformChildren();
2543	2703	} else
2544	2704	if (source == resetTransformItem)
2545	2705	{
..	..	@@ -2547,7 +2707,11 @@
2547	2707	} else
2548	2708	if (source == resetCentroidItem)
2549	2709	{
2550		- ResetCentroid();
	2710	+ ResetCentroid(true);
	2711	+ } else
	2712	+ if (source == resetCentroidXZItem)
	2713	+ {
	2714	+ ResetCentroid(false);
2551	2715	} else
2552	2716	if (source == resetParentItem)
2553	2717	{
..	..	@@ -2903,9 +3067,9 @@
2903	3067	child.CloseUI();
2904	3068	listUI.remove(child);
2905	3069
2906		- child.editWindow = null; // ???????????
	3070	+ //child.editWindow = null; // ???????????
2907	3071	}
2908		- objEditor.ctrlPanel.validate();
	3072	+ objEditor.ctrlPanel.FlushUI();
2909	3073	//objEditor.jTree.clearSelection();
2910	3074	//objEditor.ResetSliders();
2911	3075	refreshContents(true);
..	..	@@ -2989,7 +3153,10 @@
2989	3153	frontView.object = group;
2990	3154	sideView.object = group;
2991	3155	}
	3156	+
	3157	+// fix "+" issue
2992	3158	group.editWindow = this;
	3159	+
2993	3160	/*
2994	3161	currentLayout = radio.layout;
2995	3162	if (currentLayout == null)
..	..	@@ -3002,7 +3169,20 @@
3002	3169	//group.attributes = -1;
3003	3170	ResetModel();
3004	3171	refreshContents(true);
3005		- }
	3172	+ } else if (event.getSource() == editCameraItem)
	3173	+ {
	3174	+ cameraView.ProtectCamera();
	3175	+ cameraView.repaint();
	3176	+ return;
	3177	+ } else if (event.getSource() == revertCameraItem)
	3178	+ {
	3179	+ cameraView.RevertCamera();
	3180	+ cameraView.repaint();
	3181	+ return;
	3182	+ // } else if (event.getSource() == textureButton)
	3183	+ // {
	3184	+ // return; // true;
	3185	+ }
3006	3186	else
3007	3187	{
3008	3188	//return super.action(event, arg);
..	..	@@ -3063,6 +3243,28 @@
3063	3243	refreshContents();
3064	3244	}
3065	3245
	3246	+ void TransformChildren()
	3247	+ {
	3248	+ Object3D obj;
	3249	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3250	+ {
	3251	+ obj = (Object3D)e.nextElement();
	3252	+ obj.KeepTextureMatrices();
	3253	+ obj.TransformChildren();
	3254	+ obj.RestoreTextureMatrices();
	3255	+
	3256	+// if (obj.parent == null)
	3257	+// {
	3258	+// System.out.println("NULL PARENT!");
	3259	+// new Exception().printStackTrace();
	3260	+// }
	3261	+// else
	3262	+// TouchTransform(obj);
	3263	+// //obj.parent.Touch();
	3264	+ }
	3265	+
	3266	+ refreshContents();
	3267	+ }
3066	3268
3067	3269	void ResetTransform()
3068	3270	{
..	..	@@ -3175,7 +3377,7 @@
3175	3377	refreshContents();
3176	3378	}
3177	3379
3178		- void ResetCentroid()
	3380	+ void ResetCentroid(boolean full)
3179	3381	{
3180	3382	Object3D obj;
3181	3383	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3190,12 +3392,16 @@
3190	3392	LA.matIdentity(Object3D.mat);
3191	3393	obj.getBounds(minima, maxima, false);
3192	3394	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3193		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3395	+ if (full)
	3396	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3194	3397	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3195	3398	obj.TransformMesh(Object3D.mat);
	3399	+
3196	3400	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3197		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3401	+ if (full)
	3402	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3198	3403	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3404	+
3199	3405	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3200	3406	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3201	3407	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3224,7 +3430,8 @@
3224	3430
3225	3431	int size = obj.MemorySize();
3226	3432
3227		- System.err.println((size/1024) + " KB is the size of " + obj);
	3433	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3434	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3228	3435	}
3229	3436	}
3230	3437	catch (Exception e)
..	..	@@ -3261,9 +3468,9 @@
3261	3468	obj = (Object3D)e.nextElement();
3262	3469
3263	3470	System.out.println("Object is: " + obj);
3264		- GrafreeD.AnalyzeObject(obj);
	3471	+ Grafreed.AnalyzeObject(obj);
3265	3472	System.out.println("Boundary rep: " + obj.bRep);
3266		- GrafreeD.AnalyzeObject(obj.bRep);
	3473	+ Grafreed.AnalyzeObject(obj.bRep);
3267	3474
3268	3475	// System.err.println((size/1024) + " KB is the size of " + obj);
3269	3476	}
..	..	@@ -3305,6 +3512,13 @@
3305	3512	void GenNormals(boolean crease)
3306	3513	{
3307	3514	group.GenNormalsS(crease);
	3515	+
	3516	+ refreshContents();
	3517	+ }
	3518	+
	3519	+ void GenNormalsMESH()
	3520	+ {
	3521	+ group.GenNormalsMeshS();
3308	3522
3309	3523	refreshContents();
3310	3524	}
..	..	@@ -3477,8 +3691,8 @@
3477	3691
3478	3692	void ParseVertices()
3479	3693	{
3480		- boolean epsequal = GrafreeD.epsequal;
3481		- GrafreeD.epsequal = true;
	3694	+ boolean epsequal = Grafreed.epsequal;
	3695	+ Grafreed.epsequal = true;
3482	3696
3483	3697	for (int i=0; i<group.selection.size(); i++)
3484	3698	{
..	..	@@ -3503,7 +3717,7 @@
3503	3717	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3504	3718	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3505	3719
3506		- g.add(GrafreeD.clipboard);
	3720	+ g.add(Grafreed.clipboard);
3507	3721
3508	3722	buffer.add(g);
3509	3723	}
..	..	@@ -3518,7 +3732,7 @@
3518	3732	makeSomething(buffer, i==group.selection.size()-1);
3519	3733	}
3520	3734
3521		- GrafreeD.epsequal = epsequal;
	3735	+ Grafreed.epsequal = epsequal;
3522	3736
3523	3737	refreshContents();
3524	3738	}
..	..	@@ -3536,7 +3750,16 @@
3536	3750	String pigment = Object3D.GetPigment(tex);
3537	3751	//String bump = Object3D.GetBump(tex);
3538	3752
3539		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3753	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3754	+
	3755	+ try
	3756	+ {
	3757	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3758	+ }
	3759	+ catch (Exception e)
	3760	+ {
	3761	+ System.err.println("FAIL: " + node);
	3762	+ }
3540	3763
3541	3764	double s = v.s;
3542	3765
..	..	@@ -3624,11 +3847,11 @@
3624	3847
3625	3848	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3626	3849
3627		- boolean random = CameraPane.RANDOM;
3628		- CameraPane.RANDOM = false; // parse all random nodes
	3850	+ boolean random = CameraPane.SWITCH;
	3851	+ CameraPane.SWITCH = false; // parse all random nodes
3629	3852	lowres.linkVerticesThis(null);
3630	3853	lowres.linkVerticesThis(sn);
3631		- CameraPane.RANDOM = random;
	3854	+ CameraPane.SWITCH = random;
3632	3855
3633	3856	System.err.flush();
3634	3857
..	..	@@ -3668,7 +3891,7 @@
3668	3891	return;
3669	3892
3670	3893	Object3D poses = group.selection.get(0);
3671		- Object3D ref = GrafreeD.clipboard.get(0);
	3894	+ Object3D ref = Grafreed.clipboard.get(0);
3672	3895
3673	3896	Object3D newgroup = new Object3D("Po:" + poses.name);
3674	3897
..	..	@@ -3862,9 +4085,9 @@
3862	4085
3863	4086	void ClipMesh()
3864	4087	{
3865		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4088	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3866	4089	{
3867		- Object3D content = GrafreeD.clipboard.get(0);
	4090	+ Object3D content = Grafreed.clipboard.get(0);
3868	4091
3869	4092	if (content instanceof cGroup && ((cGroup)content).transientlink )
3870	4093	content = ((cGroup)content).get(0);
..	..	@@ -3873,7 +4096,7 @@
3873	4096	// {
3874	4097	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3875	4098	// }
3876		- group.selection.ClipMesh(GrafreeD.clipboard);
	4099	+ group.selection.ClipMesh(Grafreed.clipboard);
3877	4100	}
3878	4101	// group.selection.ClipMesh(GrafreeD.clipboard);
3879	4102	System.out.println("DONE.");
..	..	@@ -4008,7 +4231,7 @@
4008	4231	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4009	4232
4010	4233	Object3D elem = (Object3D)group.selection.elementAt(i);
4011		- if(elem != group)
	4234	+ if(elem != group \|\| !newWindow)
4012	4235	{
4013	4236	// if (!(elem instanceof Composite))
4014	4237	// newWindow = false;
..	..	@@ -4098,7 +4321,6 @@
4098	4321	//case 702: // Event.LIST_DESELECT
4099	4322	group.deselectAll();
4100	4323	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4101		- objEditor.ClearInfo(); // .GetMaterial());
4102	4324	if (tps != null)
4103	4325	{
4104	4326	for (int i=0; i < tps.length; i++)
..	..	@@ -4108,28 +4330,26 @@
4108	4330	//if (child.parent != null)
4109	4331	//child.parent.addSelectee(child);
4110	4332	group.addSelectee(child);
4111		- objEditor.SetMaterial(child); // .GetMaterial());
4112		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4113		- System.err.println("info : " + child.GetPath());
4114	4333	}
4115	4334	}
4116		- else
4117		- {
4118		- objEditor.SetMaterial(group); // .GetMaterial());
4119		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4120		- System.err.println("info : " + group.GetPath());
4121		- }
	4335	+// else
	4336	+// {
	4337	+// objEditor.SetMaterial(group); // .GetMaterial());
	4338	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4339	+// System.err.println("info : " + group.GetPath());
	4340	+// }
4122	4341
4123		- objEditor.SetText(); // jan 2014
4124		-
4125		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4342	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4126	4343	CameraPane.flash = true;
4127	4344
4128		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4345	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4129	4346	// a camera
4130	4347	{
4131		- CameraPane.camerachangeframe = 0; // don't refuse it
4132		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4348	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4349	+ {
	4350	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4351	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4352	+ }
4133	4353	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4134	4354	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4135	4355	}
..	..	@@ -4142,6 +4362,29 @@
4142	4362
4143	4363	freezemodel = false;
4144	4364	}
	4365	+
	4366	+ void refreshContents(boolean cp)
	4367	+ {
	4368	+ if (!Globals.MOUSEDRAGGED)
	4369	+ {
	4370	+ objEditor.ClearInfo(); // .GetMaterial());
	4371	+
	4372	+ for (int i=0; i < group.selection.size(); i++)
	4373	+ {
	4374	+ Object3D child = (Object3D) group.selection.reserve(i);
	4375	+
	4376	+ objEditor.SetMaterial(child);
	4377	+ objEditor.AddInfo(child, this, true);
	4378	+ System.err.println("info : " + child.GetPath());
	4379	+
	4380	+ group.selection.release(i);
	4381	+ }
	4382	+
	4383	+ objEditor.SetText(); // jan 2014
	4384	+ }
	4385	+
	4386	+ super.refreshContents(cp);
	4387	+ }
4145	4388
4146	4389	void linkSomething(Object3D thing)
4147	4390	{
..	..	@@ -4213,16 +4456,18 @@
4213	4456	{
4214	4457	if (group.selection.isEmpty())
4215	4458	return;
4216		- GrafreeD.clipboardIsTempGroup = false;
	4459	+
	4460	+ Grafreed.clipboardIsTempGroup = false;
4217	4461	Composite tGroup = null;
4218	4462	if (group.selection.size() > 0) // 1)
4219	4463	{
4220	4464	tGroup = new cGroup();
4221		- GrafreeD.clipboardIsTempGroup = true;
	4465	+ Grafreed.clipboardIsTempGroup = true;
4222	4466	}
4223	4467
4224	4468	if (cut)
4225	4469	{
	4470	+ Save();
4226	4471	//int indices[] = jList.getSelectedIndices();
4227	4472	//for (int i = indices.length - 1; i >= 0; i--)
4228	4473	//jList.remove(indices[i]);
..	..	@@ -4258,16 +4503,16 @@
4258	4503	//System.out.println("cut " + child);
4259	4504	//System.out.println("parent = " + child.parent);
4260	4505	// tmp.addChild(child);
4261		- if (GrafreeD.clipboardIsTempGroup)
	4506	+ if (Grafreed.clipboardIsTempGroup)
4262	4507	tGroup.add/Child/(tmp);
4263	4508	else
4264		- GrafreeD.clipboard = tmp;
	4509	+ Grafreed.clipboard = tmp;
4265	4510	}
4266	4511	else
4267		- if (GrafreeD.clipboardIsTempGroup)
	4512	+ if (Grafreed.clipboardIsTempGroup)
4268	4513	tGroup.add/Child/(child);
4269	4514	else
4270		- GrafreeD.clipboard = child;
	4515	+ Grafreed.clipboard = child;
4271	4516	}
4272	4517
4273	4518	//ResetModel();
..	..	@@ -4299,21 +4544,23 @@
4299	4544	//System.out.println("cut " + elem);
4300	4545	//System.out.println("parent = " + elem.parent);
4301	4546	// tmp.addChild(elem);
4302		- if (GrafreeD.clipboardIsTempGroup)
	4547	+ if (Grafreed.clipboardIsTempGroup)
4303	4548	tGroup.add/Child/(tmp);
4304	4549	else
4305		- GrafreeD.clipboard = tmp;
	4550	+ Grafreed.clipboard = tmp;
4306	4551	}
4307	4552	else
4308		- if (GrafreeD.clipboardIsTempGroup)
	4553	+ if (Grafreed.clipboardIsTempGroup)
4309	4554	tGroup.add/Child/(child);
4310	4555	else
4311		- GrafreeD.clipboard = child;
	4556	+ Grafreed.clipboard = child;
4312	4557	}
4313	4558
4314	4559	}
4315		- if (GrafreeD.clipboardIsTempGroup)
4316		- GrafreeD.clipboard = tGroup;
	4560	+
	4561	+ if (Grafreed.clipboardIsTempGroup)
	4562	+ Grafreed.clipboard = tGroup;
	4563	+
4317	4564	if (cut)
4318	4565	{
4319	4566	ResetModel();
..	..	@@ -4327,7 +4574,7 @@
4327	4574	// return;
4328	4575	boolean first = true;
4329	4576
4330		- if (GrafreeD.clipboardIsTempGroup)
	4577	+ if (Grafreed.clipboardIsTempGroup)
4331	4578	{
4332	4579	Composite temp;
4333	4580
..	..	@@ -4338,7 +4585,7 @@
4338	4585	temp = (Composite)Applet3D.clipboard.deepCopy();
4339	4586	*/
4340	4587	Object3D elem;
4341		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4588	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4342	4589	{
4343	4590	Object3D child = (Object3D)e.nextElement();
4344	4591
..	..	@@ -4372,21 +4619,21 @@
4372	4619	//Object3D cb = Applet3D.clipboard;
4373	4620	//temp.addChild(cb);
4374	4621	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4375		- assert(GrafreeD.clipboard.parent == null);
4376		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4377		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4378		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4379		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4622	+ assert(Grafreed.clipboard.parent == null);
	4623	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4624	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4625	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4626	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4380	4627	else
4381		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4382		- GrafreeD.clipboard.get(0).parent = keepparent;
	4628	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4629	+ Grafreed.clipboard.get(0).parent = keepparent;
4383	4630	}
4384	4631
4385	4632	ResetModel();
4386	4633	refreshContents();
4387	4634	}
4388	4635
4389		- void pasteInto(boolean copyit)
	4636	+ void pasteInto(boolean copyit, boolean clone)
4390	4637	{
4391	4638	// if (GrafreeD.clipboard == null)
4392	4639	// return;
..	..	@@ -4415,15 +4662,22 @@
4415	4662	if (copyit)
4416	4663	{
4417	4664	// paste(false);
4418		- CloneClipboard(false); // sept 2014
	4665	+ if (clone)
	4666	+ {
	4667	+ CloneClipboard(false); // sept 2014
	4668	+ }
	4669	+ else
	4670	+ {
	4671	+ paste(false);
	4672	+ }
4419	4673	}
4420	4674	else
4421	4675	{
4422	4676	boolean first = true;
4423	4677
4424		- if (GrafreeD.clipboardIsTempGroup)
	4678	+ if (Grafreed.clipboardIsTempGroup)
4425	4679	{
4426		- Composite temp = (Composite)GrafreeD.clipboard;
	4680	+ Composite temp = (Composite)Grafreed.clipboard;
4427	4681	Object3D copy;
4428	4682	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4429	4683	{
..	..	@@ -4433,7 +4687,7 @@
4433	4687	}
4434	4688	} else
4435	4689	{
4436		- linkSomething(GrafreeD.clipboard); //.get(0));
	4690	+ linkSomething(Grafreed.clipboard); //.get(0));
4437	4691	}
4438	4692	}
4439	4693	}
..	..	@@ -4838,21 +5092,6 @@
4838	5092	}
4839	5093	*/
4840	5094
4841		- void ImportGFD()
4842		- {
4843		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4844		- browser.show();
4845		- String filename = browser.getFile();
4846		- if (filename != null && filename.length() > 0)
4847		- {
4848		- String fullname = browser.getDirectory() + filename;
4849		-
4850		- //Object3D readobj =
4851		- objEditor.ReadGFD(fullname, objEditor);
4852		- //makeSomething(readobj);
4853		- }
4854		- }
4855		-
4856	5095	/*
4857	5096	public void Callback(Object obj)
4858	5097	{
..	..	@@ -4876,26 +5115,9 @@
4876	5115	}
4877	5116	*/
4878	5117
4879		- void ImportVRMLX3D()
4880		- {
4881		- if (GrafreeD.standAlone)
4882		- {
4883		- /**/
4884		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4885		- browser.show();
4886		- String filename = browser.getFile();
4887		- if (filename != null && filename.length() > 0)
4888		- {
4889		- String fullname = browser.getDirectory() + filename;
4890		- LoadVRMLX3D(fullname);
4891		- }
4892		- /**/
4893		- }
4894		- }
4895		-
4896	5118	String GetFile(String dialogName)
4897	5119	{
4898		- if (GrafreeD.standAlone)
	5120	+ if (Grafreed.standAlone)
4899	5121	{
4900	5122	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4901	5123	browser.show();
..	..	@@ -4959,10 +5181,15 @@
4959	5181	cButton flashSelectionButton;
4960	5182	cButton editButton;
4961	5183	cButton uneditButton;
	5184	+ JCheckBox allParamsButton;
4962	5185	cButton clearpanelButton;
4963		- cButton allParamsButton;
4964	5186	cButton unselectButton;
4965	5187
	5188	+ cButton saveButton;
	5189	+ cButton undoButton;
	5190	+ cButton redoButton;
	5191	+ cButton oneStepButton;
	5192	+
4966	5193	cButton screenfitButton;
4967	5194	cButton screenfitpointButton;
4968	5195	cButton snapobjectButton;
..	..	@@ -4993,6 +5220,8 @@
4993	5220	private MenuItem lookFromItem;
4994	5221	private MenuItem switchItem;
4995	5222	private MenuItem cutItem;
	5223	+ private MenuItem undoItem;
	5224	+ private MenuItem redoItem;
4996	5225	private MenuItem duplicateItem;
4997	5226	private MenuItem cloneItem;
4998	5227	private MenuItem cloneSupportItem;
..	..	@@ -5006,7 +5235,7 @@
5006	5235	private MenuItem linkverticesItem;
5007	5236	private MenuItem relinkverticesItem;
5008	5237	private MenuItem setMasterItem;
5009		- private MenuItem resetMeshItem;
	5238	+ private MenuItem resetAllItem;
5010	5239	private MenuItem stepAllItem;
5011	5240	private MenuItem revertMeshItem;
5012	5241	private MenuItem poseMeshItem;
..	..	@@ -5017,6 +5246,7 @@
5017	5246	private MenuItem mergeGeometriesItem;
5018	5247	private MenuItem copyItem;
5019	5248	private MenuItem pasteItem;
	5249	+ private MenuItem pasteIntoItem;
5020	5250	private MenuItem pasteLinkItem;
5021	5251	private MenuItem pasteCloneItem;
5022	5252	private MenuItem pasteExpandItem;
..	..	@@ -5066,8 +5296,10 @@
5066	5296	private MenuItem panoTexturesItem;
5067	5297
5068	5298	private MenuItem resetCentroidItem;
5069		- private MenuItem transformgeometryItem;
	5299	+ private MenuItem resetCentroidXZItem;
5070	5300	private MenuItem resetTransformItem;
	5301	+ private MenuItem transformGeometryItem;
	5302	+ private MenuItem transformChildrenItem;
5071	5303	private MenuItem hideItem;
5072	5304	private MenuItem grabItem;
5073	5305	private MenuItem backItem;
..	..	@@ -5114,7 +5346,7 @@
5114	5346	private MenuItem blobItem;
5115	5347	private MenuItem latheItem;
5116	5348	private MenuItem bezierItem;
5117		- private MenuItem checkerItem;
	5349	+ private MenuItem overlayItem;
5118	5350	private MenuItem meshItem;
5119	5351	// private MenuItem meshGroupItem;
5120	5352	private MenuItem springItem;
..	..	@@ -5136,11 +5368,6 @@
5136	5368	private MenuItem doubleItem;
5137	5369	private MenuItem tripleItem;
5138	5370
5139		- private MenuItem importGFDItem;
5140		- private MenuItem importVRMLX3DItem;
5141		- private MenuItem import3DSItem;
5142		- private MenuItem importOBJItem;
5143		-
5144	5371	private MenuItem computeAOItem;
5145	5372	private MenuItem recompileItem;
5146	5373	private MenuItem editScriptItem;
..	..	@@ -5150,4 +5377,8 @@
5150	5377	private MenuItem analyzeItem;
5151	5378	private MenuItem dumpItem;
5152	5379	//boolean freezemodel = false;
	5380	+
	5381	+ Menu cameraMenu;
	5382	+ MenuItem editCameraItem;
	5383	+ MenuItem revertCameraItem;
5153	5384	}