~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,41 +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		- importOBJItem = menu.add(new MenuItem("OBJ file..."));
443		- importOBJItem.addActionListener(this);
444		- menu.add("-");
445		- import3DSItem = menu.add(new MenuItem("3DS file..."));
446		- import3DSItem.addActionListener(this);
447		- menu.add("-");
448		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
449		- importVRMLX3DItem.addActionListener(this);
450		- menu.add("-");
451		- importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
452		- importGFDItem.addActionListener(this);
453		-
454	537	oe.menuBar.add(menu = new Menu("Tools"));
455	538	buildToolsMenu(menu);
456	539	}
457	540
458	541	void SetupUI2(ObjEditor oe)
459	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	+
460	555	//new Exception().printStackTrace();
461	556
462	557	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -485,97 +580,198 @@
485	580	oe.radioPanel.add(dummyButton);
486	581	oe.buttonGroup.add(dummyButton);
487	582	*/
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 2;
	586	+
488	587	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
489	588
490		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
491		- 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");
492	619	liveCB.addItemListener(this);
493	620
494		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	621	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
495	622	oneStepButton.setToolTipText("Animate one step forward");
496	623	oneStepButton.addActionListener(this);
497	624
498		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	625	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
499	626	fastCB.setToolTipText("Fast mode");
500	627	fastCB.addItemListener(this);
501	628
502		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
503		- trackCB.setToolTipText("Enable tracking");
504		- trackCB.addItemListener(this);
505		-
506		- 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);
507	632	screenfitButton.setToolTipText("Screen fit");
508	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);
509	638
510	639	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
511	640	// screenfitpointButton.addActionListener(this);
512	641
513	642	if (Globals.ADVANCED)
514	643	{
515		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	644	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
516	645	snapobjectButton.addActionListener(this);
517	646	snapobjectButton.setToolTipText("Snap Object");
518	647	}
519	648
520		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
521		- flashSelectionButton.setToolTipText("Show selection");
522		- flashSelectionButton.addActionListener(this);
	649	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
523	650
524		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
525		-
526		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	651	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
527	652	twoButton.setToolTipText("Show center view only");
528	653	twoButton.addActionListener(this);
529		- 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);
530	657	fourButton.addActionListener(this);
531	658	fourButton.setToolTipText("Show left panel only");
532		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	659	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
533	660	sixButton.setToolTipText("2-column layout left");
534	661	sixButton.addActionListener(this);
535		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	662	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
536	663	threeButton.setToolTipText("2-column layout right");
537	664	threeButton.addActionListener(this);
538		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	665	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
539	666	sevenButton.setToolTipText("3-column layout");
540	667	sevenButton.addActionListener(this);
541	668	//
542	669
543		- 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);
544	671	rootButton.setToolTipText("Edit selection in new tab");
545	672	rootButton.addActionListener(this);
546	673
547		- 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);
548	675	closeButton.setToolTipText("Close tab");
549	676	closeButton.addActionListener(this);
550	677	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
551	678	//clearButton.addActionListener(this);
552		-
553		- 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	+ }
554	711
555		- 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);
556	748	editButton.setToolTipText("Edit selection");
557	749	editButton.addActionListener(this);
558	750
559		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	751	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
560	752	uneditButton.setToolTipText("Unedit selection");
561	753	uneditButton.addActionListener(this);
562	754
563		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	755	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
564	756	allParamsButton.setToolTipText("Edit all params");
565	757	allParamsButton.addActionListener(this);
566	758
567		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	759	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
568	760	clearPanelButton.setToolTipText("Clear edit panel");
569	761	clearPanelButton.addActionListener(this);
570	762
571		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	763	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
572	764	unselectButton.setToolTipText("Unselect");
573	765	unselectButton.addActionListener(this);
574	766
575		- 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);
576	770
577		- oe.treePanel.add(commandsPanel);
578		- oe.treePanel.Return();
	771	+ editCommandsPanel.preferredHeight = 1;
	772	+
	773	+// oe.treePanel.add(commandsPanel);
	774	+// oe.treePanel.Return();
579	775
580	776	// oe.aConstraints.gridx += 1;
581	777	// oe.aConstraints.weighty = 0;
..	..	@@ -592,27 +788,12 @@
592	788
593	789	JScrollPane jSP;
594	790	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
595		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	791	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
596	792	ResetModel();
597	793
598	794	oe.treePanel.add(jSPPanel);
599	795	oe.treePanel.Return();
600	796
601		- cGridBag copyOptionsPanel = new cGridBag();
602		-
603		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
604		- colorCB.setToolTipText("Copy color when dropped");
605		- colorCB.addItemListener(this);
606		-
607		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
608		- materialCB.setToolTipText("Copy material when dropped");
609		- materialCB.addItemListener(this);
610		-
611		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
612		- textureCB.setToolTipText("Copy texture when dropped");
613		- textureCB.addItemListener(this);
614		-
615		- copyOptionsPanel.preferredHeight = 1;
616	797	oe.treePanel.add(copyOptionsPanel);
617	798	oe.treePanel.Return();
618	799
..	..	@@ -643,6 +824,20 @@
643	824
644	825	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
645	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	+
646	841	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
647	842	boxCB.setToolTipText("Display bounding boxes");
648	843	boxCB.addItemListener(this);
..	..	@@ -651,7 +846,7 @@
651	846	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
652	847	zoomBoxCB.addItemListener(this);
653	848
654		- if (Globals.ADVANCED)
	849	+ if (true) // Globals.ADVANCED)
655	850	{
656	851	panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
657	852	supportCB.setToolTipText("Enable rigging");
..	..	@@ -660,6 +855,8 @@
660	855	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
661	856	// localCB.addItemListener(this);
662	857
	858	+ panel.Return();
	859	+
663	860	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
664	861	crowdCB.setToolTipText("Used for crowds");
665	862	crowdCB.addItemListener(this);
..	..	@@ -676,6 +873,8 @@
676	873	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
677	874	// speakerMocapCB.addItemListener(this);
678	875
	876	+ panel.Return();
	877	+
679	878	if (false)
680	879	{
681	880	// handled in scripts
..	..	@@ -690,32 +889,72 @@
690	889	//constraints.gridy += 1;
691	890	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
692	891	smoothfocusCB.addItemListener(this);
	892	+ panel.Return();
693	893	}
694	894
695	895	//constraints.gridx += 1;
696	896	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
697	897	// debugCB.addItemListener(this);
698	898
	899	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	900	+ trackCB.setToolTipText("Enable tracking target");
	901	+ trackCB.addItemListener(this);
	902	+
699	903	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	904	+ oeilCB.setToolTipText("Move camera when tracking");
700	905	oeilCB.addItemListener(this);
701	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	+ {
702	927	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
703	928	lookAtCB.setToolTipText("Look-at target");
704	929	lookAtCB.addItemListener(this);
	930	+ }
705	931
706	932	}
707	933
708	934	cGridBag fill = new cGridBag();
709		-
710	935	fill.preferredHeight = 200;
	936	+ cGridBag fill2 = new cGridBag();
	937	+ fill2.preferredHeight = 200;
	938	+ cGridBag fill3 = new cGridBag();
	939	+ fill3.preferredHeight = 200;
711	940
712	941	panel.add(fill);
	942	+ panel.add(fill2);
	943	+ panel.add(fill3);
713	944
714	945	}
715	946
716	947	void EditObject(Object3D obj)
717	948	{
718	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	+
719	958	radioButton.SetObject(obj);
720	959	radioButton.layout = sevenButton;
721	960	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -724,8 +963,11 @@
724	963	buttonGroup.add(radioButton);
725	964	radioButton.doClick();
726	965	}
	966	+
727	967	void SetupViews(ObjEditor oe)
728	968	{
	969	+ theFrame = this;
	970	+
729	971	oe.SetupViews();
730	972
731	973	System.out.println("SetupViews");
..	..	@@ -734,23 +976,27 @@
734	976	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
735	977	}
736	978
737		- JCheckBox liveCB;
738		- JCheckBox supportCB;
739		- JCheckBox localCB;
740		- JCheckBox crowdCB;
741		- JCheckBox smoothCB;
742		- JCheckBox fastCB;
743		- JCheckBox slowCB;
744		- JCheckBox boxCB;
745		- JCheckBox zoomBoxCB;
746		- JCheckBox trackCB;
747		- 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;
748	991	// JCheckBox speakerMocapCB;
749		- JCheckBox speakerCameraCB;
750		- JCheckBox speakerFocusCB;
751		- JCheckBox debugCB;
752		- JCheckBox oeilCB;
753		- JCheckBox lookAtCB;
	992	+ cCheckBox speakerCameraCB;
	993	+ cCheckBox speakerFocusCB;
	994	+ cCheckBox debugCB;
	995	+
	996	+ cCheckBox oeilCB;
	997	+ cCheckBox shadowCB;
	998	+ cCheckBox autosaveCB;
	999	+ cCheckBox lookAtCB;
754	1000
755	1001	// static int COLOR = 1;
756	1002	// static int MATERIAL = 2;
..	..	@@ -758,9 +1004,9 @@
758	1004
759	1005	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
760	1006
761		- JCheckBox colorCB;
762		- JCheckBox materialCB;
763		- JCheckBox textureCB;
	1007	+ cCheckBox colorCB;
	1008	+ cCheckBox materialCB;
	1009	+ cCheckBox textureCB;
764	1010
765	1011	public void itemStateChanged(ItemEvent e)
766	1012	{
..	..	@@ -788,6 +1034,7 @@
788	1034	} else if(e.getSource() == liveCB)
789	1035	{
790	1036	cameraView.ToggleLive();
	1037	+ refreshContents(false);
791	1038	}
792	1039	else if(e.getSource() == supportCB)
793	1040	{
..	..	@@ -852,6 +1099,14 @@
852	1099	{
853	1100	cameraView.ToggleOeil();
854	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	+ }
855	1110	else if(e.getSource() == lookAtCB)
856	1111	{
857	1112	cameraView.ToggleLookAt();
..	..	@@ -868,7 +1123,8 @@
868	1123
869	1124	/**/
870	1125	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
871		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1126	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1127	+ TreePath path = objEditor.jTree.getSelectionPath();
872	1128	if ((path == null) \|\| (path.getPathCount() <= 1)) {
873	1129	// We can't move the root node or an empty selection
874	1130	return;
..	..	@@ -969,7 +1225,7 @@
969	1225
970	1226	flashIt = false;
971	1227	CameraPane pane = (CameraPane) target;
972		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1228	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
973	1229	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
974	1230
975	1231	if (group.selection.size() == 1)
..	..	@@ -985,23 +1241,33 @@
985	1241
986	1242	assert target == objEditor.jTree;
987	1243	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1244	+ Object3D destinationLeaf;
988	1245	try {
989		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1246	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
990	1247	} catch (Exception e) {
991	1248	System.out.println("destinationPath : " + destinationPath);
992	1249	return;
993	1250	}
994	1251
995		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1252	+ for (int i=group.selection.size(); --i>=0;)
996	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	+// {
997	1263	loadClipboard(true);
998	1264	objEditor.jTree.setSelectionPath(destinationPath);
999	1265	pasteInto(false, false);
1000		- } else {
1001		- loadClipboard(false);
1002		- objEditor.jTree.setSelectionPath(destinationPath);
1003		- pasteInto(false, false); // true); // ???
1004		- }
	1266	+// } else {
	1267	+// loadClipboard(false);
	1268	+// objEditor.jTree.setSelectionPath(destinationPath);
	1269	+// pasteInto(false, false); // true); // ???
	1270	+// }
1005	1271	}
1006	1272	public void dropActionChanged(DropTargetDragEvent dtde)
1007	1273	// Called if the user has modified the current drop gesture
..	..	@@ -1106,22 +1372,30 @@
1106	1372	{
1107	1373	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1108	1374	//heightFieldItem.addActionListener(this);
1109		- gridItem = menu.add(new MenuItem("Grid"));
1110		- gridItem.addActionListener(this);
1111		- rectoidItem = menu.add(new MenuItem("Box"));
1112		- rectoidItem.addActionListener(this);
1113		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1114		- ellipsoidItem.addActionListener(this);
1115		- coneItem = menu.add(new MenuItem("Cone"));
1116		- coneItem.addActionListener(this);
1117		- torusItem = menu.add(new MenuItem("Torus"));
1118		- torusItem.addActionListener(this);
1119		- superItem = menu.add(new MenuItem("Superellipsoid"));
1120		- 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	+ {
1121	1393	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1122	1394	kleinItem.addActionListener(this);
1123		- particleItem = menu.add(new MenuItem("Particle system"));
1124		- particleItem.addActionListener(this);
	1395	+ }
	1396	+
	1397	+// particleItem = menu.add(new MenuItem("Particle system"));
	1398	+// particleItem.addActionListener(this);
1125	1399	if (Globals.ADVANCED)
1126	1400	{
1127	1401	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1147,15 +1421,15 @@
1147	1421	}
1148	1422	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1149	1423	bezierItem.addActionListener(this);
1150		- overlayItem = menu.add(new MenuItem("Overlay"));
1151		- overlayItem.addActionListener(this);
1152		- lightItem = menu.add(new MenuItem("Light"));
1153		- 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);
1154	1428	menu.add("-");
1155	1429	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1156	1430	//superLoopItem.addActionListener(this);
1157		- loopItem = menu.add(new MenuItem("Loop"));
1158		- loopItem.addActionListener(this);
	1431	+// loopItem = menu.add(new MenuItem("Loop"));
	1432	+// loopItem.addActionListener(this);
1159	1433	doubleItem = menu.add(new MenuItem("Fork"));
1160	1434	doubleItem.addActionListener(this);
1161	1435	if (Globals.ADVANCED)
..	..	@@ -1195,7 +1469,7 @@
1195	1469	memoryItem.addActionListener(this);
1196	1470	menu.add(analyzeItem = new MenuItem("Analyze"));
1197	1471	analyzeItem.addActionListener(this);
1198		- menu.add(dumpItem = new MenuItem("Dump"));
	1472	+ menu.add(dumpItem = new MenuItem("Print"));
1199	1473	dumpItem.addActionListener(this);
1200	1474	// menu.add(pathItem = new MenuItem("From-to path"));
1201	1475	// pathItem.addActionListener(this);
..	..	@@ -1336,6 +1610,7 @@
1336	1610	shadow.material = new cMaterial(obj.material);
1337	1611	shadow.material.diffuse = 0.0001f;
1338	1612	shadow.material.specular = 0.0001f;
	1613	+ //shadow.projectedVertices[1].x = 300;
1339	1614
1340	1615	makeSomething(shadow);
1341	1616	}
..	..	@@ -1542,9 +1817,9 @@
1542	1817
1543	1818	void Overwrite(int mask)
1544	1819	{
1545		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1820	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1546	1821	{
1547		- Object3D content = GrafreeD.clipboard.get(0);
	1822	+ Object3D content = Grafreed.clipboard.get(0);
1548	1823
1549	1824	if (content instanceof cGroup && ((cGroup)content).transientlink )
1550	1825	content = ((cGroup)content).get(0);
..	..	@@ -1583,7 +1858,7 @@
1583	1858	{
1584	1859	ScreenFit();
1585	1860	} else
1586		- if (source == switchItem)
	1861	+ if (source == switchViewItem)
1587	1862	{
1588	1863	cVector v1 = new cVector();
1589	1864	cVector v2 = new cVector();
..	..	@@ -1592,11 +1867,11 @@
1592	1867	objEditor.cameraView.renderCamera.setAim(v2, v1);
1593	1868	objEditor.cameraView.repaint();
1594	1869	} else
1595		- if (source == rectoidItem)
	1870	+ if (source == rectoidItem \|\| source == boxButton)
1596	1871	{
1597	1872	makeSomething(new Box());
1598	1873	} else
1599		- if (source == particleItem)
	1874	+ if (source == particleItem \|\| source == particlesButton)
1600	1875	{
1601	1876	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1602	1877	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1675,27 +1950,27 @@
1675	1950
1676	1951	makeSomething(obj);
1677	1952	} else
1678		- if (source == gridItem)
	1953	+ if (source == gridItem \|\| source == gridButton)
1679	1954	{
1680	1955	makeSomething(new Grid());
1681	1956	} else
1682		- if (source == ellipsoidItem)
	1957	+ if (source == ellipsoidItem \|\| source == sphereButton)
1683	1958	{
1684	1959	makeSomething(new Sphere());
1685	1960	} else
1686		- if (source == coneItem)
	1961	+ if (source == coneItem \|\| source == coneButton)
1687	1962	{
1688	1963	makeSomething(new Cone());
1689	1964	} else
1690		- if (source == torusItem)
	1965	+ if (source == torusItem \|\| source == torusButton)
1691	1966	{
1692	1967	makeSomething(new Torus());
1693	1968	} else
1694		- if (source == superItem)
	1969	+ if (source == superItem \|\| source == superButton)
1695	1970	{
1696	1971	makeSomething(new Superellipsoid());
1697	1972	} else
1698		- if (source == kleinItem)
	1973	+ if (source == kleinItem \|\| source == kleinButton)
1699	1974	{
1700	1975	makeSomething(new Klein());
1701	1976	} else
..	..	@@ -1715,7 +1990,7 @@
1715	1990	{
1716	1991	makeSomething(new BezierSurface());
1717	1992	} else
1718		- if (source == overlayItem)
	1993	+ if (source == overlayItem \|\| source == overlayButton)
1719	1994	{
1720	1995	/*
1721	1996	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1763,7 +2038,7 @@
1763	2038	s.setup();
1764	2039	makeSomething(s);
1765	2040	} else
1766		- if (source == lightItem)
	2041	+ if (source == lightItem \|\| source == lightButton)
1767	2042	{
1768	2043	makeSomething(new Light());
1769	2044	} else
..	..	@@ -1813,7 +2088,7 @@
1813	2088
1814	2089	group(g);
1815	2090	} else
1816		- if (source == loopItem)
	2091	+ if (source == loopItem \|\| source == loopButton)
1817	2092	{
1818	2093	Composite csg = new GroupLeaf();
1819	2094	csg.count = 5;
..	..	@@ -1849,31 +2124,6 @@
1849	2124	csg.addChild(child);
1850	2125	child.addChild(csg);
1851	2126	} else
1852		-
1853		- if (source == importGFDItem)
1854		- {
1855		- ImportGFD();
1856		- } else
1857		- if (source == importVRMLX3DItem)
1858		- {
1859		- ImportVRMLX3D();
1860		- } else
1861		- if (source == import3DSItem)
1862		- {
1863		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1864		- } else
1865		- if (source == importOBJItem)
1866		- {
1867		- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1868		- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1869		- browser.setVisible(true);
1870		- String filename = browser.getFile();
1871		- if (filename != null && filename.length() > 0)
1872		- {
1873		- String fullname = browser.getDirectory() + filename;
1874		- makeSomething(ReadOBJ(fullname), true);
1875		- }
1876		- } else
1877	2127	if (source == computeAOItem)
1878	2128	{
1879	2129	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1892,7 +2142,7 @@
1892	2142	if (source == invariantsItem)
1893	2143	{
1894	2144	System.out.println("Invariants:");
1895		- GrafreeD.grafreeD.universe.invariants();
	2145	+ Grafreed.grafreeD.universe.invariants();
1896	2146	} else
1897	2147	if (source == memoryItem)
1898	2148	{
..	..	@@ -1910,6 +2160,30 @@
1910	2160	if (source == dumpItem)
1911	2161	{
1912	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();
1913	2187	} else
1914	2188	if (source == oneStepButton)
1915	2189	{
..	..	@@ -1965,12 +2239,20 @@
1965	2239	{
1966	2240	loadClipboard(true);
1967	2241	} else
	2242	+ if (source == undoItem)
	2243	+ {
	2244	+ Undo();
	2245	+ } else
	2246	+ if (source == redoItem)
	2247	+ {
	2248	+ Redo();
	2249	+ } else
1968	2250	if (source == duplicateItem)
1969	2251	{
1970		- Object3D keep = GrafreeD.clipboard;
	2252	+ Object3D keep = Grafreed.clipboard;
1971	2253	loadClipboard(false);
1972	2254	paste(false);
1973		- GrafreeD.clipboard = keep;
	2255	+ Grafreed.clipboard = keep;
1974	2256	} else
1975	2257	if (source == cloneItem)
1976	2258	{
..	..	@@ -2190,9 +2472,9 @@
2190	2472	// group.selection.get(0).setMasterThis(content); // should be identity
2191	2473	// refreshContents();
2192	2474	// }
2193		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2475	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2194	2476	{
2195		- Object3D content = GrafreeD.clipboard.get(0);
	2477	+ Object3D content = Grafreed.clipboard.get(0);
2196	2478
2197	2479	if (content instanceof cGroup && ((cGroup)content).transientlink )
2198	2480	content = ((cGroup)content).get(0);
..	..	@@ -2242,9 +2524,9 @@
2242	2524	} else
2243	2525	if (source == setMasterItem)
2244	2526	{
2245		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2527	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2246	2528	{
2247		- Object3D content = GrafreeD.clipboard.get(0);
	2529	+ Object3D content = Grafreed.clipboard.get(0);
2248	2530
2249	2531	if (content instanceof cGroup && ((cGroup)content).transientlink )
2250	2532	content = ((cGroup)content).get(0);
..	..	@@ -2257,9 +2539,9 @@
2257	2539	{
2258	2540	if (group.selection.size() == 1)
2259	2541	{
2260		- if (GrafreeD.clipboard.size() == 1)
	2542	+ if (Grafreed.clipboard.size() == 1)
2261	2543	{
2262		- Object3D content = GrafreeD.clipboard.get(0);
	2544	+ Object3D content = Grafreed.clipboard.get(0);
2263	2545
2264	2546	if (content instanceof cGroup && ((cGroup)content).transientlink )
2265	2547	content = ((cGroup)content).get(0);
..	..	@@ -2276,7 +2558,7 @@
2276	2558	{
2277	2559	RevertMeshes();
2278	2560	} else
2279		- if (source == resetMeshItem)
	2561	+ if (source == resetAllItem)
2280	2562	{
2281	2563	ResetAll();
2282	2564	} else
..	..	@@ -2296,9 +2578,9 @@
2296	2578	{
2297	2579	ClearSelection(true);
2298	2580	} else
2299		- if (source == grabItem)
	2581	+ if (source == grabItem \|\| source == groupButton)
2300	2582	{
2301		- group(new cGroup(), true);
	2583	+ group(new cGroup(), false); // true);
2302	2584	} else
2303	2585	if (source == hideItem)
2304	2586	{
..	..	@@ -2316,11 +2598,11 @@
2316	2598	{
2317	2599	makeSomething(new Camera());
2318	2600	} else
2319		- if (source == compositeItem)
	2601	+ if (source == compositeItem \|\| source == compositeButton)
2320	2602	{
2321	2603	group(new Composite());
2322	2604	} else
2323		- if (source == randomItem)
	2605	+ if (source == switchItem \|\| source == switchButton)
2324	2606	{
2325	2607	RandomNode random = new RandomNode();
2326	2608	group(random);
..	..	@@ -2422,7 +2704,7 @@
2422	2704	{
2423	2705	group(new cLinker());
2424	2706	} else
2425		- if (source == textureItem)
	2707	+ if (source == textureItem \|\| source == textureButton)
2426	2708	{
2427	2709	group(new TextureNode());
2428	2710	} else
..	..	@@ -2442,7 +2724,7 @@
2442	2724	{
2443	2725	CastShadow(2);
2444	2726	} else
2445		- if (source == ungroupItem)
	2727	+ if (source == ungroupItem \|\| source == ungroupButton)
2446	2728	{
2447	2729	//ungroup();
2448	2730	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2464,7 +2746,7 @@
2464	2746	} else
2465	2747	if (source == genNormalsMESHItem)
2466	2748	{
2467		- GenNormals(true); // TODO
	2749	+ GenNormalsMESH();
2468	2750	} else
2469	2751	if (source == genNormalsORGANItem)
2470	2752	{
..	..	@@ -2529,6 +2811,22 @@
2529	2811	if (source == unmarkleavesItem)
2530	2812	{
2531	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);
2532	2830	} else
2533	2831	if (source == flipVItem)
2534	2832	{
..	..	@@ -2614,9 +2912,13 @@
2614	2912	{
2615	2913	SmoothMesh();
2616	2914	} else
2617		- if (source == transformgeometryItem)
	2915	+ if (source == transformGeometryItem)
2618	2916	{
2619	2917	TransformGeometry();
	2918	+ } else
	2919	+ if (source == transformChildrenItem)
	2920	+ {
	2921	+ TransformChildren();
2620	2922	} else
2621	2923	if (source == resetTransformItem)
2622	2924	{
..	..	@@ -2624,7 +2926,11 @@
2624	2926	} else
2625	2927	if (source == resetCentroidItem)
2626	2928	{
2627		- ResetCentroid();
	2929	+ ResetCentroid(true);
	2930	+ } else
	2931	+ if (source == resetCentroidXZItem)
	2932	+ {
	2933	+ ResetCentroid(false);
2628	2934	} else
2629	2935	if (source == resetParentItem)
2630	2936	{
..	..	@@ -2756,6 +3062,10 @@
2756	3062	if (source == twoButton)
2757	3063	{
2758	3064	radio.layout = twoButton;
	3065	+
	3066	+ if (CameraPane.FULLSCREEN)
	3067	+ fullscreenLayout = radio.layout;
	3068	+
2759	3069	// bug
2760	3070	//gridPanel.setDividerLocation(1.0);
2761	3071	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2788,10 +3098,31 @@
2788	3098	bigThree.ClearUI();
2789	3099	bigThree.add(centralPanel);
2790	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	+
2791	3119	} else
2792	3120	if (source == threeButton)
2793	3121	{
2794	3122	radio.layout = threeButton;
	3123	+
	3124	+ if (CameraPane.FULLSCREEN)
	3125	+ fullscreenLayout = radio.layout;
2795	3126
2796	3127	// bigThree.remove(scenePanel);
2797	3128	// bigThree.remove(centralPanel);
..	..	@@ -2824,10 +3155,15 @@
2824	3155	bigThree.add(centralPanel);
2825	3156	bigThree.add(XYZPanel);
2826	3157	bigThree.FlushUI();
	3158	+
	3159	+ cameraView.requestFocusInWindow();
2827	3160	} else
2828	3161	if (source == fourButton)
2829	3162	{
2830	3163	radio.layout = fourButton;
	3164	+
	3165	+ if (CameraPane.FULLSCREEN)
	3166	+ fullscreenLayout = radio.layout;
2831	3167
2832	3168	// bigThree.remove(scenePanel);
2833	3169	// bigThree.remove(centralPanel);
..	..	@@ -2859,10 +3195,15 @@
2859	3195	bigThree.ClearUI();
2860	3196	bigThree.add(scenePanel);
2861	3197	bigThree.FlushUI();
	3198	+
	3199	+ cameraView.requestFocusInWindow();
2862	3200	} else
2863	3201	if (source == sixButton)
2864	3202	{
2865	3203	radio.layout = sixButton;
	3204	+
	3205	+ if (CameraPane.FULLSCREEN)
	3206	+ fullscreenLayout = radio.layout;
2866	3207
2867	3208	// bigThree.remove(scenePanel);
2868	3209	// bigThree.remove(centralPanel);
..	..	@@ -2895,10 +3236,15 @@
2895	3236	bigThree.add(scenePanel);
2896	3237	bigThree.add(centralPanel);
2897	3238	bigThree.FlushUI();
	3239	+
	3240	+ cameraView.requestFocusInWindow();
2898	3241	} else
2899	3242	if (source == sevenButton)
2900	3243	{
2901	3244	radio.layout = sevenButton;
	3245	+
	3246	+ if (CameraPane.FULLSCREEN)
	3247	+ fullscreenLayout = radio.layout;
2902	3248
2903	3249	// bigThree.remove(scenePanel);
2904	3250	// bigThree.remove(centralPanel);
..	..	@@ -2932,6 +3278,8 @@
2932	3278	bigThree.add(centralPanel);
2933	3279	bigThree.add(XYZPanel);
2934	3280	bigThree.FlushUI();
	3281	+
	3282	+ cameraView.requestFocusInWindow();
2935	3283	} else
2936	3284	if (source == rootButton)
2937	3285	{
..	..	@@ -2943,6 +3291,7 @@
2943	3291	EditObject(obj);
2944	3292	}
2945	3293
	3294	+ cameraView.requestFocusInWindow();
2946	3295	refreshContents(true);
2947	3296	} else
2948	3297	if (source == closeButton)
..	..	@@ -2952,18 +3301,27 @@
2952	3301	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2953	3302	{
2954	3303	ab = (cRadio)e.nextElement();
2955		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3304	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2956	3305	{
	3306	+ // Patch to avoid bug with transparency.
	3307	+ if (!ab.hadMaterial)
	3308	+ {
	3309	+ ab.object.material = null;
	3310	+ }
	3311	+
2957	3312	buttonGroup.remove(ab);
2958	3313	radioPanel.remove(ab);
2959	3314
2960		- ab.GetObject().editWindow = null;
	3315	+ //ab.GetObject().editWindow = null;
	3316	+ ab.GetObject().manipWindow = null;
2961	3317	// ab.GetObject().objectUI = null; // ?????????
2962	3318
2963	3319	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2964	3320	break;
2965	3321	}
2966	3322	}
	3323	+
	3324	+ cameraView.requestFocusInWindow();
2967	3325	refreshContents(true);
2968	3326	} else
2969	3327	if (source == editItem \|\| source == editButton)
..	..	@@ -2980,7 +3338,7 @@
2980	3338	child.CloseUI();
2981	3339	listUI.remove(child);
2982	3340
2983		- child.editWindow = null; // ???????????
	3341	+ //child.editWindow = null; // ???????????
2984	3342	}
2985	3343	objEditor.ctrlPanel.FlushUI();
2986	3344	//objEditor.jTree.clearSelection();
..	..	@@ -3066,7 +3424,11 @@
3066	3424	frontView.object = group;
3067	3425	sideView.object = group;
3068	3426	}
3069		- group.editWindow = this;
	3427	+
	3428	+// fix "+" issue
	3429	+ //group.editWindow = this;
	3430	+ group.manipWindow = this;
	3431	+
3070	3432	/*
3071	3433	currentLayout = radio.layout;
3072	3434	if (currentLayout == null)
..	..	@@ -3078,8 +3440,23 @@
3078	3440	//group.parent = null; // ROOT
3079	3441	//group.attributes = -1;
3080	3442	ResetModel();
	3443	+
	3444	+ cameraView.requestFocusInWindow();
3081	3445	refreshContents(true);
3082		- }
	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	+ }
3083	3460	else
3084	3461	{
3085	3462	//return super.action(event, arg);
..	..	@@ -3088,7 +3465,6 @@
3088	3465	}
3089	3466
3090	3467	boolean useclient = false;
3091		- cRadio radio;
3092	3468
3093	3469	void ToggleRoot()
3094	3470	{
..	..	@@ -3140,6 +3516,28 @@
3140	3516	refreshContents();
3141	3517	}
3142	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	+ }
3143	3541
3144	3542	void ResetTransform()
3145	3543	{
..	..	@@ -3252,7 +3650,7 @@
3252	3650	refreshContents();
3253	3651	}
3254	3652
3255		- void ResetCentroid()
	3653	+ void ResetCentroid(boolean full)
3256	3654	{
3257	3655	Object3D obj;
3258	3656	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3267,12 +3665,16 @@
3267	3665	LA.matIdentity(Object3D.mat);
3268	3666	obj.getBounds(minima, maxima, false);
3269	3667	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3270		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3668	+ if (full)
	3669	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3271	3670	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3272	3671	obj.TransformMesh(Object3D.mat);
	3672	+
3273	3673	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3274		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3674	+ if (full)
	3675	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3275	3676	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3677	+
3276	3678	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3277	3679	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3278	3680	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3301,7 +3703,8 @@
3301	3703
3302	3704	int size = obj.MemorySize();
3303	3705
3304		- 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)");
3305	3708	}
3306	3709	}
3307	3710	catch (Exception e)
..	..	@@ -3338,9 +3741,9 @@
3338	3741	obj = (Object3D)e.nextElement();
3339	3742
3340	3743	System.out.println("Object is: " + obj);
3341		- GrafreeD.AnalyzeObject(obj);
	3744	+ Grafreed.AnalyzeObject(obj);
3342	3745	System.out.println("Boundary rep: " + obj.bRep);
3343		- GrafreeD.AnalyzeObject(obj.bRep);
	3746	+ Grafreed.AnalyzeObject(obj.bRep);
3344	3747
3345	3748	// System.err.println((size/1024) + " KB is the size of " + obj);
3346	3749	}
..	..	@@ -3382,6 +3785,13 @@
3382	3785	void GenNormals(boolean crease)
3383	3786	{
3384	3787	group.GenNormalsS(crease);
	3788	+
	3789	+ refreshContents();
	3790	+ }
	3791	+
	3792	+ void GenNormalsMESH()
	3793	+ {
	3794	+ group.GenNormalsMeshS();
3385	3795
3386	3796	refreshContents();
3387	3797	}
..	..	@@ -3554,8 +3964,8 @@
3554	3964
3555	3965	void ParseVertices()
3556	3966	{
3557		- boolean epsequal = GrafreeD.epsequal;
3558		- GrafreeD.epsequal = true;
	3967	+ boolean epsequal = Grafreed.epsequal;
	3968	+ Grafreed.epsequal = true;
3559	3969
3560	3970	for (int i=0; i<group.selection.size(); i++)
3561	3971	{
..	..	@@ -3580,7 +3990,7 @@
3580	3990	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3581	3991	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3582	3992
3583		- g.add(GrafreeD.clipboard);
	3993	+ g.add(Grafreed.clipboard);
3584	3994
3585	3995	buffer.add(g);
3586	3996	}
..	..	@@ -3595,7 +4005,7 @@
3595	4005	makeSomething(buffer, i==group.selection.size()-1);
3596	4006	}
3597	4007
3598		- GrafreeD.epsequal = epsequal;
	4008	+ Grafreed.epsequal = epsequal;
3599	4009
3600	4010	refreshContents();
3601	4011	}
..	..	@@ -3613,7 +4023,16 @@
3613	4023	String pigment = Object3D.GetPigment(tex);
3614	4024	//String bump = Object3D.GetBump(tex);
3615	4025
3616		- 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	+ }
3617	4036
3618	4037	double s = v.s;
3619	4038
..	..	@@ -3745,7 +4164,7 @@
3745	4164	return;
3746	4165
3747	4166	Object3D poses = group.selection.get(0);
3748		- Object3D ref = GrafreeD.clipboard.get(0);
	4167	+ Object3D ref = Grafreed.clipboard.get(0);
3749	4168
3750	4169	Object3D newgroup = new Object3D("Po:" + poses.name);
3751	4170
..	..	@@ -3939,9 +4358,9 @@
3939	4358
3940	4359	void ClipMesh()
3941	4360	{
3942		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4361	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3943	4362	{
3944		- Object3D content = GrafreeD.clipboard.get(0);
	4363	+ Object3D content = Grafreed.clipboard.get(0);
3945	4364
3946	4365	if (content instanceof cGroup && ((cGroup)content).transientlink )
3947	4366	content = ((cGroup)content).get(0);
..	..	@@ -3950,7 +4369,7 @@
3950	4369	// {
3951	4370	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3952	4371	// }
3953		- group.selection.ClipMesh(GrafreeD.clipboard);
	4372	+ group.selection.ClipMesh(Grafreed.clipboard);
3954	4373	}
3955	4374	// group.selection.ClipMesh(GrafreeD.clipboard);
3956	4375	System.out.println("DONE.");
..	..	@@ -3997,6 +4416,18 @@
3997	4416	void MarkLeaves(boolean hide)
3998	4417	{
3999	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);
4000	4431	refreshContents();
4001	4432	}
4002	4433
..	..	@@ -4082,10 +4513,10 @@
4082	4513	{
4083	4514	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4084	4515	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4085		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4516	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4086	4517
4087	4518	Object3D elem = (Object3D)group.selection.elementAt(i);
4088		- if(elem != group)
	4519	+ if(elem != group \|\| !newWindow)
4089	4520	{
4090	4521	// if (!(elem instanceof Composite))
4091	4522	// newWindow = false;
..	..	@@ -4175,7 +4606,6 @@
4175	4606	//case 702: // Event.LIST_DESELECT
4176	4607	group.deselectAll();
4177	4608	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4178		- objEditor.ClearInfo(); // .GetMaterial());
4179	4609	if (tps != null)
4180	4610	{
4181	4611	for (int i=0; i < tps.length; i++)
..	..	@@ -4184,10 +4614,8 @@
4184	4614
4185	4615	//if (child.parent != null)
4186	4616	//child.parent.addSelectee(child);
	4617	+ objEditor.SetMaterial(child);
4187	4618	group.addSelectee(child);
4188		- objEditor.SetMaterial(child); // .GetMaterial());
4189		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4190		- System.err.println("info : " + child.GetPath());
4191	4619	}
4192	4620	}
4193	4621	// else
..	..	@@ -4197,16 +4625,17 @@
4197	4625	// System.err.println("info : " + group.GetPath());
4198	4626	// }
4199	4627
4200		- objEditor.SetText(); // jan 2014
4201		-
4202		- 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))
4203	4629	CameraPane.flash = true;
4204	4630
4205		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4631	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4206	4632	// a camera
4207	4633	{
4208		- CameraPane.camerachangeframe = 0; // don't refuse it
4209		- 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	+ }
4210	4639	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4211	4640	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4212	4641	}
..	..	@@ -4219,6 +4648,27 @@
4219	4648
4220	4649	freezemodel = false;
4221	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	+ }
4222	4672
4223	4673	void linkSomething(Object3D thing)
4224	4674	{
..	..	@@ -4290,16 +4740,19 @@
4290	4740	{
4291	4741	if (group.selection.isEmpty())
4292	4742	return;
4293		- GrafreeD.clipboardIsTempGroup = false;
	4743	+
	4744	+ Grafreed.clipboardIsTempGroup = false;
4294	4745	Composite tGroup = null;
4295	4746	if (group.selection.size() > 0) // 1)
4296	4747	{
4297	4748	tGroup = new cGroup();
4298		- GrafreeD.clipboardIsTempGroup = true;
	4749	+ Grafreed.clipboardIsTempGroup = true;
4299	4750	}
4300	4751
4301	4752	if (cut)
4302	4753	{
	4754	+ if (Globals.SAVEONMAKE)
	4755	+ Save();
4303	4756	//int indices[] = jList.getSelectedIndices();
4304	4757	//for (int i = indices.length - 1; i >= 0; i--)
4305	4758	//jList.remove(indices[i]);
..	..	@@ -4335,16 +4788,16 @@
4335	4788	//System.out.println("cut " + child);
4336	4789	//System.out.println("parent = " + child.parent);
4337	4790	// tmp.addChild(child);
4338		- if (GrafreeD.clipboardIsTempGroup)
	4791	+ if (Grafreed.clipboardIsTempGroup)
4339	4792	tGroup.add/Child/(tmp);
4340	4793	else
4341		- GrafreeD.clipboard = tmp;
	4794	+ Grafreed.clipboard = tmp;
4342	4795	}
4343	4796	else
4344		- if (GrafreeD.clipboardIsTempGroup)
	4797	+ if (Grafreed.clipboardIsTempGroup)
4345	4798	tGroup.add/Child/(child);
4346	4799	else
4347		- GrafreeD.clipboard = child;
	4800	+ Grafreed.clipboard = child;
4348	4801	}
4349	4802
4350	4803	//ResetModel();
..	..	@@ -4376,21 +4829,23 @@
4376	4829	//System.out.println("cut " + elem);
4377	4830	//System.out.println("parent = " + elem.parent);
4378	4831	// tmp.addChild(elem);
4379		- if (GrafreeD.clipboardIsTempGroup)
	4832	+ if (Grafreed.clipboardIsTempGroup)
4380	4833	tGroup.add/Child/(tmp);
4381	4834	else
4382		- GrafreeD.clipboard = tmp;
	4835	+ Grafreed.clipboard = tmp;
4383	4836	}
4384	4837	else
4385		- if (GrafreeD.clipboardIsTempGroup)
	4838	+ if (Grafreed.clipboardIsTempGroup)
4386	4839	tGroup.add/Child/(child);
4387	4840	else
4388		- GrafreeD.clipboard = child;
	4841	+ Grafreed.clipboard = child;
4389	4842	}
4390	4843
4391	4844	}
4392		- if (GrafreeD.clipboardIsTempGroup)
4393		- GrafreeD.clipboard = tGroup;
	4845	+
	4846	+ if (Grafreed.clipboardIsTempGroup)
	4847	+ Grafreed.clipboard = tGroup;
	4848	+
4394	4849	if (cut)
4395	4850	{
4396	4851	ResetModel();
..	..	@@ -4404,7 +4859,7 @@
4404	4859	// return;
4405	4860	boolean first = true;
4406	4861
4407		- if (GrafreeD.clipboardIsTempGroup)
	4862	+ if (Grafreed.clipboardIsTempGroup)
4408	4863	{
4409	4864	Composite temp;
4410	4865
..	..	@@ -4415,7 +4870,7 @@
4415	4870	temp = (Composite)Applet3D.clipboard.deepCopy();
4416	4871	*/
4417	4872	Object3D elem;
4418		- 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))
4419	4874	{
4420	4875	Object3D child = (Object3D)e.nextElement();
4421	4876
..	..	@@ -4449,14 +4904,14 @@
4449	4904	//Object3D cb = Applet3D.clipboard;
4450	4905	//temp.addChild(cb);
4451	4906	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4452		- assert(GrafreeD.clipboard.parent == null);
4453		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4454		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4455		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4456		- 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());
4457	4912	else
4458		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4459		- GrafreeD.clipboard.get(0).parent = keepparent;
	4913	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4914	+ Grafreed.clipboard.get(0).parent = keepparent;
4460	4915	}
4461	4916
4462	4917	ResetModel();
..	..	@@ -4505,9 +4960,9 @@
4505	4960	{
4506	4961	boolean first = true;
4507	4962
4508		- if (GrafreeD.clipboardIsTempGroup)
	4963	+ if (Grafreed.clipboardIsTempGroup)
4509	4964	{
4510		- Composite temp = (Composite)GrafreeD.clipboard;
	4965	+ Composite temp = (Composite)Grafreed.clipboard;
4511	4966	Object3D copy;
4512	4967	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4513	4968	{
..	..	@@ -4517,7 +4972,7 @@
4517	4972	}
4518	4973	} else
4519	4974	{
4520		- linkSomething(GrafreeD.clipboard); //.get(0));
	4975	+ linkSomething(Grafreed.clipboard); //.get(0));
4521	4976	}
4522	4977	}
4523	4978	}
..	..	@@ -4922,21 +5377,6 @@
4922	5377	}
4923	5378	*/
4924	5379
4925		- void ImportGFD()
4926		- {
4927		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4928		- browser.show();
4929		- String filename = browser.getFile();
4930		- if (filename != null && filename.length() > 0)
4931		- {
4932		- String fullname = browser.getDirectory() + filename;
4933		-
4934		- //Object3D readobj =
4935		- objEditor.ReadGFD(fullname, objEditor);
4936		- //makeSomething(readobj);
4937		- }
4938		- }
4939		-
4940	5380	/*
4941	5381	public void Callback(Object obj)
4942	5382	{
..	..	@@ -4960,26 +5400,9 @@
4960	5400	}
4961	5401	*/
4962	5402
4963		- void ImportVRMLX3D()
4964		- {
4965		- if (GrafreeD.standAlone)
4966		- {
4967		- /**/
4968		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4969		- browser.show();
4970		- String filename = browser.getFile();
4971		- if (filename != null && filename.length() > 0)
4972		- {
4973		- String fullname = browser.getDirectory() + filename;
4974		- LoadVRMLX3D(fullname);
4975		- }
4976		- /**/
4977		- }
4978		- }
4979		-
4980	5403	String GetFile(String dialogName)
4981	5404	{
4982		- if (GrafreeD.standAlone)
	5405	+ if (Grafreed.standAlone)
4983	5406	{
4984	5407	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4985	5408	browser.show();
..	..	@@ -5047,7 +5470,33 @@
5047	5470	cButton clearpanelButton;
5048	5471	cButton unselectButton;
5049	5472
	5473	+ cButton restoreCameraButton;
	5474	+
	5475	+ cButton minButton;
	5476	+ cButton maxButton;
	5477	+ cButton fullButton;
	5478	+ cButton undoButton;
	5479	+ cButton redoButton;
	5480	+ cButton saveButton;
5050	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;
5051	5500
5052	5501	cButton screenfitButton;
5053	5502	cButton screenfitpointButton;
..	..	@@ -5060,14 +5509,6 @@
5060	5509
5061	5510	cButton setsupportButton;
5062	5511
5063		- cButton twoButton;
5064		- cButton sixButton;
5065		- cButton threeButton;
5066		- cButton sevenButton;
5067		- cButton fourButton; // full panel
5068		- cButton oneButton; // full XYZ
5069		- //cButton currentLayout;
5070		-
5071	5512	//
5072	5513	//Composite
5073	5514	Object3D // to do !!
..	..	@@ -5077,9 +5518,11 @@
5077	5518	//JTree jTree;
5078	5519	private MenuItem lookAtItem;
5079	5520	private MenuItem lookFromItem;
5080		- private MenuItem switchItem;
	5521	+ private MenuItem switchViewItem;
5081	5522	private MenuItem cutItem;
5082		- private MenuItem duplicateItem;
	5523	+ private MenuItem undoItem;
	5524	+ private MenuItem redoItem;
	5525	+ private JMenuItem duplicateItem;
5083	5526	private MenuItem cloneItem;
5084	5527	private MenuItem cloneSupportItem;
5085	5528	private MenuItem overwriteGeoItem;
..	..	@@ -5092,7 +5535,7 @@
5092	5535	private MenuItem linkverticesItem;
5093	5536	private MenuItem relinkverticesItem;
5094	5537	private MenuItem setMasterItem;
5095		- private MenuItem resetMeshItem;
	5538	+ private MenuItem resetAllItem;
5096	5539	private MenuItem stepAllItem;
5097	5540	private MenuItem revertMeshItem;
5098	5541	private MenuItem poseMeshItem;
..	..	@@ -5142,6 +5585,10 @@
5142	5585	private MenuItem showleavesItem;
5143	5586	private MenuItem markleavesItem;
5144	5587	private MenuItem unmarkleavesItem;
	5588	+ private MenuItem rewindleavesItem;
	5589	+ private MenuItem unrewindleavesItem;
	5590	+ private MenuItem randomleavesItem;
	5591	+ private MenuItem unrandomleavesItem;
5145	5592
5146	5593	private MenuItem flipVItem;
5147	5594	private MenuItem unflipVItem;
..	..	@@ -5153,15 +5600,17 @@
5153	5600	private MenuItem panoTexturesItem;
5154	5601
5155	5602	private MenuItem resetCentroidItem;
5156		- private MenuItem transformgeometryItem;
	5603	+ private MenuItem resetCentroidXZItem;
5157	5604	private MenuItem resetTransformItem;
	5605	+ private MenuItem transformGeometryItem;
	5606	+ private MenuItem transformChildrenItem;
5158	5607	private MenuItem hideItem;
5159	5608	private MenuItem grabItem;
5160	5609	private MenuItem backItem;
5161	5610	private MenuItem frontItem;
5162	5611	private MenuItem cameraItem;
5163	5612	private MenuItem compositeItem;
5164		- private MenuItem randomItem;
	5613	+ private MenuItem switchItem;
5165	5614	private MenuItem physicsItem;
5166	5615	private MenuItem frameselectorItem;
5167	5616	private MenuItem scriptNodeItem;
..	..	@@ -5223,11 +5672,6 @@
5223	5672	private MenuItem doubleItem;
5224	5673	private MenuItem tripleItem;
5225	5674
5226		- private MenuItem importGFDItem;
5227		- private MenuItem importVRMLX3DItem;
5228		- private MenuItem import3DSItem;
5229		- private MenuItem importOBJItem;
5230		-
5231	5675	private MenuItem computeAOItem;
5232	5676	private MenuItem recompileItem;
5233	5677	private MenuItem editScriptItem;
..	..	@@ -5237,4 +5681,8 @@
5237	5681	private MenuItem analyzeItem;
5238	5682	private MenuItem dumpItem;
5239	5683	//boolean freezemodel = false;
	5684	+
	5685	+ Menu cameraMenu;
	5686	+ MenuItem editCameraItem;
	5687	+ MenuItem restoreCameraItem;
5240	5688	}