~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,213 @@
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	+ 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");
492	621	liveCB.addItemListener(this);
493	622
494		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	623	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
495	624	oneStepButton.setToolTipText("Animate one step forward");
496	625	oneStepButton.addActionListener(this);
497	626
498		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	627	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
499	628	fastCB.setToolTipText("Fast mode");
500	629	fastCB.addItemListener(this);
501	630
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);
	631	+ //oe.toolboxPanel.Return();
	632	+
	633	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
507	634	screenfitButton.setToolTipText("Screen fit");
508	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);
509	640
510	641	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
511	642	// screenfitpointButton.addActionListener(this);
512	643
513	644	if (Globals.ADVANCED)
514	645	{
515		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	646	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
516	647	snapobjectButton.addActionListener(this);
517	648	snapobjectButton.setToolTipText("Snap Object");
518	649	}
519	650
520		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
521		- flashSelectionButton.setToolTipText("Show selection");
522		- flashSelectionButton.addActionListener(this);
	651	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
523	652
524		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
525		-
526		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	653	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
527	654	twoButton.setToolTipText("Show center view only");
528	655	twoButton.addActionListener(this);
529		- 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);
530	659	fourButton.addActionListener(this);
531	660	fourButton.setToolTipText("Show left panel only");
532		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	661	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
533	662	sixButton.setToolTipText("2-column layout left");
534	663	sixButton.addActionListener(this);
535		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
536	665	threeButton.setToolTipText("2-column layout right");
537	666	threeButton.addActionListener(this);
538		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	667	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
539	668	sevenButton.setToolTipText("3-column layout");
540	669	sevenButton.addActionListener(this);
541	670	//
542	671
543		- 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);
544	673	rootButton.setToolTipText("Edit selection in new tab");
545	674	rootButton.addActionListener(this);
546	675
547		- 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);
548	677	closeButton.setToolTipText("Close tab");
549	678	closeButton.addActionListener(this);
550	679	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
551	680	//clearButton.addActionListener(this);
552		-
553		- 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	+ }
554	713
555		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
556		- 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");
557	763	editButton.addActionListener(this);
558	764
559		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
560		- uneditButton.setToolTipText("Unedit selection");
	765	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	766	+ uneditButton.setToolTipText("Remove selection controls");
561	767	uneditButton.addActionListener(this);
562	768
563		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
564		- allParamsButton.setToolTipText("Edit all params");
	769	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	770	+ allParamsButton.setToolTipText("Show all controle");
565	771	allParamsButton.addActionListener(this);
566	772
567		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	773	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
568	774	clearPanelButton.setToolTipText("Clear edit panel");
569	775	clearPanelButton.addActionListener(this);
570	776
571		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	777	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
572	778	unselectButton.setToolTipText("Unselect");
573	779	unselectButton.addActionListener(this);
574	780
575		- 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);
576	784
577		- oe.treePanel.add(commandsPanel);
578		- oe.treePanel.Return();
	785	+ editCommandsPanel.preferredHeight = 1;
	786	+
	787	+ SetPinStates(false);
	788	+// oe.treePanel.add(commandsPanel);
	789	+// oe.treePanel.Return();
579	790
580	791	// oe.aConstraints.gridx += 1;
581	792	// oe.aConstraints.weighty = 0;
..	..	@@ -592,27 +803,12 @@
592	803
593	804	JScrollPane jSP;
594	805	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
595		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	806	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
596	807	ResetModel();
597	808
598	809	oe.treePanel.add(jSPPanel);
599	810	oe.treePanel.Return();
600	811
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	812	oe.treePanel.add(copyOptionsPanel);
617	813	oe.treePanel.Return();
618	814
..	..	@@ -643,23 +839,43 @@
643	839
644	840	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
645	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	+
646	856	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
647	857	boxCB.setToolTipText("Display bounding boxes");
648	858	boxCB.addItemListener(this);
649	859
650	860	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
651		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	861	+ zoomBoxCB.setToolTipText("Display only for wheel");
652	862	zoomBoxCB.addItemListener(this);
653	863
654		- if (Globals.ADVANCED)
	864	+ if (true) // Globals.ADVANCED)
655	865	{
656		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
657		- supportCB.setToolTipText("Enable rigging");
658		- 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);
659	873
660	874	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
661	875	// localCB.addItemListener(this);
662	876
	877	+ panel.Return();
	878	+
663	879	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
664	880	crowdCB.setToolTipText("Used for crowds");
665	881	crowdCB.addItemListener(this);
..	..	@@ -676,6 +892,8 @@
676	892	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
677	893	// speakerMocapCB.addItemListener(this);
678	894
	895	+ panel.Return();
	896	+
679	897	if (false)
680	898	{
681	899	// handled in scripts
..	..	@@ -690,32 +908,72 @@
690	908	//constraints.gridy += 1;
691	909	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
692	910	smoothfocusCB.addItemListener(this);
	911	+ panel.Return();
693	912	}
694	913
695	914	//constraints.gridx += 1;
696	915	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
697	916	// debugCB.addItemListener(this);
698	917
	918	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	919	+ trackCB.setToolTipText("Enable tracking target");
	920	+ trackCB.addItemListener(this);
	921	+
699	922	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	923	+ oeilCB.setToolTipText("Move camera when tracking");
700	924	oeilCB.addItemListener(this);
701	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	+ {
702	946	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
703	947	lookAtCB.setToolTipText("Look-at target");
704	948	lookAtCB.addItemListener(this);
	949	+ }
705	950
706	951	}
707	952
708	953	cGridBag fill = new cGridBag();
709		-
710	954	fill.preferredHeight = 200;
	955	+ cGridBag fill2 = new cGridBag();
	956	+ fill2.preferredHeight = 200;
	957	+ cGridBag fill3 = new cGridBag();
	958	+ fill3.preferredHeight = 200;
711	959
712	960	panel.add(fill);
	961	+ panel.add(fill2);
	962	+ panel.add(fill3);
713	963
714	964	}
715	965
716	966	void EditObject(Object3D obj)
717	967	{
718	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	+
719	977	radioButton.SetObject(obj);
720	978	radioButton.layout = sevenButton;
721	979	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -724,8 +982,11 @@
724	982	buttonGroup.add(radioButton);
725	983	radioButton.doClick();
726	984	}
	985	+
727	986	void SetupViews(ObjEditor oe)
728	987	{
	988	+ theFrame = this;
	989	+
729	990	oe.SetupViews();
730	991
731	992	System.out.println("SetupViews");
..	..	@@ -734,23 +995,28 @@
734	995	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
735	996	}
736	997
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;
	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;
748	1011	// JCheckBox speakerMocapCB;
749		- JCheckBox speakerCameraCB;
750		- JCheckBox speakerFocusCB;
751		- JCheckBox debugCB;
752		- JCheckBox oeilCB;
753		- JCheckBox lookAtCB;
	1012	+ cCheckBox speakerCameraCB;
	1013	+ cCheckBox speakerFocusCB;
	1014	+ cCheckBox debugCB;
	1015	+
	1016	+ cCheckBox oeilCB;
	1017	+ cCheckBox shadowCB;
	1018	+ cCheckBox autosaveCB;
	1019	+ cCheckBox lookAtCB;
754	1020
755	1021	// static int COLOR = 1;
756	1022	// static int MATERIAL = 2;
..	..	@@ -758,9 +1024,9 @@
758	1024
759	1025	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
760	1026
761		- JCheckBox colorCB;
762		- JCheckBox materialCB;
763		- JCheckBox textureCB;
	1027	+ cCheckBox colorCB;
	1028	+ cCheckBox materialCB;
	1029	+ cCheckBox textureCB;
764	1030
765	1031	public void itemStateChanged(ItemEvent e)
766	1032	{
..	..	@@ -788,6 +1054,7 @@
788	1054	} else if(e.getSource() == liveCB)
789	1055	{
790	1056	cameraView.ToggleLive();
	1057	+ refreshContents(false);
791	1058	}
792	1059	else if(e.getSource() == supportCB)
793	1060	{
..	..	@@ -852,6 +1119,18 @@
852	1119	{
853	1120	cameraView.ToggleOeil();
854	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	+ }
855	1134	else if(e.getSource() == lookAtCB)
856	1135	{
857	1136	cameraView.ToggleLookAt();
..	..	@@ -868,7 +1147,8 @@
868	1147
869	1148	/**/
870	1149	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
871		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1150	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1151	+ TreePath path = objEditor.jTree.getSelectionPath();
872	1152	if ((path == null) \|\| (path.getPathCount() <= 1)) {
873	1153	// We can't move the root node or an empty selection
874	1154	return;
..	..	@@ -940,7 +1220,9 @@
940	1220	// objEditor.DropFile((java.io.File[]) object, true);
941	1221	// return;
942	1222	// }
943		- if (string.charAt(0) == '/')
	1223	+
	1224	+ // File path for Mac and Windows
	1225	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
944	1226	{
945	1227	// file(s)
946	1228	String[] names = string.split("\n");
..	..	@@ -967,7 +1249,7 @@
967	1249
968	1250	flashIt = false;
969	1251	CameraPane pane = (CameraPane) target;
970		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1252	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
971	1253	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
972	1254
973	1255	if (group.selection.size() == 1)
..	..	@@ -983,23 +1265,33 @@
983	1265
984	1266	assert target == objEditor.jTree;
985	1267	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1268	+ Object3D destinationLeaf;
986	1269	try {
987		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1270	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
988	1271	} catch (Exception e) {
989	1272	System.out.println("destinationPath : " + destinationPath);
990	1273	return;
991	1274	}
992	1275
993		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1276	+ for (int i=group.selection.size(); --i>=0;)
994	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	+// {
995	1287	loadClipboard(true);
996	1288	objEditor.jTree.setSelectionPath(destinationPath);
997	1289	pasteInto(false, false);
998		- } else {
999		- loadClipboard(false);
1000		- objEditor.jTree.setSelectionPath(destinationPath);
1001		- pasteInto(false, false); // true); // ???
1002		- }
	1290	+// } else {
	1291	+// loadClipboard(false);
	1292	+// objEditor.jTree.setSelectionPath(destinationPath);
	1293	+// pasteInto(false, false); // true); // ???
	1294	+// }
1003	1295	}
1004	1296	public void dropActionChanged(DropTargetDragEvent dtde)
1005	1297	// Called if the user has modified the current drop gesture
..	..	@@ -1104,22 +1396,30 @@
1104	1396	{
1105	1397	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1106	1398	//heightFieldItem.addActionListener(this);
1107		- gridItem = menu.add(new MenuItem("Grid"));
1108		- gridItem.addActionListener(this);
1109		- rectoidItem = menu.add(new MenuItem("Box"));
1110		- rectoidItem.addActionListener(this);
1111		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1112		- ellipsoidItem.addActionListener(this);
1113		- coneItem = menu.add(new MenuItem("Cone"));
1114		- coneItem.addActionListener(this);
1115		- torusItem = menu.add(new MenuItem("Torus"));
1116		- torusItem.addActionListener(this);
1117		- superItem = menu.add(new MenuItem("Superellipsoid"));
1118		- 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	+ {
1119	1417	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1120	1418	kleinItem.addActionListener(this);
1121		- particleItem = menu.add(new MenuItem("Particle system"));
1122		- particleItem.addActionListener(this);
	1419	+ }
	1420	+
	1421	+// particleItem = menu.add(new MenuItem("Particle system"));
	1422	+// particleItem.addActionListener(this);
1123	1423	if (Globals.ADVANCED)
1124	1424	{
1125	1425	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1145,15 +1445,15 @@
1145	1445	}
1146	1446	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1147	1447	bezierItem.addActionListener(this);
1148		- overlayItem = menu.add(new MenuItem("Overlay"));
1149		- overlayItem.addActionListener(this);
1150		- lightItem = menu.add(new MenuItem("Light"));
1151		- 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);
1152	1452	menu.add("-");
1153	1453	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1154	1454	//superLoopItem.addActionListener(this);
1155		- loopItem = menu.add(new MenuItem("Loop"));
1156		- loopItem.addActionListener(this);
	1455	+// loopItem = menu.add(new MenuItem("Loop"));
	1456	+// loopItem.addActionListener(this);
1157	1457	doubleItem = menu.add(new MenuItem("Fork"));
1158	1458	doubleItem.addActionListener(this);
1159	1459	if (Globals.ADVANCED)
..	..	@@ -1193,7 +1493,7 @@
1193	1493	memoryItem.addActionListener(this);
1194	1494	menu.add(analyzeItem = new MenuItem("Analyze"));
1195	1495	analyzeItem.addActionListener(this);
1196		- menu.add(dumpItem = new MenuItem("Dump"));
	1496	+ menu.add(dumpItem = new MenuItem("Print"));
1197	1497	dumpItem.addActionListener(this);
1198	1498	// menu.add(pathItem = new MenuItem("From-to path"));
1199	1499	// pathItem.addActionListener(this);
..	..	@@ -1334,9 +1634,24 @@
1334	1634	shadow.material = new cMaterial(obj.material);
1335	1635	shadow.material.diffuse = 0.0001f;
1336	1636	shadow.material.specular = 0.0001f;
	1637	+ //shadow.projectedVertices[1].x = 300;
1337	1638
1338	1639	makeSomething(shadow);
1339	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	+ }
1340	1655
1341	1656	/**
1342	1657	* applyExample
..	..	@@ -1540,9 +1855,9 @@
1540	1855
1541	1856	void Overwrite(int mask)
1542	1857	{
1543		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1858	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1544	1859	{
1545		- Object3D content = GrafreeD.clipboard.get(0);
	1860	+ Object3D content = Grafreed.clipboard.get(0);
1546	1861
1547	1862	if (content instanceof cGroup && ((cGroup)content).transientlink )
1548	1863	content = ((cGroup)content).get(0);
..	..	@@ -1581,7 +1896,7 @@
1581	1896	{
1582	1897	ScreenFit();
1583	1898	} else
1584		- if (source == switchItem)
	1899	+ if (source == switchViewItem)
1585	1900	{
1586	1901	cVector v1 = new cVector();
1587	1902	cVector v2 = new cVector();
..	..	@@ -1590,11 +1905,11 @@
1590	1905	objEditor.cameraView.renderCamera.setAim(v2, v1);
1591	1906	objEditor.cameraView.repaint();
1592	1907	} else
1593		- if (source == rectoidItem)
	1908	+ if (source == rectoidItem \|\| source == boxButton)
1594	1909	{
1595	1910	makeSomething(new Box());
1596	1911	} else
1597		- if (source == particleItem)
	1912	+ if (source == particleItem \|\| source == particlesButton)
1598	1913	{
1599	1914	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1600	1915	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1673,27 +1988,27 @@
1673	1988
1674	1989	makeSomething(obj);
1675	1990	} else
1676		- if (source == gridItem)
	1991	+ if (source == gridItem \|\| source == gridButton)
1677	1992	{
1678	1993	makeSomething(new Grid());
1679	1994	} else
1680		- if (source == ellipsoidItem)
	1995	+ if (source == ellipsoidItem \|\| source == sphereButton)
1681	1996	{
1682	1997	makeSomething(new Sphere());
1683	1998	} else
1684		- if (source == coneItem)
	1999	+ if (source == coneItem \|\| source == coneButton)
1685	2000	{
1686	2001	makeSomething(new Cone());
1687	2002	} else
1688		- if (source == torusItem)
	2003	+ if (source == torusItem \|\| source == torusButton)
1689	2004	{
1690	2005	makeSomething(new Torus());
1691	2006	} else
1692		- if (source == superItem)
	2007	+ if (source == superItem \|\| source == superButton)
1693	2008	{
1694	2009	makeSomething(new Superellipsoid());
1695	2010	} else
1696		- if (source == kleinItem)
	2011	+ if (source == kleinItem \|\| source == kleinButton)
1697	2012	{
1698	2013	makeSomething(new Klein());
1699	2014	} else
..	..	@@ -1713,7 +2028,7 @@
1713	2028	{
1714	2029	makeSomething(new BezierSurface());
1715	2030	} else
1716		- if (source == overlayItem)
	2031	+ if (source == overlayItem \|\| source == overlayButton)
1717	2032	{
1718	2033	/*
1719	2034	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1761,7 +2076,7 @@
1761	2076	s.setup();
1762	2077	makeSomething(s);
1763	2078	} else
1764		- if (source == lightItem)
	2079	+ if (source == lightItem \|\| source == lightButton)
1765	2080	{
1766	2081	makeSomething(new Light());
1767	2082	} else
..	..	@@ -1811,30 +2126,30 @@
1811	2126
1812	2127	group(g);
1813	2128	} else
1814		- if (source == loopItem)
	2129	+ if (source == loopItem \|\| source == loopButton)
1815	2130	{
1816	2131	Composite csg = new GroupLeaf();
1817	2132	csg.count = 5;
1818	2133	group(csg);
1819		- Composite child = new cGroup();
	2134	+ Composite child = new cGroup("Branch");
1820	2135	csg.addChild(child);
1821	2136	child.addChild(csg);
1822	2137	} else
1823	2138	if (source == doubleItem)
1824	2139	{
1825		- Composite csg = new GroupLeaf();
	2140	+ Composite csg = new GroupLeaf("Fork");
1826	2141	csg.count = 5;
1827	2142	group(csg);
1828		- Composite child = new cGroup();
	2143	+ Composite child = new cGroup("Branch A");
1829	2144	csg.addChild(child);
1830	2145	child.addChild(csg);
1831		- child = new cGroup();
	2146	+ child = new cGroup("Branch B");
1832	2147	csg.addChild(child);
1833	2148	child.addChild(csg);
1834	2149	} else
1835	2150	if (source == tripleItem)
1836	2151	{
1837		- Composite csg = new GroupLeaf();
	2152	+ Composite csg = new GroupLeaf("Trident");
1838	2153	csg.count = 4;
1839	2154	group(csg);
1840	2155	Composite child = new cGroup();
..	..	@@ -1846,31 +2161,6 @@
1846	2161	child = new cGroup();
1847	2162	csg.addChild(child);
1848	2163	child.addChild(csg);
1849		- } else
1850		-
1851		- if (source == importGFDItem)
1852		- {
1853		- ImportGFD();
1854		- } else
1855		- if (source == importVRMLX3DItem)
1856		- {
1857		- ImportVRMLX3D();
1858		- } else
1859		- if (source == import3DSItem)
1860		- {
1861		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1862		- } else
1863		- if (source == importOBJItem)
1864		- {
1865		- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1866		- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1867		- browser.setVisible(true);
1868		- String filename = browser.getFile();
1869		- if (filename != null && filename.length() > 0)
1870		- {
1871		- String fullname = browser.getDirectory() + filename;
1872		- makeSomething(ReadOBJ(fullname), true);
1873		- }
1874	2164	} else
1875	2165	if (source == computeAOItem)
1876	2166	{
..	..	@@ -1890,7 +2180,7 @@
1890	2180	if (source == invariantsItem)
1891	2181	{
1892	2182	System.out.println("Invariants:");
1893		- GrafreeD.grafreeD.universe.invariants();
	2183	+ Grafreed.grafreeD.universe.invariants();
1894	2184	} else
1895	2185	if (source == memoryItem)
1896	2186	{
..	..	@@ -1908,6 +2198,30 @@
1908	2198	if (source == dumpItem)
1909	2199	{
1910	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();
1911	2225	} else
1912	2226	if (source == oneStepButton)
1913	2227	{
..	..	@@ -1963,12 +2277,20 @@
1963	2277	{
1964	2278	loadClipboard(true);
1965	2279	} else
	2280	+ if (source == undoItem)
	2281	+ {
	2282	+ Undo();
	2283	+ } else
	2284	+ if (source == redoItem)
	2285	+ {
	2286	+ Redo();
	2287	+ } else
1966	2288	if (source == duplicateItem)
1967	2289	{
1968		- Object3D keep = GrafreeD.clipboard;
	2290	+ Object3D keep = Grafreed.clipboard;
1969	2291	loadClipboard(false);
1970	2292	paste(false);
1971		- GrafreeD.clipboard = keep;
	2293	+ Grafreed.clipboard = keep;
1972	2294	} else
1973	2295	if (source == cloneItem)
1974	2296	{
..	..	@@ -2188,9 +2510,9 @@
2188	2510	// group.selection.get(0).setMasterThis(content); // should be identity
2189	2511	// refreshContents();
2190	2512	// }
2191		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2513	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2192	2514	{
2193		- Object3D content = GrafreeD.clipboard.get(0);
	2515	+ Object3D content = Grafreed.clipboard.get(0);
2194	2516
2195	2517	if (content instanceof cGroup && ((cGroup)content).transientlink )
2196	2518	content = ((cGroup)content).get(0);
..	..	@@ -2240,9 +2562,9 @@
2240	2562	} else
2241	2563	if (source == setMasterItem)
2242	2564	{
2243		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2565	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2244	2566	{
2245		- Object3D content = GrafreeD.clipboard.get(0);
	2567	+ Object3D content = Grafreed.clipboard.get(0);
2246	2568
2247	2569	if (content instanceof cGroup && ((cGroup)content).transientlink )
2248	2570	content = ((cGroup)content).get(0);
..	..	@@ -2255,9 +2577,9 @@
2255	2577	{
2256	2578	if (group.selection.size() == 1)
2257	2579	{
2258		- if (GrafreeD.clipboard.size() == 1)
	2580	+ if (Grafreed.clipboard.size() == 1)
2259	2581	{
2260		- Object3D content = GrafreeD.clipboard.get(0);
	2582	+ Object3D content = Grafreed.clipboard.get(0);
2261	2583
2262	2584	if (content instanceof cGroup && ((cGroup)content).transientlink )
2263	2585	content = ((cGroup)content).get(0);
..	..	@@ -2274,7 +2596,7 @@
2274	2596	{
2275	2597	RevertMeshes();
2276	2598	} else
2277		- if (source == resetMeshItem)
	2599	+ if (source == resetAllItem)
2278	2600	{
2279	2601	ResetAll();
2280	2602	} else
..	..	@@ -2294,9 +2616,9 @@
2294	2616	{
2295	2617	ClearSelection(true);
2296	2618	} else
2297		- if (source == grabItem)
	2619	+ if (source == grabItem \|\| source == groupButton)
2298	2620	{
2299		- group(new cGroup(), true);
	2621	+ group(new cGroup(), false); // true);
2300	2622	} else
2301	2623	if (source == hideItem)
2302	2624	{
..	..	@@ -2314,11 +2636,11 @@
2314	2636	{
2315	2637	makeSomething(new Camera());
2316	2638	} else
2317		- if (source == compositeItem)
	2639	+ if (source == compositeItem \|\| source == compositeButton)
2318	2640	{
2319	2641	group(new Composite());
2320	2642	} else
2321		- if (source == randomItem)
	2643	+ if (source == switchItem \|\| source == switchButton)
2322	2644	{
2323	2645	RandomNode random = new RandomNode();
2324	2646	group(random);
..	..	@@ -2420,7 +2742,7 @@
2420	2742	{
2421	2743	group(new cLinker());
2422	2744	} else
2423		- if (source == textureItem)
	2745	+ if (source == textureItem \|\| source == textureButton)
2424	2746	{
2425	2747	group(new TextureNode());
2426	2748	} else
..	..	@@ -2440,17 +2762,30 @@
2440	2762	{
2441	2763	CastShadow(2);
2442	2764	} else
2443		- if (source == ungroupItem)
	2765	+ if (source == ungroupItem \|\| source == ungroupButton)
2444	2766	{
2445		- //ungroup();
	2767	+ boolean hasRoot = false;
	2768	+
2446	2769	for (int i=0; i<group.selection.size(); i++)
2447	2770	{
2448		- Ungroup(group.selection.get(i));
	2771	+ if (group.selection.get(i) == group)
	2772	+ {
	2773	+ hasRoot = true;
	2774	+ break;
	2775	+ }
2449	2776	}
2450	2777
2451		- ClearSelection(false);
2452		-
2453		- 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	+ }
2454	2789	} else
2455	2790	if (source == genUVItem)
2456	2791	{
..	..	@@ -2462,7 +2797,7 @@
2462	2797	} else
2463	2798	if (source == genNormalsMESHItem)
2464	2799	{
2465		- GenNormals(true); // TODO
	2800	+ GenNormalsMESH();
2466	2801	} else
2467	2802	if (source == genNormalsORGANItem)
2468	2803	{
..	..	@@ -2527,6 +2862,22 @@
2527	2862	if (source == unmarkleavesItem)
2528	2863	{
2529	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);
2530	2881	} else
2531	2882	if (source == flipVItem)
2532	2883	{
..	..	@@ -2612,9 +2963,13 @@
2612	2963	{
2613	2964	SmoothMesh();
2614	2965	} else
2615		- if (source == transformgeometryItem)
	2966	+ if (source == transformGeometryItem)
2616	2967	{
2617	2968	TransformGeometry();
	2969	+ } else
	2970	+ if (source == transformChildrenItem)
	2971	+ {
	2972	+ TransformChildren();
2618	2973	} else
2619	2974	if (source == resetTransformItem)
2620	2975	{
..	..	@@ -2622,7 +2977,11 @@
2622	2977	} else
2623	2978	if (source == resetCentroidItem)
2624	2979	{
2625		- ResetCentroid();
	2980	+ ResetCentroid(true);
	2981	+ } else
	2982	+ if (source == resetCentroidXZItem)
	2983	+ {
	2984	+ ResetCentroid(false);
2626	2985	} else
2627	2986	if (source == resetParentItem)
2628	2987	{
..	..	@@ -2754,6 +3113,10 @@
2754	3113	if (source == twoButton)
2755	3114	{
2756	3115	radio.layout = twoButton;
	3116	+
	3117	+ if (CameraPane.FULLSCREEN)
	3118	+ fullscreenLayout = radio.layout;
	3119	+
2757	3120	// bug
2758	3121	//gridPanel.setDividerLocation(1.0);
2759	3122	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2786,10 +3149,31 @@
2786	3149	bigThree.ClearUI();
2787	3150	bigThree.add(centralPanel);
2788	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	+
2789	3170	} else
2790	3171	if (source == threeButton)
2791	3172	{
2792	3173	radio.layout = threeButton;
	3174	+
	3175	+ if (CameraPane.FULLSCREEN)
	3176	+ fullscreenLayout = radio.layout;
2793	3177
2794	3178	// bigThree.remove(scenePanel);
2795	3179	// bigThree.remove(centralPanel);
..	..	@@ -2822,10 +3206,15 @@
2822	3206	bigThree.add(centralPanel);
2823	3207	bigThree.add(XYZPanel);
2824	3208	bigThree.FlushUI();
	3209	+
	3210	+ cameraView.requestFocusInWindow();
2825	3211	} else
2826	3212	if (source == fourButton)
2827	3213	{
2828	3214	radio.layout = fourButton;
	3215	+
	3216	+ if (CameraPane.FULLSCREEN)
	3217	+ fullscreenLayout = radio.layout;
2829	3218
2830	3219	// bigThree.remove(scenePanel);
2831	3220	// bigThree.remove(centralPanel);
..	..	@@ -2857,10 +3246,15 @@
2857	3246	bigThree.ClearUI();
2858	3247	bigThree.add(scenePanel);
2859	3248	bigThree.FlushUI();
	3249	+
	3250	+ cameraView.requestFocusInWindow();
2860	3251	} else
2861	3252	if (source == sixButton)
2862	3253	{
2863	3254	radio.layout = sixButton;
	3255	+
	3256	+ if (CameraPane.FULLSCREEN)
	3257	+ fullscreenLayout = radio.layout;
2864	3258
2865	3259	// bigThree.remove(scenePanel);
2866	3260	// bigThree.remove(centralPanel);
..	..	@@ -2893,10 +3287,15 @@
2893	3287	bigThree.add(scenePanel);
2894	3288	bigThree.add(centralPanel);
2895	3289	bigThree.FlushUI();
	3290	+
	3291	+ cameraView.requestFocusInWindow();
2896	3292	} else
2897	3293	if (source == sevenButton)
2898	3294	{
2899	3295	radio.layout = sevenButton;
	3296	+
	3297	+ if (CameraPane.FULLSCREEN)
	3298	+ fullscreenLayout = radio.layout;
2900	3299
2901	3300	// bigThree.remove(scenePanel);
2902	3301	// bigThree.remove(centralPanel);
..	..	@@ -2930,6 +3329,8 @@
2930	3329	bigThree.add(centralPanel);
2931	3330	bigThree.add(XYZPanel);
2932	3331	bigThree.FlushUI();
	3332	+
	3333	+ cameraView.requestFocusInWindow();
2933	3334	} else
2934	3335	if (source == rootButton)
2935	3336	{
..	..	@@ -2941,6 +3342,7 @@
2941	3342	EditObject(obj);
2942	3343	}
2943	3344
	3345	+ cameraView.requestFocusInWindow();
2944	3346	refreshContents(true);
2945	3347	} else
2946	3348	if (source == closeButton)
..	..	@@ -2950,22 +3352,37 @@
2950	3352	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2951	3353	{
2952	3354	ab = (cRadio)e.nextElement();
2953		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3355	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2954	3356	{
	3357	+ // Patch to avoid bug with transparency.
	3358	+ if (!ab.hadMaterial)
	3359	+ {
	3360	+ ab.object.material = null;
	3361	+ }
	3362	+
2955	3363	buttonGroup.remove(ab);
2956	3364	radioPanel.remove(ab);
2957	3365
2958		- ab.GetObject().editWindow = null;
	3366	+ //ab.GetObject().editWindow = null;
	3367	+ ab.GetObject().manipWindow = null;
2959	3368	// ab.GetObject().objectUI = null; // ?????????
2960	3369
2961	3370	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2962	3371	break;
2963	3372	}
2964	3373	}
	3374	+
	3375	+ cameraView.requestFocusInWindow();
2965	3376	refreshContents(true);
2966	3377	} else
2967	3378	if (source == editItem \|\| source == editButton)
2968	3379	{
	3380	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3381	+ {
	3382	+ Object3D child = (Object3D)e.nextElement();
	3383	+ child.pinned = true;
	3384	+ }
	3385	+
2969	3386	EditSelection(false);
2970	3387	} else
2971	3388	if (source == uneditButton)
..	..	@@ -2975,10 +3392,11 @@
2975	3392	Object3D child = (Object3D)e.nextElement();
2976	3393	if(child.editWindow != null)
2977	3394	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3395	+ child.pinned = false;
2978	3396	child.CloseUI();
2979	3397	listUI.remove(child);
2980	3398
2981		- child.editWindow = null; // ???????????
	3399	+ //child.editWindow = null; // ???????????
2982	3400	}
2983	3401	objEditor.ctrlPanel.FlushUI();
2984	3402	//objEditor.jTree.clearSelection();
..	..	@@ -2991,6 +3409,7 @@
2991	3409	//copy.ClearUI();
2992	3410	for (Object3D obj : listUI)
2993	3411	{
	3412	+ obj.pinned = false;
2994	3413	obj.CloseUI();
2995	3414	}
2996	3415	listUI.clear();
..	..	@@ -3000,7 +3419,7 @@
3000	3419	{
3001	3420	assert(copy == group);
3002	3421
3003		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3422	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3004	3423
3005	3424	for (Object3D obj : listUI)
3006	3425	{
..	..	@@ -3064,20 +3483,44 @@
3064	3483	frontView.object = group;
3065	3484	sideView.object = group;
3066	3485	}
3067		- group.editWindow = this;
	3486	+
	3487	+// fix "+" issue
	3488	+ //group.editWindow = this;
	3489	+ group.manipWindow = this;
	3490	+
3068	3491	/*
3069	3492	currentLayout = radio.layout;
3070	3493	if (currentLayout == null)
3071	3494	currentLayout = sevenButton;
3072	3495	*/
3073	3496	radio.layout.doClick();
	3497	+
	3498	+ ClearUnpinned();
	3499	+ SetPinStates(group.selection.size() > 0);
	3500	+ if (group.selection.size() == 1)
	3501	+ EditSelection(false);
3074	3502	keepparent = group.parent;
3075	3503	// PARENT = NULL or not???
3076	3504	//group.parent = null; // ROOT
3077	3505	//group.attributes = -1;
3078	3506	ResetModel();
	3507	+
	3508	+ cameraView.requestFocusInWindow();
3079	3509	refreshContents(true);
3080		- }
	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	+ }
3081	3524	else
3082	3525	{
3083	3526	//return super.action(event, arg);
..	..	@@ -3086,7 +3529,6 @@
3086	3529	}
3087	3530
3088	3531	boolean useclient = false;
3089		- cRadio radio;
3090	3532
3091	3533	void ToggleRoot()
3092	3534	{
..	..	@@ -3138,6 +3580,28 @@
3138	3580	refreshContents();
3139	3581	}
3140	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	+ }
3141	3605
3142	3606	void ResetTransform()
3143	3607	{
..	..	@@ -3250,7 +3714,7 @@
3250	3714	refreshContents();
3251	3715	}
3252	3716
3253		- void ResetCentroid()
	3717	+ void ResetCentroid(boolean full)
3254	3718	{
3255	3719	Object3D obj;
3256	3720	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3265,12 +3729,16 @@
3265	3729	LA.matIdentity(Object3D.mat);
3266	3730	obj.getBounds(minima, maxima, false);
3267	3731	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3268		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3732	+ if (full)
	3733	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3269	3734	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3270	3735	obj.TransformMesh(Object3D.mat);
	3736	+
3271	3737	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3272		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3738	+ if (full)
	3739	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3273	3740	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3741	+
3274	3742	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3275	3743	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3276	3744	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3299,7 +3767,8 @@
3299	3767
3300	3768	int size = obj.MemorySize();
3301	3769
3302		- 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)");
3303	3772	}
3304	3773	}
3305	3774	catch (Exception e)
..	..	@@ -3336,9 +3805,9 @@
3336	3805	obj = (Object3D)e.nextElement();
3337	3806
3338	3807	System.out.println("Object is: " + obj);
3339		- GrafreeD.AnalyzeObject(obj);
	3808	+ Grafreed.AnalyzeObject(obj);
3340	3809	System.out.println("Boundary rep: " + obj.bRep);
3341		- GrafreeD.AnalyzeObject(obj.bRep);
	3810	+ Grafreed.AnalyzeObject(obj.bRep);
3342	3811
3343	3812	// System.err.println((size/1024) + " KB is the size of " + obj);
3344	3813	}
..	..	@@ -3380,6 +3849,13 @@
3380	3849	void GenNormals(boolean crease)
3381	3850	{
3382	3851	group.GenNormalsS(crease);
	3852	+
	3853	+ refreshContents();
	3854	+ }
	3855	+
	3856	+ void GenNormalsMESH()
	3857	+ {
	3858	+ group.GenNormalsMeshS();
3383	3859
3384	3860	refreshContents();
3385	3861	}
..	..	@@ -3552,8 +4028,8 @@
3552	4028
3553	4029	void ParseVertices()
3554	4030	{
3555		- boolean epsequal = GrafreeD.epsequal;
3556		- GrafreeD.epsequal = true;
	4031	+ boolean epsequal = Grafreed.epsequal;
	4032	+ Grafreed.epsequal = true;
3557	4033
3558	4034	for (int i=0; i<group.selection.size(); i++)
3559	4035	{
..	..	@@ -3578,7 +4054,7 @@
3578	4054	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3579	4055	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3580	4056
3581		- g.add(GrafreeD.clipboard);
	4057	+ g.add(Grafreed.clipboard);
3582	4058
3583	4059	buffer.add(g);
3584	4060	}
..	..	@@ -3593,7 +4069,7 @@
3593	4069	makeSomething(buffer, i==group.selection.size()-1);
3594	4070	}
3595	4071
3596		- GrafreeD.epsequal = epsequal;
	4072	+ Grafreed.epsequal = epsequal;
3597	4073
3598	4074	refreshContents();
3599	4075	}
..	..	@@ -3611,7 +4087,16 @@
3611	4087	String pigment = Object3D.GetPigment(tex);
3612	4088	//String bump = Object3D.GetBump(tex);
3613	4089
3614		- 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	+ }
3615	4100
3616	4101	double s = v.s;
3617	4102
..	..	@@ -3743,7 +4228,7 @@
3743	4228	return;
3744	4229
3745	4230	Object3D poses = group.selection.get(0);
3746		- Object3D ref = GrafreeD.clipboard.get(0);
	4231	+ Object3D ref = Grafreed.clipboard.get(0);
3747	4232
3748	4233	Object3D newgroup = new Object3D("Po:" + poses.name);
3749	4234
..	..	@@ -3937,9 +4422,9 @@
3937	4422
3938	4423	void ClipMesh()
3939	4424	{
3940		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4425	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3941	4426	{
3942		- Object3D content = GrafreeD.clipboard.get(0);
	4427	+ Object3D content = Grafreed.clipboard.get(0);
3943	4428
3944	4429	if (content instanceof cGroup && ((cGroup)content).transientlink )
3945	4430	content = ((cGroup)content).get(0);
..	..	@@ -3948,7 +4433,7 @@
3948	4433	// {
3949	4434	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3950	4435	// }
3951		- group.selection.ClipMesh(GrafreeD.clipboard);
	4436	+ group.selection.ClipMesh(Grafreed.clipboard);
3952	4437	}
3953	4438	// group.selection.ClipMesh(GrafreeD.clipboard);
3954	4439	System.out.println("DONE.");
..	..	@@ -3995,6 +4480,18 @@
3995	4480	void MarkLeaves(boolean hide)
3996	4481	{
3997	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);
3998	4495	refreshContents();
3999	4496	}
4000	4497
..	..	@@ -4069,10 +4566,6 @@
4069	4566	// }
4070	4567	// }
4071	4568
4072		- static boolean allparams = true;
4073		-
4074		- static Vector<Object3D> listUI = new Vector<Object3D>();
4075		-
4076	4569	void EditSelection(boolean newWindow)
4077	4570	{
4078	4571	// aConstraints.gridy = 0;
..	..	@@ -4080,10 +4573,10 @@
4080	4573	{
4081	4574	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4082	4575	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4083		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4576	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4084	4577
4085	4578	Object3D elem = (Object3D)group.selection.elementAt(i);
4086		- if(elem != group)
	4579	+ if(elem != group \|\| !newWindow)
4087	4580	{
4088	4581	// if (!(elem instanceof Composite))
4089	4582	// newWindow = false;
..	..	@@ -4165,7 +4658,8 @@
4165	4658	//new Exception().printStackTrace();
4166	4659
4167	4660	freezemodel = true;
4168		-
	4661	+ ClearUnpinned();
	4662	+
4169	4663	/**/
4170	4664	//switch (event.id)
4171	4665	{
..	..	@@ -4173,7 +4667,6 @@
4173	4667	//case 702: // Event.LIST_DESELECT
4174	4668	group.deselectAll();
4175	4669	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4176		- objEditor.ClearInfo(); // .GetMaterial());
4177	4670	if (tps != null)
4178	4671	{
4179	4672	for (int i=0; i < tps.length; i++)
..	..	@@ -4182,10 +4675,8 @@
4182	4675
4183	4676	//if (child.parent != null)
4184	4677	//child.parent.addSelectee(child);
	4678	+ objEditor.SetMaterial(child);
4185	4679	group.addSelectee(child);
4186		- objEditor.SetMaterial(child); // .GetMaterial());
4187		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4188		- System.err.println("info : " + child.GetPath());
4189	4680	}
4190	4681	}
4191	4682	// else
..	..	@@ -4195,20 +4686,28 @@
4195	4686	// System.err.println("info : " + group.GetPath());
4196	4687	// }
4197	4688
4198		- objEditor.SetText(); // jan 2014
4199		-
4200		- 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))
4201	4690	CameraPane.flash = true;
4202	4691
4203		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4692	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4204	4693	// a camera
4205	4694	{
4206		- CameraPane.camerachangeframe = 0; // don't refuse it
4207		- 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	+ }
4208	4700	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4209	4701	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4210	4702	}
4211	4703
	4704	+ if (tps != null && tps.length == 1)
	4705	+ {
	4706	+ EditSelection(false);
	4707	+ }
	4708	+
	4709	+ SetPinStates(tps != null && tps.length > 0);
	4710	+
4212	4711	refreshContents();
4213	4712	//return true;
4214	4713	}
..	..	@@ -4217,6 +4716,35 @@
4217	4716
4218	4717	freezemodel = false;
4219	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	+ }
4220	4748
4221	4749	void linkSomething(Object3D thing)
4222	4750	{
..	..	@@ -4288,16 +4816,19 @@
4288	4816	{
4289	4817	if (group.selection.isEmpty())
4290	4818	return;
4291		- GrafreeD.clipboardIsTempGroup = false;
	4819	+
	4820	+ Grafreed.clipboardIsTempGroup = false;
4292	4821	Composite tGroup = null;
4293	4822	if (group.selection.size() > 0) // 1)
4294	4823	{
4295	4824	tGroup = new cGroup();
4296		- GrafreeD.clipboardIsTempGroup = true;
	4825	+ Grafreed.clipboardIsTempGroup = true;
4297	4826	}
4298	4827
4299	4828	if (cut)
4300	4829	{
	4830	+ if (Globals.SAVEONMAKE)
	4831	+ Save();
4301	4832	//int indices[] = jList.getSelectedIndices();
4302	4833	//for (int i = indices.length - 1; i >= 0; i--)
4303	4834	//jList.remove(indices[i]);
..	..	@@ -4333,16 +4864,16 @@
4333	4864	//System.out.println("cut " + child);
4334	4865	//System.out.println("parent = " + child.parent);
4335	4866	// tmp.addChild(child);
4336		- if (GrafreeD.clipboardIsTempGroup)
	4867	+ if (Grafreed.clipboardIsTempGroup)
4337	4868	tGroup.add/Child/(tmp);
4338	4869	else
4339		- GrafreeD.clipboard = tmp;
	4870	+ Grafreed.clipboard = tmp;
4340	4871	}
4341	4872	else
4342		- if (GrafreeD.clipboardIsTempGroup)
	4873	+ if (Grafreed.clipboardIsTempGroup)
4343	4874	tGroup.add/Child/(child);
4344	4875	else
4345		- GrafreeD.clipboard = child;
	4876	+ Grafreed.clipboard = child;
4346	4877	}
4347	4878
4348	4879	//ResetModel();
..	..	@@ -4374,21 +4905,23 @@
4374	4905	//System.out.println("cut " + elem);
4375	4906	//System.out.println("parent = " + elem.parent);
4376	4907	// tmp.addChild(elem);
4377		- if (GrafreeD.clipboardIsTempGroup)
	4908	+ if (Grafreed.clipboardIsTempGroup)
4378	4909	tGroup.add/Child/(tmp);
4379	4910	else
4380		- GrafreeD.clipboard = tmp;
	4911	+ Grafreed.clipboard = tmp;
4381	4912	}
4382	4913	else
4383		- if (GrafreeD.clipboardIsTempGroup)
	4914	+ if (Grafreed.clipboardIsTempGroup)
4384	4915	tGroup.add/Child/(child);
4385	4916	else
4386		- GrafreeD.clipboard = child;
	4917	+ Grafreed.clipboard = child;
4387	4918	}
4388	4919
4389	4920	}
4390		- if (GrafreeD.clipboardIsTempGroup)
4391		- GrafreeD.clipboard = tGroup;
	4921	+
	4922	+ if (Grafreed.clipboardIsTempGroup)
	4923	+ Grafreed.clipboard = tGroup;
	4924	+
4392	4925	if (cut)
4393	4926	{
4394	4927	ResetModel();
..	..	@@ -4402,7 +4935,7 @@
4402	4935	// return;
4403	4936	boolean first = true;
4404	4937
4405		- if (GrafreeD.clipboardIsTempGroup)
	4938	+ if (Grafreed.clipboardIsTempGroup)
4406	4939	{
4407	4940	Composite temp;
4408	4941
..	..	@@ -4413,7 +4946,7 @@
4413	4946	temp = (Composite)Applet3D.clipboard.deepCopy();
4414	4947	*/
4415	4948	Object3D elem;
4416		- 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))
4417	4950	{
4418	4951	Object3D child = (Object3D)e.nextElement();
4419	4952
..	..	@@ -4447,14 +4980,14 @@
4447	4980	//Object3D cb = Applet3D.clipboard;
4448	4981	//temp.addChild(cb);
4449	4982	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4450		- assert(GrafreeD.clipboard.parent == null);
4451		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4452		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4453		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4454		- 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());
4455	4988	else
4456		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4457		- GrafreeD.clipboard.get(0).parent = keepparent;
	4989	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4990	+ Grafreed.clipboard.get(0).parent = keepparent;
4458	4991	}
4459	4992
4460	4993	ResetModel();
..	..	@@ -4503,9 +5036,9 @@
4503	5036	{
4504	5037	boolean first = true;
4505	5038
4506		- if (GrafreeD.clipboardIsTempGroup)
	5039	+ if (Grafreed.clipboardIsTempGroup)
4507	5040	{
4508		- Composite temp = (Composite)GrafreeD.clipboard;
	5041	+ Composite temp = (Composite)Grafreed.clipboard;
4509	5042	Object3D copy;
4510	5043	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4511	5044	{
..	..	@@ -4515,7 +5048,7 @@
4515	5048	}
4516	5049	} else
4517	5050	{
4518		- linkSomething(GrafreeD.clipboard); //.get(0));
	5051	+ linkSomething(Grafreed.clipboard); //.get(0));
4519	5052	}
4520	5053	}
4521	5054	}
..	..	@@ -4920,21 +5453,6 @@
4920	5453	}
4921	5454	*/
4922	5455
4923		- void ImportGFD()
4924		- {
4925		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4926		- browser.show();
4927		- String filename = browser.getFile();
4928		- if (filename != null && filename.length() > 0)
4929		- {
4930		- String fullname = browser.getDirectory() + filename;
4931		-
4932		- //Object3D readobj =
4933		- objEditor.ReadGFD(fullname, objEditor);
4934		- //makeSomething(readobj);
4935		- }
4936		- }
4937		-
4938	5456	/*
4939	5457	public void Callback(Object obj)
4940	5458	{
..	..	@@ -4958,26 +5476,9 @@
4958	5476	}
4959	5477	*/
4960	5478
4961		- void ImportVRMLX3D()
4962		- {
4963		- if (GrafreeD.standAlone)
4964		- {
4965		- /**/
4966		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4967		- browser.show();
4968		- String filename = browser.getFile();
4969		- if (filename != null && filename.length() > 0)
4970		- {
4971		- String fullname = browser.getDirectory() + filename;
4972		- LoadVRMLX3D(fullname);
4973		- }
4974		- /**/
4975		- }
4976		- }
4977		-
4978	5479	String GetFile(String dialogName)
4979	5480	{
4980		- if (GrafreeD.standAlone)
	5481	+ if (Grafreed.standAlone)
4981	5482	{
4982	5483	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4983	5484	browser.show();
..	..	@@ -5045,7 +5546,28 @@
5045	5546	cButton clearpanelButton;
5046	5547	cButton unselectButton;
5047	5548
	5549	+ cButton restoreCameraButton;
	5550	+
	5551	+ cButton saveButton;
5048	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;
5049	5571
5050	5572	cButton screenfitButton;
5051	5573	cButton screenfitpointButton;
..	..	@@ -5058,14 +5580,6 @@
5058	5580
5059	5581	cButton setsupportButton;
5060	5582
5061		- cButton twoButton;
5062		- cButton sixButton;
5063		- cButton threeButton;
5064		- cButton sevenButton;
5065		- cButton fourButton; // full panel
5066		- cButton oneButton; // full XYZ
5067		- //cButton currentLayout;
5068		-
5069	5583	//
5070	5584	//Composite
5071	5585	Object3D // to do !!
..	..	@@ -5075,9 +5589,11 @@
5075	5589	//JTree jTree;
5076	5590	private MenuItem lookAtItem;
5077	5591	private MenuItem lookFromItem;
5078		- private MenuItem switchItem;
	5592	+ private MenuItem switchViewItem;
5079	5593	private MenuItem cutItem;
5080		- private MenuItem duplicateItem;
	5594	+ private MenuItem undoItem;
	5595	+ private MenuItem redoItem;
	5596	+ private JMenuItem duplicateItem;
5081	5597	private MenuItem cloneItem;
5082	5598	private MenuItem cloneSupportItem;
5083	5599	private MenuItem overwriteGeoItem;
..	..	@@ -5090,7 +5606,7 @@
5090	5606	private MenuItem linkverticesItem;
5091	5607	private MenuItem relinkverticesItem;
5092	5608	private MenuItem setMasterItem;
5093		- private MenuItem resetMeshItem;
	5609	+ private MenuItem resetAllItem;
5094	5610	private MenuItem stepAllItem;
5095	5611	private MenuItem revertMeshItem;
5096	5612	private MenuItem poseMeshItem;
..	..	@@ -5140,6 +5656,10 @@
5140	5656	private MenuItem showleavesItem;
5141	5657	private MenuItem markleavesItem;
5142	5658	private MenuItem unmarkleavesItem;
	5659	+ private MenuItem rewindleavesItem;
	5660	+ private MenuItem unrewindleavesItem;
	5661	+ private MenuItem randomleavesItem;
	5662	+ private MenuItem unrandomleavesItem;
5143	5663
5144	5664	private MenuItem flipVItem;
5145	5665	private MenuItem unflipVItem;
..	..	@@ -5151,15 +5671,17 @@
5151	5671	private MenuItem panoTexturesItem;
5152	5672
5153	5673	private MenuItem resetCentroidItem;
5154		- private MenuItem transformgeometryItem;
	5674	+ private MenuItem resetCentroidXZItem;
5155	5675	private MenuItem resetTransformItem;
	5676	+ private MenuItem transformGeometryItem;
	5677	+ private MenuItem transformChildrenItem;
5156	5678	private MenuItem hideItem;
5157	5679	private MenuItem grabItem;
5158	5680	private MenuItem backItem;
5159	5681	private MenuItem frontItem;
5160	5682	private MenuItem cameraItem;
5161	5683	private MenuItem compositeItem;
5162		- private MenuItem randomItem;
	5684	+ private MenuItem switchItem;
5163	5685	private MenuItem physicsItem;
5164	5686	private MenuItem frameselectorItem;
5165	5687	private MenuItem scriptNodeItem;
..	..	@@ -5221,11 +5743,6 @@
5221	5743	private MenuItem doubleItem;
5222	5744	private MenuItem tripleItem;
5223	5745
5224		- private MenuItem importGFDItem;
5225		- private MenuItem importVRMLX3DItem;
5226		- private MenuItem import3DSItem;
5227		- private MenuItem importOBJItem;
5228		-
5229	5746	private MenuItem computeAOItem;
5230	5747	private MenuItem recompileItem;
5231	5748	private MenuItem editScriptItem;
..	..	@@ -5235,4 +5752,8 @@
5235	5752	private MenuItem analyzeItem;
5236	5753	private MenuItem dumpItem;
5237	5754	//boolean freezemodel = false;
	5755	+
	5756	+ Menu cameraMenu;
	5757	+ MenuItem editCameraItem;
	5758	+ MenuItem restoreCameraItem;
5238	5759	}