~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,28 +148,21 @@
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);
174	167	cloneItem = menu.add(new MenuItem("Clone"));
175	168	cloneItem.addActionListener(this);
..	..	@@ -185,7 +178,6 @@
185	178	copyItem.addActionListener(this);
186	179	pasteItem = menu.add(new MenuItem("Paste"));
187	180	pasteItem.addActionListener(this);
188		- menu.add("-");
189	181
190	182	menu.add("-");
191	183	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -206,14 +198,97 @@
206	198	clearAllItem = menu.add(new MenuItem("Clear All"));
207	199	clearAllItem.addActionListener(this);
208	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());
209	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	+
210	289	oe.menuBar.add(menu = new Menu("Setting"));
211	290	if (Globals.ADVANCED)
212	291	{
213		- resetMeshItem = menu.add(new MenuItem("Reset All"));
214		- resetMeshItem.addActionListener(this);
215		- stepAllItem = menu.add(new MenuItem("Step All"));
216		- stepAllItem.addActionListener(this);
217	292	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218	293	revertMeshItem.addActionListener(this);
219	294	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -253,21 +328,29 @@
253	328	}
254	329
255	330	oe.menuBar.add(menu = new Menu("Group"));
256		- grabItem = menu.add(new MenuItem("Grab"));
257		- grabItem.addActionListener(this);
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
258	333	backItem = menu.add(new MenuItem("Back"));
259	334	backItem.addActionListener(this);
260	335	frontItem = menu.add(new MenuItem("Front"));
261	336	frontItem.addActionListener(this);
262		- compositeItem = menu.add(new MenuItem("Composite"));
263		- compositeItem.addActionListener(this);
	337	+// compositeItem = menu.add(new MenuItem("Composite"));
	338	+// compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
264	342	hideItem = menu.add(new MenuItem("Hidden Group"));
265	343	hideItem.addActionListener(this);
	344	+ }
266	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
267	346	ungroupItem.addActionListener(this);
268		- menu.add("-");
269		- randomItem = menu.add(new MenuItem("Switch node"));
270		- 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	+ {
271	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
272	355	switchGeoItem.addActionListener(this);
273	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -275,8 +358,6 @@
275	358	morphItem = menu.add(new MenuItem("Morph Group"));
276	359	morphItem.addActionListener(this);
277	360
278		- if (Globals.ADVANCED)
279		- {
280	361	menu.add("-");
281	362	physicsItem = menu.add(new MenuItem("Physics"));
282	363	physicsItem.addActionListener(this);
..	..	@@ -284,22 +365,20 @@
284	365	frameselectorItem.addActionListener(this);
285	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
286	367	scriptNodeItem.addActionListener(this);
287		- cameraItem = menu.add(new MenuItem("Camera"));
288		- cameraItem.addActionListener(this);
289	368	}
290	369
291	370	oe.menuBar.add(menu = new Menu("Object"));
292		- textureItem = menu.add(new MenuItem("Texture"));
293		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
294	373	billboardItem = menu.add(new MenuItem("Billboard"));
295	374	billboardItem.addActionListener(this);
296	375	csgItem = menu.add(new MenuItem("CSG"));
297	376	csgItem.addActionListener(this);
298		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	377	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
299	378	shadowXItem.addActionListener(this);
300		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	379	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
301	380	shadowYItem.addActionListener(this);
302		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	381	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
303	382	shadowZItem.addActionListener(this);
304	383	if (Globals.ADVANCED)
305	384	{
..	..	@@ -318,8 +397,12 @@
318	397	resetTransformItem.addActionListener(this);
319	398	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
320	399	resetCentroidItem.addActionListener(this);
321		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
322		- 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);
323	406
324	407	oe.menuBar.add(menu = new Menu("Geometry"));
325	408	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -368,6 +451,10 @@
368	451	oe.menuBar.add(menu = new Menu("Attributes"));
369	452	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
370	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);
371	458	menu.add("-");
372	459	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
373	460	liveleavesItem.addActionListener(this);
..	..	@@ -388,6 +475,14 @@
388	475	markleavesItem.addActionListener(this);
389	476	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
390	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);
391	486	menu.add("-");
392	487	flipVItem = menu.add(new MenuItem("Flip V"));
393	488	flipVItem.addActionListener(this);
..	..	@@ -422,38 +517,41 @@
422	517	sortbysizeItem.addActionListener(this);
423	518	sortbynameItem = menu.add(new MenuItem("Sort by name"));
424	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);
425	525	if (Globals.ADVANCED)
426	526	{
427		- menu.add("-");
	527	+ // Pretty much the same as duplicate and clone.
428	528	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
429	529	extractGeometriesItem.addActionListener(this);
430	530	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
431	531	cloneGeometriesItem.addActionListener(this);
432		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
433		- shareGeometriesItem.addActionListener(this);
434		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
435		- mergeGeometriesItem.addActionListener(this);
436	532	}
437	533
438	534	oe.menuBar.add(menu = new Menu("Insert"));
439	535	buildCreateMenu(menu);
440	536
441		- oe.menuBar.add(menu = new Menu("Include"));
442		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
443		- importGFDItem.addActionListener(this);
444		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
445		- importVRMLX3DItem.addActionListener(this);
446		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
447		- importOBJItem.addActionListener(this);
448		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
449		- import3DSItem.addActionListener(this);
450		-
451	537	oe.menuBar.add(menu = new Menu("Tools"));
452	538	buildToolsMenu(menu);
453	539	}
454	540
455	541	void SetupUI2(ObjEditor oe)
456	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	+
457	555	//new Exception().printStackTrace();
458	556
459	557	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -482,97 +580,198 @@
482	580	oe.radioPanel.add(dummyButton);
483	581	oe.buttonGroup.add(dummyButton);
484	582	*/
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 2;
	586	+
485	587	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
486	588
487		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
488		- 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");
489	619	liveCB.addItemListener(this);
490	620
491		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	621	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492	622	oneStepButton.setToolTipText("Animate one step forward");
493	623	oneStepButton.addActionListener(this);
494	624
495		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	625	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
496	626	fastCB.setToolTipText("Fast mode");
497	627	fastCB.addItemListener(this);
498	628
499		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
500		- trackCB.setToolTipText("Enable tracking");
501		- trackCB.addItemListener(this);
502		-
503		- 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);
504	632	screenfitButton.setToolTipText("Screen fit");
505	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);
506	638
507	639	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
508	640	// screenfitpointButton.addActionListener(this);
509	641
510	642	if (Globals.ADVANCED)
511	643	{
512		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	644	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
513	645	snapobjectButton.addActionListener(this);
514	646	snapobjectButton.setToolTipText("Snap Object");
515	647	}
516	648
517		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
518		- flashSelectionButton.setToolTipText("Show selection");
519		- flashSelectionButton.addActionListener(this);
	649	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
520	650
521		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
522		-
523		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	651	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
524	652	twoButton.setToolTipText("Show center view only");
525	653	twoButton.addActionListener(this);
526		- 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);
527	657	fourButton.addActionListener(this);
528	658	fourButton.setToolTipText("Show left panel only");
529		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	659	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
530	660	sixButton.setToolTipText("2-column layout left");
531	661	sixButton.addActionListener(this);
532		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	662	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
533	663	threeButton.setToolTipText("2-column layout right");
534	664	threeButton.addActionListener(this);
535		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	665	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
536	666	sevenButton.setToolTipText("3-column layout");
537	667	sevenButton.addActionListener(this);
538	668	//
539	669
540		- 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);
541	671	rootButton.setToolTipText("Edit selection in new tab");
542	672	rootButton.addActionListener(this);
543	673
544		- 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);
545	675	closeButton.setToolTipText("Close tab");
546	676	closeButton.addActionListener(this);
547	677	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
548	678	//clearButton.addActionListener(this);
549		-
550		- 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	+ }
551	711
552		- 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);
553	748	editButton.setToolTipText("Edit selection");
554	749	editButton.addActionListener(this);
555	750
556		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	751	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
557	752	uneditButton.setToolTipText("Unedit selection");
558	753	uneditButton.addActionListener(this);
559	754
560		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	755	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
561	756	allParamsButton.setToolTipText("Edit all params");
562	757	allParamsButton.addActionListener(this);
563	758
564		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	759	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565	760	clearPanelButton.setToolTipText("Clear edit panel");
566	761	clearPanelButton.addActionListener(this);
567	762
568		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	763	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569	764	unselectButton.setToolTipText("Unselect");
570	765	unselectButton.addActionListener(this);
571	766
572		- 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);
573	770
574		- oe.treePanel.add(commandsPanel);
575		- oe.treePanel.Return();
	771	+ editCommandsPanel.preferredHeight = 1;
	772	+
	773	+// oe.treePanel.add(commandsPanel);
	774	+// oe.treePanel.Return();
576	775
577	776	// oe.aConstraints.gridx += 1;
578	777	// oe.aConstraints.weighty = 0;
..	..	@@ -589,27 +788,12 @@
589	788
590	789	JScrollPane jSP;
591	790	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
592		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	791	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
593	792	ResetModel();
594	793
595	794	oe.treePanel.add(jSPPanel);
596	795	oe.treePanel.Return();
597	796
598		- cGridBag copyOptionsPanel = new cGridBag();
599		-
600		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
601		- colorCB.setToolTipText("Copy color when dropped");
602		- colorCB.addItemListener(this);
603		-
604		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
605		- materialCB.setToolTipText("Copy material when dropped");
606		- materialCB.addItemListener(this);
607		-
608		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
609		- textureCB.setToolTipText("Copy texture when dropped");
610		- textureCB.addItemListener(this);
611		-
612		- copyOptionsPanel.preferredHeight = 1;
613	797	oe.treePanel.add(copyOptionsPanel);
614	798	oe.treePanel.Return();
615	799
..	..	@@ -640,6 +824,20 @@
640	824
641	825	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
642	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	+
643	841	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
644	842	boxCB.setToolTipText("Display bounding boxes");
645	843	boxCB.addItemListener(this);
..	..	@@ -648,7 +846,7 @@
648	846	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
649	847	zoomBoxCB.addItemListener(this);
650	848
651		- if (Globals.ADVANCED)
	849	+ if (true) // Globals.ADVANCED)
652	850	{
653	851	panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
654	852	supportCB.setToolTipText("Enable rigging");
..	..	@@ -657,6 +855,8 @@
657	855	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
658	856	// localCB.addItemListener(this);
659	857
	858	+ panel.Return();
	859	+
660	860	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
661	861	crowdCB.setToolTipText("Used for crowds");
662	862	crowdCB.addItemListener(this);
..	..	@@ -673,6 +873,8 @@
673	873	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
674	874	// speakerMocapCB.addItemListener(this);
675	875
	876	+ panel.Return();
	877	+
676	878	if (false)
677	879	{
678	880	// handled in scripts
..	..	@@ -687,32 +889,72 @@
687	889	//constraints.gridy += 1;
688	890	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
689	891	smoothfocusCB.addItemListener(this);
	892	+ panel.Return();
690	893	}
691	894
692	895	//constraints.gridx += 1;
693	896	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
694	897	// debugCB.addItemListener(this);
695	898
	899	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	900	+ trackCB.setToolTipText("Enable tracking target");
	901	+ trackCB.addItemListener(this);
	902	+
696	903	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	904	+ oeilCB.setToolTipText("Move camera when tracking");
697	905	oeilCB.addItemListener(this);
698	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	+ {
699	927	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
700	928	lookAtCB.setToolTipText("Look-at target");
701	929	lookAtCB.addItemListener(this);
	930	+ }
702	931
703	932	}
704	933
705	934	cGridBag fill = new cGridBag();
706		-
707	935	fill.preferredHeight = 200;
	936	+ cGridBag fill2 = new cGridBag();
	937	+ fill2.preferredHeight = 200;
	938	+ cGridBag fill3 = new cGridBag();
	939	+ fill3.preferredHeight = 200;
708	940
709	941	panel.add(fill);
	942	+ panel.add(fill2);
	943	+ panel.add(fill3);
710	944
711	945	}
712	946
713	947	void EditObject(Object3D obj)
714	948	{
715	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	+
716	958	radioButton.SetObject(obj);
717	959	radioButton.layout = sevenButton;
718	960	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -721,8 +963,11 @@
721	963	buttonGroup.add(radioButton);
722	964	radioButton.doClick();
723	965	}
	966	+
724	967	void SetupViews(ObjEditor oe)
725	968	{
	969	+ theFrame = this;
	970	+
726	971	oe.SetupViews();
727	972
728	973	System.out.println("SetupViews");
..	..	@@ -731,23 +976,27 @@
731	976	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
732	977	}
733	978
734		- JCheckBox liveCB;
735		- JCheckBox supportCB;
736		- JCheckBox localCB;
737		- JCheckBox crowdCB;
738		- JCheckBox smoothCB;
739		- JCheckBox fastCB;
740		- JCheckBox slowCB;
741		- JCheckBox boxCB;
742		- JCheckBox zoomBoxCB;
743		- JCheckBox trackCB;
744		- 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;
745	991	// JCheckBox speakerMocapCB;
746		- JCheckBox speakerCameraCB;
747		- JCheckBox speakerFocusCB;
748		- JCheckBox debugCB;
749		- JCheckBox oeilCB;
750		- JCheckBox lookAtCB;
	992	+ cCheckBox speakerCameraCB;
	993	+ cCheckBox speakerFocusCB;
	994	+ cCheckBox debugCB;
	995	+
	996	+ cCheckBox oeilCB;
	997	+ cCheckBox shadowCB;
	998	+ cCheckBox autosaveCB;
	999	+ cCheckBox lookAtCB;
751	1000
752	1001	// static int COLOR = 1;
753	1002	// static int MATERIAL = 2;
..	..	@@ -755,9 +1004,9 @@
755	1004
756	1005	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
757	1006
758		- JCheckBox colorCB;
759		- JCheckBox materialCB;
760		- JCheckBox textureCB;
	1007	+ cCheckBox colorCB;
	1008	+ cCheckBox materialCB;
	1009	+ cCheckBox textureCB;
761	1010
762	1011	public void itemStateChanged(ItemEvent e)
763	1012	{
..	..	@@ -785,6 +1034,7 @@
785	1034	} else if(e.getSource() == liveCB)
786	1035	{
787	1036	cameraView.ToggleLive();
	1037	+ refreshContents(false);
788	1038	}
789	1039	else if(e.getSource() == supportCB)
790	1040	{
..	..	@@ -849,6 +1099,14 @@
849	1099	{
850	1100	cameraView.ToggleOeil();
851	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	+ }
852	1110	else if(e.getSource() == lookAtCB)
853	1111	{
854	1112	cameraView.ToggleLookAt();
..	..	@@ -865,7 +1123,8 @@
865	1123
866	1124	/**/
867	1125	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
868		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1126	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1127	+ TreePath path = objEditor.jTree.getSelectionPath();
869	1128	if ((path == null) \|\| (path.getPathCount() <= 1)) {
870	1129	// We can't move the root node or an empty selection
871	1130	return;
..	..	@@ -937,7 +1196,9 @@
937	1196	// objEditor.DropFile((java.io.File[]) object, true);
938	1197	// return;
939	1198	// }
940		- if (string.charAt(0) == '/')
	1199	+
	1200	+ // File path for Mac and Windows
	1201	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
941	1202	{
942	1203	// file(s)
943	1204	String[] names = string.split("\n");
..	..	@@ -964,7 +1225,7 @@
964	1225
965	1226	flashIt = false;
966	1227	CameraPane pane = (CameraPane) target;
967		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1228	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
968	1229	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
969	1230
970	1231	if (group.selection.size() == 1)
..	..	@@ -980,23 +1241,33 @@
980	1241
981	1242	assert target == objEditor.jTree;
982	1243	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1244	+ Object3D destinationLeaf;
983	1245	try {
984		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1246	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
985	1247	} catch (Exception e) {
986	1248	System.out.println("destinationPath : " + destinationPath);
987	1249	return;
988	1250	}
989	1251
990		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1252	+ for (int i=group.selection.size(); --i>=0;)
991	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	+// {
992	1263	loadClipboard(true);
993	1264	objEditor.jTree.setSelectionPath(destinationPath);
994	1265	pasteInto(false, false);
995		- } else {
996		- loadClipboard(false);
997		- objEditor.jTree.setSelectionPath(destinationPath);
998		- pasteInto(false, false); // true); // ???
999		- }
	1266	+// } else {
	1267	+// loadClipboard(false);
	1268	+// objEditor.jTree.setSelectionPath(destinationPath);
	1269	+// pasteInto(false, false); // true); // ???
	1270	+// }
1000	1271	}
1001	1272	public void dropActionChanged(DropTargetDragEvent dtde)
1002	1273	// Called if the user has modified the current drop gesture
..	..	@@ -1101,22 +1372,30 @@
1101	1372	{
1102	1373	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1103	1374	//heightFieldItem.addActionListener(this);
1104		- gridItem = menu.add(new MenuItem("Grid"));
1105		- gridItem.addActionListener(this);
1106		- rectoidItem = menu.add(new MenuItem("Box"));
1107		- rectoidItem.addActionListener(this);
1108		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1109		- ellipsoidItem.addActionListener(this);
1110		- coneItem = menu.add(new MenuItem("Cone"));
1111		- coneItem.addActionListener(this);
1112		- torusItem = menu.add(new MenuItem("Torus"));
1113		- torusItem.addActionListener(this);
1114		- superItem = menu.add(new MenuItem("Superellipsoid"));
1115		- 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	+ {
1116	1393	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1117	1394	kleinItem.addActionListener(this);
1118		- particleItem = menu.add(new MenuItem("Particle system"));
1119		- particleItem.addActionListener(this);
	1395	+ }
	1396	+
	1397	+// particleItem = menu.add(new MenuItem("Particle system"));
	1398	+// particleItem.addActionListener(this);
1120	1399	if (Globals.ADVANCED)
1121	1400	{
1122	1401	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1142,15 +1421,15 @@
1142	1421	}
1143	1422	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1144	1423	bezierItem.addActionListener(this);
1145		- overlayItem = menu.add(new MenuItem("Overlay"));
1146		- overlayItem.addActionListener(this);
1147		- lightItem = menu.add(new MenuItem("Light"));
1148		- 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);
1149	1428	menu.add("-");
1150	1429	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1151	1430	//superLoopItem.addActionListener(this);
1152		- loopItem = menu.add(new MenuItem("Loop"));
1153		- loopItem.addActionListener(this);
	1431	+// loopItem = menu.add(new MenuItem("Loop"));
	1432	+// loopItem.addActionListener(this);
1154	1433	doubleItem = menu.add(new MenuItem("Fork"));
1155	1434	doubleItem.addActionListener(this);
1156	1435	if (Globals.ADVANCED)
..	..	@@ -1190,7 +1469,7 @@
1190	1469	memoryItem.addActionListener(this);
1191	1470	menu.add(analyzeItem = new MenuItem("Analyze"));
1192	1471	analyzeItem.addActionListener(this);
1193		- menu.add(dumpItem = new MenuItem("Dump"));
	1472	+ menu.add(dumpItem = new MenuItem("Print"));
1194	1473	dumpItem.addActionListener(this);
1195	1474	// menu.add(pathItem = new MenuItem("From-to path"));
1196	1475	// pathItem.addActionListener(this);
..	..	@@ -1331,6 +1610,7 @@
1331	1610	shadow.material = new cMaterial(obj.material);
1332	1611	shadow.material.diffuse = 0.0001f;
1333	1612	shadow.material.specular = 0.0001f;
	1613	+ //shadow.projectedVertices[1].x = 300;
1334	1614
1335	1615	makeSomething(shadow);
1336	1616	}
..	..	@@ -1537,9 +1817,9 @@
1537	1817
1538	1818	void Overwrite(int mask)
1539	1819	{
1540		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1820	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1541	1821	{
1542		- Object3D content = GrafreeD.clipboard.get(0);
	1822	+ Object3D content = Grafreed.clipboard.get(0);
1543	1823
1544	1824	if (content instanceof cGroup && ((cGroup)content).transientlink )
1545	1825	content = ((cGroup)content).get(0);
..	..	@@ -1578,7 +1858,7 @@
1578	1858	{
1579	1859	ScreenFit();
1580	1860	} else
1581		- if (source == switchItem)
	1861	+ if (source == switchViewItem)
1582	1862	{
1583	1863	cVector v1 = new cVector();
1584	1864	cVector v2 = new cVector();
..	..	@@ -1587,11 +1867,11 @@
1587	1867	objEditor.cameraView.renderCamera.setAim(v2, v1);
1588	1868	objEditor.cameraView.repaint();
1589	1869	} else
1590		- if (source == rectoidItem)
	1870	+ if (source == rectoidItem \|\| source == boxButton)
1591	1871	{
1592	1872	makeSomething(new Box());
1593	1873	} else
1594		- if (source == particleItem)
	1874	+ if (source == particleItem \|\| source == particlesButton)
1595	1875	{
1596	1876	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1597	1877	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1670,27 +1950,27 @@
1670	1950
1671	1951	makeSomething(obj);
1672	1952	} else
1673		- if (source == gridItem)
	1953	+ if (source == gridItem \|\| source == gridButton)
1674	1954	{
1675	1955	makeSomething(new Grid());
1676	1956	} else
1677		- if (source == ellipsoidItem)
	1957	+ if (source == ellipsoidItem \|\| source == sphereButton)
1678	1958	{
1679	1959	makeSomething(new Sphere());
1680	1960	} else
1681		- if (source == coneItem)
	1961	+ if (source == coneItem \|\| source == coneButton)
1682	1962	{
1683	1963	makeSomething(new Cone());
1684	1964	} else
1685		- if (source == torusItem)
	1965	+ if (source == torusItem \|\| source == torusButton)
1686	1966	{
1687	1967	makeSomething(new Torus());
1688	1968	} else
1689		- if (source == superItem)
	1969	+ if (source == superItem \|\| source == superButton)
1690	1970	{
1691	1971	makeSomething(new Superellipsoid());
1692	1972	} else
1693		- if (source == kleinItem)
	1973	+ if (source == kleinItem \|\| source == kleinButton)
1694	1974	{
1695	1975	makeSomething(new Klein());
1696	1976	} else
..	..	@@ -1710,7 +1990,7 @@
1710	1990	{
1711	1991	makeSomething(new BezierSurface());
1712	1992	} else
1713		- if (source == overlayItem)
	1993	+ if (source == overlayItem \|\| source == overlayButton)
1714	1994	{
1715	1995	/*
1716	1996	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1758,7 +2038,7 @@
1758	2038	s.setup();
1759	2039	makeSomething(s);
1760	2040	} else
1761		- if (source == lightItem)
	2041	+ if (source == lightItem \|\| source == lightButton)
1762	2042	{
1763	2043	makeSomething(new Light());
1764	2044	} else
..	..	@@ -1808,7 +2088,7 @@
1808	2088
1809	2089	group(g);
1810	2090	} else
1811		- if (source == loopItem)
	2091	+ if (source == loopItem \|\| source == loopButton)
1812	2092	{
1813	2093	Composite csg = new GroupLeaf();
1814	2094	csg.count = 5;
..	..	@@ -1844,23 +2124,6 @@
1844	2124	csg.addChild(child);
1845	2125	child.addChild(csg);
1846	2126	} else
1847		-
1848		- if (source == importGFDItem)
1849		- {
1850		- ImportGFD();
1851		- } else
1852		- if (source == importVRMLX3DItem)
1853		- {
1854		- ImportVRMLX3D();
1855		- } else
1856		- if (source == import3DSItem)
1857		- {
1858		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1859		- } else
1860		- if (source == importOBJItem)
1861		- {
1862		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1863		- } else
1864	2127	if (source == computeAOItem)
1865	2128	{
1866	2129	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1879,7 +2142,7 @@
1879	2142	if (source == invariantsItem)
1880	2143	{
1881	2144	System.out.println("Invariants:");
1882		- GrafreeD.grafreeD.universe.invariants();
	2145	+ Grafreed.grafreeD.universe.invariants();
1883	2146	} else
1884	2147	if (source == memoryItem)
1885	2148	{
..	..	@@ -1897,6 +2160,30 @@
1897	2160	if (source == dumpItem)
1898	2161	{
1899	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();
1900	2187	} else
1901	2188	if (source == oneStepButton)
1902	2189	{
..	..	@@ -1952,12 +2239,20 @@
1952	2239	{
1953	2240	loadClipboard(true);
1954	2241	} else
	2242	+ if (source == undoItem)
	2243	+ {
	2244	+ Undo();
	2245	+ } else
	2246	+ if (source == redoItem)
	2247	+ {
	2248	+ Redo();
	2249	+ } else
1955	2250	if (source == duplicateItem)
1956	2251	{
1957		- Object3D keep = GrafreeD.clipboard;
	2252	+ Object3D keep = Grafreed.clipboard;
1958	2253	loadClipboard(false);
1959	2254	paste(false);
1960		- GrafreeD.clipboard = keep;
	2255	+ Grafreed.clipboard = keep;
1961	2256	} else
1962	2257	if (source == cloneItem)
1963	2258	{
..	..	@@ -2177,9 +2472,9 @@
2177	2472	// group.selection.get(0).setMasterThis(content); // should be identity
2178	2473	// refreshContents();
2179	2474	// }
2180		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2475	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2181	2476	{
2182		- Object3D content = GrafreeD.clipboard.get(0);
	2477	+ Object3D content = Grafreed.clipboard.get(0);
2183	2478
2184	2479	if (content instanceof cGroup && ((cGroup)content).transientlink )
2185	2480	content = ((cGroup)content).get(0);
..	..	@@ -2229,9 +2524,9 @@
2229	2524	} else
2230	2525	if (source == setMasterItem)
2231	2526	{
2232		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2527	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2233	2528	{
2234		- Object3D content = GrafreeD.clipboard.get(0);
	2529	+ Object3D content = Grafreed.clipboard.get(0);
2235	2530
2236	2531	if (content instanceof cGroup && ((cGroup)content).transientlink )
2237	2532	content = ((cGroup)content).get(0);
..	..	@@ -2244,9 +2539,9 @@
2244	2539	{
2245	2540	if (group.selection.size() == 1)
2246	2541	{
2247		- if (GrafreeD.clipboard.size() == 1)
	2542	+ if (Grafreed.clipboard.size() == 1)
2248	2543	{
2249		- Object3D content = GrafreeD.clipboard.get(0);
	2544	+ Object3D content = Grafreed.clipboard.get(0);
2250	2545
2251	2546	if (content instanceof cGroup && ((cGroup)content).transientlink )
2252	2547	content = ((cGroup)content).get(0);
..	..	@@ -2263,7 +2558,7 @@
2263	2558	{
2264	2559	RevertMeshes();
2265	2560	} else
2266		- if (source == resetMeshItem)
	2561	+ if (source == resetAllItem)
2267	2562	{
2268	2563	ResetAll();
2269	2564	} else
..	..	@@ -2283,9 +2578,9 @@
2283	2578	{
2284	2579	ClearSelection(true);
2285	2580	} else
2286		- if (source == grabItem)
	2581	+ if (source == grabItem \|\| source == groupButton)
2287	2582	{
2288		- group(new cGroup(), true);
	2583	+ group(new cGroup(), false); // true);
2289	2584	} else
2290	2585	if (source == hideItem)
2291	2586	{
..	..	@@ -2303,11 +2598,11 @@
2303	2598	{
2304	2599	makeSomething(new Camera());
2305	2600	} else
2306		- if (source == compositeItem)
	2601	+ if (source == compositeItem \|\| source == compositeButton)
2307	2602	{
2308	2603	group(new Composite());
2309	2604	} else
2310		- if (source == randomItem)
	2605	+ if (source == switchItem \|\| source == switchButton)
2311	2606	{
2312	2607	RandomNode random = new RandomNode();
2313	2608	group(random);
..	..	@@ -2409,7 +2704,7 @@
2409	2704	{
2410	2705	group(new cLinker());
2411	2706	} else
2412		- if (source == textureItem)
	2707	+ if (source == textureItem \|\| source == textureButton)
2413	2708	{
2414	2709	group(new TextureNode());
2415	2710	} else
..	..	@@ -2429,7 +2724,7 @@
2429	2724	{
2430	2725	CastShadow(2);
2431	2726	} else
2432		- if (source == ungroupItem)
	2727	+ if (source == ungroupItem \|\| source == ungroupButton)
2433	2728	{
2434	2729	//ungroup();
2435	2730	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2451,7 +2746,7 @@
2451	2746	} else
2452	2747	if (source == genNormalsMESHItem)
2453	2748	{
2454		- GenNormals(true); // TODO
	2749	+ GenNormalsMESH();
2455	2750	} else
2456	2751	if (source == genNormalsORGANItem)
2457	2752	{
..	..	@@ -2516,6 +2811,22 @@
2516	2811	if (source == unmarkleavesItem)
2517	2812	{
2518	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);
2519	2830	} else
2520	2831	if (source == flipVItem)
2521	2832	{
..	..	@@ -2601,9 +2912,13 @@
2601	2912	{
2602	2913	SmoothMesh();
2603	2914	} else
2604		- if (source == transformgeometryItem)
	2915	+ if (source == transformGeometryItem)
2605	2916	{
2606	2917	TransformGeometry();
	2918	+ } else
	2919	+ if (source == transformChildrenItem)
	2920	+ {
	2921	+ TransformChildren();
2607	2922	} else
2608	2923	if (source == resetTransformItem)
2609	2924	{
..	..	@@ -2611,7 +2926,11 @@
2611	2926	} else
2612	2927	if (source == resetCentroidItem)
2613	2928	{
2614		- ResetCentroid();
	2929	+ ResetCentroid(true);
	2930	+ } else
	2931	+ if (source == resetCentroidXZItem)
	2932	+ {
	2933	+ ResetCentroid(false);
2615	2934	} else
2616	2935	if (source == resetParentItem)
2617	2936	{
..	..	@@ -2743,6 +3062,10 @@
2743	3062	if (source == twoButton)
2744	3063	{
2745	3064	radio.layout = twoButton;
	3065	+
	3066	+ if (CameraPane.FULLSCREEN)
	3067	+ fullscreenLayout = radio.layout;
	3068	+
2746	3069	// bug
2747	3070	//gridPanel.setDividerLocation(1.0);
2748	3071	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2775,10 +3098,31 @@
2775	3098	bigThree.ClearUI();
2776	3099	bigThree.add(centralPanel);
2777	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	+
2778	3119	} else
2779	3120	if (source == threeButton)
2780	3121	{
2781	3122	radio.layout = threeButton;
	3123	+
	3124	+ if (CameraPane.FULLSCREEN)
	3125	+ fullscreenLayout = radio.layout;
2782	3126
2783	3127	// bigThree.remove(scenePanel);
2784	3128	// bigThree.remove(centralPanel);
..	..	@@ -2811,10 +3155,15 @@
2811	3155	bigThree.add(centralPanel);
2812	3156	bigThree.add(XYZPanel);
2813	3157	bigThree.FlushUI();
	3158	+
	3159	+ cameraView.requestFocusInWindow();
2814	3160	} else
2815	3161	if (source == fourButton)
2816	3162	{
2817	3163	radio.layout = fourButton;
	3164	+
	3165	+ if (CameraPane.FULLSCREEN)
	3166	+ fullscreenLayout = radio.layout;
2818	3167
2819	3168	// bigThree.remove(scenePanel);
2820	3169	// bigThree.remove(centralPanel);
..	..	@@ -2846,10 +3195,15 @@
2846	3195	bigThree.ClearUI();
2847	3196	bigThree.add(scenePanel);
2848	3197	bigThree.FlushUI();
	3198	+
	3199	+ cameraView.requestFocusInWindow();
2849	3200	} else
2850	3201	if (source == sixButton)
2851	3202	{
2852	3203	radio.layout = sixButton;
	3204	+
	3205	+ if (CameraPane.FULLSCREEN)
	3206	+ fullscreenLayout = radio.layout;
2853	3207
2854	3208	// bigThree.remove(scenePanel);
2855	3209	// bigThree.remove(centralPanel);
..	..	@@ -2882,10 +3236,15 @@
2882	3236	bigThree.add(scenePanel);
2883	3237	bigThree.add(centralPanel);
2884	3238	bigThree.FlushUI();
	3239	+
	3240	+ cameraView.requestFocusInWindow();
2885	3241	} else
2886	3242	if (source == sevenButton)
2887	3243	{
2888	3244	radio.layout = sevenButton;
	3245	+
	3246	+ if (CameraPane.FULLSCREEN)
	3247	+ fullscreenLayout = radio.layout;
2889	3248
2890	3249	// bigThree.remove(scenePanel);
2891	3250	// bigThree.remove(centralPanel);
..	..	@@ -2919,6 +3278,8 @@
2919	3278	bigThree.add(centralPanel);
2920	3279	bigThree.add(XYZPanel);
2921	3280	bigThree.FlushUI();
	3281	+
	3282	+ cameraView.requestFocusInWindow();
2922	3283	} else
2923	3284	if (source == rootButton)
2924	3285	{
..	..	@@ -2930,6 +3291,7 @@
2930	3291	EditObject(obj);
2931	3292	}
2932	3293
	3294	+ cameraView.requestFocusInWindow();
2933	3295	refreshContents(true);
2934	3296	} else
2935	3297	if (source == closeButton)
..	..	@@ -2939,18 +3301,27 @@
2939	3301	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2940	3302	{
2941	3303	ab = (cRadio)e.nextElement();
2942		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3304	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2943	3305	{
	3306	+ // Patch to avoid bug with transparency.
	3307	+ if (!ab.hadMaterial)
	3308	+ {
	3309	+ ab.object.material = null;
	3310	+ }
	3311	+
2944	3312	buttonGroup.remove(ab);
2945	3313	radioPanel.remove(ab);
2946	3314
2947		- ab.GetObject().editWindow = null;
	3315	+ //ab.GetObject().editWindow = null;
	3316	+ ab.GetObject().manipWindow = null;
2948	3317	// ab.GetObject().objectUI = null; // ?????????
2949	3318
2950	3319	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2951	3320	break;
2952	3321	}
2953	3322	}
	3323	+
	3324	+ cameraView.requestFocusInWindow();
2954	3325	refreshContents(true);
2955	3326	} else
2956	3327	if (source == editItem \|\| source == editButton)
..	..	@@ -2967,7 +3338,7 @@
2967	3338	child.CloseUI();
2968	3339	listUI.remove(child);
2969	3340
2970		- child.editWindow = null; // ???????????
	3341	+ //child.editWindow = null; // ???????????
2971	3342	}
2972	3343	objEditor.ctrlPanel.FlushUI();
2973	3344	//objEditor.jTree.clearSelection();
..	..	@@ -3053,7 +3424,11 @@
3053	3424	frontView.object = group;
3054	3425	sideView.object = group;
3055	3426	}
3056		- group.editWindow = this;
	3427	+
	3428	+// fix "+" issue
	3429	+ //group.editWindow = this;
	3430	+ group.manipWindow = this;
	3431	+
3057	3432	/*
3058	3433	currentLayout = radio.layout;
3059	3434	if (currentLayout == null)
..	..	@@ -3065,8 +3440,23 @@
3065	3440	//group.parent = null; // ROOT
3066	3441	//group.attributes = -1;
3067	3442	ResetModel();
	3443	+
	3444	+ cameraView.requestFocusInWindow();
3068	3445	refreshContents(true);
3069		- }
	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	+ }
3070	3460	else
3071	3461	{
3072	3462	//return super.action(event, arg);
..	..	@@ -3075,7 +3465,6 @@
3075	3465	}
3076	3466
3077	3467	boolean useclient = false;
3078		- cRadio radio;
3079	3468
3080	3469	void ToggleRoot()
3081	3470	{
..	..	@@ -3127,6 +3516,28 @@
3127	3516	refreshContents();
3128	3517	}
3129	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	+ }
3130	3541
3131	3542	void ResetTransform()
3132	3543	{
..	..	@@ -3239,7 +3650,7 @@
3239	3650	refreshContents();
3240	3651	}
3241	3652
3242		- void ResetCentroid()
	3653	+ void ResetCentroid(boolean full)
3243	3654	{
3244	3655	Object3D obj;
3245	3656	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3254,12 +3665,16 @@
3254	3665	LA.matIdentity(Object3D.mat);
3255	3666	obj.getBounds(minima, maxima, false);
3256	3667	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3257		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3668	+ if (full)
	3669	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3258	3670	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3259	3671	obj.TransformMesh(Object3D.mat);
	3672	+
3260	3673	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3261		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3674	+ if (full)
	3675	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3262	3676	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3677	+
3263	3678	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3264	3679	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3265	3680	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3288,7 +3703,8 @@
3288	3703
3289	3704	int size = obj.MemorySize();
3290	3705
3291		- 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)");
3292	3708	}
3293	3709	}
3294	3710	catch (Exception e)
..	..	@@ -3325,9 +3741,9 @@
3325	3741	obj = (Object3D)e.nextElement();
3326	3742
3327	3743	System.out.println("Object is: " + obj);
3328		- GrafreeD.AnalyzeObject(obj);
	3744	+ Grafreed.AnalyzeObject(obj);
3329	3745	System.out.println("Boundary rep: " + obj.bRep);
3330		- GrafreeD.AnalyzeObject(obj.bRep);
	3746	+ Grafreed.AnalyzeObject(obj.bRep);
3331	3747
3332	3748	// System.err.println((size/1024) + " KB is the size of " + obj);
3333	3749	}
..	..	@@ -3369,6 +3785,13 @@
3369	3785	void GenNormals(boolean crease)
3370	3786	{
3371	3787	group.GenNormalsS(crease);
	3788	+
	3789	+ refreshContents();
	3790	+ }
	3791	+
	3792	+ void GenNormalsMESH()
	3793	+ {
	3794	+ group.GenNormalsMeshS();
3372	3795
3373	3796	refreshContents();
3374	3797	}
..	..	@@ -3541,8 +3964,8 @@
3541	3964
3542	3965	void ParseVertices()
3543	3966	{
3544		- boolean epsequal = GrafreeD.epsequal;
3545		- GrafreeD.epsequal = true;
	3967	+ boolean epsequal = Grafreed.epsequal;
	3968	+ Grafreed.epsequal = true;
3546	3969
3547	3970	for (int i=0; i<group.selection.size(); i++)
3548	3971	{
..	..	@@ -3567,7 +3990,7 @@
3567	3990	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3568	3991	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3569	3992
3570		- g.add(GrafreeD.clipboard);
	3993	+ g.add(Grafreed.clipboard);
3571	3994
3572	3995	buffer.add(g);
3573	3996	}
..	..	@@ -3582,7 +4005,7 @@
3582	4005	makeSomething(buffer, i==group.selection.size()-1);
3583	4006	}
3584	4007
3585		- GrafreeD.epsequal = epsequal;
	4008	+ Grafreed.epsequal = epsequal;
3586	4009
3587	4010	refreshContents();
3588	4011	}
..	..	@@ -3600,7 +4023,16 @@
3600	4023	String pigment = Object3D.GetPigment(tex);
3601	4024	//String bump = Object3D.GetBump(tex);
3602	4025
3603		- 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	+ }
3604	4036
3605	4037	double s = v.s;
3606	4038
..	..	@@ -3732,7 +4164,7 @@
3732	4164	return;
3733	4165
3734	4166	Object3D poses = group.selection.get(0);
3735		- Object3D ref = GrafreeD.clipboard.get(0);
	4167	+ Object3D ref = Grafreed.clipboard.get(0);
3736	4168
3737	4169	Object3D newgroup = new Object3D("Po:" + poses.name);
3738	4170
..	..	@@ -3926,9 +4358,9 @@
3926	4358
3927	4359	void ClipMesh()
3928	4360	{
3929		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4361	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3930	4362	{
3931		- Object3D content = GrafreeD.clipboard.get(0);
	4363	+ Object3D content = Grafreed.clipboard.get(0);
3932	4364
3933	4365	if (content instanceof cGroup && ((cGroup)content).transientlink )
3934	4366	content = ((cGroup)content).get(0);
..	..	@@ -3937,7 +4369,7 @@
3937	4369	// {
3938	4370	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3939	4371	// }
3940		- group.selection.ClipMesh(GrafreeD.clipboard);
	4372	+ group.selection.ClipMesh(Grafreed.clipboard);
3941	4373	}
3942	4374	// group.selection.ClipMesh(GrafreeD.clipboard);
3943	4375	System.out.println("DONE.");
..	..	@@ -3984,6 +4416,18 @@
3984	4416	void MarkLeaves(boolean hide)
3985	4417	{
3986	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);
3987	4431	refreshContents();
3988	4432	}
3989	4433
..	..	@@ -4069,10 +4513,10 @@
4069	4513	{
4070	4514	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4071	4515	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4072		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4516	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4073	4517
4074	4518	Object3D elem = (Object3D)group.selection.elementAt(i);
4075		- if(elem != group)
	4519	+ if(elem != group \|\| !newWindow)
4076	4520	{
4077	4521	// if (!(elem instanceof Composite))
4078	4522	// newWindow = false;
..	..	@@ -4162,7 +4606,6 @@
4162	4606	//case 702: // Event.LIST_DESELECT
4163	4607	group.deselectAll();
4164	4608	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4165		- objEditor.ClearInfo(); // .GetMaterial());
4166	4609	if (tps != null)
4167	4610	{
4168	4611	for (int i=0; i < tps.length; i++)
..	..	@@ -4171,10 +4614,8 @@
4171	4614
4172	4615	//if (child.parent != null)
4173	4616	//child.parent.addSelectee(child);
	4617	+ objEditor.SetMaterial(child);
4174	4618	group.addSelectee(child);
4175		- objEditor.SetMaterial(child); // .GetMaterial());
4176		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4177		- System.err.println("info : " + child.GetPath());
4178	4619	}
4179	4620	}
4180	4621	// else
..	..	@@ -4184,16 +4625,17 @@
4184	4625	// System.err.println("info : " + group.GetPath());
4185	4626	// }
4186	4627
4187		- objEditor.SetText(); // jan 2014
4188		-
4189		- 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))
4190	4629	CameraPane.flash = true;
4191	4630
4192		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4631	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4193	4632	// a camera
4194	4633	{
4195		- CameraPane.camerachangeframe = 0; // don't refuse it
4196		- 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	+ }
4197	4639	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4198	4640	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4199	4641	}
..	..	@@ -4206,6 +4648,27 @@
4206	4648
4207	4649	freezemodel = false;
4208	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	+ }
4209	4672
4210	4673	void linkSomething(Object3D thing)
4211	4674	{
..	..	@@ -4277,16 +4740,19 @@
4277	4740	{
4278	4741	if (group.selection.isEmpty())
4279	4742	return;
4280		- GrafreeD.clipboardIsTempGroup = false;
	4743	+
	4744	+ Grafreed.clipboardIsTempGroup = false;
4281	4745	Composite tGroup = null;
4282	4746	if (group.selection.size() > 0) // 1)
4283	4747	{
4284	4748	tGroup = new cGroup();
4285		- GrafreeD.clipboardIsTempGroup = true;
	4749	+ Grafreed.clipboardIsTempGroup = true;
4286	4750	}
4287	4751
4288	4752	if (cut)
4289	4753	{
	4754	+ if (Globals.SAVEONMAKE)
	4755	+ Save();
4290	4756	//int indices[] = jList.getSelectedIndices();
4291	4757	//for (int i = indices.length - 1; i >= 0; i--)
4292	4758	//jList.remove(indices[i]);
..	..	@@ -4322,16 +4788,16 @@
4322	4788	//System.out.println("cut " + child);
4323	4789	//System.out.println("parent = " + child.parent);
4324	4790	// tmp.addChild(child);
4325		- if (GrafreeD.clipboardIsTempGroup)
	4791	+ if (Grafreed.clipboardIsTempGroup)
4326	4792	tGroup.add/Child/(tmp);
4327	4793	else
4328		- GrafreeD.clipboard = tmp;
	4794	+ Grafreed.clipboard = tmp;
4329	4795	}
4330	4796	else
4331		- if (GrafreeD.clipboardIsTempGroup)
	4797	+ if (Grafreed.clipboardIsTempGroup)
4332	4798	tGroup.add/Child/(child);
4333	4799	else
4334		- GrafreeD.clipboard = child;
	4800	+ Grafreed.clipboard = child;
4335	4801	}
4336	4802
4337	4803	//ResetModel();
..	..	@@ -4363,21 +4829,23 @@
4363	4829	//System.out.println("cut " + elem);
4364	4830	//System.out.println("parent = " + elem.parent);
4365	4831	// tmp.addChild(elem);
4366		- if (GrafreeD.clipboardIsTempGroup)
	4832	+ if (Grafreed.clipboardIsTempGroup)
4367	4833	tGroup.add/Child/(tmp);
4368	4834	else
4369		- GrafreeD.clipboard = tmp;
	4835	+ Grafreed.clipboard = tmp;
4370	4836	}
4371	4837	else
4372		- if (GrafreeD.clipboardIsTempGroup)
	4838	+ if (Grafreed.clipboardIsTempGroup)
4373	4839	tGroup.add/Child/(child);
4374	4840	else
4375		- GrafreeD.clipboard = child;
	4841	+ Grafreed.clipboard = child;
4376	4842	}
4377	4843
4378	4844	}
4379		- if (GrafreeD.clipboardIsTempGroup)
4380		- GrafreeD.clipboard = tGroup;
	4845	+
	4846	+ if (Grafreed.clipboardIsTempGroup)
	4847	+ Grafreed.clipboard = tGroup;
	4848	+
4381	4849	if (cut)
4382	4850	{
4383	4851	ResetModel();
..	..	@@ -4391,7 +4859,7 @@
4391	4859	// return;
4392	4860	boolean first = true;
4393	4861
4394		- if (GrafreeD.clipboardIsTempGroup)
	4862	+ if (Grafreed.clipboardIsTempGroup)
4395	4863	{
4396	4864	Composite temp;
4397	4865
..	..	@@ -4402,7 +4870,7 @@
4402	4870	temp = (Composite)Applet3D.clipboard.deepCopy();
4403	4871	*/
4404	4872	Object3D elem;
4405		- 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))
4406	4874	{
4407	4875	Object3D child = (Object3D)e.nextElement();
4408	4876
..	..	@@ -4436,14 +4904,14 @@
4436	4904	//Object3D cb = Applet3D.clipboard;
4437	4905	//temp.addChild(cb);
4438	4906	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4439		- assert(GrafreeD.clipboard.parent == null);
4440		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4441		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4442		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4443		- 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());
4444	4912	else
4445		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4446		- GrafreeD.clipboard.get(0).parent = keepparent;
	4913	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4914	+ Grafreed.clipboard.get(0).parent = keepparent;
4447	4915	}
4448	4916
4449	4917	ResetModel();
..	..	@@ -4492,9 +4960,9 @@
4492	4960	{
4493	4961	boolean first = true;
4494	4962
4495		- if (GrafreeD.clipboardIsTempGroup)
	4963	+ if (Grafreed.clipboardIsTempGroup)
4496	4964	{
4497		- Composite temp = (Composite)GrafreeD.clipboard;
	4965	+ Composite temp = (Composite)Grafreed.clipboard;
4498	4966	Object3D copy;
4499	4967	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4500	4968	{
..	..	@@ -4504,7 +4972,7 @@
4504	4972	}
4505	4973	} else
4506	4974	{
4507		- linkSomething(GrafreeD.clipboard); //.get(0));
	4975	+ linkSomething(Grafreed.clipboard); //.get(0));
4508	4976	}
4509	4977	}
4510	4978	}
..	..	@@ -4909,21 +5377,6 @@
4909	5377	}
4910	5378	*/
4911	5379
4912		- void ImportGFD()
4913		- {
4914		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4915		- browser.show();
4916		- String filename = browser.getFile();
4917		- if (filename != null && filename.length() > 0)
4918		- {
4919		- String fullname = browser.getDirectory() + filename;
4920		-
4921		- //Object3D readobj =
4922		- objEditor.ReadGFD(fullname, objEditor);
4923		- //makeSomething(readobj);
4924		- }
4925		- }
4926		-
4927	5380	/*
4928	5381	public void Callback(Object obj)
4929	5382	{
..	..	@@ -4947,26 +5400,9 @@
4947	5400	}
4948	5401	*/
4949	5402
4950		- void ImportVRMLX3D()
4951		- {
4952		- if (GrafreeD.standAlone)
4953		- {
4954		- /**/
4955		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4956		- browser.show();
4957		- String filename = browser.getFile();
4958		- if (filename != null && filename.length() > 0)
4959		- {
4960		- String fullname = browser.getDirectory() + filename;
4961		- LoadVRMLX3D(fullname);
4962		- }
4963		- /**/
4964		- }
4965		- }
4966		-
4967	5403	String GetFile(String dialogName)
4968	5404	{
4969		- if (GrafreeD.standAlone)
	5405	+ if (Grafreed.standAlone)
4970	5406	{
4971	5407	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4972	5408	browser.show();
..	..	@@ -5034,7 +5470,33 @@
5034	5470	cButton clearpanelButton;
5035	5471	cButton unselectButton;
5036	5472
	5473	+ cButton restoreCameraButton;
	5474	+
	5475	+ cButton minButton;
	5476	+ cButton maxButton;
	5477	+ cButton fullButton;
	5478	+ cButton undoButton;
	5479	+ cButton redoButton;
	5480	+ cButton saveButton;
5037	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;
5038	5500
5039	5501	cButton screenfitButton;
5040	5502	cButton screenfitpointButton;
..	..	@@ -5047,14 +5509,6 @@
5047	5509
5048	5510	cButton setsupportButton;
5049	5511
5050		- cButton twoButton;
5051		- cButton sixButton;
5052		- cButton threeButton;
5053		- cButton sevenButton;
5054		- cButton fourButton; // full panel
5055		- cButton oneButton; // full XYZ
5056		- //cButton currentLayout;
5057		-
5058	5512	//
5059	5513	//Composite
5060	5514	Object3D // to do !!
..	..	@@ -5064,9 +5518,11 @@
5064	5518	//JTree jTree;
5065	5519	private MenuItem lookAtItem;
5066	5520	private MenuItem lookFromItem;
5067		- private MenuItem switchItem;
	5521	+ private MenuItem switchViewItem;
5068	5522	private MenuItem cutItem;
5069		- private MenuItem duplicateItem;
	5523	+ private MenuItem undoItem;
	5524	+ private MenuItem redoItem;
	5525	+ private JMenuItem duplicateItem;
5070	5526	private MenuItem cloneItem;
5071	5527	private MenuItem cloneSupportItem;
5072	5528	private MenuItem overwriteGeoItem;
..	..	@@ -5079,7 +5535,7 @@
5079	5535	private MenuItem linkverticesItem;
5080	5536	private MenuItem relinkverticesItem;
5081	5537	private MenuItem setMasterItem;
5082		- private MenuItem resetMeshItem;
	5538	+ private MenuItem resetAllItem;
5083	5539	private MenuItem stepAllItem;
5084	5540	private MenuItem revertMeshItem;
5085	5541	private MenuItem poseMeshItem;
..	..	@@ -5129,6 +5585,10 @@
5129	5585	private MenuItem showleavesItem;
5130	5586	private MenuItem markleavesItem;
5131	5587	private MenuItem unmarkleavesItem;
	5588	+ private MenuItem rewindleavesItem;
	5589	+ private MenuItem unrewindleavesItem;
	5590	+ private MenuItem randomleavesItem;
	5591	+ private MenuItem unrandomleavesItem;
5132	5592
5133	5593	private MenuItem flipVItem;
5134	5594	private MenuItem unflipVItem;
..	..	@@ -5140,15 +5600,17 @@
5140	5600	private MenuItem panoTexturesItem;
5141	5601
5142	5602	private MenuItem resetCentroidItem;
5143		- private MenuItem transformgeometryItem;
	5603	+ private MenuItem resetCentroidXZItem;
5144	5604	private MenuItem resetTransformItem;
	5605	+ private MenuItem transformGeometryItem;
	5606	+ private MenuItem transformChildrenItem;
5145	5607	private MenuItem hideItem;
5146	5608	private MenuItem grabItem;
5147	5609	private MenuItem backItem;
5148	5610	private MenuItem frontItem;
5149	5611	private MenuItem cameraItem;
5150	5612	private MenuItem compositeItem;
5151		- private MenuItem randomItem;
	5613	+ private MenuItem switchItem;
5152	5614	private MenuItem physicsItem;
5153	5615	private MenuItem frameselectorItem;
5154	5616	private MenuItem scriptNodeItem;
..	..	@@ -5210,11 +5672,6 @@
5210	5672	private MenuItem doubleItem;
5211	5673	private MenuItem tripleItem;
5212	5674
5213		- private MenuItem importGFDItem;
5214		- private MenuItem importVRMLX3DItem;
5215		- private MenuItem import3DSItem;
5216		- private MenuItem importOBJItem;
5217		-
5218	5675	private MenuItem computeAOItem;
5219	5676	private MenuItem recompileItem;
5220	5677	private MenuItem editScriptItem;
..	..	@@ -5224,4 +5681,8 @@
5224	5681	private MenuItem analyzeItem;
5225	5682	private MenuItem dumpItem;
5226	5683	//boolean freezemodel = false;
	5684	+
	5685	+ Menu cameraMenu;
	5686	+ MenuItem editCameraItem;
	5687	+ MenuItem restoreCameraItem;
5227	5688	}