~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("Show 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,216 @@
482	580	oe.radioPanel.add(dummyButton);
483	581	oe.buttonGroup.add(dummyButton);
484	582	*/
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 1;
	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	+ if (Globals.ADVANCED)
	594	+ {
	595	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ maxButton.setToolTipText("Maximize window");
	597	+ maxButton.addActionListener(this);
	598	+ }
	599	+
	600	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	601	+ fullButton.setToolTipText("Full-screen window");
	602	+ fullButton.addActionListener(this);
	603	+
	604	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	605	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	606	+ restoreCameraButton.addActionListener(this);
	607	+
	608	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ undoButton.setToolTipText("Undo changes");
	610	+ undoButton.addActionListener(this);
	611	+ undoButton.setEnabled(false);
	612	+
	613	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	614	+ redoButton.setToolTipText("Redo changes");
	615	+ redoButton.addActionListener(this);
	616	+ redoButton.setEnabled(false);
	617	+
	618	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	619	+ saveButton.setToolTipText("Save changes");
	620	+ saveButton.addActionListener(this);
	621	+
	622	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	623	+ liveCB.setToolTipText("Enable animation");
489	624	liveCB.addItemListener(this);
490	625
491		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	626	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492	627	oneStepButton.setToolTipText("Animate one step forward");
493	628	oneStepButton.addActionListener(this);
494	629
495		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	630	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
496	631	fastCB.setToolTipText("Fast mode");
497	632	fastCB.addItemListener(this);
498	633
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);
	634	+ //oe.toolboxPanel.Return();
	635	+
	636	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
504	637	screenfitButton.setToolTipText("Screen fit");
505	638	screenfitButton.addActionListener(this);
	639	+
	640	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	641	+// trackCB.setToolTipText("Enable tracking");
	642	+// trackCB.addItemListener(this);
506	643
507	644	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
508	645	// screenfitpointButton.addActionListener(this);
509	646
510	647	if (Globals.ADVANCED)
511	648	{
512		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	649	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
513	650	snapobjectButton.addActionListener(this);
514	651	snapobjectButton.setToolTipText("Snap Object");
515	652	}
516	653
517		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
518		- flashSelectionButton.setToolTipText("Show selection");
519		- flashSelectionButton.addActionListener(this);
	654	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
520	655
521		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
522		-
523		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	656	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
524	657	twoButton.setToolTipText("Show center view only");
525	658	twoButton.addActionListener(this);
526		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	659	+ this.fullscreenLayout = twoButton;
	660	+
	661	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
527	662	fourButton.addActionListener(this);
528	663	fourButton.setToolTipText("Show left panel only");
529		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
530	665	sixButton.setToolTipText("2-column layout left");
531	666	sixButton.addActionListener(this);
532		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	667	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
533	668	threeButton.setToolTipText("2-column layout right");
534	669	threeButton.addActionListener(this);
535		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	670	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
536	671	sevenButton.setToolTipText("3-column layout");
537	672	sevenButton.addActionListener(this);
538	673	//
539	674
540		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	675	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
541	676	rootButton.setToolTipText("Edit selection in new tab");
542	677	rootButton.addActionListener(this);
543	678
544		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	679	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
545	680	closeButton.setToolTipText("Close tab");
546	681	closeButton.addActionListener(this);
547	682	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
548	683	//clearButton.addActionListener(this);
549		-
550		- cGridBag commandsPanel = new cGridBag();
	684	+
	685	+ // INSERT
	686	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	687	+ gridButton.setToolTipText("Create grid");
	688	+ gridButton.addActionListener(this);
	689	+
	690	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	691	+ boxButton.setToolTipText("Create box");
	692	+ boxButton.addActionListener(this);
	693	+
	694	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	695	+ sphereButton.setToolTipText("Create sphere");
	696	+ sphereButton.addActionListener(this);
	697	+
	698	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	699	+ coneButton.setToolTipText("Create cone");
	700	+ coneButton.addActionListener(this);
	701	+
	702	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	703	+ torusButton.setToolTipText("Create torus");
	704	+ torusButton.addActionListener(this);
	705	+
	706	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	707	+ superButton.setToolTipText("Create superellipsoid");
	708	+ superButton.addActionListener(this);
	709	+
	710	+ if (Globals.ADVANCED)
	711	+ {
	712	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	713	+ kleinButton.setToolTipText("Create Klein bottle");
	714	+ kleinButton.addActionListener(this);
	715	+ }
551	716
552		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
553		- editButton.setToolTipText("Edit selection");
	717	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	718	+ particlesButton.setToolTipText("Create particle system");
	719	+ particlesButton.addActionListener(this);
	720	+
	721	+ oe.toolboxPanel.Return();
	722	+
	723	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	724	+ groupButton.setToolTipText("Create group");
	725	+ groupButton.addActionListener(this);
	726	+
	727	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	728	+ compositeButton.setToolTipText("Create composite");
	729	+ compositeButton.addActionListener(this);
	730	+
	731	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	732	+ switchButton.setToolTipText("Create item switcher");
	733	+ switchButton.addActionListener(this);
	734	+
	735	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	736	+ loopButton.setToolTipText("Create loop");
	737	+ loopButton.addActionListener(this);
	738	+
	739	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	740	+ textureButton.setToolTipText("Create texture");
	741	+ textureButton.addActionListener(this);
	742	+
	743	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	744	+ overlayButton.setToolTipText("Create overlay");
	745	+ overlayButton.addActionListener(this);
	746	+
	747	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	748	+ lightButton.setToolTipText("Create light");
	749	+ lightButton.addActionListener(this);
	750	+
	751	+ for (int i=6; --i>=0;)
	752	+ {
	753	+ oe.toolboxPanel.Return();
	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	+ oe.toolboxPanel.add(new cGridBag());
	759	+ oe.toolboxPanel.add(new cGridBag());
	760	+ oe.toolboxPanel.add(new cGridBag());
	761	+ }
	762	+
	763	+ // EDIT panel
	764	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	765	+ editButton.setToolTipText("Pin selection controls");
554	766	editButton.addActionListener(this);
555	767
556		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
557		- uneditButton.setToolTipText("Unedit selection");
	768	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	769	+ uneditButton.setToolTipText("Remove selection controls");
558	770	uneditButton.addActionListener(this);
559	771
560		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
561		- allParamsButton.setToolTipText("Edit all params");
	772	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	773	+ allParamsButton.setToolTipText("Show all controle");
562	774	allParamsButton.addActionListener(this);
563	775
564		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	776	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565	777	clearPanelButton.setToolTipText("Clear edit panel");
566	778	clearPanelButton.addActionListener(this);
567	779
568		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	780	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569	781	unselectButton.setToolTipText("Unselect");
570	782	unselectButton.addActionListener(this);
571	783
572		- commandsPanel.preferredHeight = 1;
	784	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	785	+ flashSelectionButton.setToolTipText("Highlight selection");
	786	+ flashSelectionButton.addActionListener(this);
573	787
574		- oe.treePanel.add(commandsPanel);
575		- oe.treePanel.Return();
	788	+ editCommandsPanel.preferredHeight = 1;
	789	+
	790	+ SetPinStates(false);
	791	+// oe.treePanel.add(commandsPanel);
	792	+// oe.treePanel.Return();
576	793
577	794	// oe.aConstraints.gridx += 1;
578	795	// oe.aConstraints.weighty = 0;
..	..	@@ -589,27 +806,12 @@
589	806
590	807	JScrollPane jSP;
591	808	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
592		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	809	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
593	810	ResetModel();
594	811
595	812	oe.treePanel.add(jSPPanel);
596	813	oe.treePanel.Return();
597	814
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	815	oe.treePanel.add(copyOptionsPanel);
614	816	oe.treePanel.Return();
615	817
..	..	@@ -640,23 +842,43 @@
640	842
641	843	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
642	844	{
	845	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	846	+ colorCB.setToolTipText("Copy color when dropped");
	847	+ colorCB.addItemListener(this);
	848	+
	849	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	850	+ materialCB.setToolTipText("Copy material when dropped");
	851	+ materialCB.addItemListener(this);
	852	+
	853	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	854	+ textureCB.setToolTipText("Copy texture when dropped");
	855	+ textureCB.addItemListener(this);
	856	+
	857	+ panel.Return();
	858	+
643	859	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
644	860	boxCB.setToolTipText("Display bounding boxes");
645	861	boxCB.addItemListener(this);
646	862
647	863	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
648		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	864	+ zoomBoxCB.setToolTipText("Display only for wheel");
649	865	zoomBoxCB.addItemListener(this);
650	866
651		- if (Globals.ADVANCED)
	867	+ if (true) // Globals.ADVANCED)
652	868	{
653		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
654		- supportCB.setToolTipText("Enable rigging");
655		- supportCB.addItemListener(this);
	869	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	870	+// supportCB.setToolTipText("Enable rigging");
	871	+// supportCB.addItemListener(this);
	872	+
	873	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	874	+ freezeCB.setToolTipText("Fast moving camera");
	875	+ freezeCB.addItemListener(this);
656	876
657	877	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
658	878	// localCB.addItemListener(this);
659	879
	880	+ panel.Return();
	881	+
660	882	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
661	883	crowdCB.setToolTipText("Used for crowds");
662	884	crowdCB.addItemListener(this);
..	..	@@ -673,6 +895,8 @@
673	895	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
674	896	// speakerMocapCB.addItemListener(this);
675	897
	898	+ panel.Return();
	899	+
676	900	if (false)
677	901	{
678	902	// handled in scripts
..	..	@@ -687,32 +911,72 @@
687	911	//constraints.gridy += 1;
688	912	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
689	913	smoothfocusCB.addItemListener(this);
	914	+ panel.Return();
690	915	}
691	916
692	917	//constraints.gridx += 1;
693	918	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
694	919	// debugCB.addItemListener(this);
695	920
	921	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	922	+ trackCB.setToolTipText("Enable tracking target");
	923	+ trackCB.addItemListener(this);
	924	+
696	925	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	926	+ oeilCB.setToolTipText("Move camera when tracking");
697	927	oeilCB.addItemListener(this);
698	928
	929	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	930	+ shadowCB.setToolTipText("When live compute shadows");
	931	+ shadowCB.addItemListener(this);
	932	+
	933	+ panel.Return();
	934	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	935	+ toggleTextureCB.setToolTipText("Load textures");
	936	+ toggleTextureCB.addItemListener(this);
	937	+
	938	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	939	+ toggleSwitchCB.setToolTipText("Choose a single item");
	940	+ toggleSwitchCB.addItemListener(this);
	941	+
	942	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	943	+ autosaveCB.setToolTipText("On structure change");
	944	+ autosaveCB.addItemListener(this);
	945	+
	946	+ panel.Return();
	947	+ if (Globals.ADVANCED)
	948	+ {
699	949	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
700	950	lookAtCB.setToolTipText("Look-at target");
701	951	lookAtCB.addItemListener(this);
	952	+ }
702	953
703	954	}
704	955
705	956	cGridBag fill = new cGridBag();
706		-
707	957	fill.preferredHeight = 200;
	958	+ cGridBag fill2 = new cGridBag();
	959	+ fill2.preferredHeight = 200;
	960	+ cGridBag fill3 = new cGridBag();
	961	+ fill3.preferredHeight = 200;
708	962
709	963	panel.add(fill);
	964	+ panel.add(fill2);
	965	+ panel.add(fill3);
710	966
711	967	}
712	968
713	969	void EditObject(Object3D obj)
714	970	{
715	971	cRadio radioButton = new cRadio(obj.name);
	972	+
	973	+ // Patch to avoid bug with transparency.
	974	+ radioButton.hadMaterial = obj.material != null;
	975	+ if (!radioButton.hadMaterial)
	976	+ {
	977	+ obj.material = new cMaterial();
	978	+ }
	979	+
716	980	radioButton.SetObject(obj);
717	981	radioButton.layout = sevenButton;
718	982	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -721,8 +985,11 @@
721	985	buttonGroup.add(radioButton);
722	986	radioButton.doClick();
723	987	}
	988	+
724	989	void SetupViews(ObjEditor oe)
725	990	{
	991	+ theFrame = this;
	992	+
726	993	oe.SetupViews();
727	994
728	995	System.out.println("SetupViews");
..	..	@@ -731,23 +998,28 @@
731	998	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
732	999	}
733	1000
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;
	1001	+ cToggleButton liveCB;
	1002	+ cCheckBox supportCB;
	1003	+ cCheckBox localCB;
	1004	+ cCheckBox crowdCB;
	1005	+ cCheckBox smoothCB;
	1006	+ cToggleButton fastCB;
	1007	+ cCheckBox slowCB;
	1008	+ cCheckBox boxCB;
	1009	+ cCheckBox zoomBoxCB;
	1010	+ cCheckBox freezeCB;
	1011	+ //cToggleButton trackCB;
	1012	+ cCheckBox trackCB;
	1013	+ cCheckBox smoothfocusCB;
745	1014	// JCheckBox speakerMocapCB;
746		- JCheckBox speakerCameraCB;
747		- JCheckBox speakerFocusCB;
748		- JCheckBox debugCB;
749		- JCheckBox oeilCB;
750		- JCheckBox lookAtCB;
	1015	+ cCheckBox speakerCameraCB;
	1016	+ cCheckBox speakerFocusCB;
	1017	+ cCheckBox debugCB;
	1018	+
	1019	+ cCheckBox oeilCB;
	1020	+ cCheckBox shadowCB;
	1021	+ cCheckBox autosaveCB;
	1022	+ cCheckBox lookAtCB;
751	1023
752	1024	// static int COLOR = 1;
753	1025	// static int MATERIAL = 2;
..	..	@@ -755,9 +1027,9 @@
755	1027
756	1028	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
757	1029
758		- JCheckBox colorCB;
759		- JCheckBox materialCB;
760		- JCheckBox textureCB;
	1030	+ cCheckBox colorCB;
	1031	+ cCheckBox materialCB;
	1032	+ cCheckBox textureCB;
761	1033
762	1034	public void itemStateChanged(ItemEvent e)
763	1035	{
..	..	@@ -785,6 +1057,7 @@
785	1057	} else if(e.getSource() == liveCB)
786	1058	{
787	1059	cameraView.ToggleLive();
	1060	+ refreshContents(false);
788	1061	}
789	1062	else if(e.getSource() == supportCB)
790	1063	{
..	..	@@ -849,6 +1122,18 @@
849	1122	{
850	1123	cameraView.ToggleOeil();
851	1124	}
	1125	+ else if(e.getSource() == shadowCB)
	1126	+ {
	1127	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1128	+ }
	1129	+ else if(e.getSource() == freezeCB)
	1130	+ {
	1131	+ Globals.FREEZEONMOVE ^= true;
	1132	+ }
	1133	+ else if(e.getSource() == autosaveCB)
	1134	+ {
	1135	+ Globals.SAVEONMAKE ^= true;
	1136	+ }
852	1137	else if(e.getSource() == lookAtCB)
853	1138	{
854	1139	cameraView.ToggleLookAt();
..	..	@@ -865,7 +1150,8 @@
865	1150
866	1151	/**/
867	1152	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
868		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1153	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1154	+ TreePath path = objEditor.jTree.getSelectionPath();
869	1155	if ((path == null) \|\| (path.getPathCount() <= 1)) {
870	1156	// We can't move the root node or an empty selection
871	1157	return;
..	..	@@ -937,7 +1223,9 @@
937	1223	// objEditor.DropFile((java.io.File[]) object, true);
938	1224	// return;
939	1225	// }
940		- if (string.charAt(0) == '/')
	1226	+
	1227	+ // File path for Mac and Windows
	1228	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
941	1229	{
942	1230	// file(s)
943	1231	String[] names = string.split("\n");
..	..	@@ -964,7 +1252,7 @@
964	1252
965	1253	flashIt = false;
966	1254	CameraPane pane = (CameraPane) target;
967		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1255	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
968	1256	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
969	1257
970	1258	if (group.selection.size() == 1)
..	..	@@ -980,23 +1268,33 @@
980	1268
981	1269	assert target == objEditor.jTree;
982	1270	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1271	+ Object3D destinationLeaf;
983	1272	try {
984		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1273	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
985	1274	} catch (Exception e) {
986	1275	System.out.println("destinationPath : " + destinationPath);
987	1276	return;
988	1277	}
989	1278
990		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1279	+ for (int i=group.selection.size(); --i>=0;)
991	1280	{
	1281	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1282	+
	1283	+ // Cannot move into itself
	1284	+ if (child == destinationLeaf)
	1285	+ return;
	1286	+ }
	1287	+
	1288	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1289	+// {
992	1290	loadClipboard(true);
993	1291	objEditor.jTree.setSelectionPath(destinationPath);
994	1292	pasteInto(false, false);
995		- } else {
996		- loadClipboard(false);
997		- objEditor.jTree.setSelectionPath(destinationPath);
998		- pasteInto(false, false); // true); // ???
999		- }
	1293	+// } else {
	1294	+// loadClipboard(false);
	1295	+// objEditor.jTree.setSelectionPath(destinationPath);
	1296	+// pasteInto(false, false); // true); // ???
	1297	+// }
1000	1298	}
1001	1299	public void dropActionChanged(DropTargetDragEvent dtde)
1002	1300	// Called if the user has modified the current drop gesture
..	..	@@ -1101,22 +1399,30 @@
1101	1399	{
1102	1400	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1103	1401	//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);
	1402	+// gridItem = menu.add(new MenuItem("Grid"));
	1403	+// gridItem.addActionListener(this);
	1404	+// rectoidItem = menu.add(new MenuItem("Box"));
	1405	+// rectoidItem.addActionListener(this);
	1406	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1407	+// ellipsoidItem.addActionListener(this);
	1408	+// coneItem = menu.add(new MenuItem("Cone"));
	1409	+// coneItem.addActionListener(this);
	1410	+// torusItem = menu.add(new MenuItem("Torus"));
	1411	+// torusItem.addActionListener(this);
	1412	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1413	+// superItem.addActionListener(this);
	1414	+
	1415	+ cameraItem = menu.add(new MenuItem("Camera"));
	1416	+ cameraItem.addActionListener(this);
	1417	+
	1418	+ if (!Globals.ADVANCED)
	1419	+ {
1116	1420	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1117	1421	kleinItem.addActionListener(this);
1118		- particleItem = menu.add(new MenuItem("Particle system"));
1119		- particleItem.addActionListener(this);
	1422	+ }
	1423	+
	1424	+// particleItem = menu.add(new MenuItem("Particle system"));
	1425	+// particleItem.addActionListener(this);
1120	1426	if (Globals.ADVANCED)
1121	1427	{
1122	1428	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1142,15 +1448,15 @@
1142	1448	}
1143	1449	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1144	1450	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);
	1451	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1452	+// overlayItem.addActionListener(this);
	1453	+// lightItem = menu.add(new MenuItem("Light"));
	1454	+// lightItem.addActionListener(this);
1149	1455	menu.add("-");
1150	1456	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1151	1457	//superLoopItem.addActionListener(this);
1152		- loopItem = menu.add(new MenuItem("Loop"));
1153		- loopItem.addActionListener(this);
	1458	+// loopItem = menu.add(new MenuItem("Loop"));
	1459	+// loopItem.addActionListener(this);
1154	1460	doubleItem = menu.add(new MenuItem("Fork"));
1155	1461	doubleItem.addActionListener(this);
1156	1462	if (Globals.ADVANCED)
..	..	@@ -1190,7 +1496,7 @@
1190	1496	memoryItem.addActionListener(this);
1191	1497	menu.add(analyzeItem = new MenuItem("Analyze"));
1192	1498	analyzeItem.addActionListener(this);
1193		- menu.add(dumpItem = new MenuItem("Dump"));
	1499	+ menu.add(dumpItem = new MenuItem("Print"));
1194	1500	dumpItem.addActionListener(this);
1195	1501	// menu.add(pathItem = new MenuItem("From-to path"));
1196	1502	// pathItem.addActionListener(this);
..	..	@@ -1331,9 +1637,24 @@
1331	1637	shadow.material = new cMaterial(obj.material);
1332	1638	shadow.material.diffuse = 0.0001f;
1333	1639	shadow.material.specular = 0.0001f;
	1640	+ //shadow.projectedVertices[1].x = 300;
1334	1641
1335	1642	makeSomething(shadow);
1336	1643	}
	1644	+
	1645	+ private void ClearUnpinned()
	1646	+ {
	1647	+ //for (Object3D obj : listUI)
	1648	+ for (int i=listUI.size(); --i>=0;)
	1649	+ {
	1650	+ Object3D obj = listUI.elementAt(i);
	1651	+ if (!obj.pinned)
	1652	+ {
	1653	+ obj.CloseUI();
	1654	+ listUI.remove(i);
	1655	+ }
	1656	+ }
	1657	+ }
1337	1658
1338	1659	/**
1339	1660	* applyExample
..	..	@@ -1537,9 +1858,9 @@
1537	1858
1538	1859	void Overwrite(int mask)
1539	1860	{
1540		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1861	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1541	1862	{
1542		- Object3D content = GrafreeD.clipboard.get(0);
	1863	+ Object3D content = Grafreed.clipboard.get(0);
1543	1864
1544	1865	if (content instanceof cGroup && ((cGroup)content).transientlink )
1545	1866	content = ((cGroup)content).get(0);
..	..	@@ -1578,7 +1899,7 @@
1578	1899	{
1579	1900	ScreenFit();
1580	1901	} else
1581		- if (source == switchItem)
	1902	+ if (source == switchViewItem)
1582	1903	{
1583	1904	cVector v1 = new cVector();
1584	1905	cVector v2 = new cVector();
..	..	@@ -1587,11 +1908,11 @@
1587	1908	objEditor.cameraView.renderCamera.setAim(v2, v1);
1588	1909	objEditor.cameraView.repaint();
1589	1910	} else
1590		- if (source == rectoidItem)
	1911	+ if (source == rectoidItem \|\| source == boxButton)
1591	1912	{
1592	1913	makeSomething(new Box());
1593	1914	} else
1594		- if (source == particleItem)
	1915	+ if (source == particleItem \|\| source == particlesButton)
1595	1916	{
1596	1917	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1597	1918	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1670,27 +1991,27 @@
1670	1991
1671	1992	makeSomething(obj);
1672	1993	} else
1673		- if (source == gridItem)
	1994	+ if (source == gridItem \|\| source == gridButton)
1674	1995	{
1675	1996	makeSomething(new Grid());
1676	1997	} else
1677		- if (source == ellipsoidItem)
	1998	+ if (source == ellipsoidItem \|\| source == sphereButton)
1678	1999	{
1679	2000	makeSomething(new Sphere());
1680	2001	} else
1681		- if (source == coneItem)
	2002	+ if (source == coneItem \|\| source == coneButton)
1682	2003	{
1683	2004	makeSomething(new Cone());
1684	2005	} else
1685		- if (source == torusItem)
	2006	+ if (source == torusItem \|\| source == torusButton)
1686	2007	{
1687	2008	makeSomething(new Torus());
1688	2009	} else
1689		- if (source == superItem)
	2010	+ if (source == superItem \|\| source == superButton)
1690	2011	{
1691	2012	makeSomething(new Superellipsoid());
1692	2013	} else
1693		- if (source == kleinItem)
	2014	+ if (source == kleinItem \|\| source == kleinButton)
1694	2015	{
1695	2016	makeSomething(new Klein());
1696	2017	} else
..	..	@@ -1710,7 +2031,7 @@
1710	2031	{
1711	2032	makeSomething(new BezierSurface());
1712	2033	} else
1713		- if (source == overlayItem)
	2034	+ if (source == overlayItem \|\| source == overlayButton)
1714	2035	{
1715	2036	/*
1716	2037	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1758,7 +2079,7 @@
1758	2079	s.setup();
1759	2080	makeSomething(s);
1760	2081	} else
1761		- if (source == lightItem)
	2082	+ if (source == lightItem \|\| source == lightButton)
1762	2083	{
1763	2084	makeSomething(new Light());
1764	2085	} else
..	..	@@ -1808,30 +2129,30 @@
1808	2129
1809	2130	group(g);
1810	2131	} else
1811		- if (source == loopItem)
	2132	+ if (source == loopItem \|\| source == loopButton)
1812	2133	{
1813	2134	Composite csg = new GroupLeaf();
1814	2135	csg.count = 5;
1815	2136	group(csg);
1816		- Composite child = new cGroup();
	2137	+ Composite child = new cGroup("Branch");
1817	2138	csg.addChild(child);
1818	2139	child.addChild(csg);
1819	2140	} else
1820	2141	if (source == doubleItem)
1821	2142	{
1822		- Composite csg = new GroupLeaf();
	2143	+ Composite csg = new GroupLeaf("Fork");
1823	2144	csg.count = 5;
1824	2145	group(csg);
1825		- Composite child = new cGroup();
	2146	+ Composite child = new cGroup("Branch A");
1826	2147	csg.addChild(child);
1827	2148	child.addChild(csg);
1828		- child = new cGroup();
	2149	+ child = new cGroup("Branch B");
1829	2150	csg.addChild(child);
1830	2151	child.addChild(csg);
1831	2152	} else
1832	2153	if (source == tripleItem)
1833	2154	{
1834		- Composite csg = new GroupLeaf();
	2155	+ Composite csg = new GroupLeaf("Trident");
1835	2156	csg.count = 4;
1836	2157	group(csg);
1837	2158	Composite child = new cGroup();
..	..	@@ -1843,23 +2164,6 @@
1843	2164	child = new cGroup();
1844	2165	csg.addChild(child);
1845	2166	child.addChild(csg);
1846		- } 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	2167	} else
1864	2168	if (source == computeAOItem)
1865	2169	{
..	..	@@ -1879,7 +2183,7 @@
1879	2183	if (source == invariantsItem)
1880	2184	{
1881	2185	System.out.println("Invariants:");
1882		- GrafreeD.grafreeD.universe.invariants();
	2186	+ Grafreed.grafreeD.universe.invariants();
1883	2187	} else
1884	2188	if (source == memoryItem)
1885	2189	{
..	..	@@ -1897,6 +2201,30 @@
1897	2201	if (source == dumpItem)
1898	2202	{
1899	2203	DumpObject();
	2204	+ } else
	2205	+ if (source == minButton)
	2206	+ {
	2207	+ Minimize();
	2208	+ } else
	2209	+ if (source == maxButton)
	2210	+ {
	2211	+ Maximize();
	2212	+ } else
	2213	+ if (source == fullButton)
	2214	+ {
	2215	+ ToggleFullScreen();
	2216	+ } else
	2217	+ if (source == undoButton)
	2218	+ {
	2219	+ Undo();
	2220	+ } else
	2221	+ if (source == redoButton)
	2222	+ {
	2223	+ Redo();
	2224	+ } else
	2225	+ if (source == saveButton)
	2226	+ {
	2227	+ Save();
1900	2228	} else
1901	2229	if (source == oneStepButton)
1902	2230	{
..	..	@@ -1952,12 +2280,20 @@
1952	2280	{
1953	2281	loadClipboard(true);
1954	2282	} else
	2283	+ if (source == undoItem)
	2284	+ {
	2285	+ Undo();
	2286	+ } else
	2287	+ if (source == redoItem)
	2288	+ {
	2289	+ Redo();
	2290	+ } else
1955	2291	if (source == duplicateItem)
1956	2292	{
1957		- Object3D keep = GrafreeD.clipboard;
	2293	+ Object3D keep = Grafreed.clipboard;
1958	2294	loadClipboard(false);
1959	2295	paste(false);
1960		- GrafreeD.clipboard = keep;
	2296	+ Grafreed.clipboard = keep;
1961	2297	} else
1962	2298	if (source == cloneItem)
1963	2299	{
..	..	@@ -2177,9 +2513,9 @@
2177	2513	// group.selection.get(0).setMasterThis(content); // should be identity
2178	2514	// refreshContents();
2179	2515	// }
2180		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2516	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2181	2517	{
2182		- Object3D content = GrafreeD.clipboard.get(0);
	2518	+ Object3D content = Grafreed.clipboard.get(0);
2183	2519
2184	2520	if (content instanceof cGroup && ((cGroup)content).transientlink )
2185	2521	content = ((cGroup)content).get(0);
..	..	@@ -2229,9 +2565,9 @@
2229	2565	} else
2230	2566	if (source == setMasterItem)
2231	2567	{
2232		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2568	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2233	2569	{
2234		- Object3D content = GrafreeD.clipboard.get(0);
	2570	+ Object3D content = Grafreed.clipboard.get(0);
2235	2571
2236	2572	if (content instanceof cGroup && ((cGroup)content).transientlink )
2237	2573	content = ((cGroup)content).get(0);
..	..	@@ -2244,9 +2580,9 @@
2244	2580	{
2245	2581	if (group.selection.size() == 1)
2246	2582	{
2247		- if (GrafreeD.clipboard.size() == 1)
	2583	+ if (Grafreed.clipboard.size() == 1)
2248	2584	{
2249		- Object3D content = GrafreeD.clipboard.get(0);
	2585	+ Object3D content = Grafreed.clipboard.get(0);
2250	2586
2251	2587	if (content instanceof cGroup && ((cGroup)content).transientlink )
2252	2588	content = ((cGroup)content).get(0);
..	..	@@ -2263,7 +2599,7 @@
2263	2599	{
2264	2600	RevertMeshes();
2265	2601	} else
2266		- if (source == resetMeshItem)
	2602	+ if (source == resetAllItem)
2267	2603	{
2268	2604	ResetAll();
2269	2605	} else
..	..	@@ -2283,9 +2619,9 @@
2283	2619	{
2284	2620	ClearSelection(true);
2285	2621	} else
2286		- if (source == grabItem)
	2622	+ if (source == grabItem \|\| source == groupButton)
2287	2623	{
2288		- group(new cGroup(), true);
	2624	+ group(new cGroup(), false); // true);
2289	2625	} else
2290	2626	if (source == hideItem)
2291	2627	{
..	..	@@ -2303,11 +2639,11 @@
2303	2639	{
2304	2640	makeSomething(new Camera());
2305	2641	} else
2306		- if (source == compositeItem)
	2642	+ if (source == compositeItem \|\| source == compositeButton)
2307	2643	{
2308	2644	group(new Composite());
2309	2645	} else
2310		- if (source == randomItem)
	2646	+ if (source == switchItem \|\| source == switchButton)
2311	2647	{
2312	2648	RandomNode random = new RandomNode();
2313	2649	group(random);
..	..	@@ -2409,7 +2745,7 @@
2409	2745	{
2410	2746	group(new cLinker());
2411	2747	} else
2412		- if (source == textureItem)
	2748	+ if (source == textureItem \|\| source == textureButton)
2413	2749	{
2414	2750	group(new TextureNode());
2415	2751	} else
..	..	@@ -2429,17 +2765,30 @@
2429	2765	{
2430	2766	CastShadow(2);
2431	2767	} else
2432		- if (source == ungroupItem)
	2768	+ if (source == ungroupItem \|\| source == ungroupButton)
2433	2769	{
2434		- //ungroup();
	2770	+ boolean hasRoot = false;
	2771	+
2435	2772	for (int i=0; i<group.selection.size(); i++)
2436	2773	{
2437		- Ungroup(group.selection.get(i));
	2774	+ if (group.selection.get(i) == group)
	2775	+ {
	2776	+ hasRoot = true;
	2777	+ break;
	2778	+ }
2438	2779	}
2439	2780
2440		- ClearSelection(false);
2441		-
2442		- refreshContents();
	2781	+ if (!hasRoot)
	2782	+ {
	2783	+ for (int i=0; i<group.selection.size(); i++)
	2784	+ {
	2785	+ Ungroup(group.selection.get(i));
	2786	+ }
	2787	+
	2788	+ ClearSelection(false);
	2789	+
	2790	+ refreshContents();
	2791	+ }
2443	2792	} else
2444	2793	if (source == genUVItem)
2445	2794	{
..	..	@@ -2451,7 +2800,7 @@
2451	2800	} else
2452	2801	if (source == genNormalsMESHItem)
2453	2802	{
2454		- GenNormals(true); // TODO
	2803	+ GenNormalsMESH();
2455	2804	} else
2456	2805	if (source == genNormalsORGANItem)
2457	2806	{
..	..	@@ -2516,6 +2865,22 @@
2516	2865	if (source == unmarkleavesItem)
2517	2866	{
2518	2867	MarkLeaves(false);
	2868	+ } else
	2869	+ if (source == rewindleavesItem)
	2870	+ {
	2871	+ RewindLeaves(true);
	2872	+ } else
	2873	+ if (source == unrewindleavesItem)
	2874	+ {
	2875	+ RewindLeaves(false);
	2876	+ } else
	2877	+ if (source == randomleavesItem)
	2878	+ {
	2879	+ RandomLeaves(true);
	2880	+ } else
	2881	+ if (source == unrandomleavesItem)
	2882	+ {
	2883	+ RandomLeaves(false);
2519	2884	} else
2520	2885	if (source == flipVItem)
2521	2886	{
..	..	@@ -2601,9 +2966,13 @@
2601	2966	{
2602	2967	SmoothMesh();
2603	2968	} else
2604		- if (source == transformgeometryItem)
	2969	+ if (source == transformGeometryItem)
2605	2970	{
2606	2971	TransformGeometry();
	2972	+ } else
	2973	+ if (source == transformChildrenItem)
	2974	+ {
	2975	+ TransformChildren();
2607	2976	} else
2608	2977	if (source == resetTransformItem)
2609	2978	{
..	..	@@ -2611,7 +2980,11 @@
2611	2980	} else
2612	2981	if (source == resetCentroidItem)
2613	2982	{
2614		- ResetCentroid();
	2983	+ ResetCentroid(true);
	2984	+ } else
	2985	+ if (source == resetCentroidXZItem)
	2986	+ {
	2987	+ ResetCentroid(false);
2615	2988	} else
2616	2989	if (source == resetParentItem)
2617	2990	{
..	..	@@ -2743,6 +3116,10 @@
2743	3116	if (source == twoButton)
2744	3117	{
2745	3118	radio.layout = twoButton;
	3119	+
	3120	+ if (CameraPane.FULLSCREEN)
	3121	+ fullscreenLayout = radio.layout;
	3122	+
2746	3123	// bug
2747	3124	//gridPanel.setDividerLocation(1.0);
2748	3125	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2775,10 +3152,31 @@
2775	3152	bigThree.ClearUI();
2776	3153	bigThree.add(centralPanel);
2777	3154	bigThree.FlushUI();
	3155	+
	3156	+ cameraView.requestFocusInWindow();
	3157	+
	3158	+// refreshContents(true);
	3159	+//
	3160	+// try
	3161	+// {
	3162	+// java.awt.Robot bot = new java.awt.Robot();
	3163	+// int mask = InputEvent.BUTTON1_MASK;
	3164	+// bot.mouseMove(100, 100);
	3165	+// bot.mousePress(mask);
	3166	+// bot.mouseRelease(mask);
	3167	+// }
	3168	+// catch (Exception e)
	3169	+// {
	3170	+//
	3171	+// }
	3172	+
2778	3173	} else
2779	3174	if (source == threeButton)
2780	3175	{
2781	3176	radio.layout = threeButton;
	3177	+
	3178	+ if (CameraPane.FULLSCREEN)
	3179	+ fullscreenLayout = radio.layout;
2782	3180
2783	3181	// bigThree.remove(scenePanel);
2784	3182	// bigThree.remove(centralPanel);
..	..	@@ -2811,10 +3209,15 @@
2811	3209	bigThree.add(centralPanel);
2812	3210	bigThree.add(XYZPanel);
2813	3211	bigThree.FlushUI();
	3212	+
	3213	+ cameraView.requestFocusInWindow();
2814	3214	} else
2815	3215	if (source == fourButton)
2816	3216	{
2817	3217	radio.layout = fourButton;
	3218	+
	3219	+ if (CameraPane.FULLSCREEN)
	3220	+ fullscreenLayout = radio.layout;
2818	3221
2819	3222	// bigThree.remove(scenePanel);
2820	3223	// bigThree.remove(centralPanel);
..	..	@@ -2846,10 +3249,15 @@
2846	3249	bigThree.ClearUI();
2847	3250	bigThree.add(scenePanel);
2848	3251	bigThree.FlushUI();
	3252	+
	3253	+ cameraView.requestFocusInWindow();
2849	3254	} else
2850	3255	if (source == sixButton)
2851	3256	{
2852	3257	radio.layout = sixButton;
	3258	+
	3259	+ if (CameraPane.FULLSCREEN)
	3260	+ fullscreenLayout = radio.layout;
2853	3261
2854	3262	// bigThree.remove(scenePanel);
2855	3263	// bigThree.remove(centralPanel);
..	..	@@ -2882,10 +3290,15 @@
2882	3290	bigThree.add(scenePanel);
2883	3291	bigThree.add(centralPanel);
2884	3292	bigThree.FlushUI();
	3293	+
	3294	+ cameraView.requestFocusInWindow();
2885	3295	} else
2886	3296	if (source == sevenButton)
2887	3297	{
2888	3298	radio.layout = sevenButton;
	3299	+
	3300	+ if (CameraPane.FULLSCREEN)
	3301	+ fullscreenLayout = radio.layout;
2889	3302
2890	3303	// bigThree.remove(scenePanel);
2891	3304	// bigThree.remove(centralPanel);
..	..	@@ -2919,6 +3332,8 @@
2919	3332	bigThree.add(centralPanel);
2920	3333	bigThree.add(XYZPanel);
2921	3334	bigThree.FlushUI();
	3335	+
	3336	+ cameraView.requestFocusInWindow();
2922	3337	} else
2923	3338	if (source == rootButton)
2924	3339	{
..	..	@@ -2930,6 +3345,7 @@
2930	3345	EditObject(obj);
2931	3346	}
2932	3347
	3348	+ cameraView.requestFocusInWindow();
2933	3349	refreshContents(true);
2934	3350	} else
2935	3351	if (source == closeButton)
..	..	@@ -2939,22 +3355,37 @@
2939	3355	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2940	3356	{
2941	3357	ab = (cRadio)e.nextElement();
2942		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3358	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2943	3359	{
	3360	+ // Patch to avoid bug with transparency.
	3361	+ if (!ab.hadMaterial)
	3362	+ {
	3363	+ ab.object.material = null;
	3364	+ }
	3365	+
2944	3366	buttonGroup.remove(ab);
2945	3367	radioPanel.remove(ab);
2946	3368
2947		- ab.GetObject().editWindow = null;
	3369	+ //ab.GetObject().editWindow = null;
	3370	+ ab.GetObject().manipWindow = null;
2948	3371	// ab.GetObject().objectUI = null; // ?????????
2949	3372
2950	3373	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2951	3374	break;
2952	3375	}
2953	3376	}
	3377	+
	3378	+ cameraView.requestFocusInWindow();
2954	3379	refreshContents(true);
2955	3380	} else
2956	3381	if (source == editItem \|\| source == editButton)
2957	3382	{
	3383	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3384	+ {
	3385	+ Object3D child = (Object3D)e.nextElement();
	3386	+ child.pinned = true;
	3387	+ }
	3388	+
2958	3389	EditSelection(false);
2959	3390	} else
2960	3391	if (source == uneditButton)
..	..	@@ -2964,10 +3395,11 @@
2964	3395	Object3D child = (Object3D)e.nextElement();
2965	3396	if(child.editWindow != null)
2966	3397	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3398	+ child.pinned = false;
2967	3399	child.CloseUI();
2968	3400	listUI.remove(child);
2969	3401
2970		- child.editWindow = null; // ???????????
	3402	+ //child.editWindow = null; // ???????????
2971	3403	}
2972	3404	objEditor.ctrlPanel.FlushUI();
2973	3405	//objEditor.jTree.clearSelection();
..	..	@@ -2980,6 +3412,7 @@
2980	3412	//copy.ClearUI();
2981	3413	for (Object3D obj : listUI)
2982	3414	{
	3415	+ obj.pinned = false;
2983	3416	obj.CloseUI();
2984	3417	}
2985	3418	listUI.clear();
..	..	@@ -2989,7 +3422,7 @@
2989	3422	{
2990	3423	assert(copy == group);
2991	3424
2992		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3425	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2993	3426
2994	3427	for (Object3D obj : listUI)
2995	3428	{
..	..	@@ -3053,20 +3486,44 @@
3053	3486	frontView.object = group;
3054	3487	sideView.object = group;
3055	3488	}
3056		- group.editWindow = this;
	3489	+
	3490	+// fix "+" issue
	3491	+ //group.editWindow = this;
	3492	+ group.manipWindow = this;
	3493	+
3057	3494	/*
3058	3495	currentLayout = radio.layout;
3059	3496	if (currentLayout == null)
3060	3497	currentLayout = sevenButton;
3061	3498	*/
3062	3499	radio.layout.doClick();
	3500	+
	3501	+ ClearUnpinned();
	3502	+ SetPinStates(group.selection.size() > 0);
	3503	+ if (group.selection.size() == 1)
	3504	+ EditSelection(false);
3063	3505	keepparent = group.parent;
3064	3506	// PARENT = NULL or not???
3065	3507	//group.parent = null; // ROOT
3066	3508	//group.attributes = -1;
3067	3509	ResetModel();
	3510	+
	3511	+ cameraView.requestFocusInWindow();
3068	3512	refreshContents(true);
3069		- }
	3513	+ } else if (event.getSource() == editCameraItem)
	3514	+ {
	3515	+ cameraView.ProtectCamera();
	3516	+ cameraView.repaint();
	3517	+ return;
	3518	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3519	+ {
	3520	+ cameraView.RevertCamera();
	3521	+ cameraView.repaint();
	3522	+ return;
	3523	+ // } else if (event.getSource() == textureButton)
	3524	+ // {
	3525	+ // return; // true;
	3526	+ }
3070	3527	else
3071	3528	{
3072	3529	//return super.action(event, arg);
..	..	@@ -3075,7 +3532,6 @@
3075	3532	}
3076	3533
3077	3534	boolean useclient = false;
3078		- cRadio radio;
3079	3535
3080	3536	void ToggleRoot()
3081	3537	{
..	..	@@ -3127,6 +3583,28 @@
3127	3583	refreshContents();
3128	3584	}
3129	3585
	3586	+ void TransformChildren()
	3587	+ {
	3588	+ Object3D obj;
	3589	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3590	+ {
	3591	+ obj = (Object3D)e.nextElement();
	3592	+ obj.KeepTextureMatrices();
	3593	+ obj.TransformChildren();
	3594	+ obj.RestoreTextureMatrices();
	3595	+
	3596	+// if (obj.parent == null)
	3597	+// {
	3598	+// System.out.println("NULL PARENT!");
	3599	+// new Exception().printStackTrace();
	3600	+// }
	3601	+// else
	3602	+// TouchTransform(obj);
	3603	+// //obj.parent.Touch();
	3604	+ }
	3605	+
	3606	+ refreshContents();
	3607	+ }
3130	3608
3131	3609	void ResetTransform()
3132	3610	{
..	..	@@ -3239,7 +3717,7 @@
3239	3717	refreshContents();
3240	3718	}
3241	3719
3242		- void ResetCentroid()
	3720	+ void ResetCentroid(boolean full)
3243	3721	{
3244	3722	Object3D obj;
3245	3723	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3254,12 +3732,16 @@
3254	3732	LA.matIdentity(Object3D.mat);
3255	3733	obj.getBounds(minima, maxima, false);
3256	3734	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3257		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3735	+ if (full)
	3736	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3258	3737	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3259	3738	obj.TransformMesh(Object3D.mat);
	3739	+
3260	3740	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3261		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3741	+ if (full)
	3742	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3262	3743	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3744	+
3263	3745	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3264	3746	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3265	3747	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3288,7 +3770,8 @@
3288	3770
3289	3771	int size = obj.MemorySize();
3290	3772
3291		- System.err.println((size/1024) + " KB is the size of " + obj);
	3773	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3774	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3292	3775	}
3293	3776	}
3294	3777	catch (Exception e)
..	..	@@ -3325,9 +3808,9 @@
3325	3808	obj = (Object3D)e.nextElement();
3326	3809
3327	3810	System.out.println("Object is: " + obj);
3328		- GrafreeD.AnalyzeObject(obj);
	3811	+ Grafreed.AnalyzeObject(obj);
3329	3812	System.out.println("Boundary rep: " + obj.bRep);
3330		- GrafreeD.AnalyzeObject(obj.bRep);
	3813	+ Grafreed.AnalyzeObject(obj.bRep);
3331	3814
3332	3815	// System.err.println((size/1024) + " KB is the size of " + obj);
3333	3816	}
..	..	@@ -3369,6 +3852,13 @@
3369	3852	void GenNormals(boolean crease)
3370	3853	{
3371	3854	group.GenNormalsS(crease);
	3855	+
	3856	+ refreshContents();
	3857	+ }
	3858	+
	3859	+ void GenNormalsMESH()
	3860	+ {
	3861	+ group.GenNormalsMeshS();
3372	3862
3373	3863	refreshContents();
3374	3864	}
..	..	@@ -3541,8 +4031,8 @@
3541	4031
3542	4032	void ParseVertices()
3543	4033	{
3544		- boolean epsequal = GrafreeD.epsequal;
3545		- GrafreeD.epsequal = true;
	4034	+ boolean epsequal = Grafreed.epsequal;
	4035	+ Grafreed.epsequal = true;
3546	4036
3547	4037	for (int i=0; i<group.selection.size(); i++)
3548	4038	{
..	..	@@ -3567,7 +4057,7 @@
3567	4057	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3568	4058	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3569	4059
3570		- g.add(GrafreeD.clipboard);
	4060	+ g.add(Grafreed.clipboard);
3571	4061
3572	4062	buffer.add(g);
3573	4063	}
..	..	@@ -3582,7 +4072,7 @@
3582	4072	makeSomething(buffer, i==group.selection.size()-1);
3583	4073	}
3584	4074
3585		- GrafreeD.epsequal = epsequal;
	4075	+ Grafreed.epsequal = epsequal;
3586	4076
3587	4077	refreshContents();
3588	4078	}
..	..	@@ -3600,7 +4090,16 @@
3600	4090	String pigment = Object3D.GetPigment(tex);
3601	4091	//String bump = Object3D.GetBump(tex);
3602	4092
3603		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4093	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4094	+
	4095	+ try
	4096	+ {
	4097	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4098	+ }
	4099	+ catch (Exception e)
	4100	+ {
	4101	+ System.err.println("FAIL: " + node);
	4102	+ }
3604	4103
3605	4104	double s = v.s;
3606	4105
..	..	@@ -3732,7 +4231,7 @@
3732	4231	return;
3733	4232
3734	4233	Object3D poses = group.selection.get(0);
3735		- Object3D ref = GrafreeD.clipboard.get(0);
	4234	+ Object3D ref = Grafreed.clipboard.get(0);
3736	4235
3737	4236	Object3D newgroup = new Object3D("Po:" + poses.name);
3738	4237
..	..	@@ -3926,9 +4425,9 @@
3926	4425
3927	4426	void ClipMesh()
3928	4427	{
3929		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4428	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3930	4429	{
3931		- Object3D content = GrafreeD.clipboard.get(0);
	4430	+ Object3D content = Grafreed.clipboard.get(0);
3932	4431
3933	4432	if (content instanceof cGroup && ((cGroup)content).transientlink )
3934	4433	content = ((cGroup)content).get(0);
..	..	@@ -3937,7 +4436,7 @@
3937	4436	// {
3938	4437	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3939	4438	// }
3940		- group.selection.ClipMesh(GrafreeD.clipboard);
	4439	+ group.selection.ClipMesh(Grafreed.clipboard);
3941	4440	}
3942	4441	// group.selection.ClipMesh(GrafreeD.clipboard);
3943	4442	System.out.println("DONE.");
..	..	@@ -3984,6 +4483,18 @@
3984	4483	void MarkLeaves(boolean hide)
3985	4484	{
3986	4485	group.selection.MarkLeaves(hide);
	4486	+ refreshContents();
	4487	+ }
	4488	+
	4489	+ void RewindLeaves(boolean hide)
	4490	+ {
	4491	+ group.selection.RewindLeaves(hide);
	4492	+ refreshContents();
	4493	+ }
	4494	+
	4495	+ void RandomLeaves(boolean hide)
	4496	+ {
	4497	+ group.selection.RandomLeaves(hide);
3987	4498	refreshContents();
3988	4499	}
3989	4500
..	..	@@ -4058,10 +4569,6 @@
4058	4569	// }
4059	4570	// }
4060	4571
4061		- static boolean allparams = true;
4062		-
4063		- static Vector<Object3D> listUI = new Vector<Object3D>();
4064		-
4065	4572	void EditSelection(boolean newWindow)
4066	4573	{
4067	4574	// aConstraints.gridy = 0;
..	..	@@ -4069,10 +4576,10 @@
4069	4576	{
4070	4577	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4071	4578	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4072		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4579	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4073	4580
4074	4581	Object3D elem = (Object3D)group.selection.elementAt(i);
4075		- if(elem != group)
	4582	+ if(elem != group \|\| !newWindow)
4076	4583	{
4077	4584	// if (!(elem instanceof Composite))
4078	4585	// newWindow = false;
..	..	@@ -4154,7 +4661,8 @@
4154	4661	//new Exception().printStackTrace();
4155	4662
4156	4663	freezemodel = true;
4157		-
	4664	+ ClearUnpinned();
	4665	+
4158	4666	/**/
4159	4667	//switch (event.id)
4160	4668	{
..	..	@@ -4162,7 +4670,6 @@
4162	4670	//case 702: // Event.LIST_DESELECT
4163	4671	group.deselectAll();
4164	4672	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4165		- objEditor.ClearInfo(); // .GetMaterial());
4166	4673	if (tps != null)
4167	4674	{
4168	4675	for (int i=0; i < tps.length; i++)
..	..	@@ -4171,10 +4678,8 @@
4171	4678
4172	4679	//if (child.parent != null)
4173	4680	//child.parent.addSelectee(child);
	4681	+ objEditor.SetMaterial(child);
4174	4682	group.addSelectee(child);
4175		- objEditor.SetMaterial(child); // .GetMaterial());
4176		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4177		- System.err.println("info : " + child.GetPath());
4178	4683	}
4179	4684	}
4180	4685	// else
..	..	@@ -4184,20 +4689,28 @@
4184	4689	// System.err.println("info : " + group.GetPath());
4185	4690	// }
4186	4691
4187		- objEditor.SetText(); // jan 2014
4188		-
4189		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4692	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4190	4693	CameraPane.flash = true;
4191	4694
4192		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4695	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4193	4696	// a camera
4194	4697	{
4195		- CameraPane.camerachangeframe = 0; // don't refuse it
4196		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4698	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4699	+ {
	4700	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4701	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4702	+ }
4197	4703	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4198	4704	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4199	4705	}
4200	4706
	4707	+ if (tps != null && tps.length == 1)
	4708	+ {
	4709	+ EditSelection(false);
	4710	+ }
	4711	+
	4712	+ SetPinStates(tps != null && tps.length > 0);
	4713	+
4201	4714	refreshContents();
4202	4715	//return true;
4203	4716	}
..	..	@@ -4206,6 +4719,35 @@
4206	4719
4207	4720	freezemodel = false;
4208	4721	}
	4722	+
	4723	+ void SetPinStates(boolean enabled)
	4724	+ {
	4725	+ editButton.setEnabled(enabled);
	4726	+ uneditButton.setEnabled(enabled);
	4727	+ unselectButton.setEnabled(enabled);
	4728	+ flashSelectionButton.setEnabled(enabled);
	4729	+ }
	4730	+
	4731	+ void refreshContents(boolean cp)
	4732	+ {
	4733	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4734	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4735	+ {
	4736	+ objEditor.ClearInfo(); // .GetMaterial());
	4737	+
	4738	+ for (int i=0; i < group.selection.Size(); i++)
	4739	+ {
	4740	+ Object3D child = (Object3D) group.selection.get(i);
	4741	+
	4742	+ objEditor.AddInfo(child, this, true);
	4743	+ System.err.println("info : " + child.GetPath());
	4744	+ }
	4745	+
	4746	+ objEditor.SetText(); // jan 2014
	4747	+ }
	4748	+
	4749	+ super.refreshContents(cp);
	4750	+ }
4209	4751
4210	4752	void linkSomething(Object3D thing)
4211	4753	{
..	..	@@ -4277,16 +4819,19 @@
4277	4819	{
4278	4820	if (group.selection.isEmpty())
4279	4821	return;
4280		- GrafreeD.clipboardIsTempGroup = false;
	4822	+
	4823	+ Grafreed.clipboardIsTempGroup = false;
4281	4824	Composite tGroup = null;
4282	4825	if (group.selection.size() > 0) // 1)
4283	4826	{
4284	4827	tGroup = new cGroup();
4285		- GrafreeD.clipboardIsTempGroup = true;
	4828	+ Grafreed.clipboardIsTempGroup = true;
4286	4829	}
4287	4830
4288	4831	if (cut)
4289	4832	{
	4833	+ if (Globals.SAVEONMAKE)
	4834	+ Save();
4290	4835	//int indices[] = jList.getSelectedIndices();
4291	4836	//for (int i = indices.length - 1; i >= 0; i--)
4292	4837	//jList.remove(indices[i]);
..	..	@@ -4322,16 +4867,16 @@
4322	4867	//System.out.println("cut " + child);
4323	4868	//System.out.println("parent = " + child.parent);
4324	4869	// tmp.addChild(child);
4325		- if (GrafreeD.clipboardIsTempGroup)
	4870	+ if (Grafreed.clipboardIsTempGroup)
4326	4871	tGroup.add/Child/(tmp);
4327	4872	else
4328		- GrafreeD.clipboard = tmp;
	4873	+ Grafreed.clipboard = tmp;
4329	4874	}
4330	4875	else
4331		- if (GrafreeD.clipboardIsTempGroup)
	4876	+ if (Grafreed.clipboardIsTempGroup)
4332	4877	tGroup.add/Child/(child);
4333	4878	else
4334		- GrafreeD.clipboard = child;
	4879	+ Grafreed.clipboard = child;
4335	4880	}
4336	4881
4337	4882	//ResetModel();
..	..	@@ -4363,21 +4908,23 @@
4363	4908	//System.out.println("cut " + elem);
4364	4909	//System.out.println("parent = " + elem.parent);
4365	4910	// tmp.addChild(elem);
4366		- if (GrafreeD.clipboardIsTempGroup)
	4911	+ if (Grafreed.clipboardIsTempGroup)
4367	4912	tGroup.add/Child/(tmp);
4368	4913	else
4369		- GrafreeD.clipboard = tmp;
	4914	+ Grafreed.clipboard = tmp;
4370	4915	}
4371	4916	else
4372		- if (GrafreeD.clipboardIsTempGroup)
	4917	+ if (Grafreed.clipboardIsTempGroup)
4373	4918	tGroup.add/Child/(child);
4374	4919	else
4375		- GrafreeD.clipboard = child;
	4920	+ Grafreed.clipboard = child;
4376	4921	}
4377	4922
4378	4923	}
4379		- if (GrafreeD.clipboardIsTempGroup)
4380		- GrafreeD.clipboard = tGroup;
	4924	+
	4925	+ if (Grafreed.clipboardIsTempGroup)
	4926	+ Grafreed.clipboard = tGroup;
	4927	+
4381	4928	if (cut)
4382	4929	{
4383	4930	ResetModel();
..	..	@@ -4391,7 +4938,7 @@
4391	4938	// return;
4392	4939	boolean first = true;
4393	4940
4394		- if (GrafreeD.clipboardIsTempGroup)
	4941	+ if (Grafreed.clipboardIsTempGroup)
4395	4942	{
4396	4943	Composite temp;
4397	4944
..	..	@@ -4402,7 +4949,7 @@
4402	4949	temp = (Composite)Applet3D.clipboard.deepCopy();
4403	4950	*/
4404	4951	Object3D elem;
4405		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4952	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4406	4953	{
4407	4954	Object3D child = (Object3D)e.nextElement();
4408	4955
..	..	@@ -4436,14 +4983,14 @@
4436	4983	//Object3D cb = Applet3D.clipboard;
4437	4984	//temp.addChild(cb);
4438	4985	//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());
	4986	+ assert(Grafreed.clipboard.parent == null);
	4987	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4988	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4989	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4990	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4444	4991	else
4445		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4446		- GrafreeD.clipboard.get(0).parent = keepparent;
	4992	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4993	+ Grafreed.clipboard.get(0).parent = keepparent;
4447	4994	}
4448	4995
4449	4996	ResetModel();
..	..	@@ -4492,9 +5039,9 @@
4492	5039	{
4493	5040	boolean first = true;
4494	5041
4495		- if (GrafreeD.clipboardIsTempGroup)
	5042	+ if (Grafreed.clipboardIsTempGroup)
4496	5043	{
4497		- Composite temp = (Composite)GrafreeD.clipboard;
	5044	+ Composite temp = (Composite)Grafreed.clipboard;
4498	5045	Object3D copy;
4499	5046	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4500	5047	{
..	..	@@ -4504,7 +5051,7 @@
4504	5051	}
4505	5052	} else
4506	5053	{
4507		- linkSomething(GrafreeD.clipboard); //.get(0));
	5054	+ linkSomething(Grafreed.clipboard); //.get(0));
4508	5055	}
4509	5056	}
4510	5057	}
..	..	@@ -4909,21 +5456,6 @@
4909	5456	}
4910	5457	*/
4911	5458
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	5459	/*
4928	5460	public void Callback(Object obj)
4929	5461	{
..	..	@@ -4947,26 +5479,9 @@
4947	5479	}
4948	5480	*/
4949	5481
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	5482	String GetFile(String dialogName)
4968	5483	{
4969		- if (GrafreeD.standAlone)
	5484	+ if (Grafreed.standAlone)
4970	5485	{
4971	5486	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4972	5487	browser.show();
..	..	@@ -5034,7 +5549,28 @@
5034	5549	cButton clearpanelButton;
5035	5550	cButton unselectButton;
5036	5551
	5552	+ cButton restoreCameraButton;
	5553	+
	5554	+ cButton saveButton;
5037	5555	cButton oneStepButton;
	5556	+
	5557	+ cButton groupButton;
	5558	+ cButton ungroupButton;
	5559	+ cButton compositeButton;
	5560	+ cButton switchButton;
	5561	+ cButton loopButton;
	5562	+ cButton textureButton;
	5563	+
	5564	+ cButton gridButton;
	5565	+ cButton boxButton;
	5566	+ cButton sphereButton;
	5567	+ cButton coneButton;
	5568	+ cButton torusButton;
	5569	+ cButton superButton;
	5570	+ cButton kleinButton;
	5571	+ cButton particlesButton;
	5572	+ cButton overlayButton;
	5573	+ cButton lightButton;
5038	5574
5039	5575	cButton screenfitButton;
5040	5576	cButton screenfitpointButton;
..	..	@@ -5047,14 +5583,6 @@
5047	5583
5048	5584	cButton setsupportButton;
5049	5585
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	5586	//
5059	5587	//Composite
5060	5588	Object3D // to do !!
..	..	@@ -5064,9 +5592,11 @@
5064	5592	//JTree jTree;
5065	5593	private MenuItem lookAtItem;
5066	5594	private MenuItem lookFromItem;
5067		- private MenuItem switchItem;
	5595	+ private MenuItem switchViewItem;
5068	5596	private MenuItem cutItem;
5069		- private MenuItem duplicateItem;
	5597	+ private MenuItem undoItem;
	5598	+ private MenuItem redoItem;
	5599	+ private JMenuItem duplicateItem;
5070	5600	private MenuItem cloneItem;
5071	5601	private MenuItem cloneSupportItem;
5072	5602	private MenuItem overwriteGeoItem;
..	..	@@ -5079,7 +5609,7 @@
5079	5609	private MenuItem linkverticesItem;
5080	5610	private MenuItem relinkverticesItem;
5081	5611	private MenuItem setMasterItem;
5082		- private MenuItem resetMeshItem;
	5612	+ private MenuItem resetAllItem;
5083	5613	private MenuItem stepAllItem;
5084	5614	private MenuItem revertMeshItem;
5085	5615	private MenuItem poseMeshItem;
..	..	@@ -5129,6 +5659,10 @@
5129	5659	private MenuItem showleavesItem;
5130	5660	private MenuItem markleavesItem;
5131	5661	private MenuItem unmarkleavesItem;
	5662	+ private MenuItem rewindleavesItem;
	5663	+ private MenuItem unrewindleavesItem;
	5664	+ private MenuItem randomleavesItem;
	5665	+ private MenuItem unrandomleavesItem;
5132	5666
5133	5667	private MenuItem flipVItem;
5134	5668	private MenuItem unflipVItem;
..	..	@@ -5140,15 +5674,17 @@
5140	5674	private MenuItem panoTexturesItem;
5141	5675
5142	5676	private MenuItem resetCentroidItem;
5143		- private MenuItem transformgeometryItem;
	5677	+ private MenuItem resetCentroidXZItem;
5144	5678	private MenuItem resetTransformItem;
	5679	+ private MenuItem transformGeometryItem;
	5680	+ private MenuItem transformChildrenItem;
5145	5681	private MenuItem hideItem;
5146	5682	private MenuItem grabItem;
5147	5683	private MenuItem backItem;
5148	5684	private MenuItem frontItem;
5149	5685	private MenuItem cameraItem;
5150	5686	private MenuItem compositeItem;
5151		- private MenuItem randomItem;
	5687	+ private MenuItem switchItem;
5152	5688	private MenuItem physicsItem;
5153	5689	private MenuItem frameselectorItem;
5154	5690	private MenuItem scriptNodeItem;
..	..	@@ -5210,11 +5746,6 @@
5210	5746	private MenuItem doubleItem;
5211	5747	private MenuItem tripleItem;
5212	5748
5213		- private MenuItem importGFDItem;
5214		- private MenuItem importVRMLX3DItem;
5215		- private MenuItem import3DSItem;
5216		- private MenuItem importOBJItem;
5217		-
5218	5749	private MenuItem computeAOItem;
5219	5750	private MenuItem recompileItem;
5220	5751	private MenuItem editScriptItem;
..	..	@@ -5224,4 +5755,8 @@
5224	5755	private MenuItem analyzeItem;
5225	5756	private MenuItem dumpItem;
5226	5757	//boolean freezemodel = false;
	5758	+
	5759	+ Menu cameraMenu;
	5760	+ MenuItem editCameraItem;
	5761	+ MenuItem restoreCameraItem;
5227	5762	}