~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,212 @@
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	+ undoButton.setEnabled(false);
	609	+
	610	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	611	+ redoButton.setToolTipText("Redo changes");
	612	+ redoButton.addActionListener(this);
	613	+ redoButton.setEnabled(false);
	614	+
	615	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	616	+ saveButton.setToolTipText("Save changes");
	617	+ saveButton.addActionListener(this);
	618	+
	619	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	620	+ liveCB.setToolTipText("Enable animation");
489	621	liveCB.addItemListener(this);
490	622
491		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	623	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492	624	oneStepButton.setToolTipText("Animate one step forward");
493	625	oneStepButton.addActionListener(this);
494	626
495		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	627	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
496	628	fastCB.setToolTipText("Fast mode");
497	629	fastCB.addItemListener(this);
498	630
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);
	631	+ //oe.toolboxPanel.Return();
	632	+
	633	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
504	634	screenfitButton.setToolTipText("Screen fit");
505	635	screenfitButton.addActionListener(this);
	636	+
	637	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	638	+// trackCB.setToolTipText("Enable tracking");
	639	+// trackCB.addItemListener(this);
506	640
507	641	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
508	642	// screenfitpointButton.addActionListener(this);
509	643
510	644	if (Globals.ADVANCED)
511	645	{
512		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	646	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
513	647	snapobjectButton.addActionListener(this);
514	648	snapobjectButton.setToolTipText("Snap Object");
515	649	}
516	650
517		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
518		- flashSelectionButton.setToolTipText("Show selection");
519		- flashSelectionButton.addActionListener(this);
	651	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
520	652
521		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
522		-
523		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	653	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
524	654	twoButton.setToolTipText("Show center view only");
525	655	twoButton.addActionListener(this);
526		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	656	+ this.fullscreenLayout = twoButton;
	657	+
	658	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
527	659	fourButton.addActionListener(this);
528	660	fourButton.setToolTipText("Show left panel only");
529		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	661	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
530	662	sixButton.setToolTipText("2-column layout left");
531	663	sixButton.addActionListener(this);
532		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
533	665	threeButton.setToolTipText("2-column layout right");
534	666	threeButton.addActionListener(this);
535		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	667	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
536	668	sevenButton.setToolTipText("3-column layout");
537	669	sevenButton.addActionListener(this);
538	670	//
539	671
540		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	672	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
541	673	rootButton.setToolTipText("Edit selection in new tab");
542	674	rootButton.addActionListener(this);
543	675
544		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	676	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
545	677	closeButton.setToolTipText("Close tab");
546	678	closeButton.addActionListener(this);
547	679	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
548	680	//clearButton.addActionListener(this);
549		-
550		- cGridBag commandsPanel = new cGridBag();
	681	+
	682	+ // INSERT
	683	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	684	+ gridButton.setToolTipText("Create grid");
	685	+ gridButton.addActionListener(this);
	686	+
	687	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	688	+ boxButton.setToolTipText("Create box");
	689	+ boxButton.addActionListener(this);
	690	+
	691	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	692	+ sphereButton.setToolTipText("Create sphere");
	693	+ sphereButton.addActionListener(this);
	694	+
	695	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	696	+ coneButton.setToolTipText("Create cone");
	697	+ coneButton.addActionListener(this);
	698	+
	699	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ torusButton.setToolTipText("Create torus");
	701	+ torusButton.addActionListener(this);
	702	+
	703	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	704	+ superButton.setToolTipText("Create superellipsoid");
	705	+ superButton.addActionListener(this);
	706	+
	707	+ if (Globals.ADVANCED)
	708	+ {
	709	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	710	+ kleinButton.setToolTipText("Create Klein bottle");
	711	+ kleinButton.addActionListener(this);
	712	+ }
551	713
552		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	714	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	715	+ particlesButton.setToolTipText("Create particle system");
	716	+ particlesButton.addActionListener(this);
	717	+
	718	+ oe.toolboxPanel.Return();
	719	+
	720	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	721	+ groupButton.setToolTipText("Create group");
	722	+ groupButton.addActionListener(this);
	723	+
	724	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	725	+ compositeButton.setToolTipText("Create composite");
	726	+ compositeButton.addActionListener(this);
	727	+
	728	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	729	+ switchButton.setToolTipText("Create switch");
	730	+ switchButton.addActionListener(this);
	731	+
	732	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	733	+ loopButton.setToolTipText("Create loop");
	734	+ loopButton.addActionListener(this);
	735	+
	736	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	737	+ textureButton.setToolTipText("Create texture");
	738	+ textureButton.addActionListener(this);
	739	+
	740	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	741	+ overlayButton.setToolTipText("Create overlay");
	742	+ overlayButton.addActionListener(this);
	743	+
	744	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	745	+ lightButton.setToolTipText("Create light");
	746	+ lightButton.addActionListener(this);
	747	+
	748	+ for (int i=6; --i>=0;)
	749	+ {
	750	+ oe.toolboxPanel.Return();
	751	+ oe.toolboxPanel.add(new cGridBag());
	752	+ oe.toolboxPanel.add(new cGridBag());
	753	+ oe.toolboxPanel.add(new cGridBag());
	754	+ oe.toolboxPanel.add(new cGridBag());
	755	+ oe.toolboxPanel.add(new cGridBag());
	756	+ oe.toolboxPanel.add(new cGridBag());
	757	+ oe.toolboxPanel.add(new cGridBag());
	758	+ }
	759	+
	760	+ // EDIT panel
	761	+ editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
553	762	editButton.setToolTipText("Edit selection");
554	763	editButton.addActionListener(this);
555	764
556		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	765	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
557	766	uneditButton.setToolTipText("Unedit selection");
558	767	uneditButton.addActionListener(this);
559	768
560		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	769	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
561	770	allParamsButton.setToolTipText("Edit all params");
562	771	allParamsButton.addActionListener(this);
563	772
564		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	773	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565	774	clearPanelButton.setToolTipText("Clear edit panel");
566	775	clearPanelButton.addActionListener(this);
567	776
568		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	777	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569	778	unselectButton.setToolTipText("Unselect");
570	779	unselectButton.addActionListener(this);
571	780
572		- commandsPanel.preferredHeight = 1;
	781	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	782	+ flashSelectionButton.setToolTipText("Highlight selection");
	783	+ flashSelectionButton.addActionListener(this);
573	784
574		- oe.treePanel.add(commandsPanel);
575		- oe.treePanel.Return();
	785	+ editCommandsPanel.preferredHeight = 1;
	786	+
	787	+// oe.treePanel.add(commandsPanel);
	788	+// oe.treePanel.Return();
576	789
577	790	// oe.aConstraints.gridx += 1;
578	791	// oe.aConstraints.weighty = 0;
..	..	@@ -589,27 +802,12 @@
589	802
590	803	JScrollPane jSP;
591	804	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
592		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	805	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
593	806	ResetModel();
594	807
595	808	oe.treePanel.add(jSPPanel);
596	809	oe.treePanel.Return();
597	810
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	811	oe.treePanel.add(copyOptionsPanel);
614	812	oe.treePanel.Return();
615	813
..	..	@@ -640,6 +838,20 @@
640	838
641	839	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
642	840	{
	841	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	842	+ colorCB.setToolTipText("Copy color when dropped");
	843	+ colorCB.addItemListener(this);
	844	+
	845	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	846	+ materialCB.setToolTipText("Copy material when dropped");
	847	+ materialCB.addItemListener(this);
	848	+
	849	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	850	+ textureCB.setToolTipText("Copy texture when dropped");
	851	+ textureCB.addItemListener(this);
	852	+
	853	+ panel.Return();
	854	+
643	855	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
644	856	boxCB.setToolTipText("Display bounding boxes");
645	857	boxCB.addItemListener(this);
..	..	@@ -648,7 +860,7 @@
648	860	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
649	861	zoomBoxCB.addItemListener(this);
650	862
651		- if (Globals.ADVANCED)
	863	+ if (true) // Globals.ADVANCED)
652	864	{
653	865	panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
654	866	supportCB.setToolTipText("Enable rigging");
..	..	@@ -657,6 +869,8 @@
657	869	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
658	870	// localCB.addItemListener(this);
659	871
	872	+ panel.Return();
	873	+
660	874	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
661	875	crowdCB.setToolTipText("Used for crowds");
662	876	crowdCB.addItemListener(this);
..	..	@@ -673,6 +887,8 @@
673	887	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
674	888	// speakerMocapCB.addItemListener(this);
675	889
	890	+ panel.Return();
	891	+
676	892	if (false)
677	893	{
678	894	// handled in scripts
..	..	@@ -687,32 +903,72 @@
687	903	//constraints.gridy += 1;
688	904	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
689	905	smoothfocusCB.addItemListener(this);
	906	+ panel.Return();
690	907	}
691	908
692	909	//constraints.gridx += 1;
693	910	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
694	911	// debugCB.addItemListener(this);
695	912
	913	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	914	+ trackCB.setToolTipText("Enable tracking target");
	915	+ trackCB.addItemListener(this);
	916	+
696	917	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	918	+ oeilCB.setToolTipText("Move camera when tracking");
697	919	oeilCB.addItemListener(this);
698	920
	921	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	922	+ shadowCB.setToolTipText("Compute shadows when live");
	923	+ shadowCB.addItemListener(this);
	924	+
	925	+ panel.Return();
	926	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	927	+ toggleTextureCB.setToolTipText("Load textures");
	928	+ toggleTextureCB.addItemListener(this);
	929	+
	930	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	931	+ toggleSwitchCB.setToolTipText("Use switch");
	932	+ toggleSwitchCB.addItemListener(this);
	933	+
	934	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	935	+ autosaveCB.setToolTipText("Auto-save on structure change");
	936	+ autosaveCB.addItemListener(this);
	937	+
	938	+ panel.Return();
	939	+ if (Globals.ADVANCED)
	940	+ {
699	941	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
700	942	lookAtCB.setToolTipText("Look-at target");
701	943	lookAtCB.addItemListener(this);
	944	+ }
702	945
703	946	}
704	947
705	948	cGridBag fill = new cGridBag();
706		-
707	949	fill.preferredHeight = 200;
	950	+ cGridBag fill2 = new cGridBag();
	951	+ fill2.preferredHeight = 200;
	952	+ cGridBag fill3 = new cGridBag();
	953	+ fill3.preferredHeight = 200;
708	954
709	955	panel.add(fill);
	956	+ panel.add(fill2);
	957	+ panel.add(fill3);
710	958
711	959	}
712	960
713	961	void EditObject(Object3D obj)
714	962	{
715	963	cRadio radioButton = new cRadio(obj.name);
	964	+
	965	+ // Patch to avoid bug with transparency.
	966	+ radioButton.hadMaterial = obj.material != null;
	967	+ if (!radioButton.hadMaterial)
	968	+ {
	969	+ obj.material = new cMaterial();
	970	+ }
	971	+
716	972	radioButton.SetObject(obj);
717	973	radioButton.layout = sevenButton;
718	974	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -721,8 +977,11 @@
721	977	buttonGroup.add(radioButton);
722	978	radioButton.doClick();
723	979	}
	980	+
724	981	void SetupViews(ObjEditor oe)
725	982	{
	983	+ theFrame = this;
	984	+
726	985	oe.SetupViews();
727	986
728	987	System.out.println("SetupViews");
..	..	@@ -731,23 +990,27 @@
731	990	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
732	991	}
733	992
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;
	993	+ cToggleButton liveCB;
	994	+ cCheckBox supportCB;
	995	+ cCheckBox localCB;
	996	+ cCheckBox crowdCB;
	997	+ cCheckBox smoothCB;
	998	+ cToggleButton fastCB;
	999	+ cCheckBox slowCB;
	1000	+ cCheckBox boxCB;
	1001	+ cCheckBox zoomBoxCB;
	1002	+ //cToggleButton trackCB;
	1003	+ cCheckBox trackCB;
	1004	+ cCheckBox smoothfocusCB;
745	1005	// JCheckBox speakerMocapCB;
746		- JCheckBox speakerCameraCB;
747		- JCheckBox speakerFocusCB;
748		- JCheckBox debugCB;
749		- JCheckBox oeilCB;
750		- JCheckBox lookAtCB;
	1006	+ cCheckBox speakerCameraCB;
	1007	+ cCheckBox speakerFocusCB;
	1008	+ cCheckBox debugCB;
	1009	+
	1010	+ cCheckBox oeilCB;
	1011	+ cCheckBox shadowCB;
	1012	+ cCheckBox autosaveCB;
	1013	+ cCheckBox lookAtCB;
751	1014
752	1015	// static int COLOR = 1;
753	1016	// static int MATERIAL = 2;
..	..	@@ -755,9 +1018,9 @@
755	1018
756	1019	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
757	1020
758		- JCheckBox colorCB;
759		- JCheckBox materialCB;
760		- JCheckBox textureCB;
	1021	+ cCheckBox colorCB;
	1022	+ cCheckBox materialCB;
	1023	+ cCheckBox textureCB;
761	1024
762	1025	public void itemStateChanged(ItemEvent e)
763	1026	{
..	..	@@ -785,6 +1048,7 @@
785	1048	} else if(e.getSource() == liveCB)
786	1049	{
787	1050	cameraView.ToggleLive();
	1051	+ refreshContents(false);
788	1052	}
789	1053	else if(e.getSource() == supportCB)
790	1054	{
..	..	@@ -849,6 +1113,14 @@
849	1113	{
850	1114	cameraView.ToggleOeil();
851	1115	}
	1116	+ else if(e.getSource() == shadowCB)
	1117	+ {
	1118	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1119	+ }
	1120	+ else if(e.getSource() == autosaveCB)
	1121	+ {
	1122	+ Globals.SAVEONMAKE ^= true;
	1123	+ }
852	1124	else if(e.getSource() == lookAtCB)
853	1125	{
854	1126	cameraView.ToggleLookAt();
..	..	@@ -865,7 +1137,8 @@
865	1137
866	1138	/**/
867	1139	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
868		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1140	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1141	+ TreePath path = objEditor.jTree.getSelectionPath();
869	1142	if ((path == null) \|\| (path.getPathCount() <= 1)) {
870	1143	// We can't move the root node or an empty selection
871	1144	return;
..	..	@@ -937,7 +1210,9 @@
937	1210	// objEditor.DropFile((java.io.File[]) object, true);
938	1211	// return;
939	1212	// }
940		- if (string.charAt(0) == '/')
	1213	+
	1214	+ // File path for Mac and Windows
	1215	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
941	1216	{
942	1217	// file(s)
943	1218	String[] names = string.split("\n");
..	..	@@ -964,7 +1239,7 @@
964	1239
965	1240	flashIt = false;
966	1241	CameraPane pane = (CameraPane) target;
967		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1242	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
968	1243	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
969	1244
970	1245	if (group.selection.size() == 1)
..	..	@@ -980,23 +1255,33 @@
980	1255
981	1256	assert target == objEditor.jTree;
982	1257	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1258	+ Object3D destinationLeaf;
983	1259	try {
984		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1260	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
985	1261	} catch (Exception e) {
986	1262	System.out.println("destinationPath : " + destinationPath);
987	1263	return;
988	1264	}
989	1265
990		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1266	+ for (int i=group.selection.size(); --i>=0;)
991	1267	{
	1268	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1269	+
	1270	+ // Cannot move into itself
	1271	+ if (child == destinationLeaf)
	1272	+ return;
	1273	+ }
	1274	+
	1275	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1276	+// {
992	1277	loadClipboard(true);
993	1278	objEditor.jTree.setSelectionPath(destinationPath);
994	1279	pasteInto(false, false);
995		- } else {
996		- loadClipboard(false);
997		- objEditor.jTree.setSelectionPath(destinationPath);
998		- pasteInto(false, false); // true); // ???
999		- }
	1280	+// } else {
	1281	+// loadClipboard(false);
	1282	+// objEditor.jTree.setSelectionPath(destinationPath);
	1283	+// pasteInto(false, false); // true); // ???
	1284	+// }
1000	1285	}
1001	1286	public void dropActionChanged(DropTargetDragEvent dtde)
1002	1287	// Called if the user has modified the current drop gesture
..	..	@@ -1101,22 +1386,30 @@
1101	1386	{
1102	1387	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1103	1388	//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);
	1389	+// gridItem = menu.add(new MenuItem("Grid"));
	1390	+// gridItem.addActionListener(this);
	1391	+// rectoidItem = menu.add(new MenuItem("Box"));
	1392	+// rectoidItem.addActionListener(this);
	1393	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1394	+// ellipsoidItem.addActionListener(this);
	1395	+// coneItem = menu.add(new MenuItem("Cone"));
	1396	+// coneItem.addActionListener(this);
	1397	+// torusItem = menu.add(new MenuItem("Torus"));
	1398	+// torusItem.addActionListener(this);
	1399	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1400	+// superItem.addActionListener(this);
	1401	+
	1402	+ cameraItem = menu.add(new MenuItem("Camera"));
	1403	+ cameraItem.addActionListener(this);
	1404	+
	1405	+ if (!Globals.ADVANCED)
	1406	+ {
1116	1407	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1117	1408	kleinItem.addActionListener(this);
1118		- particleItem = menu.add(new MenuItem("Particle system"));
1119		- particleItem.addActionListener(this);
	1409	+ }
	1410	+
	1411	+// particleItem = menu.add(new MenuItem("Particle system"));
	1412	+// particleItem.addActionListener(this);
1120	1413	if (Globals.ADVANCED)
1121	1414	{
1122	1415	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1142,15 +1435,15 @@
1142	1435	}
1143	1436	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1144	1437	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);
	1438	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1439	+// overlayItem.addActionListener(this);
	1440	+// lightItem = menu.add(new MenuItem("Light"));
	1441	+// lightItem.addActionListener(this);
1149	1442	menu.add("-");
1150	1443	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1151	1444	//superLoopItem.addActionListener(this);
1152		- loopItem = menu.add(new MenuItem("Loop"));
1153		- loopItem.addActionListener(this);
	1445	+// loopItem = menu.add(new MenuItem("Loop"));
	1446	+// loopItem.addActionListener(this);
1154	1447	doubleItem = menu.add(new MenuItem("Fork"));
1155	1448	doubleItem.addActionListener(this);
1156	1449	if (Globals.ADVANCED)
..	..	@@ -1190,7 +1483,7 @@
1190	1483	memoryItem.addActionListener(this);
1191	1484	menu.add(analyzeItem = new MenuItem("Analyze"));
1192	1485	analyzeItem.addActionListener(this);
1193		- menu.add(dumpItem = new MenuItem("Dump"));
	1486	+ menu.add(dumpItem = new MenuItem("Print"));
1194	1487	dumpItem.addActionListener(this);
1195	1488	// menu.add(pathItem = new MenuItem("From-to path"));
1196	1489	// pathItem.addActionListener(this);
..	..	@@ -1331,6 +1624,7 @@
1331	1624	shadow.material = new cMaterial(obj.material);
1332	1625	shadow.material.diffuse = 0.0001f;
1333	1626	shadow.material.specular = 0.0001f;
	1627	+ //shadow.projectedVertices[1].x = 300;
1334	1628
1335	1629	makeSomething(shadow);
1336	1630	}
..	..	@@ -1537,9 +1831,9 @@
1537	1831
1538	1832	void Overwrite(int mask)
1539	1833	{
1540		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1834	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1541	1835	{
1542		- Object3D content = GrafreeD.clipboard.get(0);
	1836	+ Object3D content = Grafreed.clipboard.get(0);
1543	1837
1544	1838	if (content instanceof cGroup && ((cGroup)content).transientlink )
1545	1839	content = ((cGroup)content).get(0);
..	..	@@ -1578,7 +1872,7 @@
1578	1872	{
1579	1873	ScreenFit();
1580	1874	} else
1581		- if (source == switchItem)
	1875	+ if (source == switchViewItem)
1582	1876	{
1583	1877	cVector v1 = new cVector();
1584	1878	cVector v2 = new cVector();
..	..	@@ -1587,11 +1881,11 @@
1587	1881	objEditor.cameraView.renderCamera.setAim(v2, v1);
1588	1882	objEditor.cameraView.repaint();
1589	1883	} else
1590		- if (source == rectoidItem)
	1884	+ if (source == rectoidItem \|\| source == boxButton)
1591	1885	{
1592	1886	makeSomething(new Box());
1593	1887	} else
1594		- if (source == particleItem)
	1888	+ if (source == particleItem \|\| source == particlesButton)
1595	1889	{
1596	1890	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1597	1891	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1670,27 +1964,27 @@
1670	1964
1671	1965	makeSomething(obj);
1672	1966	} else
1673		- if (source == gridItem)
	1967	+ if (source == gridItem \|\| source == gridButton)
1674	1968	{
1675	1969	makeSomething(new Grid());
1676	1970	} else
1677		- if (source == ellipsoidItem)
	1971	+ if (source == ellipsoidItem \|\| source == sphereButton)
1678	1972	{
1679	1973	makeSomething(new Sphere());
1680	1974	} else
1681		- if (source == coneItem)
	1975	+ if (source == coneItem \|\| source == coneButton)
1682	1976	{
1683	1977	makeSomething(new Cone());
1684	1978	} else
1685		- if (source == torusItem)
	1979	+ if (source == torusItem \|\| source == torusButton)
1686	1980	{
1687	1981	makeSomething(new Torus());
1688	1982	} else
1689		- if (source == superItem)
	1983	+ if (source == superItem \|\| source == superButton)
1690	1984	{
1691	1985	makeSomething(new Superellipsoid());
1692	1986	} else
1693		- if (source == kleinItem)
	1987	+ if (source == kleinItem \|\| source == kleinButton)
1694	1988	{
1695	1989	makeSomething(new Klein());
1696	1990	} else
..	..	@@ -1710,7 +2004,7 @@
1710	2004	{
1711	2005	makeSomething(new BezierSurface());
1712	2006	} else
1713		- if (source == overlayItem)
	2007	+ if (source == overlayItem \|\| source == overlayButton)
1714	2008	{
1715	2009	/*
1716	2010	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1758,7 +2052,7 @@
1758	2052	s.setup();
1759	2053	makeSomething(s);
1760	2054	} else
1761		- if (source == lightItem)
	2055	+ if (source == lightItem \|\| source == lightButton)
1762	2056	{
1763	2057	makeSomething(new Light());
1764	2058	} else
..	..	@@ -1808,7 +2102,7 @@
1808	2102
1809	2103	group(g);
1810	2104	} else
1811		- if (source == loopItem)
	2105	+ if (source == loopItem \|\| source == loopButton)
1812	2106	{
1813	2107	Composite csg = new GroupLeaf();
1814	2108	csg.count = 5;
..	..	@@ -1844,23 +2138,6 @@
1844	2138	csg.addChild(child);
1845	2139	child.addChild(csg);
1846	2140	} 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	2141	if (source == computeAOItem)
1865	2142	{
1866	2143	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1879,7 +2156,7 @@
1879	2156	if (source == invariantsItem)
1880	2157	{
1881	2158	System.out.println("Invariants:");
1882		- GrafreeD.grafreeD.universe.invariants();
	2159	+ Grafreed.grafreeD.universe.invariants();
1883	2160	} else
1884	2161	if (source == memoryItem)
1885	2162	{
..	..	@@ -1897,6 +2174,30 @@
1897	2174	if (source == dumpItem)
1898	2175	{
1899	2176	DumpObject();
	2177	+ } else
	2178	+ if (source == minButton)
	2179	+ {
	2180	+ Minimize();
	2181	+ } else
	2182	+ if (source == maxButton)
	2183	+ {
	2184	+ Maximize();
	2185	+ } else
	2186	+ if (source == fullButton)
	2187	+ {
	2188	+ ToggleFullScreen();
	2189	+ } else
	2190	+ if (source == undoButton)
	2191	+ {
	2192	+ Undo();
	2193	+ } else
	2194	+ if (source == redoButton)
	2195	+ {
	2196	+ Redo();
	2197	+ } else
	2198	+ if (source == saveButton)
	2199	+ {
	2200	+ Save();
1900	2201	} else
1901	2202	if (source == oneStepButton)
1902	2203	{
..	..	@@ -1952,12 +2253,20 @@
1952	2253	{
1953	2254	loadClipboard(true);
1954	2255	} else
	2256	+ if (source == undoItem)
	2257	+ {
	2258	+ Undo();
	2259	+ } else
	2260	+ if (source == redoItem)
	2261	+ {
	2262	+ Redo();
	2263	+ } else
1955	2264	if (source == duplicateItem)
1956	2265	{
1957		- Object3D keep = GrafreeD.clipboard;
	2266	+ Object3D keep = Grafreed.clipboard;
1958	2267	loadClipboard(false);
1959	2268	paste(false);
1960		- GrafreeD.clipboard = keep;
	2269	+ Grafreed.clipboard = keep;
1961	2270	} else
1962	2271	if (source == cloneItem)
1963	2272	{
..	..	@@ -2177,9 +2486,9 @@
2177	2486	// group.selection.get(0).setMasterThis(content); // should be identity
2178	2487	// refreshContents();
2179	2488	// }
2180		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2489	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2181	2490	{
2182		- Object3D content = GrafreeD.clipboard.get(0);
	2491	+ Object3D content = Grafreed.clipboard.get(0);
2183	2492
2184	2493	if (content instanceof cGroup && ((cGroup)content).transientlink )
2185	2494	content = ((cGroup)content).get(0);
..	..	@@ -2229,9 +2538,9 @@
2229	2538	} else
2230	2539	if (source == setMasterItem)
2231	2540	{
2232		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2541	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2233	2542	{
2234		- Object3D content = GrafreeD.clipboard.get(0);
	2543	+ Object3D content = Grafreed.clipboard.get(0);
2235	2544
2236	2545	if (content instanceof cGroup && ((cGroup)content).transientlink )
2237	2546	content = ((cGroup)content).get(0);
..	..	@@ -2244,9 +2553,9 @@
2244	2553	{
2245	2554	if (group.selection.size() == 1)
2246	2555	{
2247		- if (GrafreeD.clipboard.size() == 1)
	2556	+ if (Grafreed.clipboard.size() == 1)
2248	2557	{
2249		- Object3D content = GrafreeD.clipboard.get(0);
	2558	+ Object3D content = Grafreed.clipboard.get(0);
2250	2559
2251	2560	if (content instanceof cGroup && ((cGroup)content).transientlink )
2252	2561	content = ((cGroup)content).get(0);
..	..	@@ -2263,7 +2572,7 @@
2263	2572	{
2264	2573	RevertMeshes();
2265	2574	} else
2266		- if (source == resetMeshItem)
	2575	+ if (source == resetAllItem)
2267	2576	{
2268	2577	ResetAll();
2269	2578	} else
..	..	@@ -2283,9 +2592,9 @@
2283	2592	{
2284	2593	ClearSelection(true);
2285	2594	} else
2286		- if (source == grabItem)
	2595	+ if (source == grabItem \|\| source == groupButton)
2287	2596	{
2288		- group(new cGroup(), true);
	2597	+ group(new cGroup(), false); // true);
2289	2598	} else
2290	2599	if (source == hideItem)
2291	2600	{
..	..	@@ -2303,11 +2612,11 @@
2303	2612	{
2304	2613	makeSomething(new Camera());
2305	2614	} else
2306		- if (source == compositeItem)
	2615	+ if (source == compositeItem \|\| source == compositeButton)
2307	2616	{
2308	2617	group(new Composite());
2309	2618	} else
2310		- if (source == randomItem)
	2619	+ if (source == switchItem \|\| source == switchButton)
2311	2620	{
2312	2621	RandomNode random = new RandomNode();
2313	2622	group(random);
..	..	@@ -2409,7 +2718,7 @@
2409	2718	{
2410	2719	group(new cLinker());
2411	2720	} else
2412		- if (source == textureItem)
	2721	+ if (source == textureItem \|\| source == textureButton)
2413	2722	{
2414	2723	group(new TextureNode());
2415	2724	} else
..	..	@@ -2429,7 +2738,7 @@
2429	2738	{
2430	2739	CastShadow(2);
2431	2740	} else
2432		- if (source == ungroupItem)
	2741	+ if (source == ungroupItem \|\| source == ungroupButton)
2433	2742	{
2434	2743	//ungroup();
2435	2744	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2451,7 +2760,7 @@
2451	2760	} else
2452	2761	if (source == genNormalsMESHItem)
2453	2762	{
2454		- GenNormals(true); // TODO
	2763	+ GenNormalsMESH();
2455	2764	} else
2456	2765	if (source == genNormalsORGANItem)
2457	2766	{
..	..	@@ -2516,6 +2825,22 @@
2516	2825	if (source == unmarkleavesItem)
2517	2826	{
2518	2827	MarkLeaves(false);
	2828	+ } else
	2829	+ if (source == rewindleavesItem)
	2830	+ {
	2831	+ RewindLeaves(true);
	2832	+ } else
	2833	+ if (source == unrewindleavesItem)
	2834	+ {
	2835	+ RewindLeaves(false);
	2836	+ } else
	2837	+ if (source == randomleavesItem)
	2838	+ {
	2839	+ RandomLeaves(true);
	2840	+ } else
	2841	+ if (source == unrandomleavesItem)
	2842	+ {
	2843	+ RandomLeaves(false);
2519	2844	} else
2520	2845	if (source == flipVItem)
2521	2846	{
..	..	@@ -2601,9 +2926,13 @@
2601	2926	{
2602	2927	SmoothMesh();
2603	2928	} else
2604		- if (source == transformgeometryItem)
	2929	+ if (source == transformGeometryItem)
2605	2930	{
2606	2931	TransformGeometry();
	2932	+ } else
	2933	+ if (source == transformChildrenItem)
	2934	+ {
	2935	+ TransformChildren();
2607	2936	} else
2608	2937	if (source == resetTransformItem)
2609	2938	{
..	..	@@ -2611,7 +2940,11 @@
2611	2940	} else
2612	2941	if (source == resetCentroidItem)
2613	2942	{
2614		- ResetCentroid();
	2943	+ ResetCentroid(true);
	2944	+ } else
	2945	+ if (source == resetCentroidXZItem)
	2946	+ {
	2947	+ ResetCentroid(false);
2615	2948	} else
2616	2949	if (source == resetParentItem)
2617	2950	{
..	..	@@ -2743,6 +3076,10 @@
2743	3076	if (source == twoButton)
2744	3077	{
2745	3078	radio.layout = twoButton;
	3079	+
	3080	+ if (CameraPane.FULLSCREEN)
	3081	+ fullscreenLayout = radio.layout;
	3082	+
2746	3083	// bug
2747	3084	//gridPanel.setDividerLocation(1.0);
2748	3085	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2775,10 +3112,31 @@
2775	3112	bigThree.ClearUI();
2776	3113	bigThree.add(centralPanel);
2777	3114	bigThree.FlushUI();
	3115	+
	3116	+ cameraView.requestFocusInWindow();
	3117	+
	3118	+// refreshContents(true);
	3119	+//
	3120	+// try
	3121	+// {
	3122	+// java.awt.Robot bot = new java.awt.Robot();
	3123	+// int mask = InputEvent.BUTTON1_MASK;
	3124	+// bot.mouseMove(100, 100);
	3125	+// bot.mousePress(mask);
	3126	+// bot.mouseRelease(mask);
	3127	+// }
	3128	+// catch (Exception e)
	3129	+// {
	3130	+//
	3131	+// }
	3132	+
2778	3133	} else
2779	3134	if (source == threeButton)
2780	3135	{
2781	3136	radio.layout = threeButton;
	3137	+
	3138	+ if (CameraPane.FULLSCREEN)
	3139	+ fullscreenLayout = radio.layout;
2782	3140
2783	3141	// bigThree.remove(scenePanel);
2784	3142	// bigThree.remove(centralPanel);
..	..	@@ -2811,10 +3169,15 @@
2811	3169	bigThree.add(centralPanel);
2812	3170	bigThree.add(XYZPanel);
2813	3171	bigThree.FlushUI();
	3172	+
	3173	+ cameraView.requestFocusInWindow();
2814	3174	} else
2815	3175	if (source == fourButton)
2816	3176	{
2817	3177	radio.layout = fourButton;
	3178	+
	3179	+ if (CameraPane.FULLSCREEN)
	3180	+ fullscreenLayout = radio.layout;
2818	3181
2819	3182	// bigThree.remove(scenePanel);
2820	3183	// bigThree.remove(centralPanel);
..	..	@@ -2846,10 +3209,15 @@
2846	3209	bigThree.ClearUI();
2847	3210	bigThree.add(scenePanel);
2848	3211	bigThree.FlushUI();
	3212	+
	3213	+ cameraView.requestFocusInWindow();
2849	3214	} else
2850	3215	if (source == sixButton)
2851	3216	{
2852	3217	radio.layout = sixButton;
	3218	+
	3219	+ if (CameraPane.FULLSCREEN)
	3220	+ fullscreenLayout = radio.layout;
2853	3221
2854	3222	// bigThree.remove(scenePanel);
2855	3223	// bigThree.remove(centralPanel);
..	..	@@ -2882,10 +3250,15 @@
2882	3250	bigThree.add(scenePanel);
2883	3251	bigThree.add(centralPanel);
2884	3252	bigThree.FlushUI();
	3253	+
	3254	+ cameraView.requestFocusInWindow();
2885	3255	} else
2886	3256	if (source == sevenButton)
2887	3257	{
2888	3258	radio.layout = sevenButton;
	3259	+
	3260	+ if (CameraPane.FULLSCREEN)
	3261	+ fullscreenLayout = radio.layout;
2889	3262
2890	3263	// bigThree.remove(scenePanel);
2891	3264	// bigThree.remove(centralPanel);
..	..	@@ -2919,6 +3292,8 @@
2919	3292	bigThree.add(centralPanel);
2920	3293	bigThree.add(XYZPanel);
2921	3294	bigThree.FlushUI();
	3295	+
	3296	+ cameraView.requestFocusInWindow();
2922	3297	} else
2923	3298	if (source == rootButton)
2924	3299	{
..	..	@@ -2930,6 +3305,7 @@
2930	3305	EditObject(obj);
2931	3306	}
2932	3307
	3308	+ cameraView.requestFocusInWindow();
2933	3309	refreshContents(true);
2934	3310	} else
2935	3311	if (source == closeButton)
..	..	@@ -2939,22 +3315,37 @@
2939	3315	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2940	3316	{
2941	3317	ab = (cRadio)e.nextElement();
2942		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3318	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2943	3319	{
	3320	+ // Patch to avoid bug with transparency.
	3321	+ if (!ab.hadMaterial)
	3322	+ {
	3323	+ ab.object.material = null;
	3324	+ }
	3325	+
2944	3326	buttonGroup.remove(ab);
2945	3327	radioPanel.remove(ab);
2946	3328
2947		- ab.GetObject().editWindow = null;
	3329	+ //ab.GetObject().editWindow = null;
	3330	+ ab.GetObject().manipWindow = null;
2948	3331	// ab.GetObject().objectUI = null; // ?????????
2949	3332
2950	3333	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2951	3334	break;
2952	3335	}
2953	3336	}
	3337	+
	3338	+ cameraView.requestFocusInWindow();
2954	3339	refreshContents(true);
2955	3340	} else
2956	3341	if (source == editItem \|\| source == editButton)
2957	3342	{
	3343	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3344	+ {
	3345	+ Object3D child = (Object3D)e.nextElement();
	3346	+ child.pinned = true;
	3347	+ }
	3348	+
2958	3349	EditSelection(false);
2959	3350	} else
2960	3351	if (source == uneditButton)
..	..	@@ -2964,10 +3355,11 @@
2964	3355	Object3D child = (Object3D)e.nextElement();
2965	3356	if(child.editWindow != null)
2966	3357	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3358	+ child.pinned = false;
2967	3359	child.CloseUI();
2968	3360	listUI.remove(child);
2969	3361
2970		- child.editWindow = null; // ???????????
	3362	+ //child.editWindow = null; // ???????????
2971	3363	}
2972	3364	objEditor.ctrlPanel.FlushUI();
2973	3365	//objEditor.jTree.clearSelection();
..	..	@@ -2980,6 +3372,7 @@
2980	3372	//copy.ClearUI();
2981	3373	for (Object3D obj : listUI)
2982	3374	{
	3375	+ obj.pinned = true;
2983	3376	obj.CloseUI();
2984	3377	}
2985	3378	listUI.clear();
..	..	@@ -2989,7 +3382,7 @@
2989	3382	{
2990	3383	assert(copy == group);
2991	3384
2992		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3385	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2993	3386
2994	3387	for (Object3D obj : listUI)
2995	3388	{
..	..	@@ -3053,7 +3446,11 @@
3053	3446	frontView.object = group;
3054	3447	sideView.object = group;
3055	3448	}
3056		- group.editWindow = this;
	3449	+
	3450	+// fix "+" issue
	3451	+ //group.editWindow = this;
	3452	+ group.manipWindow = this;
	3453	+
3057	3454	/*
3058	3455	currentLayout = radio.layout;
3059	3456	if (currentLayout == null)
..	..	@@ -3065,8 +3462,23 @@
3065	3462	//group.parent = null; // ROOT
3066	3463	//group.attributes = -1;
3067	3464	ResetModel();
	3465	+
	3466	+ cameraView.requestFocusInWindow();
3068	3467	refreshContents(true);
3069		- }
	3468	+ } else if (event.getSource() == editCameraItem)
	3469	+ {
	3470	+ cameraView.ProtectCamera();
	3471	+ cameraView.repaint();
	3472	+ return;
	3473	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3474	+ {
	3475	+ cameraView.RevertCamera();
	3476	+ cameraView.repaint();
	3477	+ return;
	3478	+ // } else if (event.getSource() == textureButton)
	3479	+ // {
	3480	+ // return; // true;
	3481	+ }
3070	3482	else
3071	3483	{
3072	3484	//return super.action(event, arg);
..	..	@@ -3075,7 +3487,6 @@
3075	3487	}
3076	3488
3077	3489	boolean useclient = false;
3078		- cRadio radio;
3079	3490
3080	3491	void ToggleRoot()
3081	3492	{
..	..	@@ -3127,6 +3538,28 @@
3127	3538	refreshContents();
3128	3539	}
3129	3540
	3541	+ void TransformChildren()
	3542	+ {
	3543	+ Object3D obj;
	3544	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3545	+ {
	3546	+ obj = (Object3D)e.nextElement();
	3547	+ obj.KeepTextureMatrices();
	3548	+ obj.TransformChildren();
	3549	+ obj.RestoreTextureMatrices();
	3550	+
	3551	+// if (obj.parent == null)
	3552	+// {
	3553	+// System.out.println("NULL PARENT!");
	3554	+// new Exception().printStackTrace();
	3555	+// }
	3556	+// else
	3557	+// TouchTransform(obj);
	3558	+// //obj.parent.Touch();
	3559	+ }
	3560	+
	3561	+ refreshContents();
	3562	+ }
3130	3563
3131	3564	void ResetTransform()
3132	3565	{
..	..	@@ -3239,7 +3672,7 @@
3239	3672	refreshContents();
3240	3673	}
3241	3674
3242		- void ResetCentroid()
	3675	+ void ResetCentroid(boolean full)
3243	3676	{
3244	3677	Object3D obj;
3245	3678	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3254,12 +3687,16 @@
3254	3687	LA.matIdentity(Object3D.mat);
3255	3688	obj.getBounds(minima, maxima, false);
3256	3689	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3257		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3690	+ if (full)
	3691	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3258	3692	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3259	3693	obj.TransformMesh(Object3D.mat);
	3694	+
3260	3695	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3261		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3696	+ if (full)
	3697	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3262	3698	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3699	+
3263	3700	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3264	3701	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3265	3702	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3288,7 +3725,8 @@
3288	3725
3289	3726	int size = obj.MemorySize();
3290	3727
3291		- System.err.println((size/1024) + " KB is the size of " + obj);
	3728	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3729	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3292	3730	}
3293	3731	}
3294	3732	catch (Exception e)
..	..	@@ -3325,9 +3763,9 @@
3325	3763	obj = (Object3D)e.nextElement();
3326	3764
3327	3765	System.out.println("Object is: " + obj);
3328		- GrafreeD.AnalyzeObject(obj);
	3766	+ Grafreed.AnalyzeObject(obj);
3329	3767	System.out.println("Boundary rep: " + obj.bRep);
3330		- GrafreeD.AnalyzeObject(obj.bRep);
	3768	+ Grafreed.AnalyzeObject(obj.bRep);
3331	3769
3332	3770	// System.err.println((size/1024) + " KB is the size of " + obj);
3333	3771	}
..	..	@@ -3369,6 +3807,13 @@
3369	3807	void GenNormals(boolean crease)
3370	3808	{
3371	3809	group.GenNormalsS(crease);
	3810	+
	3811	+ refreshContents();
	3812	+ }
	3813	+
	3814	+ void GenNormalsMESH()
	3815	+ {
	3816	+ group.GenNormalsMeshS();
3372	3817
3373	3818	refreshContents();
3374	3819	}
..	..	@@ -3541,8 +3986,8 @@
3541	3986
3542	3987	void ParseVertices()
3543	3988	{
3544		- boolean epsequal = GrafreeD.epsequal;
3545		- GrafreeD.epsequal = true;
	3989	+ boolean epsequal = Grafreed.epsequal;
	3990	+ Grafreed.epsequal = true;
3546	3991
3547	3992	for (int i=0; i<group.selection.size(); i++)
3548	3993	{
..	..	@@ -3567,7 +4012,7 @@
3567	4012	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3568	4013	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3569	4014
3570		- g.add(GrafreeD.clipboard);
	4015	+ g.add(Grafreed.clipboard);
3571	4016
3572	4017	buffer.add(g);
3573	4018	}
..	..	@@ -3582,7 +4027,7 @@
3582	4027	makeSomething(buffer, i==group.selection.size()-1);
3583	4028	}
3584	4029
3585		- GrafreeD.epsequal = epsequal;
	4030	+ Grafreed.epsequal = epsequal;
3586	4031
3587	4032	refreshContents();
3588	4033	}
..	..	@@ -3600,7 +4045,16 @@
3600	4045	String pigment = Object3D.GetPigment(tex);
3601	4046	//String bump = Object3D.GetBump(tex);
3602	4047
3603		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4048	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4049	+
	4050	+ try
	4051	+ {
	4052	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4053	+ }
	4054	+ catch (Exception e)
	4055	+ {
	4056	+ System.err.println("FAIL: " + node);
	4057	+ }
3604	4058
3605	4059	double s = v.s;
3606	4060
..	..	@@ -3732,7 +4186,7 @@
3732	4186	return;
3733	4187
3734	4188	Object3D poses = group.selection.get(0);
3735		- Object3D ref = GrafreeD.clipboard.get(0);
	4189	+ Object3D ref = Grafreed.clipboard.get(0);
3736	4190
3737	4191	Object3D newgroup = new Object3D("Po:" + poses.name);
3738	4192
..	..	@@ -3926,9 +4380,9 @@
3926	4380
3927	4381	void ClipMesh()
3928	4382	{
3929		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4383	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3930	4384	{
3931		- Object3D content = GrafreeD.clipboard.get(0);
	4385	+ Object3D content = Grafreed.clipboard.get(0);
3932	4386
3933	4387	if (content instanceof cGroup && ((cGroup)content).transientlink )
3934	4388	content = ((cGroup)content).get(0);
..	..	@@ -3937,7 +4391,7 @@
3937	4391	// {
3938	4392	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3939	4393	// }
3940		- group.selection.ClipMesh(GrafreeD.clipboard);
	4394	+ group.selection.ClipMesh(Grafreed.clipboard);
3941	4395	}
3942	4396	// group.selection.ClipMesh(GrafreeD.clipboard);
3943	4397	System.out.println("DONE.");
..	..	@@ -3984,6 +4438,18 @@
3984	4438	void MarkLeaves(boolean hide)
3985	4439	{
3986	4440	group.selection.MarkLeaves(hide);
	4441	+ refreshContents();
	4442	+ }
	4443	+
	4444	+ void RewindLeaves(boolean hide)
	4445	+ {
	4446	+ group.selection.RewindLeaves(hide);
	4447	+ refreshContents();
	4448	+ }
	4449	+
	4450	+ void RandomLeaves(boolean hide)
	4451	+ {
	4452	+ group.selection.RandomLeaves(hide);
3987	4453	refreshContents();
3988	4454	}
3989	4455
..	..	@@ -4058,10 +4524,6 @@
4058	4524	// }
4059	4525	// }
4060	4526
4061		- static boolean allparams = true;
4062		-
4063		- static Vector<Object3D> listUI = new Vector<Object3D>();
4064		-
4065	4527	void EditSelection(boolean newWindow)
4066	4528	{
4067	4529	// aConstraints.gridy = 0;
..	..	@@ -4069,10 +4531,10 @@
4069	4531	{
4070	4532	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4071	4533	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4072		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4534	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4073	4535
4074	4536	Object3D elem = (Object3D)group.selection.elementAt(i);
4075		- if(elem != group)
	4537	+ if(elem != group \|\| !newWindow)
4076	4538	{
4077	4539	// if (!(elem instanceof Composite))
4078	4540	// newWindow = false;
..	..	@@ -4155,6 +4617,17 @@
4155	4617
4156	4618	freezemodel = true;
4157	4619
	4620	+ //for (Object3D obj : listUI)
	4621	+ for (int i=listUI.size(); --i>=0;)
	4622	+ {
	4623	+ Object3D obj = listUI.elementAt(i);
	4624	+ if (!obj.pinned)
	4625	+ {
	4626	+ obj.CloseUI();
	4627	+ listUI.remove(i);
	4628	+ }
	4629	+ }
	4630	+
4158	4631	/**/
4159	4632	//switch (event.id)
4160	4633	{
..	..	@@ -4162,7 +4635,6 @@
4162	4635	//case 702: // Event.LIST_DESELECT
4163	4636	group.deselectAll();
4164	4637	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4165		- objEditor.ClearInfo(); // .GetMaterial());
4166	4638	if (tps != null)
4167	4639	{
4168	4640	for (int i=0; i < tps.length; i++)
..	..	@@ -4171,10 +4643,8 @@
4171	4643
4172	4644	//if (child.parent != null)
4173	4645	//child.parent.addSelectee(child);
	4646	+ objEditor.SetMaterial(child);
4174	4647	group.addSelectee(child);
4175		- objEditor.SetMaterial(child); // .GetMaterial());
4176		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4177		- System.err.println("info : " + child.GetPath());
4178	4648	}
4179	4649	}
4180	4650	// else
..	..	@@ -4184,20 +4654,28 @@
4184	4654	// System.err.println("info : " + group.GetPath());
4185	4655	// }
4186	4656
4187		- objEditor.SetText(); // jan 2014
4188		-
4189		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4657	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4190	4658	CameraPane.flash = true;
4191	4659
4192		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4660	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4193	4661	// a camera
4194	4662	{
4195		- CameraPane.camerachangeframe = 0; // don't refuse it
4196		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4663	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4664	+ {
	4665	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4666	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4667	+ }
4197	4668	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4198	4669	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4199	4670	}
4200	4671
	4672	+ if (tps != null && tps.length == 1)
	4673	+ {
	4674	+ EditSelection(false);
	4675	+ }
	4676	+
	4677	+ SetPinStates(tps != null && tps.length > 0);
	4678	+
4201	4679	refreshContents();
4202	4680	//return true;
4203	4681	}
..	..	@@ -4206,6 +4684,33 @@
4206	4684
4207	4685	freezemodel = false;
4208	4686	}
	4687	+
	4688	+ void SetPinStates(boolean enabled)
	4689	+ {
	4690	+ editButton.setEnabled(enabled);
	4691	+ uneditButton.setEnabled(enabled);
	4692	+ }
	4693	+
	4694	+ void refreshContents(boolean cp)
	4695	+ {
	4696	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4697	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4698	+ {
	4699	+ objEditor.ClearInfo(); // .GetMaterial());
	4700	+
	4701	+ for (int i=0; i < group.selection.Size(); i++)
	4702	+ {
	4703	+ Object3D child = (Object3D) group.selection.get(i);
	4704	+
	4705	+ objEditor.AddInfo(child, this, true);
	4706	+ System.err.println("info : " + child.GetPath());
	4707	+ }
	4708	+
	4709	+ objEditor.SetText(); // jan 2014
	4710	+ }
	4711	+
	4712	+ super.refreshContents(cp);
	4713	+ }
4209	4714
4210	4715	void linkSomething(Object3D thing)
4211	4716	{
..	..	@@ -4277,16 +4782,19 @@
4277	4782	{
4278	4783	if (group.selection.isEmpty())
4279	4784	return;
4280		- GrafreeD.clipboardIsTempGroup = false;
	4785	+
	4786	+ Grafreed.clipboardIsTempGroup = false;
4281	4787	Composite tGroup = null;
4282	4788	if (group.selection.size() > 0) // 1)
4283	4789	{
4284	4790	tGroup = new cGroup();
4285		- GrafreeD.clipboardIsTempGroup = true;
	4791	+ Grafreed.clipboardIsTempGroup = true;
4286	4792	}
4287	4793
4288	4794	if (cut)
4289	4795	{
	4796	+ if (Globals.SAVEONMAKE)
	4797	+ Save();
4290	4798	//int indices[] = jList.getSelectedIndices();
4291	4799	//for (int i = indices.length - 1; i >= 0; i--)
4292	4800	//jList.remove(indices[i]);
..	..	@@ -4322,16 +4830,16 @@
4322	4830	//System.out.println("cut " + child);
4323	4831	//System.out.println("parent = " + child.parent);
4324	4832	// tmp.addChild(child);
4325		- if (GrafreeD.clipboardIsTempGroup)
	4833	+ if (Grafreed.clipboardIsTempGroup)
4326	4834	tGroup.add/Child/(tmp);
4327	4835	else
4328		- GrafreeD.clipboard = tmp;
	4836	+ Grafreed.clipboard = tmp;
4329	4837	}
4330	4838	else
4331		- if (GrafreeD.clipboardIsTempGroup)
	4839	+ if (Grafreed.clipboardIsTempGroup)
4332	4840	tGroup.add/Child/(child);
4333	4841	else
4334		- GrafreeD.clipboard = child;
	4842	+ Grafreed.clipboard = child;
4335	4843	}
4336	4844
4337	4845	//ResetModel();
..	..	@@ -4363,21 +4871,23 @@
4363	4871	//System.out.println("cut " + elem);
4364	4872	//System.out.println("parent = " + elem.parent);
4365	4873	// tmp.addChild(elem);
4366		- if (GrafreeD.clipboardIsTempGroup)
	4874	+ if (Grafreed.clipboardIsTempGroup)
4367	4875	tGroup.add/Child/(tmp);
4368	4876	else
4369		- GrafreeD.clipboard = tmp;
	4877	+ Grafreed.clipboard = tmp;
4370	4878	}
4371	4879	else
4372		- if (GrafreeD.clipboardIsTempGroup)
	4880	+ if (Grafreed.clipboardIsTempGroup)
4373	4881	tGroup.add/Child/(child);
4374	4882	else
4375		- GrafreeD.clipboard = child;
	4883	+ Grafreed.clipboard = child;
4376	4884	}
4377	4885
4378	4886	}
4379		- if (GrafreeD.clipboardIsTempGroup)
4380		- GrafreeD.clipboard = tGroup;
	4887	+
	4888	+ if (Grafreed.clipboardIsTempGroup)
	4889	+ Grafreed.clipboard = tGroup;
	4890	+
4381	4891	if (cut)
4382	4892	{
4383	4893	ResetModel();
..	..	@@ -4391,7 +4901,7 @@
4391	4901	// return;
4392	4902	boolean first = true;
4393	4903
4394		- if (GrafreeD.clipboardIsTempGroup)
	4904	+ if (Grafreed.clipboardIsTempGroup)
4395	4905	{
4396	4906	Composite temp;
4397	4907
..	..	@@ -4402,7 +4912,7 @@
4402	4912	temp = (Composite)Applet3D.clipboard.deepCopy();
4403	4913	*/
4404	4914	Object3D elem;
4405		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4915	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4406	4916	{
4407	4917	Object3D child = (Object3D)e.nextElement();
4408	4918
..	..	@@ -4436,14 +4946,14 @@
4436	4946	//Object3D cb = Applet3D.clipboard;
4437	4947	//temp.addChild(cb);
4438	4948	//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());
	4949	+ assert(Grafreed.clipboard.parent == null);
	4950	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4951	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4952	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4953	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4444	4954	else
4445		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4446		- GrafreeD.clipboard.get(0).parent = keepparent;
	4955	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4956	+ Grafreed.clipboard.get(0).parent = keepparent;
4447	4957	}
4448	4958
4449	4959	ResetModel();
..	..	@@ -4492,9 +5002,9 @@
4492	5002	{
4493	5003	boolean first = true;
4494	5004
4495		- if (GrafreeD.clipboardIsTempGroup)
	5005	+ if (Grafreed.clipboardIsTempGroup)
4496	5006	{
4497		- Composite temp = (Composite)GrafreeD.clipboard;
	5007	+ Composite temp = (Composite)Grafreed.clipboard;
4498	5008	Object3D copy;
4499	5009	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4500	5010	{
..	..	@@ -4504,7 +5014,7 @@
4504	5014	}
4505	5015	} else
4506	5016	{
4507		- linkSomething(GrafreeD.clipboard); //.get(0));
	5017	+ linkSomething(Grafreed.clipboard); //.get(0));
4508	5018	}
4509	5019	}
4510	5020	}
..	..	@@ -4909,21 +5419,6 @@
4909	5419	}
4910	5420	*/
4911	5421
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	5422	/*
4928	5423	public void Callback(Object obj)
4929	5424	{
..	..	@@ -4947,26 +5442,9 @@
4947	5442	}
4948	5443	*/
4949	5444
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	5445	String GetFile(String dialogName)
4968	5446	{
4969		- if (GrafreeD.standAlone)
	5447	+ if (Grafreed.standAlone)
4970	5448	{
4971	5449	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4972	5450	browser.show();
..	..	@@ -5034,7 +5512,31 @@
5034	5512	cButton clearpanelButton;
5035	5513	cButton unselectButton;
5036	5514
	5515	+ cButton restoreCameraButton;
	5516	+
	5517	+ cButton minButton;
	5518	+ cButton maxButton;
	5519	+ cButton fullButton;
	5520	+ cButton saveButton;
5037	5521	cButton oneStepButton;
	5522	+
	5523	+ cButton groupButton;
	5524	+ cButton ungroupButton;
	5525	+ cButton compositeButton;
	5526	+ cButton switchButton;
	5527	+ cButton loopButton;
	5528	+ cButton textureButton;
	5529	+
	5530	+ cButton gridButton;
	5531	+ cButton boxButton;
	5532	+ cButton sphereButton;
	5533	+ cButton coneButton;
	5534	+ cButton torusButton;
	5535	+ cButton superButton;
	5536	+ cButton kleinButton;
	5537	+ cButton particlesButton;
	5538	+ cButton overlayButton;
	5539	+ cButton lightButton;
5038	5540
5039	5541	cButton screenfitButton;
5040	5542	cButton screenfitpointButton;
..	..	@@ -5047,14 +5549,6 @@
5047	5549
5048	5550	cButton setsupportButton;
5049	5551
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	5552	//
5059	5553	//Composite
5060	5554	Object3D // to do !!
..	..	@@ -5064,9 +5558,11 @@
5064	5558	//JTree jTree;
5065	5559	private MenuItem lookAtItem;
5066	5560	private MenuItem lookFromItem;
5067		- private MenuItem switchItem;
	5561	+ private MenuItem switchViewItem;
5068	5562	private MenuItem cutItem;
5069		- private MenuItem duplicateItem;
	5563	+ private MenuItem undoItem;
	5564	+ private MenuItem redoItem;
	5565	+ private JMenuItem duplicateItem;
5070	5566	private MenuItem cloneItem;
5071	5567	private MenuItem cloneSupportItem;
5072	5568	private MenuItem overwriteGeoItem;
..	..	@@ -5079,7 +5575,7 @@
5079	5575	private MenuItem linkverticesItem;
5080	5576	private MenuItem relinkverticesItem;
5081	5577	private MenuItem setMasterItem;
5082		- private MenuItem resetMeshItem;
	5578	+ private MenuItem resetAllItem;
5083	5579	private MenuItem stepAllItem;
5084	5580	private MenuItem revertMeshItem;
5085	5581	private MenuItem poseMeshItem;
..	..	@@ -5129,6 +5625,10 @@
5129	5625	private MenuItem showleavesItem;
5130	5626	private MenuItem markleavesItem;
5131	5627	private MenuItem unmarkleavesItem;
	5628	+ private MenuItem rewindleavesItem;
	5629	+ private MenuItem unrewindleavesItem;
	5630	+ private MenuItem randomleavesItem;
	5631	+ private MenuItem unrandomleavesItem;
5132	5632
5133	5633	private MenuItem flipVItem;
5134	5634	private MenuItem unflipVItem;
..	..	@@ -5140,15 +5640,17 @@
5140	5640	private MenuItem panoTexturesItem;
5141	5641
5142	5642	private MenuItem resetCentroidItem;
5143		- private MenuItem transformgeometryItem;
	5643	+ private MenuItem resetCentroidXZItem;
5144	5644	private MenuItem resetTransformItem;
	5645	+ private MenuItem transformGeometryItem;
	5646	+ private MenuItem transformChildrenItem;
5145	5647	private MenuItem hideItem;
5146	5648	private MenuItem grabItem;
5147	5649	private MenuItem backItem;
5148	5650	private MenuItem frontItem;
5149	5651	private MenuItem cameraItem;
5150	5652	private MenuItem compositeItem;
5151		- private MenuItem randomItem;
	5653	+ private MenuItem switchItem;
5152	5654	private MenuItem physicsItem;
5153	5655	private MenuItem frameselectorItem;
5154	5656	private MenuItem scriptNodeItem;
..	..	@@ -5210,11 +5712,6 @@
5210	5712	private MenuItem doubleItem;
5211	5713	private MenuItem tripleItem;
5212	5714
5213		- private MenuItem importGFDItem;
5214		- private MenuItem importVRMLX3DItem;
5215		- private MenuItem import3DSItem;
5216		- private MenuItem importOBJItem;
5217		-
5218	5715	private MenuItem computeAOItem;
5219	5716	private MenuItem recompileItem;
5220	5717	private MenuItem editScriptItem;
..	..	@@ -5224,4 +5721,8 @@
5224	5721	private MenuItem analyzeItem;
5225	5722	private MenuItem dumpItem;
5226	5723	//boolean freezemodel = false;
	5724	+
	5725	+ Menu cameraMenu;
	5726	+ MenuItem editCameraItem;
	5727	+ MenuItem restoreCameraItem;
5227	5728	}