~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,41 +517,41 @@
422	517	sortbysizeItem.addActionListener(this);
423	518	sortbynameItem = menu.add(new MenuItem("Sort by name"));
424	519	sortbynameItem.addActionListener(this);
	520	+ menu.add("-");
	521	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	522	+ shareGeometriesItem.addActionListener(this);
	523	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	524	+ mergeGeometriesItem.addActionListener(this);
425	525	if (Globals.ADVANCED)
426	526	{
427		- menu.add("-");
	527	+ // Pretty much the same as duplicate and clone.
428	528	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
429	529	extractGeometriesItem.addActionListener(this);
430	530	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
431	531	cloneGeometriesItem.addActionListener(this);
432		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
433		- shareGeometriesItem.addActionListener(this);
434		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
435		- mergeGeometriesItem.addActionListener(this);
436	532	}
437	533
438	534	oe.menuBar.add(menu = new Menu("Insert"));
439	535	buildCreateMenu(menu);
440	536
441		- oe.menuBar.add(menu = new Menu("Include"));
442		- importOBJItem = menu.add(new MenuItem("OBJ file..."));
443		- importOBJItem.addActionListener(this);
444		- menu.add("-");
445		- import3DSItem = menu.add(new MenuItem("3DS file..."));
446		- import3DSItem.addActionListener(this);
447		- menu.add("-");
448		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
449		- importVRMLX3DItem.addActionListener(this);
450		- menu.add("-");
451		- importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
452		- importGFDItem.addActionListener(this);
453		-
454	537	oe.menuBar.add(menu = new Menu("Tools"));
455	538	buildToolsMenu(menu);
456	539	}
457	540
458	541	void SetupUI2(ObjEditor oe)
459	542	{
	543	+ // June 2019
	544	+ if (oe == null)
	545	+ {
	546	+ //super.SetupUI2(this);
	547	+ //return;
	548	+ }
	549	+
	550	+ if (copy != group)
	551	+ {
	552	+ //super.SetupUI2(this);
	553	+ }
	554	+
460	555	//new Exception().printStackTrace();
461	556
462	557	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -485,97 +580,216 @@
485	580	oe.radioPanel.add(dummyButton);
486	581	oe.buttonGroup.add(dummyButton);
487	582	*/
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 1;
	586	+
488	587	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
489	588
490		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
491		- liveCB.setToolTipText("Enabled animation");
	589	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	590	+ //minButton.setToolTipText("Minimize window");
	591	+ //minButton.addActionListener(this);
	592	+
	593	+ 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");
492	624	liveCB.addItemListener(this);
493	625
494		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	626	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
495	627	oneStepButton.setToolTipText("Animate one step forward");
496	628	oneStepButton.addActionListener(this);
497	629
498		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	630	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
499	631	fastCB.setToolTipText("Fast mode");
500	632	fastCB.addItemListener(this);
501	633
502		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
503		- trackCB.setToolTipText("Enable tracking");
504		- trackCB.addItemListener(this);
505		-
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	634	+ //oe.toolboxPanel.Return();
	635	+
	636	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
507	637	screenfitButton.setToolTipText("Screen fit");
508	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);
509	643
510	644	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
511	645	// screenfitpointButton.addActionListener(this);
512	646
513	647	if (Globals.ADVANCED)
514	648	{
515		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	649	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
516	650	snapobjectButton.addActionListener(this);
517	651	snapobjectButton.setToolTipText("Snap Object");
518	652	}
519	653
520		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
521		- flashSelectionButton.setToolTipText("Show selection");
522		- flashSelectionButton.addActionListener(this);
	654	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
523	655
524		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
525		-
526		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	656	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
527	657	twoButton.setToolTipText("Show center view only");
528	658	twoButton.addActionListener(this);
529		- 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);
530	662	fourButton.addActionListener(this);
531	663	fourButton.setToolTipText("Show left panel only");
532		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
533	665	sixButton.setToolTipText("2-column layout left");
534	666	sixButton.addActionListener(this);
535		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	667	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
536	668	threeButton.setToolTipText("2-column layout right");
537	669	threeButton.addActionListener(this);
538		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	670	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
539	671	sevenButton.setToolTipText("3-column layout");
540	672	sevenButton.addActionListener(this);
541	673	//
542	674
543		- 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);
544	676	rootButton.setToolTipText("Edit selection in new tab");
545	677	rootButton.addActionListener(this);
546	678
547		- 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);
548	680	closeButton.setToolTipText("Close tab");
549	681	closeButton.addActionListener(this);
550	682	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
551	683	//clearButton.addActionListener(this);
552		-
553		- 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	+ }
554	716
555		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
556		- 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");
557	766	editButton.addActionListener(this);
558	767
559		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
560		- uneditButton.setToolTipText("Unedit selection");
	768	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	769	+ uneditButton.setToolTipText("Remove selection controls");
561	770	uneditButton.addActionListener(this);
562	771
563		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
564		- allParamsButton.setToolTipText("Edit all params");
	772	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	773	+ allParamsButton.setToolTipText("Show all controle");
565	774	allParamsButton.addActionListener(this);
566	775
567		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	776	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
568	777	clearPanelButton.setToolTipText("Clear edit panel");
569	778	clearPanelButton.addActionListener(this);
570	779
571		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	780	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
572	781	unselectButton.setToolTipText("Unselect");
573	782	unselectButton.addActionListener(this);
574	783
575		- 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);
576	787
577		- oe.treePanel.add(commandsPanel);
578		- oe.treePanel.Return();
	788	+ editCommandsPanel.preferredHeight = 1;
	789	+
	790	+ SetPinStates(false);
	791	+// oe.treePanel.add(commandsPanel);
	792	+// oe.treePanel.Return();
579	793
580	794	// oe.aConstraints.gridx += 1;
581	795	// oe.aConstraints.weighty = 0;
..	..	@@ -592,27 +806,12 @@
592	806
593	807	JScrollPane jSP;
594	808	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
595		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	809	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
596	810	ResetModel();
597	811
598	812	oe.treePanel.add(jSPPanel);
599	813	oe.treePanel.Return();
600	814
601		- cGridBag copyOptionsPanel = new cGridBag();
602		-
603		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
604		- colorCB.setToolTipText("Copy color when dropped");
605		- colorCB.addItemListener(this);
606		-
607		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
608		- materialCB.setToolTipText("Copy material when dropped");
609		- materialCB.addItemListener(this);
610		-
611		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
612		- textureCB.setToolTipText("Copy texture when dropped");
613		- textureCB.addItemListener(this);
614		-
615		- copyOptionsPanel.preferredHeight = 1;
616	815	oe.treePanel.add(copyOptionsPanel);
617	816	oe.treePanel.Return();
618	817
..	..	@@ -643,23 +842,43 @@
643	842
644	843	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
645	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	+
646	859	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
647	860	boxCB.setToolTipText("Display bounding boxes");
648	861	boxCB.addItemListener(this);
649	862
650	863	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
651		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	864	+ zoomBoxCB.setToolTipText("Display only for wheel");
652	865	zoomBoxCB.addItemListener(this);
653	866
654		- if (Globals.ADVANCED)
	867	+ if (true) // Globals.ADVANCED)
655	868	{
656		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
657		- supportCB.setToolTipText("Enable rigging");
658		- 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);
659	876
660	877	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
661	878	// localCB.addItemListener(this);
662	879
	880	+ panel.Return();
	881	+
663	882	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
664	883	crowdCB.setToolTipText("Used for crowds");
665	884	crowdCB.addItemListener(this);
..	..	@@ -676,6 +895,8 @@
676	895	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
677	896	// speakerMocapCB.addItemListener(this);
678	897
	898	+ panel.Return();
	899	+
679	900	if (false)
680	901	{
681	902	// handled in scripts
..	..	@@ -690,32 +911,72 @@
690	911	//constraints.gridy += 1;
691	912	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
692	913	smoothfocusCB.addItemListener(this);
	914	+ panel.Return();
693	915	}
694	916
695	917	//constraints.gridx += 1;
696	918	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
697	919	// debugCB.addItemListener(this);
698	920
	921	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	922	+ trackCB.setToolTipText("Enable tracking target");
	923	+ trackCB.addItemListener(this);
	924	+
699	925	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	926	+ oeilCB.setToolTipText("Move camera when tracking");
700	927	oeilCB.addItemListener(this);
701	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	+ {
702	949	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
703	950	lookAtCB.setToolTipText("Look-at target");
704	951	lookAtCB.addItemListener(this);
	952	+ }
705	953
706	954	}
707	955
708	956	cGridBag fill = new cGridBag();
709		-
710	957	fill.preferredHeight = 200;
	958	+ cGridBag fill2 = new cGridBag();
	959	+ fill2.preferredHeight = 200;
	960	+ cGridBag fill3 = new cGridBag();
	961	+ fill3.preferredHeight = 200;
711	962
712	963	panel.add(fill);
	964	+ panel.add(fill2);
	965	+ panel.add(fill3);
713	966
714	967	}
715	968
716	969	void EditObject(Object3D obj)
717	970	{
718	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	+
719	980	radioButton.SetObject(obj);
720	981	radioButton.layout = sevenButton;
721	982	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -724,8 +985,11 @@
724	985	buttonGroup.add(radioButton);
725	986	radioButton.doClick();
726	987	}
	988	+
727	989	void SetupViews(ObjEditor oe)
728	990	{
	991	+ theFrame = this;
	992	+
729	993	oe.SetupViews();
730	994
731	995	System.out.println("SetupViews");
..	..	@@ -734,23 +998,28 @@
734	998	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
735	999	}
736	1000
737		- JCheckBox liveCB;
738		- JCheckBox supportCB;
739		- JCheckBox localCB;
740		- JCheckBox crowdCB;
741		- JCheckBox smoothCB;
742		- JCheckBox fastCB;
743		- JCheckBox slowCB;
744		- JCheckBox boxCB;
745		- JCheckBox zoomBoxCB;
746		- JCheckBox trackCB;
747		- JCheckBox smoothfocusCB;
	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;
748	1014	// JCheckBox speakerMocapCB;
749		- JCheckBox speakerCameraCB;
750		- JCheckBox speakerFocusCB;
751		- JCheckBox debugCB;
752		- JCheckBox oeilCB;
753		- JCheckBox lookAtCB;
	1015	+ cCheckBox speakerCameraCB;
	1016	+ cCheckBox speakerFocusCB;
	1017	+ cCheckBox debugCB;
	1018	+
	1019	+ cCheckBox oeilCB;
	1020	+ cCheckBox shadowCB;
	1021	+ cCheckBox autosaveCB;
	1022	+ cCheckBox lookAtCB;
754	1023
755	1024	// static int COLOR = 1;
756	1025	// static int MATERIAL = 2;
..	..	@@ -758,9 +1027,9 @@
758	1027
759	1028	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
760	1029
761		- JCheckBox colorCB;
762		- JCheckBox materialCB;
763		- JCheckBox textureCB;
	1030	+ cCheckBox colorCB;
	1031	+ cCheckBox materialCB;
	1032	+ cCheckBox textureCB;
764	1033
765	1034	public void itemStateChanged(ItemEvent e)
766	1035	{
..	..	@@ -788,6 +1057,7 @@
788	1057	} else if(e.getSource() == liveCB)
789	1058	{
790	1059	cameraView.ToggleLive();
	1060	+ refreshContents(false);
791	1061	}
792	1062	else if(e.getSource() == supportCB)
793	1063	{
..	..	@@ -852,6 +1122,18 @@
852	1122	{
853	1123	cameraView.ToggleOeil();
854	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	+ }
855	1137	else if(e.getSource() == lookAtCB)
856	1138	{
857	1139	cameraView.ToggleLookAt();
..	..	@@ -868,7 +1150,8 @@
868	1150
869	1151	/**/
870	1152	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
871		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1153	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1154	+ TreePath path = objEditor.jTree.getSelectionPath();
872	1155	if ((path == null) \|\| (path.getPathCount() <= 1)) {
873	1156	// We can't move the root node or an empty selection
874	1157	return;
..	..	@@ -985,23 +1268,33 @@
985	1268
986	1269	assert target == objEditor.jTree;
987	1270	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1271	+ Object3D destinationLeaf;
988	1272	try {
989		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1273	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
990	1274	} catch (Exception e) {
991	1275	System.out.println("destinationPath : " + destinationPath);
992	1276	return;
993	1277	}
994	1278
995		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1279	+ for (int i=group.selection.size(); --i>=0;)
996	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	+// {
997	1290	loadClipboard(true);
998	1291	objEditor.jTree.setSelectionPath(destinationPath);
999	1292	pasteInto(false, false);
1000		- } else {
1001		- loadClipboard(false);
1002		- objEditor.jTree.setSelectionPath(destinationPath);
1003		- pasteInto(false, false); // true); // ???
1004		- }
	1293	+// } else {
	1294	+// loadClipboard(false);
	1295	+// objEditor.jTree.setSelectionPath(destinationPath);
	1296	+// pasteInto(false, false); // true); // ???
	1297	+// }
1005	1298	}
1006	1299	public void dropActionChanged(DropTargetDragEvent dtde)
1007	1300	// Called if the user has modified the current drop gesture
..	..	@@ -1106,22 +1399,30 @@
1106	1399	{
1107	1400	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1108	1401	//heightFieldItem.addActionListener(this);
1109		- gridItem = menu.add(new MenuItem("Grid"));
1110		- gridItem.addActionListener(this);
1111		- rectoidItem = menu.add(new MenuItem("Box"));
1112		- rectoidItem.addActionListener(this);
1113		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1114		- ellipsoidItem.addActionListener(this);
1115		- coneItem = menu.add(new MenuItem("Cone"));
1116		- coneItem.addActionListener(this);
1117		- torusItem = menu.add(new MenuItem("Torus"));
1118		- torusItem.addActionListener(this);
1119		- superItem = menu.add(new MenuItem("Superellipsoid"));
1120		- superItem.addActionListener(this);
	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	+ {
1121	1420	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1122	1421	kleinItem.addActionListener(this);
1123		- particleItem = menu.add(new MenuItem("Particle system"));
1124		- particleItem.addActionListener(this);
	1422	+ }
	1423	+
	1424	+// particleItem = menu.add(new MenuItem("Particle system"));
	1425	+// particleItem.addActionListener(this);
1125	1426	if (Globals.ADVANCED)
1126	1427	{
1127	1428	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1147,15 +1448,15 @@
1147	1448	}
1148	1449	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1149	1450	bezierItem.addActionListener(this);
1150		- overlayItem = menu.add(new MenuItem("Overlay"));
1151		- overlayItem.addActionListener(this);
1152		- lightItem = menu.add(new MenuItem("Light"));
1153		- lightItem.addActionListener(this);
	1451	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1452	+// overlayItem.addActionListener(this);
	1453	+// lightItem = menu.add(new MenuItem("Light"));
	1454	+// lightItem.addActionListener(this);
1154	1455	menu.add("-");
1155	1456	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1156	1457	//superLoopItem.addActionListener(this);
1157		- loopItem = menu.add(new MenuItem("Loop"));
1158		- loopItem.addActionListener(this);
	1458	+// loopItem = menu.add(new MenuItem("Loop"));
	1459	+// loopItem.addActionListener(this);
1159	1460	doubleItem = menu.add(new MenuItem("Fork"));
1160	1461	doubleItem.addActionListener(this);
1161	1462	if (Globals.ADVANCED)
..	..	@@ -1195,7 +1496,7 @@
1195	1496	memoryItem.addActionListener(this);
1196	1497	menu.add(analyzeItem = new MenuItem("Analyze"));
1197	1498	analyzeItem.addActionListener(this);
1198		- menu.add(dumpItem = new MenuItem("Dump"));
	1499	+ menu.add(dumpItem = new MenuItem("Print"));
1199	1500	dumpItem.addActionListener(this);
1200	1501	// menu.add(pathItem = new MenuItem("From-to path"));
1201	1502	// pathItem.addActionListener(this);
..	..	@@ -1336,9 +1637,24 @@
1336	1637	shadow.material = new cMaterial(obj.material);
1337	1638	shadow.material.diffuse = 0.0001f;
1338	1639	shadow.material.specular = 0.0001f;
	1640	+ //shadow.projectedVertices[1].x = 300;
1339	1641
1340	1642	makeSomething(shadow);
1341	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	+ }
1342	1658
1343	1659	/**
1344	1660	* applyExample
..	..	@@ -1542,9 +1858,9 @@
1542	1858
1543	1859	void Overwrite(int mask)
1544	1860	{
1545		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1861	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1546	1862	{
1547		- Object3D content = GrafreeD.clipboard.get(0);
	1863	+ Object3D content = Grafreed.clipboard.get(0);
1548	1864
1549	1865	if (content instanceof cGroup && ((cGroup)content).transientlink )
1550	1866	content = ((cGroup)content).get(0);
..	..	@@ -1583,7 +1899,7 @@
1583	1899	{
1584	1900	ScreenFit();
1585	1901	} else
1586		- if (source == switchItem)
	1902	+ if (source == switchViewItem)
1587	1903	{
1588	1904	cVector v1 = new cVector();
1589	1905	cVector v2 = new cVector();
..	..	@@ -1592,11 +1908,11 @@
1592	1908	objEditor.cameraView.renderCamera.setAim(v2, v1);
1593	1909	objEditor.cameraView.repaint();
1594	1910	} else
1595		- if (source == rectoidItem)
	1911	+ if (source == rectoidItem \|\| source == boxButton)
1596	1912	{
1597	1913	makeSomething(new Box());
1598	1914	} else
1599		- if (source == particleItem)
	1915	+ if (source == particleItem \|\| source == particlesButton)
1600	1916	{
1601	1917	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1602	1918	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1675,27 +1991,27 @@
1675	1991
1676	1992	makeSomething(obj);
1677	1993	} else
1678		- if (source == gridItem)
	1994	+ if (source == gridItem \|\| source == gridButton)
1679	1995	{
1680	1996	makeSomething(new Grid());
1681	1997	} else
1682		- if (source == ellipsoidItem)
	1998	+ if (source == ellipsoidItem \|\| source == sphereButton)
1683	1999	{
1684	2000	makeSomething(new Sphere());
1685	2001	} else
1686		- if (source == coneItem)
	2002	+ if (source == coneItem \|\| source == coneButton)
1687	2003	{
1688	2004	makeSomething(new Cone());
1689	2005	} else
1690		- if (source == torusItem)
	2006	+ if (source == torusItem \|\| source == torusButton)
1691	2007	{
1692	2008	makeSomething(new Torus());
1693	2009	} else
1694		- if (source == superItem)
	2010	+ if (source == superItem \|\| source == superButton)
1695	2011	{
1696	2012	makeSomething(new Superellipsoid());
1697	2013	} else
1698		- if (source == kleinItem)
	2014	+ if (source == kleinItem \|\| source == kleinButton)
1699	2015	{
1700	2016	makeSomething(new Klein());
1701	2017	} else
..	..	@@ -1715,7 +2031,7 @@
1715	2031	{
1716	2032	makeSomething(new BezierSurface());
1717	2033	} else
1718		- if (source == overlayItem)
	2034	+ if (source == overlayItem \|\| source == overlayButton)
1719	2035	{
1720	2036	/*
1721	2037	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1763,7 +2079,7 @@
1763	2079	s.setup();
1764	2080	makeSomething(s);
1765	2081	} else
1766		- if (source == lightItem)
	2082	+ if (source == lightItem \|\| source == lightButton)
1767	2083	{
1768	2084	makeSomething(new Light());
1769	2085	} else
..	..	@@ -1813,30 +2129,30 @@
1813	2129
1814	2130	group(g);
1815	2131	} else
1816		- if (source == loopItem)
	2132	+ if (source == loopItem \|\| source == loopButton)
1817	2133	{
1818	2134	Composite csg = new GroupLeaf();
1819	2135	csg.count = 5;
1820	2136	group(csg);
1821		- Composite child = new cGroup();
	2137	+ Composite child = new cGroup("Branch");
1822	2138	csg.addChild(child);
1823	2139	child.addChild(csg);
1824	2140	} else
1825	2141	if (source == doubleItem)
1826	2142	{
1827		- Composite csg = new GroupLeaf();
	2143	+ Composite csg = new GroupLeaf("Fork");
1828	2144	csg.count = 5;
1829	2145	group(csg);
1830		- Composite child = new cGroup();
	2146	+ Composite child = new cGroup("Branch A");
1831	2147	csg.addChild(child);
1832	2148	child.addChild(csg);
1833		- child = new cGroup();
	2149	+ child = new cGroup("Branch B");
1834	2150	csg.addChild(child);
1835	2151	child.addChild(csg);
1836	2152	} else
1837	2153	if (source == tripleItem)
1838	2154	{
1839		- Composite csg = new GroupLeaf();
	2155	+ Composite csg = new GroupLeaf("Trident");
1840	2156	csg.count = 4;
1841	2157	group(csg);
1842	2158	Composite child = new cGroup();
..	..	@@ -1848,31 +2164,6 @@
1848	2164	child = new cGroup();
1849	2165	csg.addChild(child);
1850	2166	child.addChild(csg);
1851		- } else
1852		-
1853		- if (source == importGFDItem)
1854		- {
1855		- ImportGFD();
1856		- } else
1857		- if (source == importVRMLX3DItem)
1858		- {
1859		- ImportVRMLX3D();
1860		- } else
1861		- if (source == import3DSItem)
1862		- {
1863		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1864		- } else
1865		- if (source == importOBJItem)
1866		- {
1867		- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1868		- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1869		- browser.setVisible(true);
1870		- String filename = browser.getFile();
1871		- if (filename != null && filename.length() > 0)
1872		- {
1873		- String fullname = browser.getDirectory() + filename;
1874		- makeSomething(ReadOBJ(fullname), true);
1875		- }
1876	2167	} else
1877	2168	if (source == computeAOItem)
1878	2169	{
..	..	@@ -1892,7 +2183,7 @@
1892	2183	if (source == invariantsItem)
1893	2184	{
1894	2185	System.out.println("Invariants:");
1895		- GrafreeD.grafreeD.universe.invariants();
	2186	+ Grafreed.grafreeD.universe.invariants();
1896	2187	} else
1897	2188	if (source == memoryItem)
1898	2189	{
..	..	@@ -1910,6 +2201,30 @@
1910	2201	if (source == dumpItem)
1911	2202	{
1912	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();
1913	2228	} else
1914	2229	if (source == oneStepButton)
1915	2230	{
..	..	@@ -1965,12 +2280,20 @@
1965	2280	{
1966	2281	loadClipboard(true);
1967	2282	} else
	2283	+ if (source == undoItem)
	2284	+ {
	2285	+ Undo();
	2286	+ } else
	2287	+ if (source == redoItem)
	2288	+ {
	2289	+ Redo();
	2290	+ } else
1968	2291	if (source == duplicateItem)
1969	2292	{
1970		- Object3D keep = GrafreeD.clipboard;
	2293	+ Object3D keep = Grafreed.clipboard;
1971	2294	loadClipboard(false);
1972	2295	paste(false);
1973		- GrafreeD.clipboard = keep;
	2296	+ Grafreed.clipboard = keep;
1974	2297	} else
1975	2298	if (source == cloneItem)
1976	2299	{
..	..	@@ -2190,9 +2513,9 @@
2190	2513	// group.selection.get(0).setMasterThis(content); // should be identity
2191	2514	// refreshContents();
2192	2515	// }
2193		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2516	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2194	2517	{
2195		- Object3D content = GrafreeD.clipboard.get(0);
	2518	+ Object3D content = Grafreed.clipboard.get(0);
2196	2519
2197	2520	if (content instanceof cGroup && ((cGroup)content).transientlink )
2198	2521	content = ((cGroup)content).get(0);
..	..	@@ -2242,9 +2565,9 @@
2242	2565	} else
2243	2566	if (source == setMasterItem)
2244	2567	{
2245		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2568	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2246	2569	{
2247		- Object3D content = GrafreeD.clipboard.get(0);
	2570	+ Object3D content = Grafreed.clipboard.get(0);
2248	2571
2249	2572	if (content instanceof cGroup && ((cGroup)content).transientlink )
2250	2573	content = ((cGroup)content).get(0);
..	..	@@ -2257,9 +2580,9 @@
2257	2580	{
2258	2581	if (group.selection.size() == 1)
2259	2582	{
2260		- if (GrafreeD.clipboard.size() == 1)
	2583	+ if (Grafreed.clipboard.size() == 1)
2261	2584	{
2262		- Object3D content = GrafreeD.clipboard.get(0);
	2585	+ Object3D content = Grafreed.clipboard.get(0);
2263	2586
2264	2587	if (content instanceof cGroup && ((cGroup)content).transientlink )
2265	2588	content = ((cGroup)content).get(0);
..	..	@@ -2276,7 +2599,7 @@
2276	2599	{
2277	2600	RevertMeshes();
2278	2601	} else
2279		- if (source == resetMeshItem)
	2602	+ if (source == resetAllItem)
2280	2603	{
2281	2604	ResetAll();
2282	2605	} else
..	..	@@ -2296,9 +2619,9 @@
2296	2619	{
2297	2620	ClearSelection(true);
2298	2621	} else
2299		- if (source == grabItem)
	2622	+ if (source == grabItem \|\| source == groupButton)
2300	2623	{
2301		- group(new cGroup(), true);
	2624	+ group(new cGroup(), false); // true);
2302	2625	} else
2303	2626	if (source == hideItem)
2304	2627	{
..	..	@@ -2316,11 +2639,11 @@
2316	2639	{
2317	2640	makeSomething(new Camera());
2318	2641	} else
2319		- if (source == compositeItem)
	2642	+ if (source == compositeItem \|\| source == compositeButton)
2320	2643	{
2321	2644	group(new Composite());
2322	2645	} else
2323		- if (source == randomItem)
	2646	+ if (source == switchItem \|\| source == switchButton)
2324	2647	{
2325	2648	RandomNode random = new RandomNode();
2326	2649	group(random);
..	..	@@ -2422,7 +2745,7 @@
2422	2745	{
2423	2746	group(new cLinker());
2424	2747	} else
2425		- if (source == textureItem)
	2748	+ if (source == textureItem \|\| source == textureButton)
2426	2749	{
2427	2750	group(new TextureNode());
2428	2751	} else
..	..	@@ -2442,17 +2765,30 @@
2442	2765	{
2443	2766	CastShadow(2);
2444	2767	} else
2445		- if (source == ungroupItem)
	2768	+ if (source == ungroupItem \|\| source == ungroupButton)
2446	2769	{
2447		- //ungroup();
	2770	+ boolean hasRoot = false;
	2771	+
2448	2772	for (int i=0; i<group.selection.size(); i++)
2449	2773	{
2450		- Ungroup(group.selection.get(i));
	2774	+ if (group.selection.get(i) == group)
	2775	+ {
	2776	+ hasRoot = true;
	2777	+ break;
	2778	+ }
2451	2779	}
2452	2780
2453		- ClearSelection(false);
2454		-
2455		- 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	+ }
2456	2792	} else
2457	2793	if (source == genUVItem)
2458	2794	{
..	..	@@ -2464,7 +2800,7 @@
2464	2800	} else
2465	2801	if (source == genNormalsMESHItem)
2466	2802	{
2467		- GenNormals(true); // TODO
	2803	+ GenNormalsMESH();
2468	2804	} else
2469	2805	if (source == genNormalsORGANItem)
2470	2806	{
..	..	@@ -2529,6 +2865,22 @@
2529	2865	if (source == unmarkleavesItem)
2530	2866	{
2531	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);
2532	2884	} else
2533	2885	if (source == flipVItem)
2534	2886	{
..	..	@@ -2614,9 +2966,13 @@
2614	2966	{
2615	2967	SmoothMesh();
2616	2968	} else
2617		- if (source == transformgeometryItem)
	2969	+ if (source == transformGeometryItem)
2618	2970	{
2619	2971	TransformGeometry();
	2972	+ } else
	2973	+ if (source == transformChildrenItem)
	2974	+ {
	2975	+ TransformChildren();
2620	2976	} else
2621	2977	if (source == resetTransformItem)
2622	2978	{
..	..	@@ -2624,7 +2980,11 @@
2624	2980	} else
2625	2981	if (source == resetCentroidItem)
2626	2982	{
2627		- ResetCentroid();
	2983	+ ResetCentroid(true);
	2984	+ } else
	2985	+ if (source == resetCentroidXZItem)
	2986	+ {
	2987	+ ResetCentroid(false);
2628	2988	} else
2629	2989	if (source == resetParentItem)
2630	2990	{
..	..	@@ -2756,6 +3116,10 @@
2756	3116	if (source == twoButton)
2757	3117	{
2758	3118	radio.layout = twoButton;
	3119	+
	3120	+ if (CameraPane.FULLSCREEN)
	3121	+ fullscreenLayout = radio.layout;
	3122	+
2759	3123	// bug
2760	3124	//gridPanel.setDividerLocation(1.0);
2761	3125	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2788,10 +3152,31 @@
2788	3152	bigThree.ClearUI();
2789	3153	bigThree.add(centralPanel);
2790	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	+
2791	3173	} else
2792	3174	if (source == threeButton)
2793	3175	{
2794	3176	radio.layout = threeButton;
	3177	+
	3178	+ if (CameraPane.FULLSCREEN)
	3179	+ fullscreenLayout = radio.layout;
2795	3180
2796	3181	// bigThree.remove(scenePanel);
2797	3182	// bigThree.remove(centralPanel);
..	..	@@ -2824,10 +3209,15 @@
2824	3209	bigThree.add(centralPanel);
2825	3210	bigThree.add(XYZPanel);
2826	3211	bigThree.FlushUI();
	3212	+
	3213	+ cameraView.requestFocusInWindow();
2827	3214	} else
2828	3215	if (source == fourButton)
2829	3216	{
2830	3217	radio.layout = fourButton;
	3218	+
	3219	+ if (CameraPane.FULLSCREEN)
	3220	+ fullscreenLayout = radio.layout;
2831	3221
2832	3222	// bigThree.remove(scenePanel);
2833	3223	// bigThree.remove(centralPanel);
..	..	@@ -2859,10 +3249,15 @@
2859	3249	bigThree.ClearUI();
2860	3250	bigThree.add(scenePanel);
2861	3251	bigThree.FlushUI();
	3252	+
	3253	+ cameraView.requestFocusInWindow();
2862	3254	} else
2863	3255	if (source == sixButton)
2864	3256	{
2865	3257	radio.layout = sixButton;
	3258	+
	3259	+ if (CameraPane.FULLSCREEN)
	3260	+ fullscreenLayout = radio.layout;
2866	3261
2867	3262	// bigThree.remove(scenePanel);
2868	3263	// bigThree.remove(centralPanel);
..	..	@@ -2895,10 +3290,15 @@
2895	3290	bigThree.add(scenePanel);
2896	3291	bigThree.add(centralPanel);
2897	3292	bigThree.FlushUI();
	3293	+
	3294	+ cameraView.requestFocusInWindow();
2898	3295	} else
2899	3296	if (source == sevenButton)
2900	3297	{
2901	3298	radio.layout = sevenButton;
	3299	+
	3300	+ if (CameraPane.FULLSCREEN)
	3301	+ fullscreenLayout = radio.layout;
2902	3302
2903	3303	// bigThree.remove(scenePanel);
2904	3304	// bigThree.remove(centralPanel);
..	..	@@ -2932,6 +3332,8 @@
2932	3332	bigThree.add(centralPanel);
2933	3333	bigThree.add(XYZPanel);
2934	3334	bigThree.FlushUI();
	3335	+
	3336	+ cameraView.requestFocusInWindow();
2935	3337	} else
2936	3338	if (source == rootButton)
2937	3339	{
..	..	@@ -2943,6 +3345,7 @@
2943	3345	EditObject(obj);
2944	3346	}
2945	3347
	3348	+ cameraView.requestFocusInWindow();
2946	3349	refreshContents(true);
2947	3350	} else
2948	3351	if (source == closeButton)
..	..	@@ -2952,22 +3355,37 @@
2952	3355	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2953	3356	{
2954	3357	ab = (cRadio)e.nextElement();
2955		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3358	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2956	3359	{
	3360	+ // Patch to avoid bug with transparency.
	3361	+ if (!ab.hadMaterial)
	3362	+ {
	3363	+ ab.object.material = null;
	3364	+ }
	3365	+
2957	3366	buttonGroup.remove(ab);
2958	3367	radioPanel.remove(ab);
2959	3368
2960		- ab.GetObject().editWindow = null;
	3369	+ //ab.GetObject().editWindow = null;
	3370	+ ab.GetObject().manipWindow = null;
2961	3371	// ab.GetObject().objectUI = null; // ?????????
2962	3372
2963	3373	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2964	3374	break;
2965	3375	}
2966	3376	}
	3377	+
	3378	+ cameraView.requestFocusInWindow();
2967	3379	refreshContents(true);
2968	3380	} else
2969	3381	if (source == editItem \|\| source == editButton)
2970	3382	{
	3383	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3384	+ {
	3385	+ Object3D child = (Object3D)e.nextElement();
	3386	+ child.pinned = true;
	3387	+ }
	3388	+
2971	3389	EditSelection(false);
2972	3390	} else
2973	3391	if (source == uneditButton)
..	..	@@ -2977,10 +3395,11 @@
2977	3395	Object3D child = (Object3D)e.nextElement();
2978	3396	if(child.editWindow != null)
2979	3397	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3398	+ child.pinned = false;
2980	3399	child.CloseUI();
2981	3400	listUI.remove(child);
2982	3401
2983		- child.editWindow = null; // ???????????
	3402	+ //child.editWindow = null; // ???????????
2984	3403	}
2985	3404	objEditor.ctrlPanel.FlushUI();
2986	3405	//objEditor.jTree.clearSelection();
..	..	@@ -2993,6 +3412,7 @@
2993	3412	//copy.ClearUI();
2994	3413	for (Object3D obj : listUI)
2995	3414	{
	3415	+ obj.pinned = false;
2996	3416	obj.CloseUI();
2997	3417	}
2998	3418	listUI.clear();
..	..	@@ -3002,7 +3422,7 @@
3002	3422	{
3003	3423	assert(copy == group);
3004	3424
3005		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3425	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3006	3426
3007	3427	for (Object3D obj : listUI)
3008	3428	{
..	..	@@ -3066,20 +3486,44 @@
3066	3486	frontView.object = group;
3067	3487	sideView.object = group;
3068	3488	}
3069		- group.editWindow = this;
	3489	+
	3490	+// fix "+" issue
	3491	+ //group.editWindow = this;
	3492	+ group.manipWindow = this;
	3493	+
3070	3494	/*
3071	3495	currentLayout = radio.layout;
3072	3496	if (currentLayout == null)
3073	3497	currentLayout = sevenButton;
3074	3498	*/
3075	3499	radio.layout.doClick();
	3500	+
	3501	+ ClearUnpinned();
	3502	+ SetPinStates(group.selection.size() > 0);
	3503	+ if (group.selection.size() == 1)
	3504	+ EditSelection(false);
3076	3505	keepparent = group.parent;
3077	3506	// PARENT = NULL or not???
3078	3507	//group.parent = null; // ROOT
3079	3508	//group.attributes = -1;
3080	3509	ResetModel();
	3510	+
	3511	+ cameraView.requestFocusInWindow();
3081	3512	refreshContents(true);
3082		- }
	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	+ }
3083	3527	else
3084	3528	{
3085	3529	//return super.action(event, arg);
..	..	@@ -3088,7 +3532,6 @@
3088	3532	}
3089	3533
3090	3534	boolean useclient = false;
3091		- cRadio radio;
3092	3535
3093	3536	void ToggleRoot()
3094	3537	{
..	..	@@ -3140,6 +3583,28 @@
3140	3583	refreshContents();
3141	3584	}
3142	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	+ }
3143	3608
3144	3609	void ResetTransform()
3145	3610	{
..	..	@@ -3252,7 +3717,7 @@
3252	3717	refreshContents();
3253	3718	}
3254	3719
3255		- void ResetCentroid()
	3720	+ void ResetCentroid(boolean full)
3256	3721	{
3257	3722	Object3D obj;
3258	3723	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3267,12 +3732,16 @@
3267	3732	LA.matIdentity(Object3D.mat);
3268	3733	obj.getBounds(minima, maxima, false);
3269	3734	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3270		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3735	+ if (full)
	3736	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3271	3737	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3272	3738	obj.TransformMesh(Object3D.mat);
	3739	+
3273	3740	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3274		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3741	+ if (full)
	3742	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3275	3743	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3744	+
3276	3745	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3277	3746	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3278	3747	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3301,7 +3770,8 @@
3301	3770
3302	3771	int size = obj.MemorySize();
3303	3772
3304		- 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)");
3305	3775	}
3306	3776	}
3307	3777	catch (Exception e)
..	..	@@ -3338,9 +3808,9 @@
3338	3808	obj = (Object3D)e.nextElement();
3339	3809
3340	3810	System.out.println("Object is: " + obj);
3341		- GrafreeD.AnalyzeObject(obj);
	3811	+ Grafreed.AnalyzeObject(obj);
3342	3812	System.out.println("Boundary rep: " + obj.bRep);
3343		- GrafreeD.AnalyzeObject(obj.bRep);
	3813	+ Grafreed.AnalyzeObject(obj.bRep);
3344	3814
3345	3815	// System.err.println((size/1024) + " KB is the size of " + obj);
3346	3816	}
..	..	@@ -3382,6 +3852,13 @@
3382	3852	void GenNormals(boolean crease)
3383	3853	{
3384	3854	group.GenNormalsS(crease);
	3855	+
	3856	+ refreshContents();
	3857	+ }
	3858	+
	3859	+ void GenNormalsMESH()
	3860	+ {
	3861	+ group.GenNormalsMeshS();
3385	3862
3386	3863	refreshContents();
3387	3864	}
..	..	@@ -3554,8 +4031,8 @@
3554	4031
3555	4032	void ParseVertices()
3556	4033	{
3557		- boolean epsequal = GrafreeD.epsequal;
3558		- GrafreeD.epsequal = true;
	4034	+ boolean epsequal = Grafreed.epsequal;
	4035	+ Grafreed.epsequal = true;
3559	4036
3560	4037	for (int i=0; i<group.selection.size(); i++)
3561	4038	{
..	..	@@ -3580,7 +4057,7 @@
3580	4057	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3581	4058	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3582	4059
3583		- g.add(GrafreeD.clipboard);
	4060	+ g.add(Grafreed.clipboard);
3584	4061
3585	4062	buffer.add(g);
3586	4063	}
..	..	@@ -3595,7 +4072,7 @@
3595	4072	makeSomething(buffer, i==group.selection.size()-1);
3596	4073	}
3597	4074
3598		- GrafreeD.epsequal = epsequal;
	4075	+ Grafreed.epsequal = epsequal;
3599	4076
3600	4077	refreshContents();
3601	4078	}
..	..	@@ -3613,7 +4090,16 @@
3613	4090	String pigment = Object3D.GetPigment(tex);
3614	4091	//String bump = Object3D.GetBump(tex);
3615	4092
3616		- 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	+ }
3617	4103
3618	4104	double s = v.s;
3619	4105
..	..	@@ -3745,7 +4231,7 @@
3745	4231	return;
3746	4232
3747	4233	Object3D poses = group.selection.get(0);
3748		- Object3D ref = GrafreeD.clipboard.get(0);
	4234	+ Object3D ref = Grafreed.clipboard.get(0);
3749	4235
3750	4236	Object3D newgroup = new Object3D("Po:" + poses.name);
3751	4237
..	..	@@ -3939,9 +4425,9 @@
3939	4425
3940	4426	void ClipMesh()
3941	4427	{
3942		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4428	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3943	4429	{
3944		- Object3D content = GrafreeD.clipboard.get(0);
	4430	+ Object3D content = Grafreed.clipboard.get(0);
3945	4431
3946	4432	if (content instanceof cGroup && ((cGroup)content).transientlink )
3947	4433	content = ((cGroup)content).get(0);
..	..	@@ -3950,7 +4436,7 @@
3950	4436	// {
3951	4437	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3952	4438	// }
3953		- group.selection.ClipMesh(GrafreeD.clipboard);
	4439	+ group.selection.ClipMesh(Grafreed.clipboard);
3954	4440	}
3955	4441	// group.selection.ClipMesh(GrafreeD.clipboard);
3956	4442	System.out.println("DONE.");
..	..	@@ -3997,6 +4483,18 @@
3997	4483	void MarkLeaves(boolean hide)
3998	4484	{
3999	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);
4000	4498	refreshContents();
4001	4499	}
4002	4500
..	..	@@ -4071,10 +4569,6 @@
4071	4569	// }
4072	4570	// }
4073	4571
4074		- static boolean allparams = true;
4075		-
4076		- static Vector<Object3D> listUI = new Vector<Object3D>();
4077		-
4078	4572	void EditSelection(boolean newWindow)
4079	4573	{
4080	4574	// aConstraints.gridy = 0;
..	..	@@ -4082,10 +4576,10 @@
4082	4576	{
4083	4577	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4084	4578	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4085		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4579	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4086	4580
4087	4581	Object3D elem = (Object3D)group.selection.elementAt(i);
4088		- if(elem != group)
	4582	+ if(elem != group \|\| !newWindow)
4089	4583	{
4090	4584	// if (!(elem instanceof Composite))
4091	4585	// newWindow = false;
..	..	@@ -4167,7 +4661,8 @@
4167	4661	//new Exception().printStackTrace();
4168	4662
4169	4663	freezemodel = true;
4170		-
	4664	+ ClearUnpinned();
	4665	+
4171	4666	/**/
4172	4667	//switch (event.id)
4173	4668	{
..	..	@@ -4175,7 +4670,6 @@
4175	4670	//case 702: // Event.LIST_DESELECT
4176	4671	group.deselectAll();
4177	4672	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4178		- objEditor.ClearInfo(); // .GetMaterial());
4179	4673	if (tps != null)
4180	4674	{
4181	4675	for (int i=0; i < tps.length; i++)
..	..	@@ -4184,10 +4678,8 @@
4184	4678
4185	4679	//if (child.parent != null)
4186	4680	//child.parent.addSelectee(child);
	4681	+ objEditor.SetMaterial(child);
4187	4682	group.addSelectee(child);
4188		- objEditor.SetMaterial(child); // .GetMaterial());
4189		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4190		- System.err.println("info : " + child.GetPath());
4191	4683	}
4192	4684	}
4193	4685	// else
..	..	@@ -4197,20 +4689,28 @@
4197	4689	// System.err.println("info : " + group.GetPath());
4198	4690	// }
4199	4691
4200		- objEditor.SetText(); // jan 2014
4201		-
4202		- 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))
4203	4693	CameraPane.flash = true;
4204	4694
4205		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4695	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4206	4696	// a camera
4207	4697	{
4208		- CameraPane.camerachangeframe = 0; // don't refuse it
4209		- 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	+ }
4210	4703	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4211	4704	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4212	4705	}
4213	4706
	4707	+ if (tps != null && tps.length == 1)
	4708	+ {
	4709	+ EditSelection(false);
	4710	+ }
	4711	+
	4712	+ SetPinStates(tps != null && tps.length > 0);
	4713	+
4214	4714	refreshContents();
4215	4715	//return true;
4216	4716	}
..	..	@@ -4219,6 +4719,35 @@
4219	4719
4220	4720	freezemodel = false;
4221	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	+ }
4222	4751
4223	4752	void linkSomething(Object3D thing)
4224	4753	{
..	..	@@ -4290,16 +4819,19 @@
4290	4819	{
4291	4820	if (group.selection.isEmpty())
4292	4821	return;
4293		- GrafreeD.clipboardIsTempGroup = false;
	4822	+
	4823	+ Grafreed.clipboardIsTempGroup = false;
4294	4824	Composite tGroup = null;
4295	4825	if (group.selection.size() > 0) // 1)
4296	4826	{
4297	4827	tGroup = new cGroup();
4298		- GrafreeD.clipboardIsTempGroup = true;
	4828	+ Grafreed.clipboardIsTempGroup = true;
4299	4829	}
4300	4830
4301	4831	if (cut)
4302	4832	{
	4833	+ if (Globals.SAVEONMAKE)
	4834	+ Save();
4303	4835	//int indices[] = jList.getSelectedIndices();
4304	4836	//for (int i = indices.length - 1; i >= 0; i--)
4305	4837	//jList.remove(indices[i]);
..	..	@@ -4335,16 +4867,16 @@
4335	4867	//System.out.println("cut " + child);
4336	4868	//System.out.println("parent = " + child.parent);
4337	4869	// tmp.addChild(child);
4338		- if (GrafreeD.clipboardIsTempGroup)
	4870	+ if (Grafreed.clipboardIsTempGroup)
4339	4871	tGroup.add/Child/(tmp);
4340	4872	else
4341		- GrafreeD.clipboard = tmp;
	4873	+ Grafreed.clipboard = tmp;
4342	4874	}
4343	4875	else
4344		- if (GrafreeD.clipboardIsTempGroup)
	4876	+ if (Grafreed.clipboardIsTempGroup)
4345	4877	tGroup.add/Child/(child);
4346	4878	else
4347		- GrafreeD.clipboard = child;
	4879	+ Grafreed.clipboard = child;
4348	4880	}
4349	4881
4350	4882	//ResetModel();
..	..	@@ -4376,21 +4908,23 @@
4376	4908	//System.out.println("cut " + elem);
4377	4909	//System.out.println("parent = " + elem.parent);
4378	4910	// tmp.addChild(elem);
4379		- if (GrafreeD.clipboardIsTempGroup)
	4911	+ if (Grafreed.clipboardIsTempGroup)
4380	4912	tGroup.add/Child/(tmp);
4381	4913	else
4382		- GrafreeD.clipboard = tmp;
	4914	+ Grafreed.clipboard = tmp;
4383	4915	}
4384	4916	else
4385		- if (GrafreeD.clipboardIsTempGroup)
	4917	+ if (Grafreed.clipboardIsTempGroup)
4386	4918	tGroup.add/Child/(child);
4387	4919	else
4388		- GrafreeD.clipboard = child;
	4920	+ Grafreed.clipboard = child;
4389	4921	}
4390	4922
4391	4923	}
4392		- if (GrafreeD.clipboardIsTempGroup)
4393		- GrafreeD.clipboard = tGroup;
	4924	+
	4925	+ if (Grafreed.clipboardIsTempGroup)
	4926	+ Grafreed.clipboard = tGroup;
	4927	+
4394	4928	if (cut)
4395	4929	{
4396	4930	ResetModel();
..	..	@@ -4404,7 +4938,7 @@
4404	4938	// return;
4405	4939	boolean first = true;
4406	4940
4407		- if (GrafreeD.clipboardIsTempGroup)
	4941	+ if (Grafreed.clipboardIsTempGroup)
4408	4942	{
4409	4943	Composite temp;
4410	4944
..	..	@@ -4415,7 +4949,7 @@
4415	4949	temp = (Composite)Applet3D.clipboard.deepCopy();
4416	4950	*/
4417	4951	Object3D elem;
4418		- 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))
4419	4953	{
4420	4954	Object3D child = (Object3D)e.nextElement();
4421	4955
..	..	@@ -4449,14 +4983,14 @@
4449	4983	//Object3D cb = Applet3D.clipboard;
4450	4984	//temp.addChild(cb);
4451	4985	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4452		- assert(GrafreeD.clipboard.parent == null);
4453		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4454		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4455		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4456		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	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());
4457	4991	else
4458		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4459		- GrafreeD.clipboard.get(0).parent = keepparent;
	4992	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4993	+ Grafreed.clipboard.get(0).parent = keepparent;
4460	4994	}
4461	4995
4462	4996	ResetModel();
..	..	@@ -4505,9 +5039,9 @@
4505	5039	{
4506	5040	boolean first = true;
4507	5041
4508		- if (GrafreeD.clipboardIsTempGroup)
	5042	+ if (Grafreed.clipboardIsTempGroup)
4509	5043	{
4510		- Composite temp = (Composite)GrafreeD.clipboard;
	5044	+ Composite temp = (Composite)Grafreed.clipboard;
4511	5045	Object3D copy;
4512	5046	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4513	5047	{
..	..	@@ -4517,7 +5051,7 @@
4517	5051	}
4518	5052	} else
4519	5053	{
4520		- linkSomething(GrafreeD.clipboard); //.get(0));
	5054	+ linkSomething(Grafreed.clipboard); //.get(0));
4521	5055	}
4522	5056	}
4523	5057	}
..	..	@@ -4922,21 +5456,6 @@
4922	5456	}
4923	5457	*/
4924	5458
4925		- void ImportGFD()
4926		- {
4927		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4928		- browser.show();
4929		- String filename = browser.getFile();
4930		- if (filename != null && filename.length() > 0)
4931		- {
4932		- String fullname = browser.getDirectory() + filename;
4933		-
4934		- //Object3D readobj =
4935		- objEditor.ReadGFD(fullname, objEditor);
4936		- //makeSomething(readobj);
4937		- }
4938		- }
4939		-
4940	5459	/*
4941	5460	public void Callback(Object obj)
4942	5461	{
..	..	@@ -4960,26 +5479,9 @@
4960	5479	}
4961	5480	*/
4962	5481
4963		- void ImportVRMLX3D()
4964		- {
4965		- if (GrafreeD.standAlone)
4966		- {
4967		- /**/
4968		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4969		- browser.show();
4970		- String filename = browser.getFile();
4971		- if (filename != null && filename.length() > 0)
4972		- {
4973		- String fullname = browser.getDirectory() + filename;
4974		- LoadVRMLX3D(fullname);
4975		- }
4976		- /**/
4977		- }
4978		- }
4979		-
4980	5482	String GetFile(String dialogName)
4981	5483	{
4982		- if (GrafreeD.standAlone)
	5484	+ if (Grafreed.standAlone)
4983	5485	{
4984	5486	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4985	5487	browser.show();
..	..	@@ -5047,7 +5549,28 @@
5047	5549	cButton clearpanelButton;
5048	5550	cButton unselectButton;
5049	5551
	5552	+ cButton restoreCameraButton;
	5553	+
	5554	+ cButton saveButton;
5050	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;
5051	5574
5052	5575	cButton screenfitButton;
5053	5576	cButton screenfitpointButton;
..	..	@@ -5060,14 +5583,6 @@
5060	5583
5061	5584	cButton setsupportButton;
5062	5585
5063		- cButton twoButton;
5064		- cButton sixButton;
5065		- cButton threeButton;
5066		- cButton sevenButton;
5067		- cButton fourButton; // full panel
5068		- cButton oneButton; // full XYZ
5069		- //cButton currentLayout;
5070		-
5071	5586	//
5072	5587	//Composite
5073	5588	Object3D // to do !!
..	..	@@ -5077,9 +5592,11 @@
5077	5592	//JTree jTree;
5078	5593	private MenuItem lookAtItem;
5079	5594	private MenuItem lookFromItem;
5080		- private MenuItem switchItem;
	5595	+ private MenuItem switchViewItem;
5081	5596	private MenuItem cutItem;
5082		- private MenuItem duplicateItem;
	5597	+ private MenuItem undoItem;
	5598	+ private MenuItem redoItem;
	5599	+ private JMenuItem duplicateItem;
5083	5600	private MenuItem cloneItem;
5084	5601	private MenuItem cloneSupportItem;
5085	5602	private MenuItem overwriteGeoItem;
..	..	@@ -5092,7 +5609,7 @@
5092	5609	private MenuItem linkverticesItem;
5093	5610	private MenuItem relinkverticesItem;
5094	5611	private MenuItem setMasterItem;
5095		- private MenuItem resetMeshItem;
	5612	+ private MenuItem resetAllItem;
5096	5613	private MenuItem stepAllItem;
5097	5614	private MenuItem revertMeshItem;
5098	5615	private MenuItem poseMeshItem;
..	..	@@ -5142,6 +5659,10 @@
5142	5659	private MenuItem showleavesItem;
5143	5660	private MenuItem markleavesItem;
5144	5661	private MenuItem unmarkleavesItem;
	5662	+ private MenuItem rewindleavesItem;
	5663	+ private MenuItem unrewindleavesItem;
	5664	+ private MenuItem randomleavesItem;
	5665	+ private MenuItem unrandomleavesItem;
5145	5666
5146	5667	private MenuItem flipVItem;
5147	5668	private MenuItem unflipVItem;
..	..	@@ -5153,15 +5674,17 @@
5153	5674	private MenuItem panoTexturesItem;
5154	5675
5155	5676	private MenuItem resetCentroidItem;
5156		- private MenuItem transformgeometryItem;
	5677	+ private MenuItem resetCentroidXZItem;
5157	5678	private MenuItem resetTransformItem;
	5679	+ private MenuItem transformGeometryItem;
	5680	+ private MenuItem transformChildrenItem;
5158	5681	private MenuItem hideItem;
5159	5682	private MenuItem grabItem;
5160	5683	private MenuItem backItem;
5161	5684	private MenuItem frontItem;
5162	5685	private MenuItem cameraItem;
5163	5686	private MenuItem compositeItem;
5164		- private MenuItem randomItem;
	5687	+ private MenuItem switchItem;
5165	5688	private MenuItem physicsItem;
5166	5689	private MenuItem frameselectorItem;
5167	5690	private MenuItem scriptNodeItem;
..	..	@@ -5223,11 +5746,6 @@
5223	5746	private MenuItem doubleItem;
5224	5747	private MenuItem tripleItem;
5225	5748
5226		- private MenuItem importGFDItem;
5227		- private MenuItem importVRMLX3DItem;
5228		- private MenuItem import3DSItem;
5229		- private MenuItem importOBJItem;
5230		-
5231	5749	private MenuItem computeAOItem;
5232	5750	private MenuItem recompileItem;
5233	5751	private MenuItem editScriptItem;
..	..	@@ -5237,4 +5755,8 @@
5237	5755	private MenuItem analyzeItem;
5238	5756	private MenuItem dumpItem;
5239	5757	//boolean freezemodel = false;
	5758	+
	5759	+ Menu cameraMenu;
	5760	+ MenuItem editCameraItem;
	5761	+ MenuItem restoreCameraItem;
5240	5762	}