~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,213 @@
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	+ 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);
553		- editButton.setToolTipText("Edit selection");
	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 item switcher");
	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 = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	762	+ editButton.setToolTipText("Pin selection controls");
554	763	editButton.addActionListener(this);
555	764
556		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
557		- uneditButton.setToolTipText("Unedit selection");
	765	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	766	+ uneditButton.setToolTipText("Remove selection controls");
558	767	uneditButton.addActionListener(this);
559	768
560		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
561		- allParamsButton.setToolTipText("Edit all params");
	769	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	770	+ allParamsButton.setToolTipText("Show all controle");
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	+ SetPinStates(false);
	788	+// oe.treePanel.add(commandsPanel);
	789	+// oe.treePanel.Return();
576	790
577	791	// oe.aConstraints.gridx += 1;
578	792	// oe.aConstraints.weighty = 0;
..	..	@@ -589,27 +803,12 @@
589	803
590	804	JScrollPane jSP;
591	805	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
592		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	806	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
593	807	ResetModel();
594	808
595	809	oe.treePanel.add(jSPPanel);
596	810	oe.treePanel.Return();
597	811
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	812	oe.treePanel.add(copyOptionsPanel);
614	813	oe.treePanel.Return();
615	814
..	..	@@ -640,23 +839,43 @@
640	839
641	840	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
642	841	{
	842	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	843	+ colorCB.setToolTipText("Copy color when dropped");
	844	+ colorCB.addItemListener(this);
	845	+
	846	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	847	+ materialCB.setToolTipText("Copy material when dropped");
	848	+ materialCB.addItemListener(this);
	849	+
	850	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	851	+ textureCB.setToolTipText("Copy texture when dropped");
	852	+ textureCB.addItemListener(this);
	853	+
	854	+ panel.Return();
	855	+
643	856	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
644	857	boxCB.setToolTipText("Display bounding boxes");
645	858	boxCB.addItemListener(this);
646	859
647	860	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
648		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	861	+ zoomBoxCB.setToolTipText("Display only for wheel");
649	862	zoomBoxCB.addItemListener(this);
650	863
651		- if (Globals.ADVANCED)
	864	+ if (true) // Globals.ADVANCED)
652	865	{
653		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
654		- supportCB.setToolTipText("Enable rigging");
655		- supportCB.addItemListener(this);
	866	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	867	+// supportCB.setToolTipText("Enable rigging");
	868	+// supportCB.addItemListener(this);
	869	+
	870	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	871	+ freezeCB.setToolTipText("Fast moving camera");
	872	+ freezeCB.addItemListener(this);
656	873
657	874	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
658	875	// localCB.addItemListener(this);
659	876
	877	+ panel.Return();
	878	+
660	879	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
661	880	crowdCB.setToolTipText("Used for crowds");
662	881	crowdCB.addItemListener(this);
..	..	@@ -673,6 +892,8 @@
673	892	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
674	893	// speakerMocapCB.addItemListener(this);
675	894
	895	+ panel.Return();
	896	+
676	897	if (false)
677	898	{
678	899	// handled in scripts
..	..	@@ -687,32 +908,72 @@
687	908	//constraints.gridy += 1;
688	909	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
689	910	smoothfocusCB.addItemListener(this);
	911	+ panel.Return();
690	912	}
691	913
692	914	//constraints.gridx += 1;
693	915	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
694	916	// debugCB.addItemListener(this);
695	917
	918	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	919	+ trackCB.setToolTipText("Enable tracking target");
	920	+ trackCB.addItemListener(this);
	921	+
696	922	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	923	+ oeilCB.setToolTipText("Move camera when tracking");
697	924	oeilCB.addItemListener(this);
698	925
	926	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	927	+ shadowCB.setToolTipText("When live compute shadows");
	928	+ shadowCB.addItemListener(this);
	929	+
	930	+ panel.Return();
	931	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	932	+ toggleTextureCB.setToolTipText("Load textures");
	933	+ toggleTextureCB.addItemListener(this);
	934	+
	935	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	936	+ toggleSwitchCB.setToolTipText("Choose a single item");
	937	+ toggleSwitchCB.addItemListener(this);
	938	+
	939	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	940	+ autosaveCB.setToolTipText("On structure change");
	941	+ autosaveCB.addItemListener(this);
	942	+
	943	+ panel.Return();
	944	+ if (Globals.ADVANCED)
	945	+ {
699	946	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
700	947	lookAtCB.setToolTipText("Look-at target");
701	948	lookAtCB.addItemListener(this);
	949	+ }
702	950
703	951	}
704	952
705	953	cGridBag fill = new cGridBag();
706		-
707	954	fill.preferredHeight = 200;
	955	+ cGridBag fill2 = new cGridBag();
	956	+ fill2.preferredHeight = 200;
	957	+ cGridBag fill3 = new cGridBag();
	958	+ fill3.preferredHeight = 200;
708	959
709	960	panel.add(fill);
	961	+ panel.add(fill2);
	962	+ panel.add(fill3);
710	963
711	964	}
712	965
713	966	void EditObject(Object3D obj)
714	967	{
715	968	cRadio radioButton = new cRadio(obj.name);
	969	+
	970	+ // Patch to avoid bug with transparency.
	971	+ radioButton.hadMaterial = obj.material != null;
	972	+ if (!radioButton.hadMaterial)
	973	+ {
	974	+ obj.material = new cMaterial();
	975	+ }
	976	+
716	977	radioButton.SetObject(obj);
717	978	radioButton.layout = sevenButton;
718	979	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -721,8 +982,11 @@
721	982	buttonGroup.add(radioButton);
722	983	radioButton.doClick();
723	984	}
	985	+
724	986	void SetupViews(ObjEditor oe)
725	987	{
	988	+ theFrame = this;
	989	+
726	990	oe.SetupViews();
727	991
728	992	System.out.println("SetupViews");
..	..	@@ -731,23 +995,28 @@
731	995	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
732	996	}
733	997
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;
	998	+ cToggleButton liveCB;
	999	+ cCheckBox supportCB;
	1000	+ cCheckBox localCB;
	1001	+ cCheckBox crowdCB;
	1002	+ cCheckBox smoothCB;
	1003	+ cToggleButton fastCB;
	1004	+ cCheckBox slowCB;
	1005	+ cCheckBox boxCB;
	1006	+ cCheckBox zoomBoxCB;
	1007	+ cCheckBox freezeCB;
	1008	+ //cToggleButton trackCB;
	1009	+ cCheckBox trackCB;
	1010	+ cCheckBox smoothfocusCB;
745	1011	// JCheckBox speakerMocapCB;
746		- JCheckBox speakerCameraCB;
747		- JCheckBox speakerFocusCB;
748		- JCheckBox debugCB;
749		- JCheckBox oeilCB;
750		- JCheckBox lookAtCB;
	1012	+ cCheckBox speakerCameraCB;
	1013	+ cCheckBox speakerFocusCB;
	1014	+ cCheckBox debugCB;
	1015	+
	1016	+ cCheckBox oeilCB;
	1017	+ cCheckBox shadowCB;
	1018	+ cCheckBox autosaveCB;
	1019	+ cCheckBox lookAtCB;
751	1020
752	1021	// static int COLOR = 1;
753	1022	// static int MATERIAL = 2;
..	..	@@ -755,9 +1024,9 @@
755	1024
756	1025	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
757	1026
758		- JCheckBox colorCB;
759		- JCheckBox materialCB;
760		- JCheckBox textureCB;
	1027	+ cCheckBox colorCB;
	1028	+ cCheckBox materialCB;
	1029	+ cCheckBox textureCB;
761	1030
762	1031	public void itemStateChanged(ItemEvent e)
763	1032	{
..	..	@@ -785,6 +1054,7 @@
785	1054	} else if(e.getSource() == liveCB)
786	1055	{
787	1056	cameraView.ToggleLive();
	1057	+ refreshContents(false);
788	1058	}
789	1059	else if(e.getSource() == supportCB)
790	1060	{
..	..	@@ -849,6 +1119,18 @@
849	1119	{
850	1120	cameraView.ToggleOeil();
851	1121	}
	1122	+ else if(e.getSource() == shadowCB)
	1123	+ {
	1124	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1125	+ }
	1126	+ else if(e.getSource() == freezeCB)
	1127	+ {
	1128	+ Globals.FREEZEONMOVE ^= true;
	1129	+ }
	1130	+ else if(e.getSource() == autosaveCB)
	1131	+ {
	1132	+ Globals.SAVEONMAKE ^= true;
	1133	+ }
852	1134	else if(e.getSource() == lookAtCB)
853	1135	{
854	1136	cameraView.ToggleLookAt();
..	..	@@ -865,7 +1147,8 @@
865	1147
866	1148	/**/
867	1149	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
868		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1150	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1151	+ TreePath path = objEditor.jTree.getSelectionPath();
869	1152	if ((path == null) \|\| (path.getPathCount() <= 1)) {
870	1153	// We can't move the root node or an empty selection
871	1154	return;
..	..	@@ -937,7 +1220,9 @@
937	1220	// objEditor.DropFile((java.io.File[]) object, true);
938	1221	// return;
939	1222	// }
940		- if (string.charAt(0) == '/')
	1223	+
	1224	+ // File path for Mac and Windows
	1225	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
941	1226	{
942	1227	// file(s)
943	1228	String[] names = string.split("\n");
..	..	@@ -964,7 +1249,7 @@
964	1249
965	1250	flashIt = false;
966	1251	CameraPane pane = (CameraPane) target;
967		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1252	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
968	1253	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
969	1254
970	1255	if (group.selection.size() == 1)
..	..	@@ -980,23 +1265,33 @@
980	1265
981	1266	assert target == objEditor.jTree;
982	1267	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1268	+ Object3D destinationLeaf;
983	1269	try {
984		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1270	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
985	1271	} catch (Exception e) {
986	1272	System.out.println("destinationPath : " + destinationPath);
987	1273	return;
988	1274	}
989	1275
990		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1276	+ for (int i=group.selection.size(); --i>=0;)
991	1277	{
	1278	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1279	+
	1280	+ // Cannot move into itself
	1281	+ if (child == destinationLeaf)
	1282	+ return;
	1283	+ }
	1284	+
	1285	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1286	+// {
992	1287	loadClipboard(true);
993	1288	objEditor.jTree.setSelectionPath(destinationPath);
994	1289	pasteInto(false, false);
995		- } else {
996		- loadClipboard(false);
997		- objEditor.jTree.setSelectionPath(destinationPath);
998		- pasteInto(false, false); // true); // ???
999		- }
	1290	+// } else {
	1291	+// loadClipboard(false);
	1292	+// objEditor.jTree.setSelectionPath(destinationPath);
	1293	+// pasteInto(false, false); // true); // ???
	1294	+// }
1000	1295	}
1001	1296	public void dropActionChanged(DropTargetDragEvent dtde)
1002	1297	// Called if the user has modified the current drop gesture
..	..	@@ -1101,22 +1396,30 @@
1101	1396	{
1102	1397	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1103	1398	//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);
	1399	+// gridItem = menu.add(new MenuItem("Grid"));
	1400	+// gridItem.addActionListener(this);
	1401	+// rectoidItem = menu.add(new MenuItem("Box"));
	1402	+// rectoidItem.addActionListener(this);
	1403	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1404	+// ellipsoidItem.addActionListener(this);
	1405	+// coneItem = menu.add(new MenuItem("Cone"));
	1406	+// coneItem.addActionListener(this);
	1407	+// torusItem = menu.add(new MenuItem("Torus"));
	1408	+// torusItem.addActionListener(this);
	1409	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1410	+// superItem.addActionListener(this);
	1411	+
	1412	+ cameraItem = menu.add(new MenuItem("Camera"));
	1413	+ cameraItem.addActionListener(this);
	1414	+
	1415	+ if (!Globals.ADVANCED)
	1416	+ {
1116	1417	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1117	1418	kleinItem.addActionListener(this);
1118		- particleItem = menu.add(new MenuItem("Particle system"));
1119		- particleItem.addActionListener(this);
	1419	+ }
	1420	+
	1421	+// particleItem = menu.add(new MenuItem("Particle system"));
	1422	+// particleItem.addActionListener(this);
1120	1423	if (Globals.ADVANCED)
1121	1424	{
1122	1425	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1142,15 +1445,15 @@
1142	1445	}
1143	1446	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1144	1447	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);
	1448	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1449	+// overlayItem.addActionListener(this);
	1450	+// lightItem = menu.add(new MenuItem("Light"));
	1451	+// lightItem.addActionListener(this);
1149	1452	menu.add("-");
1150	1453	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1151	1454	//superLoopItem.addActionListener(this);
1152		- loopItem = menu.add(new MenuItem("Loop"));
1153		- loopItem.addActionListener(this);
	1455	+// loopItem = menu.add(new MenuItem("Loop"));
	1456	+// loopItem.addActionListener(this);
1154	1457	doubleItem = menu.add(new MenuItem("Fork"));
1155	1458	doubleItem.addActionListener(this);
1156	1459	if (Globals.ADVANCED)
..	..	@@ -1190,7 +1493,7 @@
1190	1493	memoryItem.addActionListener(this);
1191	1494	menu.add(analyzeItem = new MenuItem("Analyze"));
1192	1495	analyzeItem.addActionListener(this);
1193		- menu.add(dumpItem = new MenuItem("Dump"));
	1496	+ menu.add(dumpItem = new MenuItem("Print"));
1194	1497	dumpItem.addActionListener(this);
1195	1498	// menu.add(pathItem = new MenuItem("From-to path"));
1196	1499	// pathItem.addActionListener(this);
..	..	@@ -1331,9 +1634,24 @@
1331	1634	shadow.material = new cMaterial(obj.material);
1332	1635	shadow.material.diffuse = 0.0001f;
1333	1636	shadow.material.specular = 0.0001f;
	1637	+ //shadow.projectedVertices[1].x = 300;
1334	1638
1335	1639	makeSomething(shadow);
1336	1640	}
	1641	+
	1642	+ private void ClearUnpinned()
	1643	+ {
	1644	+ //for (Object3D obj : listUI)
	1645	+ for (int i=listUI.size(); --i>=0;)
	1646	+ {
	1647	+ Object3D obj = listUI.elementAt(i);
	1648	+ if (!obj.pinned)
	1649	+ {
	1650	+ obj.CloseUI();
	1651	+ listUI.remove(i);
	1652	+ }
	1653	+ }
	1654	+ }
1337	1655
1338	1656	/**
1339	1657	* applyExample
..	..	@@ -1537,9 +1855,9 @@
1537	1855
1538	1856	void Overwrite(int mask)
1539	1857	{
1540		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1858	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1541	1859	{
1542		- Object3D content = GrafreeD.clipboard.get(0);
	1860	+ Object3D content = Grafreed.clipboard.get(0);
1543	1861
1544	1862	if (content instanceof cGroup && ((cGroup)content).transientlink )
1545	1863	content = ((cGroup)content).get(0);
..	..	@@ -1578,7 +1896,7 @@
1578	1896	{
1579	1897	ScreenFit();
1580	1898	} else
1581		- if (source == switchItem)
	1899	+ if (source == switchViewItem)
1582	1900	{
1583	1901	cVector v1 = new cVector();
1584	1902	cVector v2 = new cVector();
..	..	@@ -1587,11 +1905,11 @@
1587	1905	objEditor.cameraView.renderCamera.setAim(v2, v1);
1588	1906	objEditor.cameraView.repaint();
1589	1907	} else
1590		- if (source == rectoidItem)
	1908	+ if (source == rectoidItem \|\| source == boxButton)
1591	1909	{
1592	1910	makeSomething(new Box());
1593	1911	} else
1594		- if (source == particleItem)
	1912	+ if (source == particleItem \|\| source == particlesButton)
1595	1913	{
1596	1914	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1597	1915	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1670,27 +1988,27 @@
1670	1988
1671	1989	makeSomething(obj);
1672	1990	} else
1673		- if (source == gridItem)
	1991	+ if (source == gridItem \|\| source == gridButton)
1674	1992	{
1675	1993	makeSomething(new Grid());
1676	1994	} else
1677		- if (source == ellipsoidItem)
	1995	+ if (source == ellipsoidItem \|\| source == sphereButton)
1678	1996	{
1679	1997	makeSomething(new Sphere());
1680	1998	} else
1681		- if (source == coneItem)
	1999	+ if (source == coneItem \|\| source == coneButton)
1682	2000	{
1683	2001	makeSomething(new Cone());
1684	2002	} else
1685		- if (source == torusItem)
	2003	+ if (source == torusItem \|\| source == torusButton)
1686	2004	{
1687	2005	makeSomething(new Torus());
1688	2006	} else
1689		- if (source == superItem)
	2007	+ if (source == superItem \|\| source == superButton)
1690	2008	{
1691	2009	makeSomething(new Superellipsoid());
1692	2010	} else
1693		- if (source == kleinItem)
	2011	+ if (source == kleinItem \|\| source == kleinButton)
1694	2012	{
1695	2013	makeSomething(new Klein());
1696	2014	} else
..	..	@@ -1710,7 +2028,7 @@
1710	2028	{
1711	2029	makeSomething(new BezierSurface());
1712	2030	} else
1713		- if (source == overlayItem)
	2031	+ if (source == overlayItem \|\| source == overlayButton)
1714	2032	{
1715	2033	/*
1716	2034	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1758,7 +2076,7 @@
1758	2076	s.setup();
1759	2077	makeSomething(s);
1760	2078	} else
1761		- if (source == lightItem)
	2079	+ if (source == lightItem \|\| source == lightButton)
1762	2080	{
1763	2081	makeSomething(new Light());
1764	2082	} else
..	..	@@ -1808,30 +2126,30 @@
1808	2126
1809	2127	group(g);
1810	2128	} else
1811		- if (source == loopItem)
	2129	+ if (source == loopItem \|\| source == loopButton)
1812	2130	{
1813	2131	Composite csg = new GroupLeaf();
1814	2132	csg.count = 5;
1815	2133	group(csg);
1816		- Composite child = new cGroup();
	2134	+ Composite child = new cGroup("Branch");
1817	2135	csg.addChild(child);
1818	2136	child.addChild(csg);
1819	2137	} else
1820	2138	if (source == doubleItem)
1821	2139	{
1822		- Composite csg = new GroupLeaf();
	2140	+ Composite csg = new GroupLeaf("Fork");
1823	2141	csg.count = 5;
1824	2142	group(csg);
1825		- Composite child = new cGroup();
	2143	+ Composite child = new cGroup("Branch A");
1826	2144	csg.addChild(child);
1827	2145	child.addChild(csg);
1828		- child = new cGroup();
	2146	+ child = new cGroup("Branch B");
1829	2147	csg.addChild(child);
1830	2148	child.addChild(csg);
1831	2149	} else
1832	2150	if (source == tripleItem)
1833	2151	{
1834		- Composite csg = new GroupLeaf();
	2152	+ Composite csg = new GroupLeaf("Trident");
1835	2153	csg.count = 4;
1836	2154	group(csg);
1837	2155	Composite child = new cGroup();
..	..	@@ -1843,23 +2161,6 @@
1843	2161	child = new cGroup();
1844	2162	csg.addChild(child);
1845	2163	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	2164	} else
1864	2165	if (source == computeAOItem)
1865	2166	{
..	..	@@ -1879,7 +2180,7 @@
1879	2180	if (source == invariantsItem)
1880	2181	{
1881	2182	System.out.println("Invariants:");
1882		- GrafreeD.grafreeD.universe.invariants();
	2183	+ Grafreed.grafreeD.universe.invariants();
1883	2184	} else
1884	2185	if (source == memoryItem)
1885	2186	{
..	..	@@ -1897,6 +2198,30 @@
1897	2198	if (source == dumpItem)
1898	2199	{
1899	2200	DumpObject();
	2201	+ } else
	2202	+ if (source == minButton)
	2203	+ {
	2204	+ Minimize();
	2205	+ } else
	2206	+ if (source == maxButton)
	2207	+ {
	2208	+ Maximize();
	2209	+ } else
	2210	+ if (source == fullButton)
	2211	+ {
	2212	+ ToggleFullScreen();
	2213	+ } else
	2214	+ if (source == undoButton)
	2215	+ {
	2216	+ Undo();
	2217	+ } else
	2218	+ if (source == redoButton)
	2219	+ {
	2220	+ Redo();
	2221	+ } else
	2222	+ if (source == saveButton)
	2223	+ {
	2224	+ Save();
1900	2225	} else
1901	2226	if (source == oneStepButton)
1902	2227	{
..	..	@@ -1952,12 +2277,20 @@
1952	2277	{
1953	2278	loadClipboard(true);
1954	2279	} else
	2280	+ if (source == undoItem)
	2281	+ {
	2282	+ Undo();
	2283	+ } else
	2284	+ if (source == redoItem)
	2285	+ {
	2286	+ Redo();
	2287	+ } else
1955	2288	if (source == duplicateItem)
1956	2289	{
1957		- Object3D keep = GrafreeD.clipboard;
	2290	+ Object3D keep = Grafreed.clipboard;
1958	2291	loadClipboard(false);
1959	2292	paste(false);
1960		- GrafreeD.clipboard = keep;
	2293	+ Grafreed.clipboard = keep;
1961	2294	} else
1962	2295	if (source == cloneItem)
1963	2296	{
..	..	@@ -2177,9 +2510,9 @@
2177	2510	// group.selection.get(0).setMasterThis(content); // should be identity
2178	2511	// refreshContents();
2179	2512	// }
2180		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2513	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2181	2514	{
2182		- Object3D content = GrafreeD.clipboard.get(0);
	2515	+ Object3D content = Grafreed.clipboard.get(0);
2183	2516
2184	2517	if (content instanceof cGroup && ((cGroup)content).transientlink )
2185	2518	content = ((cGroup)content).get(0);
..	..	@@ -2229,9 +2562,9 @@
2229	2562	} else
2230	2563	if (source == setMasterItem)
2231	2564	{
2232		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2565	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2233	2566	{
2234		- Object3D content = GrafreeD.clipboard.get(0);
	2567	+ Object3D content = Grafreed.clipboard.get(0);
2235	2568
2236	2569	if (content instanceof cGroup && ((cGroup)content).transientlink )
2237	2570	content = ((cGroup)content).get(0);
..	..	@@ -2244,9 +2577,9 @@
2244	2577	{
2245	2578	if (group.selection.size() == 1)
2246	2579	{
2247		- if (GrafreeD.clipboard.size() == 1)
	2580	+ if (Grafreed.clipboard.size() == 1)
2248	2581	{
2249		- Object3D content = GrafreeD.clipboard.get(0);
	2582	+ Object3D content = Grafreed.clipboard.get(0);
2250	2583
2251	2584	if (content instanceof cGroup && ((cGroup)content).transientlink )
2252	2585	content = ((cGroup)content).get(0);
..	..	@@ -2263,7 +2596,7 @@
2263	2596	{
2264	2597	RevertMeshes();
2265	2598	} else
2266		- if (source == resetMeshItem)
	2599	+ if (source == resetAllItem)
2267	2600	{
2268	2601	ResetAll();
2269	2602	} else
..	..	@@ -2283,9 +2616,9 @@
2283	2616	{
2284	2617	ClearSelection(true);
2285	2618	} else
2286		- if (source == grabItem)
	2619	+ if (source == grabItem \|\| source == groupButton)
2287	2620	{
2288		- group(new cGroup(), true);
	2621	+ group(new cGroup(), false); // true);
2289	2622	} else
2290	2623	if (source == hideItem)
2291	2624	{
..	..	@@ -2303,11 +2636,11 @@
2303	2636	{
2304	2637	makeSomething(new Camera());
2305	2638	} else
2306		- if (source == compositeItem)
	2639	+ if (source == compositeItem \|\| source == compositeButton)
2307	2640	{
2308	2641	group(new Composite());
2309	2642	} else
2310		- if (source == randomItem)
	2643	+ if (source == switchItem \|\| source == switchButton)
2311	2644	{
2312	2645	RandomNode random = new RandomNode();
2313	2646	group(random);
..	..	@@ -2409,7 +2742,7 @@
2409	2742	{
2410	2743	group(new cLinker());
2411	2744	} else
2412		- if (source == textureItem)
	2745	+ if (source == textureItem \|\| source == textureButton)
2413	2746	{
2414	2747	group(new TextureNode());
2415	2748	} else
..	..	@@ -2429,17 +2762,30 @@
2429	2762	{
2430	2763	CastShadow(2);
2431	2764	} else
2432		- if (source == ungroupItem)
	2765	+ if (source == ungroupItem \|\| source == ungroupButton)
2433	2766	{
2434		- //ungroup();
	2767	+ boolean hasRoot = false;
	2768	+
2435	2769	for (int i=0; i<group.selection.size(); i++)
2436	2770	{
2437		- Ungroup(group.selection.get(i));
	2771	+ if (group.selection.get(i) == group)
	2772	+ {
	2773	+ hasRoot = true;
	2774	+ break;
	2775	+ }
2438	2776	}
2439	2777
2440		- ClearSelection(false);
2441		-
2442		- refreshContents();
	2778	+ if (!hasRoot)
	2779	+ {
	2780	+ for (int i=0; i<group.selection.size(); i++)
	2781	+ {
	2782	+ Ungroup(group.selection.get(i));
	2783	+ }
	2784	+
	2785	+ ClearSelection(false);
	2786	+
	2787	+ refreshContents();
	2788	+ }
2443	2789	} else
2444	2790	if (source == genUVItem)
2445	2791	{
..	..	@@ -2451,7 +2797,7 @@
2451	2797	} else
2452	2798	if (source == genNormalsMESHItem)
2453	2799	{
2454		- GenNormals(true); // TODO
	2800	+ GenNormalsMESH();
2455	2801	} else
2456	2802	if (source == genNormalsORGANItem)
2457	2803	{
..	..	@@ -2516,6 +2862,22 @@
2516	2862	if (source == unmarkleavesItem)
2517	2863	{
2518	2864	MarkLeaves(false);
	2865	+ } else
	2866	+ if (source == rewindleavesItem)
	2867	+ {
	2868	+ RewindLeaves(true);
	2869	+ } else
	2870	+ if (source == unrewindleavesItem)
	2871	+ {
	2872	+ RewindLeaves(false);
	2873	+ } else
	2874	+ if (source == randomleavesItem)
	2875	+ {
	2876	+ RandomLeaves(true);
	2877	+ } else
	2878	+ if (source == unrandomleavesItem)
	2879	+ {
	2880	+ RandomLeaves(false);
2519	2881	} else
2520	2882	if (source == flipVItem)
2521	2883	{
..	..	@@ -2601,9 +2963,13 @@
2601	2963	{
2602	2964	SmoothMesh();
2603	2965	} else
2604		- if (source == transformgeometryItem)
	2966	+ if (source == transformGeometryItem)
2605	2967	{
2606	2968	TransformGeometry();
	2969	+ } else
	2970	+ if (source == transformChildrenItem)
	2971	+ {
	2972	+ TransformChildren();
2607	2973	} else
2608	2974	if (source == resetTransformItem)
2609	2975	{
..	..	@@ -2611,7 +2977,11 @@
2611	2977	} else
2612	2978	if (source == resetCentroidItem)
2613	2979	{
2614		- ResetCentroid();
	2980	+ ResetCentroid(true);
	2981	+ } else
	2982	+ if (source == resetCentroidXZItem)
	2983	+ {
	2984	+ ResetCentroid(false);
2615	2985	} else
2616	2986	if (source == resetParentItem)
2617	2987	{
..	..	@@ -2743,6 +3113,10 @@
2743	3113	if (source == twoButton)
2744	3114	{
2745	3115	radio.layout = twoButton;
	3116	+
	3117	+ if (CameraPane.FULLSCREEN)
	3118	+ fullscreenLayout = radio.layout;
	3119	+
2746	3120	// bug
2747	3121	//gridPanel.setDividerLocation(1.0);
2748	3122	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2775,10 +3149,31 @@
2775	3149	bigThree.ClearUI();
2776	3150	bigThree.add(centralPanel);
2777	3151	bigThree.FlushUI();
	3152	+
	3153	+ cameraView.requestFocusInWindow();
	3154	+
	3155	+// refreshContents(true);
	3156	+//
	3157	+// try
	3158	+// {
	3159	+// java.awt.Robot bot = new java.awt.Robot();
	3160	+// int mask = InputEvent.BUTTON1_MASK;
	3161	+// bot.mouseMove(100, 100);
	3162	+// bot.mousePress(mask);
	3163	+// bot.mouseRelease(mask);
	3164	+// }
	3165	+// catch (Exception e)
	3166	+// {
	3167	+//
	3168	+// }
	3169	+
2778	3170	} else
2779	3171	if (source == threeButton)
2780	3172	{
2781	3173	radio.layout = threeButton;
	3174	+
	3175	+ if (CameraPane.FULLSCREEN)
	3176	+ fullscreenLayout = radio.layout;
2782	3177
2783	3178	// bigThree.remove(scenePanel);
2784	3179	// bigThree.remove(centralPanel);
..	..	@@ -2811,10 +3206,15 @@
2811	3206	bigThree.add(centralPanel);
2812	3207	bigThree.add(XYZPanel);
2813	3208	bigThree.FlushUI();
	3209	+
	3210	+ cameraView.requestFocusInWindow();
2814	3211	} else
2815	3212	if (source == fourButton)
2816	3213	{
2817	3214	radio.layout = fourButton;
	3215	+
	3216	+ if (CameraPane.FULLSCREEN)
	3217	+ fullscreenLayout = radio.layout;
2818	3218
2819	3219	// bigThree.remove(scenePanel);
2820	3220	// bigThree.remove(centralPanel);
..	..	@@ -2846,10 +3246,15 @@
2846	3246	bigThree.ClearUI();
2847	3247	bigThree.add(scenePanel);
2848	3248	bigThree.FlushUI();
	3249	+
	3250	+ cameraView.requestFocusInWindow();
2849	3251	} else
2850	3252	if (source == sixButton)
2851	3253	{
2852	3254	radio.layout = sixButton;
	3255	+
	3256	+ if (CameraPane.FULLSCREEN)
	3257	+ fullscreenLayout = radio.layout;
2853	3258
2854	3259	// bigThree.remove(scenePanel);
2855	3260	// bigThree.remove(centralPanel);
..	..	@@ -2882,10 +3287,15 @@
2882	3287	bigThree.add(scenePanel);
2883	3288	bigThree.add(centralPanel);
2884	3289	bigThree.FlushUI();
	3290	+
	3291	+ cameraView.requestFocusInWindow();
2885	3292	} else
2886	3293	if (source == sevenButton)
2887	3294	{
2888	3295	radio.layout = sevenButton;
	3296	+
	3297	+ if (CameraPane.FULLSCREEN)
	3298	+ fullscreenLayout = radio.layout;
2889	3299
2890	3300	// bigThree.remove(scenePanel);
2891	3301	// bigThree.remove(centralPanel);
..	..	@@ -2919,6 +3329,8 @@
2919	3329	bigThree.add(centralPanel);
2920	3330	bigThree.add(XYZPanel);
2921	3331	bigThree.FlushUI();
	3332	+
	3333	+ cameraView.requestFocusInWindow();
2922	3334	} else
2923	3335	if (source == rootButton)
2924	3336	{
..	..	@@ -2930,6 +3342,7 @@
2930	3342	EditObject(obj);
2931	3343	}
2932	3344
	3345	+ cameraView.requestFocusInWindow();
2933	3346	refreshContents(true);
2934	3347	} else
2935	3348	if (source == closeButton)
..	..	@@ -2939,22 +3352,37 @@
2939	3352	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2940	3353	{
2941	3354	ab = (cRadio)e.nextElement();
2942		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3355	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2943	3356	{
	3357	+ // Patch to avoid bug with transparency.
	3358	+ if (!ab.hadMaterial)
	3359	+ {
	3360	+ ab.object.material = null;
	3361	+ }
	3362	+
2944	3363	buttonGroup.remove(ab);
2945	3364	radioPanel.remove(ab);
2946	3365
2947		- ab.GetObject().editWindow = null;
	3366	+ //ab.GetObject().editWindow = null;
	3367	+ ab.GetObject().manipWindow = null;
2948	3368	// ab.GetObject().objectUI = null; // ?????????
2949	3369
2950	3370	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2951	3371	break;
2952	3372	}
2953	3373	}
	3374	+
	3375	+ cameraView.requestFocusInWindow();
2954	3376	refreshContents(true);
2955	3377	} else
2956	3378	if (source == editItem \|\| source == editButton)
2957	3379	{
	3380	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3381	+ {
	3382	+ Object3D child = (Object3D)e.nextElement();
	3383	+ child.pinned = true;
	3384	+ }
	3385	+
2958	3386	EditSelection(false);
2959	3387	} else
2960	3388	if (source == uneditButton)
..	..	@@ -2964,10 +3392,11 @@
2964	3392	Object3D child = (Object3D)e.nextElement();
2965	3393	if(child.editWindow != null)
2966	3394	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3395	+ child.pinned = false;
2967	3396	child.CloseUI();
2968	3397	listUI.remove(child);
2969	3398
2970		- child.editWindow = null; // ???????????
	3399	+ //child.editWindow = null; // ???????????
2971	3400	}
2972	3401	objEditor.ctrlPanel.FlushUI();
2973	3402	//objEditor.jTree.clearSelection();
..	..	@@ -2980,6 +3409,7 @@
2980	3409	//copy.ClearUI();
2981	3410	for (Object3D obj : listUI)
2982	3411	{
	3412	+ obj.pinned = false;
2983	3413	obj.CloseUI();
2984	3414	}
2985	3415	listUI.clear();
..	..	@@ -2989,7 +3419,7 @@
2989	3419	{
2990	3420	assert(copy == group);
2991	3421
2992		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3422	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2993	3423
2994	3424	for (Object3D obj : listUI)
2995	3425	{
..	..	@@ -3053,20 +3483,44 @@
3053	3483	frontView.object = group;
3054	3484	sideView.object = group;
3055	3485	}
3056		- group.editWindow = this;
	3486	+
	3487	+// fix "+" issue
	3488	+ //group.editWindow = this;
	3489	+ group.manipWindow = this;
	3490	+
3057	3491	/*
3058	3492	currentLayout = radio.layout;
3059	3493	if (currentLayout == null)
3060	3494	currentLayout = sevenButton;
3061	3495	*/
3062	3496	radio.layout.doClick();
	3497	+
	3498	+ ClearUnpinned();
	3499	+ SetPinStates(group.selection.size() > 0);
	3500	+ if (group.selection.size() == 1)
	3501	+ EditSelection(false);
3063	3502	keepparent = group.parent;
3064	3503	// PARENT = NULL or not???
3065	3504	//group.parent = null; // ROOT
3066	3505	//group.attributes = -1;
3067	3506	ResetModel();
	3507	+
	3508	+ cameraView.requestFocusInWindow();
3068	3509	refreshContents(true);
3069		- }
	3510	+ } else if (event.getSource() == editCameraItem)
	3511	+ {
	3512	+ cameraView.ProtectCamera();
	3513	+ cameraView.repaint();
	3514	+ return;
	3515	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3516	+ {
	3517	+ cameraView.RevertCamera();
	3518	+ cameraView.repaint();
	3519	+ return;
	3520	+ // } else if (event.getSource() == textureButton)
	3521	+ // {
	3522	+ // return; // true;
	3523	+ }
3070	3524	else
3071	3525	{
3072	3526	//return super.action(event, arg);
..	..	@@ -3075,7 +3529,6 @@
3075	3529	}
3076	3530
3077	3531	boolean useclient = false;
3078		- cRadio radio;
3079	3532
3080	3533	void ToggleRoot()
3081	3534	{
..	..	@@ -3127,6 +3580,28 @@
3127	3580	refreshContents();
3128	3581	}
3129	3582
	3583	+ void TransformChildren()
	3584	+ {
	3585	+ Object3D obj;
	3586	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3587	+ {
	3588	+ obj = (Object3D)e.nextElement();
	3589	+ obj.KeepTextureMatrices();
	3590	+ obj.TransformChildren();
	3591	+ obj.RestoreTextureMatrices();
	3592	+
	3593	+// if (obj.parent == null)
	3594	+// {
	3595	+// System.out.println("NULL PARENT!");
	3596	+// new Exception().printStackTrace();
	3597	+// }
	3598	+// else
	3599	+// TouchTransform(obj);
	3600	+// //obj.parent.Touch();
	3601	+ }
	3602	+
	3603	+ refreshContents();
	3604	+ }
3130	3605
3131	3606	void ResetTransform()
3132	3607	{
..	..	@@ -3239,7 +3714,7 @@
3239	3714	refreshContents();
3240	3715	}
3241	3716
3242		- void ResetCentroid()
	3717	+ void ResetCentroid(boolean full)
3243	3718	{
3244	3719	Object3D obj;
3245	3720	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3254,12 +3729,16 @@
3254	3729	LA.matIdentity(Object3D.mat);
3255	3730	obj.getBounds(minima, maxima, false);
3256	3731	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3257		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3732	+ if (full)
	3733	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3258	3734	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3259	3735	obj.TransformMesh(Object3D.mat);
	3736	+
3260	3737	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3261		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3738	+ if (full)
	3739	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3262	3740	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3741	+
3263	3742	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3264	3743	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3265	3744	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3288,7 +3767,8 @@
3288	3767
3289	3768	int size = obj.MemorySize();
3290	3769
3291		- System.err.println((size/1024) + " KB is the size of " + obj);
	3770	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3771	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3292	3772	}
3293	3773	}
3294	3774	catch (Exception e)
..	..	@@ -3325,9 +3805,9 @@
3325	3805	obj = (Object3D)e.nextElement();
3326	3806
3327	3807	System.out.println("Object is: " + obj);
3328		- GrafreeD.AnalyzeObject(obj);
	3808	+ Grafreed.AnalyzeObject(obj);
3329	3809	System.out.println("Boundary rep: " + obj.bRep);
3330		- GrafreeD.AnalyzeObject(obj.bRep);
	3810	+ Grafreed.AnalyzeObject(obj.bRep);
3331	3811
3332	3812	// System.err.println((size/1024) + " KB is the size of " + obj);
3333	3813	}
..	..	@@ -3369,6 +3849,13 @@
3369	3849	void GenNormals(boolean crease)
3370	3850	{
3371	3851	group.GenNormalsS(crease);
	3852	+
	3853	+ refreshContents();
	3854	+ }
	3855	+
	3856	+ void GenNormalsMESH()
	3857	+ {
	3858	+ group.GenNormalsMeshS();
3372	3859
3373	3860	refreshContents();
3374	3861	}
..	..	@@ -3541,8 +4028,8 @@
3541	4028
3542	4029	void ParseVertices()
3543	4030	{
3544		- boolean epsequal = GrafreeD.epsequal;
3545		- GrafreeD.epsequal = true;
	4031	+ boolean epsequal = Grafreed.epsequal;
	4032	+ Grafreed.epsequal = true;
3546	4033
3547	4034	for (int i=0; i<group.selection.size(); i++)
3548	4035	{
..	..	@@ -3567,7 +4054,7 @@
3567	4054	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3568	4055	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3569	4056
3570		- g.add(GrafreeD.clipboard);
	4057	+ g.add(Grafreed.clipboard);
3571	4058
3572	4059	buffer.add(g);
3573	4060	}
..	..	@@ -3582,7 +4069,7 @@
3582	4069	makeSomething(buffer, i==group.selection.size()-1);
3583	4070	}
3584	4071
3585		- GrafreeD.epsequal = epsequal;
	4072	+ Grafreed.epsequal = epsequal;
3586	4073
3587	4074	refreshContents();
3588	4075	}
..	..	@@ -3600,7 +4087,16 @@
3600	4087	String pigment = Object3D.GetPigment(tex);
3601	4088	//String bump = Object3D.GetBump(tex);
3602	4089
3603		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4090	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4091	+
	4092	+ try
	4093	+ {
	4094	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4095	+ }
	4096	+ catch (Exception e)
	4097	+ {
	4098	+ System.err.println("FAIL: " + node);
	4099	+ }
3604	4100
3605	4101	double s = v.s;
3606	4102
..	..	@@ -3732,7 +4228,7 @@
3732	4228	return;
3733	4229
3734	4230	Object3D poses = group.selection.get(0);
3735		- Object3D ref = GrafreeD.clipboard.get(0);
	4231	+ Object3D ref = Grafreed.clipboard.get(0);
3736	4232
3737	4233	Object3D newgroup = new Object3D("Po:" + poses.name);
3738	4234
..	..	@@ -3926,9 +4422,9 @@
3926	4422
3927	4423	void ClipMesh()
3928	4424	{
3929		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4425	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3930	4426	{
3931		- Object3D content = GrafreeD.clipboard.get(0);
	4427	+ Object3D content = Grafreed.clipboard.get(0);
3932	4428
3933	4429	if (content instanceof cGroup && ((cGroup)content).transientlink )
3934	4430	content = ((cGroup)content).get(0);
..	..	@@ -3937,7 +4433,7 @@
3937	4433	// {
3938	4434	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3939	4435	// }
3940		- group.selection.ClipMesh(GrafreeD.clipboard);
	4436	+ group.selection.ClipMesh(Grafreed.clipboard);
3941	4437	}
3942	4438	// group.selection.ClipMesh(GrafreeD.clipboard);
3943	4439	System.out.println("DONE.");
..	..	@@ -3984,6 +4480,18 @@
3984	4480	void MarkLeaves(boolean hide)
3985	4481	{
3986	4482	group.selection.MarkLeaves(hide);
	4483	+ refreshContents();
	4484	+ }
	4485	+
	4486	+ void RewindLeaves(boolean hide)
	4487	+ {
	4488	+ group.selection.RewindLeaves(hide);
	4489	+ refreshContents();
	4490	+ }
	4491	+
	4492	+ void RandomLeaves(boolean hide)
	4493	+ {
	4494	+ group.selection.RandomLeaves(hide);
3987	4495	refreshContents();
3988	4496	}
3989	4497
..	..	@@ -4058,10 +4566,6 @@
4058	4566	// }
4059	4567	// }
4060	4568
4061		- static boolean allparams = true;
4062		-
4063		- static Vector<Object3D> listUI = new Vector<Object3D>();
4064		-
4065	4569	void EditSelection(boolean newWindow)
4066	4570	{
4067	4571	// aConstraints.gridy = 0;
..	..	@@ -4069,10 +4573,10 @@
4069	4573	{
4070	4574	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4071	4575	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4072		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4576	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4073	4577
4074	4578	Object3D elem = (Object3D)group.selection.elementAt(i);
4075		- if(elem != group)
	4579	+ if(elem != group \|\| !newWindow)
4076	4580	{
4077	4581	// if (!(elem instanceof Composite))
4078	4582	// newWindow = false;
..	..	@@ -4154,7 +4658,8 @@
4154	4658	//new Exception().printStackTrace();
4155	4659
4156	4660	freezemodel = true;
4157		-
	4661	+ ClearUnpinned();
	4662	+
4158	4663	/**/
4159	4664	//switch (event.id)
4160	4665	{
..	..	@@ -4162,7 +4667,6 @@
4162	4667	//case 702: // Event.LIST_DESELECT
4163	4668	group.deselectAll();
4164	4669	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4165		- objEditor.ClearInfo(); // .GetMaterial());
4166	4670	if (tps != null)
4167	4671	{
4168	4672	for (int i=0; i < tps.length; i++)
..	..	@@ -4171,10 +4675,8 @@
4171	4675
4172	4676	//if (child.parent != null)
4173	4677	//child.parent.addSelectee(child);
	4678	+ objEditor.SetMaterial(child);
4174	4679	group.addSelectee(child);
4175		- objEditor.SetMaterial(child); // .GetMaterial());
4176		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4177		- System.err.println("info : " + child.GetPath());
4178	4680	}
4179	4681	}
4180	4682	// else
..	..	@@ -4184,20 +4686,28 @@
4184	4686	// System.err.println("info : " + group.GetPath());
4185	4687	// }
4186	4688
4187		- objEditor.SetText(); // jan 2014
4188		-
4189		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4689	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4190	4690	CameraPane.flash = true;
4191	4691
4192		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4692	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4193	4693	// a camera
4194	4694	{
4195		- CameraPane.camerachangeframe = 0; // don't refuse it
4196		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4695	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4696	+ {
	4697	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4698	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4699	+ }
4197	4700	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4198	4701	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4199	4702	}
4200	4703
	4704	+ if (tps != null && tps.length == 1)
	4705	+ {
	4706	+ EditSelection(false);
	4707	+ }
	4708	+
	4709	+ SetPinStates(tps != null && tps.length > 0);
	4710	+
4201	4711	refreshContents();
4202	4712	//return true;
4203	4713	}
..	..	@@ -4206,6 +4716,35 @@
4206	4716
4207	4717	freezemodel = false;
4208	4718	}
	4719	+
	4720	+ void SetPinStates(boolean enabled)
	4721	+ {
	4722	+ editButton.setEnabled(enabled);
	4723	+ uneditButton.setEnabled(enabled);
	4724	+ unselectButton.setEnabled(enabled);
	4725	+ flashSelectionButton.setEnabled(enabled);
	4726	+ }
	4727	+
	4728	+ void refreshContents(boolean cp)
	4729	+ {
	4730	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4731	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4732	+ {
	4733	+ objEditor.ClearInfo(); // .GetMaterial());
	4734	+
	4735	+ for (int i=0; i < group.selection.Size(); i++)
	4736	+ {
	4737	+ Object3D child = (Object3D) group.selection.get(i);
	4738	+
	4739	+ objEditor.AddInfo(child, this, true);
	4740	+ System.err.println("info : " + child.GetPath());
	4741	+ }
	4742	+
	4743	+ objEditor.SetText(); // jan 2014
	4744	+ }
	4745	+
	4746	+ super.refreshContents(cp);
	4747	+ }
4209	4748
4210	4749	void linkSomething(Object3D thing)
4211	4750	{
..	..	@@ -4277,16 +4816,19 @@
4277	4816	{
4278	4817	if (group.selection.isEmpty())
4279	4818	return;
4280		- GrafreeD.clipboardIsTempGroup = false;
	4819	+
	4820	+ Grafreed.clipboardIsTempGroup = false;
4281	4821	Composite tGroup = null;
4282	4822	if (group.selection.size() > 0) // 1)
4283	4823	{
4284	4824	tGroup = new cGroup();
4285		- GrafreeD.clipboardIsTempGroup = true;
	4825	+ Grafreed.clipboardIsTempGroup = true;
4286	4826	}
4287	4827
4288	4828	if (cut)
4289	4829	{
	4830	+ if (Globals.SAVEONMAKE)
	4831	+ Save();
4290	4832	//int indices[] = jList.getSelectedIndices();
4291	4833	//for (int i = indices.length - 1; i >= 0; i--)
4292	4834	//jList.remove(indices[i]);
..	..	@@ -4322,16 +4864,16 @@
4322	4864	//System.out.println("cut " + child);
4323	4865	//System.out.println("parent = " + child.parent);
4324	4866	// tmp.addChild(child);
4325		- if (GrafreeD.clipboardIsTempGroup)
	4867	+ if (Grafreed.clipboardIsTempGroup)
4326	4868	tGroup.add/Child/(tmp);
4327	4869	else
4328		- GrafreeD.clipboard = tmp;
	4870	+ Grafreed.clipboard = tmp;
4329	4871	}
4330	4872	else
4331		- if (GrafreeD.clipboardIsTempGroup)
	4873	+ if (Grafreed.clipboardIsTempGroup)
4332	4874	tGroup.add/Child/(child);
4333	4875	else
4334		- GrafreeD.clipboard = child;
	4876	+ Grafreed.clipboard = child;
4335	4877	}
4336	4878
4337	4879	//ResetModel();
..	..	@@ -4363,21 +4905,23 @@
4363	4905	//System.out.println("cut " + elem);
4364	4906	//System.out.println("parent = " + elem.parent);
4365	4907	// tmp.addChild(elem);
4366		- if (GrafreeD.clipboardIsTempGroup)
	4908	+ if (Grafreed.clipboardIsTempGroup)
4367	4909	tGroup.add/Child/(tmp);
4368	4910	else
4369		- GrafreeD.clipboard = tmp;
	4911	+ Grafreed.clipboard = tmp;
4370	4912	}
4371	4913	else
4372		- if (GrafreeD.clipboardIsTempGroup)
	4914	+ if (Grafreed.clipboardIsTempGroup)
4373	4915	tGroup.add/Child/(child);
4374	4916	else
4375		- GrafreeD.clipboard = child;
	4917	+ Grafreed.clipboard = child;
4376	4918	}
4377	4919
4378	4920	}
4379		- if (GrafreeD.clipboardIsTempGroup)
4380		- GrafreeD.clipboard = tGroup;
	4921	+
	4922	+ if (Grafreed.clipboardIsTempGroup)
	4923	+ Grafreed.clipboard = tGroup;
	4924	+
4381	4925	if (cut)
4382	4926	{
4383	4927	ResetModel();
..	..	@@ -4391,7 +4935,7 @@
4391	4935	// return;
4392	4936	boolean first = true;
4393	4937
4394		- if (GrafreeD.clipboardIsTempGroup)
	4938	+ if (Grafreed.clipboardIsTempGroup)
4395	4939	{
4396	4940	Composite temp;
4397	4941
..	..	@@ -4402,7 +4946,7 @@
4402	4946	temp = (Composite)Applet3D.clipboard.deepCopy();
4403	4947	*/
4404	4948	Object3D elem;
4405		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4949	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4406	4950	{
4407	4951	Object3D child = (Object3D)e.nextElement();
4408	4952
..	..	@@ -4436,14 +4980,14 @@
4436	4980	//Object3D cb = Applet3D.clipboard;
4437	4981	//temp.addChild(cb);
4438	4982	//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());
	4983	+ assert(Grafreed.clipboard.parent == null);
	4984	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4985	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4986	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4987	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4444	4988	else
4445		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4446		- GrafreeD.clipboard.get(0).parent = keepparent;
	4989	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4990	+ Grafreed.clipboard.get(0).parent = keepparent;
4447	4991	}
4448	4992
4449	4993	ResetModel();
..	..	@@ -4492,9 +5036,9 @@
4492	5036	{
4493	5037	boolean first = true;
4494	5038
4495		- if (GrafreeD.clipboardIsTempGroup)
	5039	+ if (Grafreed.clipboardIsTempGroup)
4496	5040	{
4497		- Composite temp = (Composite)GrafreeD.clipboard;
	5041	+ Composite temp = (Composite)Grafreed.clipboard;
4498	5042	Object3D copy;
4499	5043	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4500	5044	{
..	..	@@ -4504,7 +5048,7 @@
4504	5048	}
4505	5049	} else
4506	5050	{
4507		- linkSomething(GrafreeD.clipboard); //.get(0));
	5051	+ linkSomething(Grafreed.clipboard); //.get(0));
4508	5052	}
4509	5053	}
4510	5054	}
..	..	@@ -4909,21 +5453,6 @@
4909	5453	}
4910	5454	*/
4911	5455
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	5456	/*
4928	5457	public void Callback(Object obj)
4929	5458	{
..	..	@@ -4947,26 +5476,9 @@
4947	5476	}
4948	5477	*/
4949	5478
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	5479	String GetFile(String dialogName)
4968	5480	{
4969		- if (GrafreeD.standAlone)
	5481	+ if (Grafreed.standAlone)
4970	5482	{
4971	5483	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4972	5484	browser.show();
..	..	@@ -5034,7 +5546,28 @@
5034	5546	cButton clearpanelButton;
5035	5547	cButton unselectButton;
5036	5548
	5549	+ cButton restoreCameraButton;
	5550	+
	5551	+ cButton saveButton;
5037	5552	cButton oneStepButton;
	5553	+
	5554	+ cButton groupButton;
	5555	+ cButton ungroupButton;
	5556	+ cButton compositeButton;
	5557	+ cButton switchButton;
	5558	+ cButton loopButton;
	5559	+ cButton textureButton;
	5560	+
	5561	+ cButton gridButton;
	5562	+ cButton boxButton;
	5563	+ cButton sphereButton;
	5564	+ cButton coneButton;
	5565	+ cButton torusButton;
	5566	+ cButton superButton;
	5567	+ cButton kleinButton;
	5568	+ cButton particlesButton;
	5569	+ cButton overlayButton;
	5570	+ cButton lightButton;
5038	5571
5039	5572	cButton screenfitButton;
5040	5573	cButton screenfitpointButton;
..	..	@@ -5047,14 +5580,6 @@
5047	5580
5048	5581	cButton setsupportButton;
5049	5582
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	5583	//
5059	5584	//Composite
5060	5585	Object3D // to do !!
..	..	@@ -5064,9 +5589,11 @@
5064	5589	//JTree jTree;
5065	5590	private MenuItem lookAtItem;
5066	5591	private MenuItem lookFromItem;
5067		- private MenuItem switchItem;
	5592	+ private MenuItem switchViewItem;
5068	5593	private MenuItem cutItem;
5069		- private MenuItem duplicateItem;
	5594	+ private MenuItem undoItem;
	5595	+ private MenuItem redoItem;
	5596	+ private JMenuItem duplicateItem;
5070	5597	private MenuItem cloneItem;
5071	5598	private MenuItem cloneSupportItem;
5072	5599	private MenuItem overwriteGeoItem;
..	..	@@ -5079,7 +5606,7 @@
5079	5606	private MenuItem linkverticesItem;
5080	5607	private MenuItem relinkverticesItem;
5081	5608	private MenuItem setMasterItem;
5082		- private MenuItem resetMeshItem;
	5609	+ private MenuItem resetAllItem;
5083	5610	private MenuItem stepAllItem;
5084	5611	private MenuItem revertMeshItem;
5085	5612	private MenuItem poseMeshItem;
..	..	@@ -5129,6 +5656,10 @@
5129	5656	private MenuItem showleavesItem;
5130	5657	private MenuItem markleavesItem;
5131	5658	private MenuItem unmarkleavesItem;
	5659	+ private MenuItem rewindleavesItem;
	5660	+ private MenuItem unrewindleavesItem;
	5661	+ private MenuItem randomleavesItem;
	5662	+ private MenuItem unrandomleavesItem;
5132	5663
5133	5664	private MenuItem flipVItem;
5134	5665	private MenuItem unflipVItem;
..	..	@@ -5140,15 +5671,17 @@
5140	5671	private MenuItem panoTexturesItem;
5141	5672
5142	5673	private MenuItem resetCentroidItem;
5143		- private MenuItem transformgeometryItem;
	5674	+ private MenuItem resetCentroidXZItem;
5144	5675	private MenuItem resetTransformItem;
	5676	+ private MenuItem transformGeometryItem;
	5677	+ private MenuItem transformChildrenItem;
5145	5678	private MenuItem hideItem;
5146	5679	private MenuItem grabItem;
5147	5680	private MenuItem backItem;
5148	5681	private MenuItem frontItem;
5149	5682	private MenuItem cameraItem;
5150	5683	private MenuItem compositeItem;
5151		- private MenuItem randomItem;
	5684	+ private MenuItem switchItem;
5152	5685	private MenuItem physicsItem;
5153	5686	private MenuItem frameselectorItem;
5154	5687	private MenuItem scriptNodeItem;
..	..	@@ -5210,11 +5743,6 @@
5210	5743	private MenuItem doubleItem;
5211	5744	private MenuItem tripleItem;
5212	5745
5213		- private MenuItem importGFDItem;
5214		- private MenuItem importVRMLX3DItem;
5215		- private MenuItem import3DSItem;
5216		- private MenuItem importOBJItem;
5217		-
5218	5746	private MenuItem computeAOItem;
5219	5747	private MenuItem recompileItem;
5220	5748	private MenuItem editScriptItem;
..	..	@@ -5224,4 +5752,8 @@
5224	5752	private MenuItem analyzeItem;
5225	5753	private MenuItem dumpItem;
5226	5754	//boolean freezemodel = false;
	5755	+
	5756	+ Menu cameraMenu;
	5757	+ MenuItem editCameraItem;
	5758	+ MenuItem restoreCameraItem;
5227	5759	}