~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,40 +148,37 @@
148	148
149	149	//JTextField nameField;
150	150
151		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
152	152	{
153		- if (Globals.ADVANCED)
154		- {
155		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
156		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
157		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
158		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
159		- oe.cameraMenu.add("-");
160		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
161		- openWindowItem.addActionListener(this);
162		- editLeafItem.addActionListener(this);
163		- lookAtItem.addActionListener(this);
164		- //lookFromItem.addActinoListener(this);
165		- //switchItem.addActionListener(this);
166		- }
167		-
	153	+ oe.jTree = new cTree();
	154	+
168	155	Menu menu;
169	156	oe.menuBar.add(menu = new Menu("Edit"));
170	157	//editItem = menu.add(new MenuItem("Edit"));
171	158	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	159	+
	160	+// undoItem = menu.add(new MenuItem("Undo"));
	161	+// undoItem.addActionListener(this);
	162	+// redoItem = menu.add(new MenuItem("Redo"));
	163	+// redoItem.addActionListener(this);
	164	+// menu.add("-");
	165	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	166	duplicateItem.addActionListener(this);
	167	+ cloneItem = menu.add(new MenuItem("Clone"));
	168	+ cloneItem.addActionListener(this);
	169	+ if (Globals.ADVANCED)
	170	+ {
	171	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	172	+ cloneSupportItem.addActionListener(this);
	173	+ }
	174	+ menu.add("-");
174	175	cutItem = menu.add(new MenuItem("Cut"));
175	176	cutItem.addActionListener(this);
176	177	copyItem = menu.add(new MenuItem("Copy"));
177	178	copyItem.addActionListener(this);
178	179	pasteItem = menu.add(new MenuItem("Paste"));
179	180	pasteItem.addActionListener(this);
180		- menu.add("-");
181		- cloneItem = menu.add(new MenuItem("Clone"));
182		- cloneItem.addActionListener(this);
183		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
184		- cloneSupportItem.addActionListener(this);
	181	+
185	182	menu.add("-");
186	183	pasteIntoItem = menu.add(new MenuItem("Paste into"));
187	184	pasteIntoItem.addActionListener(this);
..	..	@@ -201,14 +198,97 @@
201	198	clearAllItem = menu.add(new MenuItem("Clear All"));
202	199	clearAllItem.addActionListener(this);
203	200	}
	201	+
	202	+ menuBar.add(cameraMenu = new Menu("View"));
	203	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	204	+ //zBufferItem.addActionListener(this);
	205	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	206	+ //normalLensItem.addActionListener(this);
	207	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ restoreCameraItem.addActionListener(this);
	209	+
	210	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	211	+// toggleFullScreenItem.addItemListener(this);
	212	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	213	+// cameraMenu.add("-");
	214	+//
	215	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	216	+// toggleTextureItem.addItemListener(this);
	217	+// toggleTextureItem.setState(CameraPane.textureon);
	218	+//
	219	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	220	+// toggleSwitchItem.addItemListener(this);
	221	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	222	+
	223	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	224	+ toggleHandleItem.addItemListener(this);
	225	+ toggleHandleItem.setState(CameraPane.HANDLES);
	226	+
	227	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	228	+ togglePaintItem.addItemListener(this);
	229	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	230	+
	231	+ if (Globals.ADVANCED)
	232	+ {
	233	+ cameraMenu.add("-");
	234	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	235	+ toggleLiveItem.addItemListener(this);
	236	+ toggleLiveItem.setState(Globals.isLIVE());
204	237
	238	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	239	+ stepItem.addActionListener(this);
	240	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	241	+ // toggleDLItem.addItemListener(this);
	242	+ // toggleDLItem.setState(false);
	243	+
	244	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	245	+ toggleRenderItem.addItemListener(this);
	246	+ toggleRenderItem.setState(!CameraPane.frozen);
	247	+
	248	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	249	+ toggleDebugItem.addItemListener(this);
	250	+ toggleDebugItem.setState(Globals.DEBUG);
	251	+
	252	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	253	+ toggleFrustumItem.addItemListener(this);
	254	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	255	+
	256	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	257	+ toggleFootContactItem.addItemListener(this);
	258	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	259	+
	260	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	261	+ toggleTimelineItem.addItemListener(this);
	262	+ }
	263	+
	264	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	265	+// toggleRootItem.addItemListener(this);
	266	+// toggleRootItem.setState(false);
	267	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	268	+// animationItem.addItemListener(this);
	269	+// animationItem.setState(CameraPane.ANIMATION);
	270	+ cameraMenu.add("-");
	271	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	272	+ editCameraItem.addActionListener(this);
	273	+
	274	+ if (Globals.ADVANCED)
	275	+ {
	276	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	277	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	278	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	279	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	280	+ oe.cameraMenu.add("-");
	281	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	282	+ openWindowItem.addActionListener(this);
	283	+ editLeafItem.addActionListener(this);
	284	+ lookAtItem.addActionListener(this);
	285	+ //lookFromItem.addActinoListener(this);
	286	+ //switchViewItem.addActionListener(this);
	287	+ }
	288	+
205	289	oe.menuBar.add(menu = new Menu("Setting"));
206	290	if (Globals.ADVANCED)
207	291	{
208		- resetMeshItem = menu.add(new MenuItem("Reset All"));
209		- resetMeshItem.addActionListener(this);
210		- stepAllItem = menu.add(new MenuItem("Step All"));
211		- stepAllItem.addActionListener(this);
212	292	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
213	293	revertMeshItem.addActionListener(this);
214	294	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -248,21 +328,29 @@
248	328	}
249	329
250	330	oe.menuBar.add(menu = new Menu("Group"));
251		- grabItem = menu.add(new MenuItem("Grab"));
252		- grabItem.addActionListener(this);
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
253	333	backItem = menu.add(new MenuItem("Back"));
254	334	backItem.addActionListener(this);
255	335	frontItem = menu.add(new MenuItem("Front"));
256	336	frontItem.addActionListener(this);
257		- compositeItem = menu.add(new MenuItem("Composite"));
258		- compositeItem.addActionListener(this);
	337	+// compositeItem = menu.add(new MenuItem("Composite"));
	338	+// compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
259	342	hideItem = menu.add(new MenuItem("Hidden Group"));
260	343	hideItem.addActionListener(this);
	344	+ }
261	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
262	346	ungroupItem.addActionListener(this);
263		- menu.add("-");
264		- randomItem = menu.add(new MenuItem("Switch node"));
265		- randomItem.addActionListener(this);
	347	+
	348	+// menu.add("-");
	349	+//
	350	+// switchItem = menu.add(new MenuItem("Switch node"));
	351	+// switchItem.addActionListener(this);
	352	+ if (Globals.ADVANCED)
	353	+ {
266	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
267	355	switchGeoItem.addActionListener(this);
268	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -270,33 +358,31 @@
270	358	morphItem = menu.add(new MenuItem("Morph Group"));
271	359	morphItem.addActionListener(this);
272	360
273		- if (Globals.ADVANCED)
274		- {
	361	+ menu.add("-");
275	362	physicsItem = menu.add(new MenuItem("Physics"));
276	363	physicsItem.addActionListener(this);
277	364	frameselectorItem = menu.add(new MenuItem("Frame Selector"));
278	365	frameselectorItem.addActionListener(this);
279	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
280	367	scriptNodeItem.addActionListener(this);
281		- cameraItem = menu.add(new MenuItem("Camera"));
282		- cameraItem.addActionListener(this);
283	368	}
284	369
285	370	oe.menuBar.add(menu = new Menu("Object"));
286		- textureItem = menu.add(new MenuItem("Texture"));
287		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
288	373	billboardItem = menu.add(new MenuItem("Billboard"));
289	374	billboardItem.addActionListener(this);
290	375	csgItem = menu.add(new MenuItem("CSG"));
291	376	csgItem.addActionListener(this);
292		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	377	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
293	378	shadowXItem.addActionListener(this);
294		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	379	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
295	380	shadowYItem.addActionListener(this);
296		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	381	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
297	382	shadowZItem.addActionListener(this);
298	383	if (Globals.ADVANCED)
299	384	{
	385	+ menu.add("-");
300	386	linkerItem = menu.add(new MenuItem("Linker"));
301	387	linkerItem.addActionListener(this);
302	388	attributeItem = menu.add(new MenuItem("Attribute"));
..	..	@@ -305,14 +391,18 @@
305	391	templateItem.addActionListener(this);
306	392	pointflowItem = menu.add(new MenuItem("Point Flow"));
307	393	pointflowItem.addActionListener(this);
308		- menu.add("-");
309	394	}
	395	+ menu.add("-");
310	396	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
311	397	resetTransformItem.addActionListener(this);
312	398	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
313	399	resetCentroidItem.addActionListener(this);
314		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
315		- transformgeometryItem.addActionListener(this);
	400	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	401	+ resetCentroidXZItem.addActionListener(this);
	402	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	403	+ transformGeometryItem.addActionListener(this);
	404	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	405	+ transformChildrenItem.addActionListener(this);
316	406
317	407	oe.menuBar.add(menu = new Menu("Geometry"));
318	408	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -361,6 +451,10 @@
361	451	oe.menuBar.add(menu = new Menu("Attributes"));
362	452	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
363	453	clearMaterialsItem.addActionListener(this);
	454	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	455	+ resetAllItem.addActionListener(this);
	456	+ stepAllItem = menu.add(new MenuItem("Step All"));
	457	+ stepAllItem.addActionListener(this);
364	458	menu.add("-");
365	459	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
366	460	liveleavesItem.addActionListener(this);
..	..	@@ -381,6 +475,14 @@
381	475	markleavesItem.addActionListener(this);
382	476	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
383	477	unmarkleavesItem.addActionListener(this);
	478	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	479	+ rewindleavesItem.addActionListener(this);
	480	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	481	+ unrewindleavesItem.addActionListener(this);
	482	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	483	+ randomleavesItem.addActionListener(this);
	484	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	485	+ unrandomleavesItem.addActionListener(this);
384	486	menu.add("-");
385	487	flipVItem = menu.add(new MenuItem("Flip V"));
386	488	flipVItem.addActionListener(this);
..	..	@@ -415,38 +517,41 @@
415	517	sortbysizeItem.addActionListener(this);
416	518	sortbynameItem = menu.add(new MenuItem("Sort by name"));
417	519	sortbynameItem.addActionListener(this);
	520	+ menu.add("-");
	521	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	522	+ shareGeometriesItem.addActionListener(this);
	523	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	524	+ mergeGeometriesItem.addActionListener(this);
418	525	if (Globals.ADVANCED)
419	526	{
420		- menu.add("-");
	527	+ // Pretty much the same as duplicate and clone.
421	528	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
422	529	extractGeometriesItem.addActionListener(this);
423	530	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
424	531	cloneGeometriesItem.addActionListener(this);
425		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
426		- shareGeometriesItem.addActionListener(this);
427		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
428		- mergeGeometriesItem.addActionListener(this);
429	532	}
430	533
431	534	oe.menuBar.add(menu = new Menu("Insert"));
432	535	buildCreateMenu(menu);
433	536
434		- oe.menuBar.add(menu = new Menu("Include"));
435		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
436		- importGFDItem.addActionListener(this);
437		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
438		- importVRMLX3DItem.addActionListener(this);
439		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
440		- importOBJItem.addActionListener(this);
441		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
442		- import3DSItem.addActionListener(this);
443		-
444	537	oe.menuBar.add(menu = new Menu("Tools"));
445	538	buildToolsMenu(menu);
446	539	}
447	540
448	541	void SetupUI2(ObjEditor oe)
449	542	{
	543	+ // June 2019
	544	+ if (oe == null)
	545	+ {
	546	+ //super.SetupUI2(this);
	547	+ //return;
	548	+ }
	549	+
	550	+ if (copy != group)
	551	+ {
	552	+ //super.SetupUI2(this);
	553	+ }
	554	+
450	555	//new Exception().printStackTrace();
451	556
452	557	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -475,97 +580,198 @@
475	580	oe.radioPanel.add(dummyButton);
476	581	oe.buttonGroup.add(dummyButton);
477	582	*/
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 2;
	586	+
478	587	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
479	588
480		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
481		- liveCB.setToolTipText("Enabled animation");
	589	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	590	+ //minButton.setToolTipText("Minimize window");
	591	+ //minButton.addActionListener(this);
	592	+
	593	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	594	+ maxButton.setToolTipText("Maximize window");
	595	+ maxButton.addActionListener(this);
	596	+
	597	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	598	+ fullButton.setToolTipText("Full-screen window");
	599	+ fullButton.addActionListener(this);
	600	+
	601	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	602	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	603	+ restoreCameraButton.addActionListener(this);
	604	+
	605	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	606	+ undoButton.setToolTipText("Undo changes");
	607	+ undoButton.addActionListener(this);
	608	+
	609	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	610	+ redoButton.setToolTipText("Redo changes");
	611	+ redoButton.addActionListener(this);
	612	+
	613	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	614	+ saveButton.setToolTipText("Save changes");
	615	+ saveButton.addActionListener(this);
	616	+
	617	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	618	+ liveCB.setToolTipText("Enable animation");
482	619	liveCB.addItemListener(this);
483	620
484		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	621	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	622	oneStepButton.setToolTipText("Animate one step forward");
486	623	oneStepButton.addActionListener(this);
487	624
488		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	625	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
489	626	fastCB.setToolTipText("Fast mode");
490	627	fastCB.addItemListener(this);
491	628
492		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
493		- trackCB.setToolTipText("Enable tracking");
494		- trackCB.addItemListener(this);
495		-
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	629	+ //oe.toolboxPanel.Return();
	630	+
	631	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
497	632	screenfitButton.setToolTipText("Screen fit");
498	633	screenfitButton.addActionListener(this);
	634	+
	635	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	636	+// trackCB.setToolTipText("Enable tracking");
	637	+// trackCB.addItemListener(this);
499	638
500	639	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
501	640	// screenfitpointButton.addActionListener(this);
502	641
503	642	if (Globals.ADVANCED)
504	643	{
505		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	644	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
506	645	snapobjectButton.addActionListener(this);
507	646	snapobjectButton.setToolTipText("Snap Object");
508	647	}
509	648
510		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
511		- flashSelectionButton.setToolTipText("Show selection");
512		- flashSelectionButton.addActionListener(this);
	649	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
513	650
514		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
515		-
516		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	651	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
517	652	twoButton.setToolTipText("Show center view only");
518	653	twoButton.addActionListener(this);
519		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	654	+ this.fullscreenLayout = twoButton;
	655	+
	656	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
520	657	fourButton.addActionListener(this);
521	658	fourButton.setToolTipText("Show left panel only");
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	659	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
523	660	sixButton.setToolTipText("2-column layout left");
524	661	sixButton.addActionListener(this);
525		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	662	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
526	663	threeButton.setToolTipText("2-column layout right");
527	664	threeButton.addActionListener(this);
528		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	665	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
529	666	sevenButton.setToolTipText("3-column layout");
530	667	sevenButton.addActionListener(this);
531	668	//
532	669
533		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	670	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
534	671	rootButton.setToolTipText("Edit selection in new tab");
535	672	rootButton.addActionListener(this);
536	673
537		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	674	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
538	675	closeButton.setToolTipText("Close tab");
539	676	closeButton.addActionListener(this);
540	677	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
541	678	//clearButton.addActionListener(this);
542		-
543		- cGridBag commandsPanel = new cGridBag();
	679	+
	680	+ // INSERT
	681	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	682	+ gridButton.setToolTipText("Create grid");
	683	+ gridButton.addActionListener(this);
	684	+
	685	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	686	+ boxButton.setToolTipText("Create box");
	687	+ boxButton.addActionListener(this);
	688	+
	689	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	690	+ sphereButton.setToolTipText("Create sphere");
	691	+ sphereButton.addActionListener(this);
	692	+
	693	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	694	+ coneButton.setToolTipText("Create cone");
	695	+ coneButton.addActionListener(this);
	696	+
	697	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	698	+ torusButton.setToolTipText("Create torus");
	699	+ torusButton.addActionListener(this);
	700	+
	701	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	702	+ superButton.setToolTipText("Create superellipsoid");
	703	+ superButton.addActionListener(this);
	704	+
	705	+ if (Globals.ADVANCED)
	706	+ {
	707	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	708	+ kleinButton.setToolTipText("Create Klein bottle");
	709	+ kleinButton.addActionListener(this);
	710	+ }
544	711
545		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	712	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	713	+ particlesButton.setToolTipText("Create particle system");
	714	+ particlesButton.addActionListener(this);
	715	+
	716	+ oe.toolboxPanel.Return();
	717	+
	718	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ groupButton.setToolTipText("Create group");
	720	+ groupButton.addActionListener(this);
	721	+
	722	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	723	+ compositeButton.setToolTipText("Create composite");
	724	+ compositeButton.addActionListener(this);
	725	+
	726	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	727	+ switchButton.setToolTipText("Create switch");
	728	+ switchButton.addActionListener(this);
	729	+
	730	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	731	+ loopButton.setToolTipText("Create loop");
	732	+ loopButton.addActionListener(this);
	733	+
	734	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	735	+ textureButton.setToolTipText("Create texture");
	736	+ textureButton.addActionListener(this);
	737	+
	738	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	739	+ overlayButton.setToolTipText("Create overlay");
	740	+ overlayButton.addActionListener(this);
	741	+
	742	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	743	+ lightButton.setToolTipText("Create light");
	744	+ lightButton.addActionListener(this);
	745	+
	746	+ // EDIT panel
	747	+ editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
546	748	editButton.setToolTipText("Edit selection");
547	749	editButton.addActionListener(this);
548	750
549		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	751	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
550	752	uneditButton.setToolTipText("Unedit selection");
551	753	uneditButton.addActionListener(this);
552	754
553		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	755	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
554	756	allParamsButton.setToolTipText("Edit all params");
555	757	allParamsButton.addActionListener(this);
556	758
557		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	759	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
558	760	clearPanelButton.setToolTipText("Clear edit panel");
559	761	clearPanelButton.addActionListener(this);
560	762
561		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	763	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
562	764	unselectButton.setToolTipText("Unselect");
563	765	unselectButton.addActionListener(this);
564	766
565		- commandsPanel.preferredHeight = 1;
	767	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	768	+ flashSelectionButton.setToolTipText("Highlight selection");
	769	+ flashSelectionButton.addActionListener(this);
566	770
567		- oe.treePanel.add(commandsPanel);
568		- oe.treePanel.Return();
	771	+ editCommandsPanel.preferredHeight = 1;
	772	+
	773	+// oe.treePanel.add(commandsPanel);
	774	+// oe.treePanel.Return();
569	775
570	776	// oe.aConstraints.gridx += 1;
571	777	// oe.aConstraints.weighty = 0;
..	..	@@ -582,27 +788,12 @@
582	788
583	789	JScrollPane jSP;
584	790	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
585		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	791	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
586	792	ResetModel();
587	793
588	794	oe.treePanel.add(jSPPanel);
589	795	oe.treePanel.Return();
590	796
591		- cGridBag copyOptionsPanel = new cGridBag();
592		-
593		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
594		- colorCB.setToolTipText("Copy color when dropped");
595		- colorCB.addItemListener(this);
596		-
597		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
598		- materialCB.setToolTipText("Copy material when dropped");
599		- materialCB.addItemListener(this);
600		-
601		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
602		- textureCB.setToolTipText("Copy texture when dropped");
603		- textureCB.addItemListener(this);
604		-
605		- copyOptionsPanel.preferredHeight = 1;
606	797	oe.treePanel.add(copyOptionsPanel);
607	798	oe.treePanel.Return();
608	799
..	..	@@ -633,6 +824,20 @@
633	824
634	825	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
635	826	{
	827	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	828	+ colorCB.setToolTipText("Copy color when dropped");
	829	+ colorCB.addItemListener(this);
	830	+
	831	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	832	+ materialCB.setToolTipText("Copy material when dropped");
	833	+ materialCB.addItemListener(this);
	834	+
	835	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	836	+ textureCB.setToolTipText("Copy texture when dropped");
	837	+ textureCB.addItemListener(this);
	838	+
	839	+ panel.Return();
	840	+
636	841	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
637	842	boxCB.setToolTipText("Display bounding boxes");
638	843	boxCB.addItemListener(this);
..	..	@@ -641,7 +846,7 @@
641	846	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
642	847	zoomBoxCB.addItemListener(this);
643	848
644		- if (Globals.ADVANCED)
	849	+ if (true) // Globals.ADVANCED)
645	850	{
646	851	panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
647	852	supportCB.setToolTipText("Enable rigging");
..	..	@@ -650,6 +855,8 @@
650	855	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
651	856	// localCB.addItemListener(this);
652	857
	858	+ panel.Return();
	859	+
653	860	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
654	861	crowdCB.setToolTipText("Used for crowds");
655	862	crowdCB.addItemListener(this);
..	..	@@ -666,6 +873,8 @@
666	873	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
667	874	// speakerMocapCB.addItemListener(this);
668	875
	876	+ panel.Return();
	877	+
669	878	if (false)
670	879	{
671	880	// handled in scripts
..	..	@@ -680,32 +889,72 @@
680	889	//constraints.gridy += 1;
681	890	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
682	891	smoothfocusCB.addItemListener(this);
	892	+ panel.Return();
683	893	}
684	894
685	895	//constraints.gridx += 1;
686	896	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
687	897	// debugCB.addItemListener(this);
688	898
	899	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	900	+ trackCB.setToolTipText("Enable tracking target");
	901	+ trackCB.addItemListener(this);
	902	+
689	903	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	904	+ oeilCB.setToolTipText("Move camera when tracking");
690	905	oeilCB.addItemListener(this);
691	906
	907	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	908	+ shadowCB.setToolTipText("Compute shadows when live");
	909	+ shadowCB.addItemListener(this);
	910	+
	911	+ panel.Return();
	912	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	913	+ toggleTextureCB.setToolTipText("Load textures");
	914	+ toggleTextureCB.addItemListener(this);
	915	+
	916	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	917	+ toggleSwitchCB.setToolTipText("Use switch");
	918	+ toggleSwitchCB.addItemListener(this);
	919	+
	920	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	921	+ autosaveCB.setToolTipText("Auto-save on structure change");
	922	+ autosaveCB.addItemListener(this);
	923	+
	924	+ panel.Return();
	925	+ if (Globals.ADVANCED)
	926	+ {
692	927	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
693	928	lookAtCB.setToolTipText("Look-at target");
694	929	lookAtCB.addItemListener(this);
	930	+ }
695	931
696	932	}
697	933
698	934	cGridBag fill = new cGridBag();
699		-
700	935	fill.preferredHeight = 200;
	936	+ cGridBag fill2 = new cGridBag();
	937	+ fill2.preferredHeight = 200;
	938	+ cGridBag fill3 = new cGridBag();
	939	+ fill3.preferredHeight = 200;
701	940
702	941	panel.add(fill);
	942	+ panel.add(fill2);
	943	+ panel.add(fill3);
703	944
704	945	}
705	946
706	947	void EditObject(Object3D obj)
707	948	{
708	949	cRadio radioButton = new cRadio(obj.name);
	950	+
	951	+ // Patch to avoid bug with transparency.
	952	+ radioButton.hadMaterial = obj.material != null;
	953	+ if (!radioButton.hadMaterial)
	954	+ {
	955	+ obj.material = new cMaterial();
	956	+ }
	957	+
709	958	radioButton.SetObject(obj);
710	959	radioButton.layout = sevenButton;
711	960	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -714,8 +963,11 @@
714	963	buttonGroup.add(radioButton);
715	964	radioButton.doClick();
716	965	}
	966	+
717	967	void SetupViews(ObjEditor oe)
718	968	{
	969	+ theFrame = this;
	970	+
719	971	oe.SetupViews();
720	972
721	973	System.out.println("SetupViews");
..	..	@@ -724,23 +976,27 @@
724	976	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
725	977	}
726	978
727		- JCheckBox liveCB;
728		- JCheckBox supportCB;
729		- JCheckBox localCB;
730		- JCheckBox crowdCB;
731		- JCheckBox smoothCB;
732		- JCheckBox fastCB;
733		- JCheckBox slowCB;
734		- JCheckBox boxCB;
735		- JCheckBox zoomBoxCB;
736		- JCheckBox trackCB;
737		- JCheckBox smoothfocusCB;
	979	+ cToggleButton liveCB;
	980	+ cCheckBox supportCB;
	981	+ cCheckBox localCB;
	982	+ cCheckBox crowdCB;
	983	+ cCheckBox smoothCB;
	984	+ cToggleButton fastCB;
	985	+ cCheckBox slowCB;
	986	+ cCheckBox boxCB;
	987	+ cCheckBox zoomBoxCB;
	988	+ //cToggleButton trackCB;
	989	+ cCheckBox trackCB;
	990	+ cCheckBox smoothfocusCB;
738	991	// JCheckBox speakerMocapCB;
739		- JCheckBox speakerCameraCB;
740		- JCheckBox speakerFocusCB;
741		- JCheckBox debugCB;
742		- JCheckBox oeilCB;
743		- JCheckBox lookAtCB;
	992	+ cCheckBox speakerCameraCB;
	993	+ cCheckBox speakerFocusCB;
	994	+ cCheckBox debugCB;
	995	+
	996	+ cCheckBox oeilCB;
	997	+ cCheckBox shadowCB;
	998	+ cCheckBox autosaveCB;
	999	+ cCheckBox lookAtCB;
744	1000
745	1001	// static int COLOR = 1;
746	1002	// static int MATERIAL = 2;
..	..	@@ -748,9 +1004,9 @@
748	1004
749	1005	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
750	1006
751		- JCheckBox colorCB;
752		- JCheckBox materialCB;
753		- JCheckBox textureCB;
	1007	+ cCheckBox colorCB;
	1008	+ cCheckBox materialCB;
	1009	+ cCheckBox textureCB;
754	1010
755	1011	public void itemStateChanged(ItemEvent e)
756	1012	{
..	..	@@ -778,6 +1034,7 @@
778	1034	} else if(e.getSource() == liveCB)
779	1035	{
780	1036	cameraView.ToggleLive();
	1037	+ refreshContents(false);
781	1038	}
782	1039	else if(e.getSource() == supportCB)
783	1040	{
..	..	@@ -842,6 +1099,14 @@
842	1099	{
843	1100	cameraView.ToggleOeil();
844	1101	}
	1102	+ else if(e.getSource() == shadowCB)
	1103	+ {
	1104	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1105	+ }
	1106	+ else if(e.getSource() == autosaveCB)
	1107	+ {
	1108	+ Globals.SAVEONMAKE ^= true;
	1109	+ }
845	1110	else if(e.getSource() == lookAtCB)
846	1111	{
847	1112	cameraView.ToggleLookAt();
..	..	@@ -858,7 +1123,8 @@
858	1123
859	1124	/**/
860	1125	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
861		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1126	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1127	+ TreePath path = objEditor.jTree.getSelectionPath();
862	1128	if ((path == null) \|\| (path.getPathCount() <= 1)) {
863	1129	// We can't move the root node or an empty selection
864	1130	return;
..	..	@@ -930,7 +1196,9 @@
930	1196	// objEditor.DropFile((java.io.File[]) object, true);
931	1197	// return;
932	1198	// }
933		- if (string.charAt(0) == '/')
	1199	+
	1200	+ // File path for Mac and Windows
	1201	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
934	1202	{
935	1203	// file(s)
936	1204	String[] names = string.split("\n");
..	..	@@ -957,7 +1225,7 @@
957	1225
958	1226	flashIt = false;
959	1227	CameraPane pane = (CameraPane) target;
960		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1228	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
961	1229	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
962	1230
963	1231	if (group.selection.size() == 1)
..	..	@@ -973,23 +1241,33 @@
973	1241
974	1242	assert target == objEditor.jTree;
975	1243	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1244	+ Object3D destinationLeaf;
976	1245	try {
977		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1246	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
978	1247	} catch (Exception e) {
979	1248	System.out.println("destinationPath : " + destinationPath);
980	1249	return;
981	1250	}
982	1251
983		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1252	+ for (int i=group.selection.size(); --i>=0;)
984	1253	{
	1254	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1255	+
	1256	+ // Cannot move into itself
	1257	+ if (child == destinationLeaf)
	1258	+ return;
	1259	+ }
	1260	+
	1261	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1262	+// {
985	1263	loadClipboard(true);
986	1264	objEditor.jTree.setSelectionPath(destinationPath);
987	1265	pasteInto(false, false);
988		- } else {
989		- loadClipboard(false);
990		- objEditor.jTree.setSelectionPath(destinationPath);
991		- pasteInto(false, false); // true); // ???
992		- }
	1266	+// } else {
	1267	+// loadClipboard(false);
	1268	+// objEditor.jTree.setSelectionPath(destinationPath);
	1269	+// pasteInto(false, false); // true); // ???
	1270	+// }
993	1271	}
994	1272	public void dropActionChanged(DropTargetDragEvent dtde)
995	1273	// Called if the user has modified the current drop gesture
..	..	@@ -1094,22 +1372,30 @@
1094	1372	{
1095	1373	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1096	1374	//heightFieldItem.addActionListener(this);
1097		- gridItem = menu.add(new MenuItem("Grid"));
1098		- gridItem.addActionListener(this);
1099		- rectoidItem = menu.add(new MenuItem("Box"));
1100		- rectoidItem.addActionListener(this);
1101		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1102		- ellipsoidItem.addActionListener(this);
1103		- coneItem = menu.add(new MenuItem("Cone"));
1104		- coneItem.addActionListener(this);
1105		- torusItem = menu.add(new MenuItem("Torus"));
1106		- torusItem.addActionListener(this);
1107		- superItem = menu.add(new MenuItem("Superellipsoid"));
1108		- superItem.addActionListener(this);
	1375	+// gridItem = menu.add(new MenuItem("Grid"));
	1376	+// gridItem.addActionListener(this);
	1377	+// rectoidItem = menu.add(new MenuItem("Box"));
	1378	+// rectoidItem.addActionListener(this);
	1379	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1380	+// ellipsoidItem.addActionListener(this);
	1381	+// coneItem = menu.add(new MenuItem("Cone"));
	1382	+// coneItem.addActionListener(this);
	1383	+// torusItem = menu.add(new MenuItem("Torus"));
	1384	+// torusItem.addActionListener(this);
	1385	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1386	+// superItem.addActionListener(this);
	1387	+
	1388	+ cameraItem = menu.add(new MenuItem("Camera"));
	1389	+ cameraItem.addActionListener(this);
	1390	+
	1391	+ if (!Globals.ADVANCED)
	1392	+ {
1109	1393	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1110	1394	kleinItem.addActionListener(this);
1111		- particleItem = menu.add(new MenuItem("Particle system"));
1112		- particleItem.addActionListener(this);
	1395	+ }
	1396	+
	1397	+// particleItem = menu.add(new MenuItem("Particle system"));
	1398	+// particleItem.addActionListener(this);
1113	1399	if (Globals.ADVANCED)
1114	1400	{
1115	1401	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1135,15 +1421,15 @@
1135	1421	}
1136	1422	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1137	1423	bezierItem.addActionListener(this);
1138		- overlayItem = menu.add(new MenuItem("Overlay"));
1139		- overlayItem.addActionListener(this);
1140		- lightItem = menu.add(new MenuItem("Light"));
1141		- lightItem.addActionListener(this);
	1424	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1425	+// overlayItem.addActionListener(this);
	1426	+// lightItem = menu.add(new MenuItem("Light"));
	1427	+// lightItem.addActionListener(this);
1142	1428	menu.add("-");
1143	1429	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1144	1430	//superLoopItem.addActionListener(this);
1145		- loopItem = menu.add(new MenuItem("Loop"));
1146		- loopItem.addActionListener(this);
	1431	+// loopItem = menu.add(new MenuItem("Loop"));
	1432	+// loopItem.addActionListener(this);
1147	1433	doubleItem = menu.add(new MenuItem("Fork"));
1148	1434	doubleItem.addActionListener(this);
1149	1435	if (Globals.ADVANCED)
..	..	@@ -1164,13 +1450,13 @@
1164	1450	parseverticesItem.addActionListener(this);
1165	1451	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1166	1452	textureFieldItem.addActionListener(this);
1167		- alignItem = menu.add(new MenuItem("Align Object"));
	1453	+ alignItem = menu.add(new MenuItem("Align Objects"));
1168	1454	alignItem.addActionListener(this);
1169	1455	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1170	1456	reduceMorphItem.addActionListener(this);
1171	1457	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1172	1458	reduce34MorphItem.addActionListener(this);
1173		-
	1459	+ menu.add("-");
1174	1460	menu.add(computeAOItem = new MenuItem("Compute AO"));
1175	1461	computeAOItem.addActionListener(this);
1176	1462
..	..	@@ -1183,7 +1469,7 @@
1183	1469	memoryItem.addActionListener(this);
1184	1470	menu.add(analyzeItem = new MenuItem("Analyze"));
1185	1471	analyzeItem.addActionListener(this);
1186		- menu.add(dumpItem = new MenuItem("Dump"));
	1472	+ menu.add(dumpItem = new MenuItem("Print"));
1187	1473	dumpItem.addActionListener(this);
1188	1474	// menu.add(pathItem = new MenuItem("From-to path"));
1189	1475	// pathItem.addActionListener(this);
..	..	@@ -1324,6 +1610,7 @@
1324	1610	shadow.material = new cMaterial(obj.material);
1325	1611	shadow.material.diffuse = 0.0001f;
1326	1612	shadow.material.specular = 0.0001f;
	1613	+ //shadow.projectedVertices[1].x = 300;
1327	1614
1328	1615	makeSomething(shadow);
1329	1616	}
..	..	@@ -1530,9 +1817,9 @@
1530	1817
1531	1818	void Overwrite(int mask)
1532	1819	{
1533		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1820	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1534	1821	{
1535		- Object3D content = GrafreeD.clipboard.get(0);
	1822	+ Object3D content = Grafreed.clipboard.get(0);
1536	1823
1537	1824	if (content instanceof cGroup && ((cGroup)content).transientlink )
1538	1825	content = ((cGroup)content).get(0);
..	..	@@ -1571,7 +1858,7 @@
1571	1858	{
1572	1859	ScreenFit();
1573	1860	} else
1574		- if (source == switchItem)
	1861	+ if (source == switchViewItem)
1575	1862	{
1576	1863	cVector v1 = new cVector();
1577	1864	cVector v2 = new cVector();
..	..	@@ -1580,11 +1867,11 @@
1580	1867	objEditor.cameraView.renderCamera.setAim(v2, v1);
1581	1868	objEditor.cameraView.repaint();
1582	1869	} else
1583		- if (source == rectoidItem)
	1870	+ if (source == rectoidItem \|\| source == boxButton)
1584	1871	{
1585	1872	makeSomething(new Box());
1586	1873	} else
1587		- if (source == particleItem)
	1874	+ if (source == particleItem \|\| source == particlesButton)
1588	1875	{
1589	1876	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1590	1877	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1663,27 +1950,27 @@
1663	1950
1664	1951	makeSomething(obj);
1665	1952	} else
1666		- if (source == gridItem)
	1953	+ if (source == gridItem \|\| source == gridButton)
1667	1954	{
1668	1955	makeSomething(new Grid());
1669	1956	} else
1670		- if (source == ellipsoidItem)
	1957	+ if (source == ellipsoidItem \|\| source == sphereButton)
1671	1958	{
1672	1959	makeSomething(new Sphere());
1673	1960	} else
1674		- if (source == coneItem)
	1961	+ if (source == coneItem \|\| source == coneButton)
1675	1962	{
1676	1963	makeSomething(new Cone());
1677	1964	} else
1678		- if (source == torusItem)
	1965	+ if (source == torusItem \|\| source == torusButton)
1679	1966	{
1680	1967	makeSomething(new Torus());
1681	1968	} else
1682		- if (source == superItem)
	1969	+ if (source == superItem \|\| source == superButton)
1683	1970	{
1684	1971	makeSomething(new Superellipsoid());
1685	1972	} else
1686		- if (source == kleinItem)
	1973	+ if (source == kleinItem \|\| source == kleinButton)
1687	1974	{
1688	1975	makeSomething(new Klein());
1689	1976	} else
..	..	@@ -1703,7 +1990,7 @@
1703	1990	{
1704	1991	makeSomething(new BezierSurface());
1705	1992	} else
1706		- if (source == overlayItem)
	1993	+ if (source == overlayItem \|\| source == overlayButton)
1707	1994	{
1708	1995	/*
1709	1996	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1751,7 +2038,7 @@
1751	2038	s.setup();
1752	2039	makeSomething(s);
1753	2040	} else
1754		- if (source == lightItem)
	2041	+ if (source == lightItem \|\| source == lightButton)
1755	2042	{
1756	2043	makeSomething(new Light());
1757	2044	} else
..	..	@@ -1801,7 +2088,7 @@
1801	2088
1802	2089	group(g);
1803	2090	} else
1804		- if (source == loopItem)
	2091	+ if (source == loopItem \|\| source == loopButton)
1805	2092	{
1806	2093	Composite csg = new GroupLeaf();
1807	2094	csg.count = 5;
..	..	@@ -1837,23 +2124,6 @@
1837	2124	csg.addChild(child);
1838	2125	child.addChild(csg);
1839	2126	} else
1840		-
1841		- if (source == importGFDItem)
1842		- {
1843		- ImportGFD();
1844		- } else
1845		- if (source == importVRMLX3DItem)
1846		- {
1847		- ImportVRMLX3D();
1848		- } else
1849		- if (source == import3DSItem)
1850		- {
1851		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1852		- } else
1853		- if (source == importOBJItem)
1854		- {
1855		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1856		- } else
1857	2127	if (source == computeAOItem)
1858	2128	{
1859	2129	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1872,7 +2142,7 @@
1872	2142	if (source == invariantsItem)
1873	2143	{
1874	2144	System.out.println("Invariants:");
1875		- GrafreeD.grafreeD.universe.invariants();
	2145	+ Grafreed.grafreeD.universe.invariants();
1876	2146	} else
1877	2147	if (source == memoryItem)
1878	2148	{
..	..	@@ -1890,6 +2160,30 @@
1890	2160	if (source == dumpItem)
1891	2161	{
1892	2162	DumpObject();
	2163	+ } else
	2164	+ if (source == minButton)
	2165	+ {
	2166	+ Minimize();
	2167	+ } else
	2168	+ if (source == maxButton)
	2169	+ {
	2170	+ Maximize();
	2171	+ } else
	2172	+ if (source == fullButton)
	2173	+ {
	2174	+ ToggleFullScreen();
	2175	+ } else
	2176	+ if (source == undoButton)
	2177	+ {
	2178	+ Undo();
	2179	+ } else
	2180	+ if (source == redoButton)
	2181	+ {
	2182	+ Redo();
	2183	+ } else
	2184	+ if (source == saveButton)
	2185	+ {
	2186	+ Save();
1893	2187	} else
1894	2188	if (source == oneStepButton)
1895	2189	{
..	..	@@ -1945,12 +2239,20 @@
1945	2239	{
1946	2240	loadClipboard(true);
1947	2241	} else
	2242	+ if (source == undoItem)
	2243	+ {
	2244	+ Undo();
	2245	+ } else
	2246	+ if (source == redoItem)
	2247	+ {
	2248	+ Redo();
	2249	+ } else
1948	2250	if (source == duplicateItem)
1949	2251	{
1950		- Object3D keep = GrafreeD.clipboard;
	2252	+ Object3D keep = Grafreed.clipboard;
1951	2253	loadClipboard(false);
1952	2254	paste(false);
1953		- GrafreeD.clipboard = keep;
	2255	+ Grafreed.clipboard = keep;
1954	2256	} else
1955	2257	if (source == cloneItem)
1956	2258	{
..	..	@@ -2170,9 +2472,9 @@
2170	2472	// group.selection.get(0).setMasterThis(content); // should be identity
2171	2473	// refreshContents();
2172	2474	// }
2173		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2475	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2174	2476	{
2175		- Object3D content = GrafreeD.clipboard.get(0);
	2477	+ Object3D content = Grafreed.clipboard.get(0);
2176	2478
2177	2479	if (content instanceof cGroup && ((cGroup)content).transientlink )
2178	2480	content = ((cGroup)content).get(0);
..	..	@@ -2222,9 +2524,9 @@
2222	2524	} else
2223	2525	if (source == setMasterItem)
2224	2526	{
2225		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2527	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2226	2528	{
2227		- Object3D content = GrafreeD.clipboard.get(0);
	2529	+ Object3D content = Grafreed.clipboard.get(0);
2228	2530
2229	2531	if (content instanceof cGroup && ((cGroup)content).transientlink )
2230	2532	content = ((cGroup)content).get(0);
..	..	@@ -2237,9 +2539,9 @@
2237	2539	{
2238	2540	if (group.selection.size() == 1)
2239	2541	{
2240		- if (GrafreeD.clipboard.size() == 1)
	2542	+ if (Grafreed.clipboard.size() == 1)
2241	2543	{
2242		- Object3D content = GrafreeD.clipboard.get(0);
	2544	+ Object3D content = Grafreed.clipboard.get(0);
2243	2545
2244	2546	if (content instanceof cGroup && ((cGroup)content).transientlink )
2245	2547	content = ((cGroup)content).get(0);
..	..	@@ -2256,7 +2558,7 @@
2256	2558	{
2257	2559	RevertMeshes();
2258	2560	} else
2259		- if (source == resetMeshItem)
	2561	+ if (source == resetAllItem)
2260	2562	{
2261	2563	ResetAll();
2262	2564	} else
..	..	@@ -2276,9 +2578,9 @@
2276	2578	{
2277	2579	ClearSelection(true);
2278	2580	} else
2279		- if (source == grabItem)
	2581	+ if (source == grabItem \|\| source == groupButton)
2280	2582	{
2281		- group(new cGroup(), true);
	2583	+ group(new cGroup(), false); // true);
2282	2584	} else
2283	2585	if (source == hideItem)
2284	2586	{
..	..	@@ -2296,11 +2598,11 @@
2296	2598	{
2297	2599	makeSomething(new Camera());
2298	2600	} else
2299		- if (source == compositeItem)
	2601	+ if (source == compositeItem \|\| source == compositeButton)
2300	2602	{
2301	2603	group(new Composite());
2302	2604	} else
2303		- if (source == randomItem)
	2605	+ if (source == switchItem \|\| source == switchButton)
2304	2606	{
2305	2607	RandomNode random = new RandomNode();
2306	2608	group(random);
..	..	@@ -2402,7 +2704,7 @@
2402	2704	{
2403	2705	group(new cLinker());
2404	2706	} else
2405		- if (source == textureItem)
	2707	+ if (source == textureItem \|\| source == textureButton)
2406	2708	{
2407	2709	group(new TextureNode());
2408	2710	} else
..	..	@@ -2422,7 +2724,7 @@
2422	2724	{
2423	2725	CastShadow(2);
2424	2726	} else
2425		- if (source == ungroupItem)
	2727	+ if (source == ungroupItem \|\| source == ungroupButton)
2426	2728	{
2427	2729	//ungroup();
2428	2730	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2444,7 +2746,7 @@
2444	2746	} else
2445	2747	if (source == genNormalsMESHItem)
2446	2748	{
2447		- GenNormals(true); // TODO
	2749	+ GenNormalsMESH();
2448	2750	} else
2449	2751	if (source == genNormalsORGANItem)
2450	2752	{
..	..	@@ -2509,6 +2811,22 @@
2509	2811	if (source == unmarkleavesItem)
2510	2812	{
2511	2813	MarkLeaves(false);
	2814	+ } else
	2815	+ if (source == rewindleavesItem)
	2816	+ {
	2817	+ RewindLeaves(true);
	2818	+ } else
	2819	+ if (source == unrewindleavesItem)
	2820	+ {
	2821	+ RewindLeaves(false);
	2822	+ } else
	2823	+ if (source == randomleavesItem)
	2824	+ {
	2825	+ RandomLeaves(true);
	2826	+ } else
	2827	+ if (source == unrandomleavesItem)
	2828	+ {
	2829	+ RandomLeaves(false);
2512	2830	} else
2513	2831	if (source == flipVItem)
2514	2832	{
..	..	@@ -2594,9 +2912,13 @@
2594	2912	{
2595	2913	SmoothMesh();
2596	2914	} else
2597		- if (source == transformgeometryItem)
	2915	+ if (source == transformGeometryItem)
2598	2916	{
2599	2917	TransformGeometry();
	2918	+ } else
	2919	+ if (source == transformChildrenItem)
	2920	+ {
	2921	+ TransformChildren();
2600	2922	} else
2601	2923	if (source == resetTransformItem)
2602	2924	{
..	..	@@ -2604,7 +2926,11 @@
2604	2926	} else
2605	2927	if (source == resetCentroidItem)
2606	2928	{
2607		- ResetCentroid();
	2929	+ ResetCentroid(true);
	2930	+ } else
	2931	+ if (source == resetCentroidXZItem)
	2932	+ {
	2933	+ ResetCentroid(false);
2608	2934	} else
2609	2935	if (source == resetParentItem)
2610	2936	{
..	..	@@ -2736,6 +3062,10 @@
2736	3062	if (source == twoButton)
2737	3063	{
2738	3064	radio.layout = twoButton;
	3065	+
	3066	+ if (CameraPane.FULLSCREEN)
	3067	+ fullscreenLayout = radio.layout;
	3068	+
2739	3069	// bug
2740	3070	//gridPanel.setDividerLocation(1.0);
2741	3071	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2768,10 +3098,31 @@
2768	3098	bigThree.ClearUI();
2769	3099	bigThree.add(centralPanel);
2770	3100	bigThree.FlushUI();
	3101	+
	3102	+ cameraView.requestFocusInWindow();
	3103	+
	3104	+// refreshContents(true);
	3105	+//
	3106	+// try
	3107	+// {
	3108	+// java.awt.Robot bot = new java.awt.Robot();
	3109	+// int mask = InputEvent.BUTTON1_MASK;
	3110	+// bot.mouseMove(100, 100);
	3111	+// bot.mousePress(mask);
	3112	+// bot.mouseRelease(mask);
	3113	+// }
	3114	+// catch (Exception e)
	3115	+// {
	3116	+//
	3117	+// }
	3118	+
2771	3119	} else
2772	3120	if (source == threeButton)
2773	3121	{
2774	3122	radio.layout = threeButton;
	3123	+
	3124	+ if (CameraPane.FULLSCREEN)
	3125	+ fullscreenLayout = radio.layout;
2775	3126
2776	3127	// bigThree.remove(scenePanel);
2777	3128	// bigThree.remove(centralPanel);
..	..	@@ -2804,10 +3155,15 @@
2804	3155	bigThree.add(centralPanel);
2805	3156	bigThree.add(XYZPanel);
2806	3157	bigThree.FlushUI();
	3158	+
	3159	+ cameraView.requestFocusInWindow();
2807	3160	} else
2808	3161	if (source == fourButton)
2809	3162	{
2810	3163	radio.layout = fourButton;
	3164	+
	3165	+ if (CameraPane.FULLSCREEN)
	3166	+ fullscreenLayout = radio.layout;
2811	3167
2812	3168	// bigThree.remove(scenePanel);
2813	3169	// bigThree.remove(centralPanel);
..	..	@@ -2839,10 +3195,15 @@
2839	3195	bigThree.ClearUI();
2840	3196	bigThree.add(scenePanel);
2841	3197	bigThree.FlushUI();
	3198	+
	3199	+ cameraView.requestFocusInWindow();
2842	3200	} else
2843	3201	if (source == sixButton)
2844	3202	{
2845	3203	radio.layout = sixButton;
	3204	+
	3205	+ if (CameraPane.FULLSCREEN)
	3206	+ fullscreenLayout = radio.layout;
2846	3207
2847	3208	// bigThree.remove(scenePanel);
2848	3209	// bigThree.remove(centralPanel);
..	..	@@ -2875,10 +3236,15 @@
2875	3236	bigThree.add(scenePanel);
2876	3237	bigThree.add(centralPanel);
2877	3238	bigThree.FlushUI();
	3239	+
	3240	+ cameraView.requestFocusInWindow();
2878	3241	} else
2879	3242	if (source == sevenButton)
2880	3243	{
2881	3244	radio.layout = sevenButton;
	3245	+
	3246	+ if (CameraPane.FULLSCREEN)
	3247	+ fullscreenLayout = radio.layout;
2882	3248
2883	3249	// bigThree.remove(scenePanel);
2884	3250	// bigThree.remove(centralPanel);
..	..	@@ -2912,6 +3278,8 @@
2912	3278	bigThree.add(centralPanel);
2913	3279	bigThree.add(XYZPanel);
2914	3280	bigThree.FlushUI();
	3281	+
	3282	+ cameraView.requestFocusInWindow();
2915	3283	} else
2916	3284	if (source == rootButton)
2917	3285	{
..	..	@@ -2923,6 +3291,7 @@
2923	3291	EditObject(obj);
2924	3292	}
2925	3293
	3294	+ cameraView.requestFocusInWindow();
2926	3295	refreshContents(true);
2927	3296	} else
2928	3297	if (source == closeButton)
..	..	@@ -2932,18 +3301,27 @@
2932	3301	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2933	3302	{
2934	3303	ab = (cRadio)e.nextElement();
2935		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3304	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2936	3305	{
	3306	+ // Patch to avoid bug with transparency.
	3307	+ if (!ab.hadMaterial)
	3308	+ {
	3309	+ ab.object.material = null;
	3310	+ }
	3311	+
2937	3312	buttonGroup.remove(ab);
2938	3313	radioPanel.remove(ab);
2939	3314
2940		- ab.GetObject().editWindow = null;
	3315	+ //ab.GetObject().editWindow = null;
	3316	+ ab.GetObject().manipWindow = null;
2941	3317	// ab.GetObject().objectUI = null; // ?????????
2942	3318
2943	3319	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2944	3320	break;
2945	3321	}
2946	3322	}
	3323	+
	3324	+ cameraView.requestFocusInWindow();
2947	3325	refreshContents(true);
2948	3326	} else
2949	3327	if (source == editItem \|\| source == editButton)
..	..	@@ -2960,7 +3338,7 @@
2960	3338	child.CloseUI();
2961	3339	listUI.remove(child);
2962	3340
2963		- child.editWindow = null; // ???????????
	3341	+ //child.editWindow = null; // ???????????
2964	3342	}
2965	3343	objEditor.ctrlPanel.FlushUI();
2966	3344	//objEditor.jTree.clearSelection();
..	..	@@ -3046,7 +3424,11 @@
3046	3424	frontView.object = group;
3047	3425	sideView.object = group;
3048	3426	}
3049		- group.editWindow = this;
	3427	+
	3428	+// fix "+" issue
	3429	+ //group.editWindow = this;
	3430	+ group.manipWindow = this;
	3431	+
3050	3432	/*
3051	3433	currentLayout = radio.layout;
3052	3434	if (currentLayout == null)
..	..	@@ -3058,8 +3440,23 @@
3058	3440	//group.parent = null; // ROOT
3059	3441	//group.attributes = -1;
3060	3442	ResetModel();
	3443	+
	3444	+ cameraView.requestFocusInWindow();
3061	3445	refreshContents(true);
3062		- }
	3446	+ } else if (event.getSource() == editCameraItem)
	3447	+ {
	3448	+ cameraView.ProtectCamera();
	3449	+ cameraView.repaint();
	3450	+ return;
	3451	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3452	+ {
	3453	+ cameraView.RevertCamera();
	3454	+ cameraView.repaint();
	3455	+ return;
	3456	+ // } else if (event.getSource() == textureButton)
	3457	+ // {
	3458	+ // return; // true;
	3459	+ }
3063	3460	else
3064	3461	{
3065	3462	//return super.action(event, arg);
..	..	@@ -3068,7 +3465,6 @@
3068	3465	}
3069	3466
3070	3467	boolean useclient = false;
3071		- cRadio radio;
3072	3468
3073	3469	void ToggleRoot()
3074	3470	{
..	..	@@ -3120,6 +3516,28 @@
3120	3516	refreshContents();
3121	3517	}
3122	3518
	3519	+ void TransformChildren()
	3520	+ {
	3521	+ Object3D obj;
	3522	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3523	+ {
	3524	+ obj = (Object3D)e.nextElement();
	3525	+ obj.KeepTextureMatrices();
	3526	+ obj.TransformChildren();
	3527	+ obj.RestoreTextureMatrices();
	3528	+
	3529	+// if (obj.parent == null)
	3530	+// {
	3531	+// System.out.println("NULL PARENT!");
	3532	+// new Exception().printStackTrace();
	3533	+// }
	3534	+// else
	3535	+// TouchTransform(obj);
	3536	+// //obj.parent.Touch();
	3537	+ }
	3538	+
	3539	+ refreshContents();
	3540	+ }
3123	3541
3124	3542	void ResetTransform()
3125	3543	{
..	..	@@ -3232,7 +3650,7 @@
3232	3650	refreshContents();
3233	3651	}
3234	3652
3235		- void ResetCentroid()
	3653	+ void ResetCentroid(boolean full)
3236	3654	{
3237	3655	Object3D obj;
3238	3656	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3247,12 +3665,16 @@
3247	3665	LA.matIdentity(Object3D.mat);
3248	3666	obj.getBounds(minima, maxima, false);
3249	3667	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3250		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3668	+ if (full)
	3669	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3251	3670	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3252	3671	obj.TransformMesh(Object3D.mat);
	3672	+
3253	3673	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3254		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3674	+ if (full)
	3675	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3255	3676	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3677	+
3256	3678	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3257	3679	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3258	3680	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3281,7 +3703,8 @@
3281	3703
3282	3704	int size = obj.MemorySize();
3283	3705
3284		- System.err.println((size/1024) + " KB is the size of " + obj);
	3706	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3707	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3285	3708	}
3286	3709	}
3287	3710	catch (Exception e)
..	..	@@ -3318,9 +3741,9 @@
3318	3741	obj = (Object3D)e.nextElement();
3319	3742
3320	3743	System.out.println("Object is: " + obj);
3321		- GrafreeD.AnalyzeObject(obj);
	3744	+ Grafreed.AnalyzeObject(obj);
3322	3745	System.out.println("Boundary rep: " + obj.bRep);
3323		- GrafreeD.AnalyzeObject(obj.bRep);
	3746	+ Grafreed.AnalyzeObject(obj.bRep);
3324	3747
3325	3748	// System.err.println((size/1024) + " KB is the size of " + obj);
3326	3749	}
..	..	@@ -3362,6 +3785,13 @@
3362	3785	void GenNormals(boolean crease)
3363	3786	{
3364	3787	group.GenNormalsS(crease);
	3788	+
	3789	+ refreshContents();
	3790	+ }
	3791	+
	3792	+ void GenNormalsMESH()
	3793	+ {
	3794	+ group.GenNormalsMeshS();
3365	3795
3366	3796	refreshContents();
3367	3797	}
..	..	@@ -3534,8 +3964,8 @@
3534	3964
3535	3965	void ParseVertices()
3536	3966	{
3537		- boolean epsequal = GrafreeD.epsequal;
3538		- GrafreeD.epsequal = true;
	3967	+ boolean epsequal = Grafreed.epsequal;
	3968	+ Grafreed.epsequal = true;
3539	3969
3540	3970	for (int i=0; i<group.selection.size(); i++)
3541	3971	{
..	..	@@ -3560,7 +3990,7 @@
3560	3990	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3561	3991	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3562	3992
3563		- g.add(GrafreeD.clipboard);
	3993	+ g.add(Grafreed.clipboard);
3564	3994
3565	3995	buffer.add(g);
3566	3996	}
..	..	@@ -3575,7 +4005,7 @@
3575	4005	makeSomething(buffer, i==group.selection.size()-1);
3576	4006	}
3577	4007
3578		- GrafreeD.epsequal = epsequal;
	4008	+ Grafreed.epsequal = epsequal;
3579	4009
3580	4010	refreshContents();
3581	4011	}
..	..	@@ -3593,7 +4023,16 @@
3593	4023	String pigment = Object3D.GetPigment(tex);
3594	4024	//String bump = Object3D.GetBump(tex);
3595	4025
3596		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4026	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4027	+
	4028	+ try
	4029	+ {
	4030	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4031	+ }
	4032	+ catch (Exception e)
	4033	+ {
	4034	+ System.err.println("FAIL: " + node);
	4035	+ }
3597	4036
3598	4037	double s = v.s;
3599	4038
..	..	@@ -3725,7 +4164,7 @@
3725	4164	return;
3726	4165
3727	4166	Object3D poses = group.selection.get(0);
3728		- Object3D ref = GrafreeD.clipboard.get(0);
	4167	+ Object3D ref = Grafreed.clipboard.get(0);
3729	4168
3730	4169	Object3D newgroup = new Object3D("Po:" + poses.name);
3731	4170
..	..	@@ -3919,9 +4358,9 @@
3919	4358
3920	4359	void ClipMesh()
3921	4360	{
3922		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4361	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3923	4362	{
3924		- Object3D content = GrafreeD.clipboard.get(0);
	4363	+ Object3D content = Grafreed.clipboard.get(0);
3925	4364
3926	4365	if (content instanceof cGroup && ((cGroup)content).transientlink )
3927	4366	content = ((cGroup)content).get(0);
..	..	@@ -3930,7 +4369,7 @@
3930	4369	// {
3931	4370	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3932	4371	// }
3933		- group.selection.ClipMesh(GrafreeD.clipboard);
	4372	+ group.selection.ClipMesh(Grafreed.clipboard);
3934	4373	}
3935	4374	// group.selection.ClipMesh(GrafreeD.clipboard);
3936	4375	System.out.println("DONE.");
..	..	@@ -3977,6 +4416,18 @@
3977	4416	void MarkLeaves(boolean hide)
3978	4417	{
3979	4418	group.selection.MarkLeaves(hide);
	4419	+ refreshContents();
	4420	+ }
	4421	+
	4422	+ void RewindLeaves(boolean hide)
	4423	+ {
	4424	+ group.selection.RewindLeaves(hide);
	4425	+ refreshContents();
	4426	+ }
	4427	+
	4428	+ void RandomLeaves(boolean hide)
	4429	+ {
	4430	+ group.selection.RandomLeaves(hide);
3980	4431	refreshContents();
3981	4432	}
3982	4433
..	..	@@ -4062,10 +4513,10 @@
4062	4513	{
4063	4514	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4064	4515	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4065		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4516	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4066	4517
4067	4518	Object3D elem = (Object3D)group.selection.elementAt(i);
4068		- if(elem != group)
	4519	+ if(elem != group \|\| !newWindow)
4069	4520	{
4070	4521	// if (!(elem instanceof Composite))
4071	4522	// newWindow = false;
..	..	@@ -4155,7 +4606,6 @@
4155	4606	//case 702: // Event.LIST_DESELECT
4156	4607	group.deselectAll();
4157	4608	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4158		- objEditor.ClearInfo(); // .GetMaterial());
4159	4609	if (tps != null)
4160	4610	{
4161	4611	for (int i=0; i < tps.length; i++)
..	..	@@ -4164,10 +4614,8 @@
4164	4614
4165	4615	//if (child.parent != null)
4166	4616	//child.parent.addSelectee(child);
	4617	+ objEditor.SetMaterial(child);
4167	4618	group.addSelectee(child);
4168		- objEditor.SetMaterial(child); // .GetMaterial());
4169		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4170		- System.err.println("info : " + child.GetPath());
4171	4619	}
4172	4620	}
4173	4621	// else
..	..	@@ -4177,16 +4625,17 @@
4177	4625	// System.err.println("info : " + group.GetPath());
4178	4626	// }
4179	4627
4180		- objEditor.SetText(); // jan 2014
4181		-
4182		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4628	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4183	4629	CameraPane.flash = true;
4184	4630
4185		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4631	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4186	4632	// a camera
4187	4633	{
4188		- CameraPane.camerachangeframe = 0; // don't refuse it
4189		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4634	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4635	+ {
	4636	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4637	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4638	+ }
4190	4639	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4191	4640	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4192	4641	}
..	..	@@ -4199,6 +4648,27 @@
4199	4648
4200	4649	freezemodel = false;
4201	4650	}
	4651	+
	4652	+ void refreshContents(boolean cp)
	4653	+ {
	4654	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4655	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4656	+ {
	4657	+ objEditor.ClearInfo(); // .GetMaterial());
	4658	+
	4659	+ for (int i=0; i < group.selection.Size(); i++)
	4660	+ {
	4661	+ Object3D child = (Object3D) group.selection.get(i);
	4662	+
	4663	+ objEditor.AddInfo(child, this, true);
	4664	+ System.err.println("info : " + child.GetPath());
	4665	+ }
	4666	+
	4667	+ objEditor.SetText(); // jan 2014
	4668	+ }
	4669	+
	4670	+ super.refreshContents(cp);
	4671	+ }
4202	4672
4203	4673	void linkSomething(Object3D thing)
4204	4674	{
..	..	@@ -4270,16 +4740,19 @@
4270	4740	{
4271	4741	if (group.selection.isEmpty())
4272	4742	return;
4273		- GrafreeD.clipboardIsTempGroup = false;
	4743	+
	4744	+ Grafreed.clipboardIsTempGroup = false;
4274	4745	Composite tGroup = null;
4275	4746	if (group.selection.size() > 0) // 1)
4276	4747	{
4277	4748	tGroup = new cGroup();
4278		- GrafreeD.clipboardIsTempGroup = true;
	4749	+ Grafreed.clipboardIsTempGroup = true;
4279	4750	}
4280	4751
4281	4752	if (cut)
4282	4753	{
	4754	+ if (Globals.SAVEONMAKE)
	4755	+ Save();
4283	4756	//int indices[] = jList.getSelectedIndices();
4284	4757	//for (int i = indices.length - 1; i >= 0; i--)
4285	4758	//jList.remove(indices[i]);
..	..	@@ -4315,16 +4788,16 @@
4315	4788	//System.out.println("cut " + child);
4316	4789	//System.out.println("parent = " + child.parent);
4317	4790	// tmp.addChild(child);
4318		- if (GrafreeD.clipboardIsTempGroup)
	4791	+ if (Grafreed.clipboardIsTempGroup)
4319	4792	tGroup.add/Child/(tmp);
4320	4793	else
4321		- GrafreeD.clipboard = tmp;
	4794	+ Grafreed.clipboard = tmp;
4322	4795	}
4323	4796	else
4324		- if (GrafreeD.clipboardIsTempGroup)
	4797	+ if (Grafreed.clipboardIsTempGroup)
4325	4798	tGroup.add/Child/(child);
4326	4799	else
4327		- GrafreeD.clipboard = child;
	4800	+ Grafreed.clipboard = child;
4328	4801	}
4329	4802
4330	4803	//ResetModel();
..	..	@@ -4356,21 +4829,23 @@
4356	4829	//System.out.println("cut " + elem);
4357	4830	//System.out.println("parent = " + elem.parent);
4358	4831	// tmp.addChild(elem);
4359		- if (GrafreeD.clipboardIsTempGroup)
	4832	+ if (Grafreed.clipboardIsTempGroup)
4360	4833	tGroup.add/Child/(tmp);
4361	4834	else
4362		- GrafreeD.clipboard = tmp;
	4835	+ Grafreed.clipboard = tmp;
4363	4836	}
4364	4837	else
4365		- if (GrafreeD.clipboardIsTempGroup)
	4838	+ if (Grafreed.clipboardIsTempGroup)
4366	4839	tGroup.add/Child/(child);
4367	4840	else
4368		- GrafreeD.clipboard = child;
	4841	+ Grafreed.clipboard = child;
4369	4842	}
4370	4843
4371	4844	}
4372		- if (GrafreeD.clipboardIsTempGroup)
4373		- GrafreeD.clipboard = tGroup;
	4845	+
	4846	+ if (Grafreed.clipboardIsTempGroup)
	4847	+ Grafreed.clipboard = tGroup;
	4848	+
4374	4849	if (cut)
4375	4850	{
4376	4851	ResetModel();
..	..	@@ -4384,7 +4859,7 @@
4384	4859	// return;
4385	4860	boolean first = true;
4386	4861
4387		- if (GrafreeD.clipboardIsTempGroup)
	4862	+ if (Grafreed.clipboardIsTempGroup)
4388	4863	{
4389	4864	Composite temp;
4390	4865
..	..	@@ -4395,7 +4870,7 @@
4395	4870	temp = (Composite)Applet3D.clipboard.deepCopy();
4396	4871	*/
4397	4872	Object3D elem;
4398		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4873	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4399	4874	{
4400	4875	Object3D child = (Object3D)e.nextElement();
4401	4876
..	..	@@ -4429,14 +4904,14 @@
4429	4904	//Object3D cb = Applet3D.clipboard;
4430	4905	//temp.addChild(cb);
4431	4906	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4432		- assert(GrafreeD.clipboard.parent == null);
4433		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4434		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4435		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4436		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4907	+ assert(Grafreed.clipboard.parent == null);
	4908	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4909	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4910	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4911	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4437	4912	else
4438		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4439		- GrafreeD.clipboard.get(0).parent = keepparent;
	4913	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4914	+ Grafreed.clipboard.get(0).parent = keepparent;
4440	4915	}
4441	4916
4442	4917	ResetModel();
..	..	@@ -4485,9 +4960,9 @@
4485	4960	{
4486	4961	boolean first = true;
4487	4962
4488		- if (GrafreeD.clipboardIsTempGroup)
	4963	+ if (Grafreed.clipboardIsTempGroup)
4489	4964	{
4490		- Composite temp = (Composite)GrafreeD.clipboard;
	4965	+ Composite temp = (Composite)Grafreed.clipboard;
4491	4966	Object3D copy;
4492	4967	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4493	4968	{
..	..	@@ -4497,7 +4972,7 @@
4497	4972	}
4498	4973	} else
4499	4974	{
4500		- linkSomething(GrafreeD.clipboard); //.get(0));
	4975	+ linkSomething(Grafreed.clipboard); //.get(0));
4501	4976	}
4502	4977	}
4503	4978	}
..	..	@@ -4902,21 +5377,6 @@
4902	5377	}
4903	5378	*/
4904	5379
4905		- void ImportGFD()
4906		- {
4907		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4908		- browser.show();
4909		- String filename = browser.getFile();
4910		- if (filename != null && filename.length() > 0)
4911		- {
4912		- String fullname = browser.getDirectory() + filename;
4913		-
4914		- //Object3D readobj =
4915		- objEditor.ReadGFD(fullname, objEditor);
4916		- //makeSomething(readobj);
4917		- }
4918		- }
4919		-
4920	5380	/*
4921	5381	public void Callback(Object obj)
4922	5382	{
..	..	@@ -4940,26 +5400,9 @@
4940	5400	}
4941	5401	*/
4942	5402
4943		- void ImportVRMLX3D()
4944		- {
4945		- if (GrafreeD.standAlone)
4946		- {
4947		- /**/
4948		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4949		- browser.show();
4950		- String filename = browser.getFile();
4951		- if (filename != null && filename.length() > 0)
4952		- {
4953		- String fullname = browser.getDirectory() + filename;
4954		- LoadVRMLX3D(fullname);
4955		- }
4956		- /**/
4957		- }
4958		- }
4959		-
4960	5403	String GetFile(String dialogName)
4961	5404	{
4962		- if (GrafreeD.standAlone)
	5405	+ if (Grafreed.standAlone)
4963	5406	{
4964	5407	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4965	5408	browser.show();
..	..	@@ -5027,7 +5470,33 @@
5027	5470	cButton clearpanelButton;
5028	5471	cButton unselectButton;
5029	5472
	5473	+ cButton restoreCameraButton;
	5474	+
	5475	+ cButton minButton;
	5476	+ cButton maxButton;
	5477	+ cButton fullButton;
	5478	+ cButton undoButton;
	5479	+ cButton redoButton;
	5480	+ cButton saveButton;
5030	5481	cButton oneStepButton;
	5482	+
	5483	+ cButton groupButton;
	5484	+ cButton ungroupButton;
	5485	+ cButton compositeButton;
	5486	+ cButton switchButton;
	5487	+ cButton loopButton;
	5488	+ cButton textureButton;
	5489	+
	5490	+ cButton gridButton;
	5491	+ cButton boxButton;
	5492	+ cButton sphereButton;
	5493	+ cButton coneButton;
	5494	+ cButton torusButton;
	5495	+ cButton superButton;
	5496	+ cButton kleinButton;
	5497	+ cButton particlesButton;
	5498	+ cButton overlayButton;
	5499	+ cButton lightButton;
5031	5500
5032	5501	cButton screenfitButton;
5033	5502	cButton screenfitpointButton;
..	..	@@ -5040,14 +5509,6 @@
5040	5509
5041	5510	cButton setsupportButton;
5042	5511
5043		- cButton twoButton;
5044		- cButton sixButton;
5045		- cButton threeButton;
5046		- cButton sevenButton;
5047		- cButton fourButton; // full panel
5048		- cButton oneButton; // full XYZ
5049		- //cButton currentLayout;
5050		-
5051	5512	//
5052	5513	//Composite
5053	5514	Object3D // to do !!
..	..	@@ -5057,9 +5518,11 @@
5057	5518	//JTree jTree;
5058	5519	private MenuItem lookAtItem;
5059	5520	private MenuItem lookFromItem;
5060		- private MenuItem switchItem;
	5521	+ private MenuItem switchViewItem;
5061	5522	private MenuItem cutItem;
5062		- private MenuItem duplicateItem;
	5523	+ private MenuItem undoItem;
	5524	+ private MenuItem redoItem;
	5525	+ private JMenuItem duplicateItem;
5063	5526	private MenuItem cloneItem;
5064	5527	private MenuItem cloneSupportItem;
5065	5528	private MenuItem overwriteGeoItem;
..	..	@@ -5072,7 +5535,7 @@
5072	5535	private MenuItem linkverticesItem;
5073	5536	private MenuItem relinkverticesItem;
5074	5537	private MenuItem setMasterItem;
5075		- private MenuItem resetMeshItem;
	5538	+ private MenuItem resetAllItem;
5076	5539	private MenuItem stepAllItem;
5077	5540	private MenuItem revertMeshItem;
5078	5541	private MenuItem poseMeshItem;
..	..	@@ -5122,6 +5585,10 @@
5122	5585	private MenuItem showleavesItem;
5123	5586	private MenuItem markleavesItem;
5124	5587	private MenuItem unmarkleavesItem;
	5588	+ private MenuItem rewindleavesItem;
	5589	+ private MenuItem unrewindleavesItem;
	5590	+ private MenuItem randomleavesItem;
	5591	+ private MenuItem unrandomleavesItem;
5125	5592
5126	5593	private MenuItem flipVItem;
5127	5594	private MenuItem unflipVItem;
..	..	@@ -5133,15 +5600,17 @@
5133	5600	private MenuItem panoTexturesItem;
5134	5601
5135	5602	private MenuItem resetCentroidItem;
5136		- private MenuItem transformgeometryItem;
	5603	+ private MenuItem resetCentroidXZItem;
5137	5604	private MenuItem resetTransformItem;
	5605	+ private MenuItem transformGeometryItem;
	5606	+ private MenuItem transformChildrenItem;
5138	5607	private MenuItem hideItem;
5139	5608	private MenuItem grabItem;
5140	5609	private MenuItem backItem;
5141	5610	private MenuItem frontItem;
5142	5611	private MenuItem cameraItem;
5143	5612	private MenuItem compositeItem;
5144		- private MenuItem randomItem;
	5613	+ private MenuItem switchItem;
5145	5614	private MenuItem physicsItem;
5146	5615	private MenuItem frameselectorItem;
5147	5616	private MenuItem scriptNodeItem;
..	..	@@ -5203,11 +5672,6 @@
5203	5672	private MenuItem doubleItem;
5204	5673	private MenuItem tripleItem;
5205	5674
5206		- private MenuItem importGFDItem;
5207		- private MenuItem importVRMLX3DItem;
5208		- private MenuItem import3DSItem;
5209		- private MenuItem importOBJItem;
5210		-
5211	5675	private MenuItem computeAOItem;
5212	5676	private MenuItem recompileItem;
5213	5677	private MenuItem editScriptItem;
..	..	@@ -5217,4 +5681,8 @@
5217	5681	private MenuItem analyzeItem;
5218	5682	private MenuItem dumpItem;
5219	5683	//boolean freezemodel = false;
	5684	+
	5685	+ Menu cameraMenu;
	5686	+ MenuItem editCameraItem;
	5687	+ MenuItem restoreCameraItem;
5220	5688	}