~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;
..	..	@@ -940,7 +1223,9 @@
940	1223	// objEditor.DropFile((java.io.File[]) object, true);
941	1224	// return;
942	1225	// }
943		- if (string.charAt(0) == '/')
	1226	+
	1227	+ // File path for Mac and Windows
	1228	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
944	1229	{
945	1230	// file(s)
946	1231	String[] names = string.split("\n");
..	..	@@ -967,7 +1252,7 @@
967	1252
968	1253	flashIt = false;
969	1254	CameraPane pane = (CameraPane) target;
970		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1255	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
971	1256	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
972	1257
973	1258	if (group.selection.size() == 1)
..	..	@@ -983,23 +1268,33 @@
983	1268
984	1269	assert target == objEditor.jTree;
985	1270	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1271	+ Object3D destinationLeaf;
986	1272	try {
987		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1273	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
988	1274	} catch (Exception e) {
989	1275	System.out.println("destinationPath : " + destinationPath);
990	1276	return;
991	1277	}
992	1278
993		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1279	+ for (int i=group.selection.size(); --i>=0;)
994	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	+// {
995	1290	loadClipboard(true);
996	1291	objEditor.jTree.setSelectionPath(destinationPath);
997	1292	pasteInto(false, false);
998		- } else {
999		- loadClipboard(false);
1000		- objEditor.jTree.setSelectionPath(destinationPath);
1001		- pasteInto(false, false); // true); // ???
1002		- }
	1293	+// } else {
	1294	+// loadClipboard(false);
	1295	+// objEditor.jTree.setSelectionPath(destinationPath);
	1296	+// pasteInto(false, false); // true); // ???
	1297	+// }
1003	1298	}
1004	1299	public void dropActionChanged(DropTargetDragEvent dtde)
1005	1300	// Called if the user has modified the current drop gesture
..	..	@@ -1104,22 +1399,30 @@
1104	1399	{
1105	1400	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1106	1401	//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);
	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	+ {
1119	1420	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1120	1421	kleinItem.addActionListener(this);
1121		- particleItem = menu.add(new MenuItem("Particle system"));
1122		- particleItem.addActionListener(this);
	1422	+ }
	1423	+
	1424	+// particleItem = menu.add(new MenuItem("Particle system"));
	1425	+// particleItem.addActionListener(this);
1123	1426	if (Globals.ADVANCED)
1124	1427	{
1125	1428	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1145,15 +1448,15 @@
1145	1448	}
1146	1449	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1147	1450	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);
	1451	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1452	+// overlayItem.addActionListener(this);
	1453	+// lightItem = menu.add(new MenuItem("Light"));
	1454	+// lightItem.addActionListener(this);
1152	1455	menu.add("-");
1153	1456	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1154	1457	//superLoopItem.addActionListener(this);
1155		- loopItem = menu.add(new MenuItem("Loop"));
1156		- loopItem.addActionListener(this);
	1458	+// loopItem = menu.add(new MenuItem("Loop"));
	1459	+// loopItem.addActionListener(this);
1157	1460	doubleItem = menu.add(new MenuItem("Fork"));
1158	1461	doubleItem.addActionListener(this);
1159	1462	if (Globals.ADVANCED)
..	..	@@ -1168,6 +1471,9 @@
1168	1471	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1169	1472	animationItem.addItemListener(this);
1170	1473	animationItem.setState(Globals.ANIMATION);
	1474	+
	1475	+ menu.add(archiveItem = new CheckboxMenuItem("Archive3D..."));
	1476	+ archiveItem.addItemListener(this);
1171	1477
1172	1478	menu.add("-");
1173	1479	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
..	..	@@ -1193,7 +1499,7 @@
1193	1499	memoryItem.addActionListener(this);
1194	1500	menu.add(analyzeItem = new MenuItem("Analyze"));
1195	1501	analyzeItem.addActionListener(this);
1196		- menu.add(dumpItem = new MenuItem("Dump"));
	1502	+ menu.add(dumpItem = new MenuItem("Print"));
1197	1503	dumpItem.addActionListener(this);
1198	1504	// menu.add(pathItem = new MenuItem("From-to path"));
1199	1505	// pathItem.addActionListener(this);
..	..	@@ -1334,9 +1640,24 @@
1334	1640	shadow.material = new cMaterial(obj.material);
1335	1641	shadow.material.diffuse = 0.0001f;
1336	1642	shadow.material.specular = 0.0001f;
	1643	+ //shadow.projectedVertices[1].x = 300;
1337	1644
1338	1645	makeSomething(shadow);
1339	1646	}
	1647	+
	1648	+ private void ClearUnpinned()
	1649	+ {
	1650	+ //for (Object3D obj : listUI)
	1651	+ for (int i=listUI.size(); --i>=0;)
	1652	+ {
	1653	+ Object3D obj = listUI.elementAt(i);
	1654	+ if (!obj.pinned)
	1655	+ {
	1656	+ obj.CloseUI();
	1657	+ listUI.remove(i);
	1658	+ }
	1659	+ }
	1660	+ }
1340	1661
1341	1662	/**
1342	1663	* applyExample
..	..	@@ -1540,9 +1861,9 @@
1540	1861
1541	1862	void Overwrite(int mask)
1542	1863	{
1543		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1864	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1544	1865	{
1545		- Object3D content = GrafreeD.clipboard.get(0);
	1866	+ Object3D content = Grafreed.clipboard.get(0);
1546	1867
1547	1868	if (content instanceof cGroup && ((cGroup)content).transientlink )
1548	1869	content = ((cGroup)content).get(0);
..	..	@@ -1581,7 +1902,7 @@
1581	1902	{
1582	1903	ScreenFit();
1583	1904	} else
1584		- if (source == switchItem)
	1905	+ if (source == switchViewItem)
1585	1906	{
1586	1907	cVector v1 = new cVector();
1587	1908	cVector v2 = new cVector();
..	..	@@ -1590,11 +1911,11 @@
1590	1911	objEditor.cameraView.renderCamera.setAim(v2, v1);
1591	1912	objEditor.cameraView.repaint();
1592	1913	} else
1593		- if (source == rectoidItem)
	1914	+ if (source == rectoidItem \|\| source == boxButton)
1594	1915	{
1595	1916	makeSomething(new Box());
1596	1917	} else
1597		- if (source == particleItem)
	1918	+ if (source == particleItem \|\| source == particlesButton)
1598	1919	{
1599	1920	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1600	1921	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1673,27 +1994,27 @@
1673	1994
1674	1995	makeSomething(obj);
1675	1996	} else
1676		- if (source == gridItem)
	1997	+ if (source == gridItem \|\| source == gridButton)
1677	1998	{
1678	1999	makeSomething(new Grid());
1679	2000	} else
1680		- if (source == ellipsoidItem)
	2001	+ if (source == ellipsoidItem \|\| source == sphereButton)
1681	2002	{
1682	2003	makeSomething(new Sphere());
1683	2004	} else
1684		- if (source == coneItem)
	2005	+ if (source == coneItem \|\| source == coneButton)
1685	2006	{
1686	2007	makeSomething(new Cone());
1687	2008	} else
1688		- if (source == torusItem)
	2009	+ if (source == torusItem \|\| source == torusButton)
1689	2010	{
1690	2011	makeSomething(new Torus());
1691	2012	} else
1692		- if (source == superItem)
	2013	+ if (source == superItem \|\| source == superButton)
1693	2014	{
1694	2015	makeSomething(new Superellipsoid());
1695	2016	} else
1696		- if (source == kleinItem)
	2017	+ if (source == kleinItem \|\| source == kleinButton)
1697	2018	{
1698	2019	makeSomething(new Klein());
1699	2020	} else
..	..	@@ -1713,7 +2034,7 @@
1713	2034	{
1714	2035	makeSomething(new BezierSurface());
1715	2036	} else
1716		- if (source == overlayItem)
	2037	+ if (source == overlayItem \|\| source == overlayButton)
1717	2038	{
1718	2039	/*
1719	2040	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1761,7 +2082,7 @@
1761	2082	s.setup();
1762	2083	makeSomething(s);
1763	2084	} else
1764		- if (source == lightItem)
	2085	+ if (source == lightItem \|\| source == lightButton)
1765	2086	{
1766	2087	makeSomething(new Light());
1767	2088	} else
..	..	@@ -1811,30 +2132,30 @@
1811	2132
1812	2133	group(g);
1813	2134	} else
1814		- if (source == loopItem)
	2135	+ if (source == loopItem \|\| source == loopButton)
1815	2136	{
1816	2137	Composite csg = new GroupLeaf();
1817	2138	csg.count = 5;
1818	2139	group(csg);
1819		- Composite child = new cGroup();
	2140	+ Composite child = new cGroup("Branch");
1820	2141	csg.addChild(child);
1821	2142	child.addChild(csg);
1822	2143	} else
1823	2144	if (source == doubleItem)
1824	2145	{
1825		- Composite csg = new GroupLeaf();
	2146	+ Composite csg = new GroupLeaf("Fork");
1826	2147	csg.count = 5;
1827	2148	group(csg);
1828		- Composite child = new cGroup();
	2149	+ Composite child = new cGroup("Branch A");
1829	2150	csg.addChild(child);
1830	2151	child.addChild(csg);
1831		- child = new cGroup();
	2152	+ child = new cGroup("Branch B");
1832	2153	csg.addChild(child);
1833	2154	child.addChild(csg);
1834	2155	} else
1835	2156	if (source == tripleItem)
1836	2157	{
1837		- Composite csg = new GroupLeaf();
	2158	+ Composite csg = new GroupLeaf("Trident");
1838	2159	csg.count = 4;
1839	2160	group(csg);
1840	2161	Composite child = new cGroup();
..	..	@@ -1846,31 +2167,6 @@
1846	2167	child = new cGroup();
1847	2168	csg.addChild(child);
1848	2169	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	2170	} else
1875	2171	if (source == computeAOItem)
1876	2172	{
..	..	@@ -1890,7 +2186,7 @@
1890	2186	if (source == invariantsItem)
1891	2187	{
1892	2188	System.out.println("Invariants:");
1893		- GrafreeD.grafreeD.universe.invariants();
	2189	+ Grafreed.grafreeD.universe.invariants();
1894	2190	} else
1895	2191	if (source == memoryItem)
1896	2192	{
..	..	@@ -1908,6 +2204,30 @@
1908	2204	if (source == dumpItem)
1909	2205	{
1910	2206	DumpObject();
	2207	+ } else
	2208	+ if (source == minButton)
	2209	+ {
	2210	+ Minimize();
	2211	+ } else
	2212	+ if (source == maxButton)
	2213	+ {
	2214	+ Maximize();
	2215	+ } else
	2216	+ if (source == fullButton)
	2217	+ {
	2218	+ ToggleFullScreen();
	2219	+ } else
	2220	+ if (source == undoButton)
	2221	+ {
	2222	+ Undo();
	2223	+ } else
	2224	+ if (source == redoButton)
	2225	+ {
	2226	+ Redo();
	2227	+ } else
	2228	+ if (source == saveButton)
	2229	+ {
	2230	+ Save();
1911	2231	} else
1912	2232	if (source == oneStepButton)
1913	2233	{
..	..	@@ -1963,12 +2283,20 @@
1963	2283	{
1964	2284	loadClipboard(true);
1965	2285	} else
	2286	+ if (source == undoItem)
	2287	+ {
	2288	+ Undo();
	2289	+ } else
	2290	+ if (source == redoItem)
	2291	+ {
	2292	+ Redo();
	2293	+ } else
1966	2294	if (source == duplicateItem)
1967	2295	{
1968		- Object3D keep = GrafreeD.clipboard;
	2296	+ Object3D keep = Grafreed.clipboard;
1969	2297	loadClipboard(false);
1970	2298	paste(false);
1971		- GrafreeD.clipboard = keep;
	2299	+ Grafreed.clipboard = keep;
1972	2300	} else
1973	2301	if (source == cloneItem)
1974	2302	{
..	..	@@ -2188,9 +2516,9 @@
2188	2516	// group.selection.get(0).setMasterThis(content); // should be identity
2189	2517	// refreshContents();
2190	2518	// }
2191		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2519	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2192	2520	{
2193		- Object3D content = GrafreeD.clipboard.get(0);
	2521	+ Object3D content = Grafreed.clipboard.get(0);
2194	2522
2195	2523	if (content instanceof cGroup && ((cGroup)content).transientlink )
2196	2524	content = ((cGroup)content).get(0);
..	..	@@ -2240,9 +2568,9 @@
2240	2568	} else
2241	2569	if (source == setMasterItem)
2242	2570	{
2243		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2571	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2244	2572	{
2245		- Object3D content = GrafreeD.clipboard.get(0);
	2573	+ Object3D content = Grafreed.clipboard.get(0);
2246	2574
2247	2575	if (content instanceof cGroup && ((cGroup)content).transientlink )
2248	2576	content = ((cGroup)content).get(0);
..	..	@@ -2255,9 +2583,9 @@
2255	2583	{
2256	2584	if (group.selection.size() == 1)
2257	2585	{
2258		- if (GrafreeD.clipboard.size() == 1)
	2586	+ if (Grafreed.clipboard.size() == 1)
2259	2587	{
2260		- Object3D content = GrafreeD.clipboard.get(0);
	2588	+ Object3D content = Grafreed.clipboard.get(0);
2261	2589
2262	2590	if (content instanceof cGroup && ((cGroup)content).transientlink )
2263	2591	content = ((cGroup)content).get(0);
..	..	@@ -2274,7 +2602,7 @@
2274	2602	{
2275	2603	RevertMeshes();
2276	2604	} else
2277		- if (source == resetMeshItem)
	2605	+ if (source == resetAllItem)
2278	2606	{
2279	2607	ResetAll();
2280	2608	} else
..	..	@@ -2294,9 +2622,9 @@
2294	2622	{
2295	2623	ClearSelection(true);
2296	2624	} else
2297		- if (source == grabItem)
	2625	+ if (source == grabItem \|\| source == groupButton)
2298	2626	{
2299		- group(new cGroup(), true);
	2627	+ group(new cGroup(), false); // true);
2300	2628	} else
2301	2629	if (source == hideItem)
2302	2630	{
..	..	@@ -2314,11 +2642,11 @@
2314	2642	{
2315	2643	makeSomething(new Camera());
2316	2644	} else
2317		- if (source == compositeItem)
	2645	+ if (source == compositeItem \|\| source == compositeButton)
2318	2646	{
2319	2647	group(new Composite());
2320	2648	} else
2321		- if (source == randomItem)
	2649	+ if (source == switchItem \|\| source == switchButton)
2322	2650	{
2323	2651	RandomNode random = new RandomNode();
2324	2652	group(random);
..	..	@@ -2420,7 +2748,7 @@
2420	2748	{
2421	2749	group(new cLinker());
2422	2750	} else
2423		- if (source == textureItem)
	2751	+ if (source == textureItem \|\| source == textureButton)
2424	2752	{
2425	2753	group(new TextureNode());
2426	2754	} else
..	..	@@ -2440,17 +2768,30 @@
2440	2768	{
2441	2769	CastShadow(2);
2442	2770	} else
2443		- if (source == ungroupItem)
	2771	+ if (source == ungroupItem \|\| source == ungroupButton)
2444	2772	{
2445		- //ungroup();
	2773	+ boolean hasRoot = false;
	2774	+
2446	2775	for (int i=0; i<group.selection.size(); i++)
2447	2776	{
2448		- Ungroup(group.selection.get(i));
	2777	+ if (group.selection.get(i) == group)
	2778	+ {
	2779	+ hasRoot = true;
	2780	+ break;
	2781	+ }
2449	2782	}
2450	2783
2451		- ClearSelection(false);
2452		-
2453		- refreshContents();
	2784	+ if (!hasRoot)
	2785	+ {
	2786	+ for (int i=0; i<group.selection.size(); i++)
	2787	+ {
	2788	+ Ungroup(group.selection.get(i));
	2789	+ }
	2790	+
	2791	+ ClearSelection(false);
	2792	+
	2793	+ refreshContents();
	2794	+ }
2454	2795	} else
2455	2796	if (source == genUVItem)
2456	2797	{
..	..	@@ -2462,7 +2803,7 @@
2462	2803	} else
2463	2804	if (source == genNormalsMESHItem)
2464	2805	{
2465		- GenNormals(true); // TODO
	2806	+ GenNormalsMESH();
2466	2807	} else
2467	2808	if (source == genNormalsORGANItem)
2468	2809	{
..	..	@@ -2527,6 +2868,22 @@
2527	2868	if (source == unmarkleavesItem)
2528	2869	{
2529	2870	MarkLeaves(false);
	2871	+ } else
	2872	+ if (source == rewindleavesItem)
	2873	+ {
	2874	+ RewindLeaves(true);
	2875	+ } else
	2876	+ if (source == unrewindleavesItem)
	2877	+ {
	2878	+ RewindLeaves(false);
	2879	+ } else
	2880	+ if (source == randomleavesItem)
	2881	+ {
	2882	+ RandomLeaves(true);
	2883	+ } else
	2884	+ if (source == unrandomleavesItem)
	2885	+ {
	2886	+ RandomLeaves(false);
2530	2887	} else
2531	2888	if (source == flipVItem)
2532	2889	{
..	..	@@ -2612,9 +2969,13 @@
2612	2969	{
2613	2970	SmoothMesh();
2614	2971	} else
2615		- if (source == transformgeometryItem)
	2972	+ if (source == transformGeometryItem)
2616	2973	{
2617	2974	TransformGeometry();
	2975	+ } else
	2976	+ if (source == transformChildrenItem)
	2977	+ {
	2978	+ TransformChildren();
2618	2979	} else
2619	2980	if (source == resetTransformItem)
2620	2981	{
..	..	@@ -2622,7 +2983,11 @@
2622	2983	} else
2623	2984	if (source == resetCentroidItem)
2624	2985	{
2625		- ResetCentroid();
	2986	+ ResetCentroid(true);
	2987	+ } else
	2988	+ if (source == resetCentroidXZItem)
	2989	+ {
	2990	+ ResetCentroid(false);
2626	2991	} else
2627	2992	if (source == resetParentItem)
2628	2993	{
..	..	@@ -2754,6 +3119,10 @@
2754	3119	if (source == twoButton)
2755	3120	{
2756	3121	radio.layout = twoButton;
	3122	+
	3123	+ if (CameraPane.FULLSCREEN)
	3124	+ fullscreenLayout = radio.layout;
	3125	+
2757	3126	// bug
2758	3127	//gridPanel.setDividerLocation(1.0);
2759	3128	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2786,10 +3155,31 @@
2786	3155	bigThree.ClearUI();
2787	3156	bigThree.add(centralPanel);
2788	3157	bigThree.FlushUI();
	3158	+
	3159	+ cameraView.requestFocusInWindow();
	3160	+
	3161	+// refreshContents(true);
	3162	+//
	3163	+// try
	3164	+// {
	3165	+// java.awt.Robot bot = new java.awt.Robot();
	3166	+// int mask = InputEvent.BUTTON1_MASK;
	3167	+// bot.mouseMove(100, 100);
	3168	+// bot.mousePress(mask);
	3169	+// bot.mouseRelease(mask);
	3170	+// }
	3171	+// catch (Exception e)
	3172	+// {
	3173	+//
	3174	+// }
	3175	+
2789	3176	} else
2790	3177	if (source == threeButton)
2791	3178	{
2792	3179	radio.layout = threeButton;
	3180	+
	3181	+ if (CameraPane.FULLSCREEN)
	3182	+ fullscreenLayout = radio.layout;
2793	3183
2794	3184	// bigThree.remove(scenePanel);
2795	3185	// bigThree.remove(centralPanel);
..	..	@@ -2822,10 +3212,15 @@
2822	3212	bigThree.add(centralPanel);
2823	3213	bigThree.add(XYZPanel);
2824	3214	bigThree.FlushUI();
	3215	+
	3216	+ cameraView.requestFocusInWindow();
2825	3217	} else
2826	3218	if (source == fourButton)
2827	3219	{
2828	3220	radio.layout = fourButton;
	3221	+
	3222	+ if (CameraPane.FULLSCREEN)
	3223	+ fullscreenLayout = radio.layout;
2829	3224
2830	3225	// bigThree.remove(scenePanel);
2831	3226	// bigThree.remove(centralPanel);
..	..	@@ -2857,10 +3252,15 @@
2857	3252	bigThree.ClearUI();
2858	3253	bigThree.add(scenePanel);
2859	3254	bigThree.FlushUI();
	3255	+
	3256	+ cameraView.requestFocusInWindow();
2860	3257	} else
2861	3258	if (source == sixButton)
2862	3259	{
2863	3260	radio.layout = sixButton;
	3261	+
	3262	+ if (CameraPane.FULLSCREEN)
	3263	+ fullscreenLayout = radio.layout;
2864	3264
2865	3265	// bigThree.remove(scenePanel);
2866	3266	// bigThree.remove(centralPanel);
..	..	@@ -2893,10 +3293,15 @@
2893	3293	bigThree.add(scenePanel);
2894	3294	bigThree.add(centralPanel);
2895	3295	bigThree.FlushUI();
	3296	+
	3297	+ cameraView.requestFocusInWindow();
2896	3298	} else
2897	3299	if (source == sevenButton)
2898	3300	{
2899	3301	radio.layout = sevenButton;
	3302	+
	3303	+ if (CameraPane.FULLSCREEN)
	3304	+ fullscreenLayout = radio.layout;
2900	3305
2901	3306	// bigThree.remove(scenePanel);
2902	3307	// bigThree.remove(centralPanel);
..	..	@@ -2930,6 +3335,8 @@
2930	3335	bigThree.add(centralPanel);
2931	3336	bigThree.add(XYZPanel);
2932	3337	bigThree.FlushUI();
	3338	+
	3339	+ cameraView.requestFocusInWindow();
2933	3340	} else
2934	3341	if (source == rootButton)
2935	3342	{
..	..	@@ -2941,6 +3348,7 @@
2941	3348	EditObject(obj);
2942	3349	}
2943	3350
	3351	+ cameraView.requestFocusInWindow();
2944	3352	refreshContents(true);
2945	3353	} else
2946	3354	if (source == closeButton)
..	..	@@ -2950,22 +3358,37 @@
2950	3358	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2951	3359	{
2952	3360	ab = (cRadio)e.nextElement();
2953		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3361	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2954	3362	{
	3363	+ // Patch to avoid bug with transparency.
	3364	+ if (!ab.hadMaterial)
	3365	+ {
	3366	+ ab.object.material = null;
	3367	+ }
	3368	+
2955	3369	buttonGroup.remove(ab);
2956	3370	radioPanel.remove(ab);
2957	3371
2958		- ab.GetObject().editWindow = null;
	3372	+ //ab.GetObject().editWindow = null;
	3373	+ ab.GetObject().manipWindow = null;
2959	3374	// ab.GetObject().objectUI = null; // ?????????
2960	3375
2961	3376	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2962	3377	break;
2963	3378	}
2964	3379	}
	3380	+
	3381	+ cameraView.requestFocusInWindow();
2965	3382	refreshContents(true);
2966	3383	} else
2967	3384	if (source == editItem \|\| source == editButton)
2968	3385	{
	3386	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3387	+ {
	3388	+ Object3D child = (Object3D)e.nextElement();
	3389	+ child.pinned = true;
	3390	+ }
	3391	+
2969	3392	EditSelection(false);
2970	3393	} else
2971	3394	if (source == uneditButton)
..	..	@@ -2975,10 +3398,11 @@
2975	3398	Object3D child = (Object3D)e.nextElement();
2976	3399	if(child.editWindow != null)
2977	3400	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3401	+ child.pinned = false;
2978	3402	child.CloseUI();
2979	3403	listUI.remove(child);
2980	3404
2981		- child.editWindow = null; // ???????????
	3405	+ //child.editWindow = null; // ???????????
2982	3406	}
2983	3407	objEditor.ctrlPanel.FlushUI();
2984	3408	//objEditor.jTree.clearSelection();
..	..	@@ -2991,6 +3415,7 @@
2991	3415	//copy.ClearUI();
2992	3416	for (Object3D obj : listUI)
2993	3417	{
	3418	+ obj.pinned = false;
2994	3419	obj.CloseUI();
2995	3420	}
2996	3421	listUI.clear();
..	..	@@ -3000,7 +3425,7 @@
3000	3425	{
3001	3426	assert(copy == group);
3002	3427
3003		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3428	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3004	3429
3005	3430	for (Object3D obj : listUI)
3006	3431	{
..	..	@@ -3064,20 +3489,44 @@
3064	3489	frontView.object = group;
3065	3490	sideView.object = group;
3066	3491	}
3067		- group.editWindow = this;
	3492	+
	3493	+// fix "+" issue
	3494	+ //group.editWindow = this;
	3495	+ group.manipWindow = this;
	3496	+
3068	3497	/*
3069	3498	currentLayout = radio.layout;
3070	3499	if (currentLayout == null)
3071	3500	currentLayout = sevenButton;
3072	3501	*/
3073	3502	radio.layout.doClick();
	3503	+
	3504	+ ClearUnpinned();
	3505	+ SetPinStates(group.selection.size() > 0);
	3506	+ if (group.selection.size() == 1)
	3507	+ EditSelection(false);
3074	3508	keepparent = group.parent;
3075	3509	// PARENT = NULL or not???
3076	3510	//group.parent = null; // ROOT
3077	3511	//group.attributes = -1;
3078	3512	ResetModel();
	3513	+
	3514	+ cameraView.requestFocusInWindow();
3079	3515	refreshContents(true);
3080		- }
	3516	+ } else if (event.getSource() == editCameraItem)
	3517	+ {
	3518	+ cameraView.ProtectCamera();
	3519	+ cameraView.repaint();
	3520	+ return;
	3521	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3522	+ {
	3523	+ cameraView.RevertCamera();
	3524	+ cameraView.repaint();
	3525	+ return;
	3526	+ // } else if (event.getSource() == textureButton)
	3527	+ // {
	3528	+ // return; // true;
	3529	+ }
3081	3530	else
3082	3531	{
3083	3532	//return super.action(event, arg);
..	..	@@ -3086,7 +3535,6 @@
3086	3535	}
3087	3536
3088	3537	boolean useclient = false;
3089		- cRadio radio;
3090	3538
3091	3539	void ToggleRoot()
3092	3540	{
..	..	@@ -3138,6 +3586,28 @@
3138	3586	refreshContents();
3139	3587	}
3140	3588
	3589	+ void TransformChildren()
	3590	+ {
	3591	+ Object3D obj;
	3592	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3593	+ {
	3594	+ obj = (Object3D)e.nextElement();
	3595	+ obj.KeepTextureMatrices();
	3596	+ obj.TransformChildren();
	3597	+ obj.RestoreTextureMatrices();
	3598	+
	3599	+// if (obj.parent == null)
	3600	+// {
	3601	+// System.out.println("NULL PARENT!");
	3602	+// new Exception().printStackTrace();
	3603	+// }
	3604	+// else
	3605	+// TouchTransform(obj);
	3606	+// //obj.parent.Touch();
	3607	+ }
	3608	+
	3609	+ refreshContents();
	3610	+ }
3141	3611
3142	3612	void ResetTransform()
3143	3613	{
..	..	@@ -3250,7 +3720,7 @@
3250	3720	refreshContents();
3251	3721	}
3252	3722
3253		- void ResetCentroid()
	3723	+ void ResetCentroid(boolean full)
3254	3724	{
3255	3725	Object3D obj;
3256	3726	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3265,12 +3735,16 @@
3265	3735	LA.matIdentity(Object3D.mat);
3266	3736	obj.getBounds(minima, maxima, false);
3267	3737	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3268		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3738	+ if (full)
	3739	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3269	3740	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3270	3741	obj.TransformMesh(Object3D.mat);
	3742	+
3271	3743	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3272		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3744	+ if (full)
	3745	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3273	3746	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3747	+
3274	3748	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3275	3749	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3276	3750	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3299,7 +3773,8 @@
3299	3773
3300	3774	int size = obj.MemorySize();
3301	3775
3302		- System.err.println((size/1024) + " KB is the size of " + obj);
	3776	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3777	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3303	3778	}
3304	3779	}
3305	3780	catch (Exception e)
..	..	@@ -3336,9 +3811,9 @@
3336	3811	obj = (Object3D)e.nextElement();
3337	3812
3338	3813	System.out.println("Object is: " + obj);
3339		- GrafreeD.AnalyzeObject(obj);
	3814	+ Grafreed.AnalyzeObject(obj);
3340	3815	System.out.println("Boundary rep: " + obj.bRep);
3341		- GrafreeD.AnalyzeObject(obj.bRep);
	3816	+ Grafreed.AnalyzeObject(obj.bRep);
3342	3817
3343	3818	// System.err.println((size/1024) + " KB is the size of " + obj);
3344	3819	}
..	..	@@ -3380,6 +3855,13 @@
3380	3855	void GenNormals(boolean crease)
3381	3856	{
3382	3857	group.GenNormalsS(crease);
	3858	+
	3859	+ refreshContents();
	3860	+ }
	3861	+
	3862	+ void GenNormalsMESH()
	3863	+ {
	3864	+ group.GenNormalsMeshS();
3383	3865
3384	3866	refreshContents();
3385	3867	}
..	..	@@ -3552,8 +4034,8 @@
3552	4034
3553	4035	void ParseVertices()
3554	4036	{
3555		- boolean epsequal = GrafreeD.epsequal;
3556		- GrafreeD.epsequal = true;
	4037	+ boolean epsequal = Grafreed.epsequal;
	4038	+ Grafreed.epsequal = true;
3557	4039
3558	4040	for (int i=0; i<group.selection.size(); i++)
3559	4041	{
..	..	@@ -3578,7 +4060,7 @@
3578	4060	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3579	4061	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3580	4062
3581		- g.add(GrafreeD.clipboard);
	4063	+ g.add(Grafreed.clipboard);
3582	4064
3583	4065	buffer.add(g);
3584	4066	}
..	..	@@ -3593,7 +4075,7 @@
3593	4075	makeSomething(buffer, i==group.selection.size()-1);
3594	4076	}
3595	4077
3596		- GrafreeD.epsequal = epsequal;
	4078	+ Grafreed.epsequal = epsequal;
3597	4079
3598	4080	refreshContents();
3599	4081	}
..	..	@@ -3611,7 +4093,16 @@
3611	4093	String pigment = Object3D.GetPigment(tex);
3612	4094	//String bump = Object3D.GetBump(tex);
3613	4095
3614		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4096	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4097	+
	4098	+ try
	4099	+ {
	4100	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4101	+ }
	4102	+ catch (Exception e)
	4103	+ {
	4104	+ System.err.println("FAIL: " + node);
	4105	+ }
3615	4106
3616	4107	double s = v.s;
3617	4108
..	..	@@ -3743,7 +4234,7 @@
3743	4234	return;
3744	4235
3745	4236	Object3D poses = group.selection.get(0);
3746		- Object3D ref = GrafreeD.clipboard.get(0);
	4237	+ Object3D ref = Grafreed.clipboard.get(0);
3747	4238
3748	4239	Object3D newgroup = new Object3D("Po:" + poses.name);
3749	4240
..	..	@@ -3937,9 +4428,9 @@
3937	4428
3938	4429	void ClipMesh()
3939	4430	{
3940		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4431	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3941	4432	{
3942		- Object3D content = GrafreeD.clipboard.get(0);
	4433	+ Object3D content = Grafreed.clipboard.get(0);
3943	4434
3944	4435	if (content instanceof cGroup && ((cGroup)content).transientlink )
3945	4436	content = ((cGroup)content).get(0);
..	..	@@ -3948,7 +4439,7 @@
3948	4439	// {
3949	4440	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3950	4441	// }
3951		- group.selection.ClipMesh(GrafreeD.clipboard);
	4442	+ group.selection.ClipMesh(Grafreed.clipboard);
3952	4443	}
3953	4444	// group.selection.ClipMesh(GrafreeD.clipboard);
3954	4445	System.out.println("DONE.");
..	..	@@ -3995,6 +4486,18 @@
3995	4486	void MarkLeaves(boolean hide)
3996	4487	{
3997	4488	group.selection.MarkLeaves(hide);
	4489	+ refreshContents();
	4490	+ }
	4491	+
	4492	+ void RewindLeaves(boolean hide)
	4493	+ {
	4494	+ group.selection.RewindLeaves(hide);
	4495	+ refreshContents();
	4496	+ }
	4497	+
	4498	+ void RandomLeaves(boolean hide)
	4499	+ {
	4500	+ group.selection.RandomLeaves(hide);
3998	4501	refreshContents();
3999	4502	}
4000	4503
..	..	@@ -4069,10 +4572,6 @@
4069	4572	// }
4070	4573	// }
4071	4574
4072		- static boolean allparams = true;
4073		-
4074		- static Vector<Object3D> listUI = new Vector<Object3D>();
4075		-
4076	4575	void EditSelection(boolean newWindow)
4077	4576	{
4078	4577	// aConstraints.gridy = 0;
..	..	@@ -4080,10 +4579,10 @@
4080	4579	{
4081	4580	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4082	4581	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4083		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4582	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4084	4583
4085	4584	Object3D elem = (Object3D)group.selection.elementAt(i);
4086		- if(elem != group)
	4585	+ if(elem != group \|\| !newWindow)
4087	4586	{
4088	4587	// if (!(elem instanceof Composite))
4089	4588	// newWindow = false;
..	..	@@ -4165,7 +4664,8 @@
4165	4664	//new Exception().printStackTrace();
4166	4665
4167	4666	freezemodel = true;
4168		-
	4667	+ ClearUnpinned();
	4668	+
4169	4669	/**/
4170	4670	//switch (event.id)
4171	4671	{
..	..	@@ -4173,7 +4673,6 @@
4173	4673	//case 702: // Event.LIST_DESELECT
4174	4674	group.deselectAll();
4175	4675	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4176		- objEditor.ClearInfo(); // .GetMaterial());
4177	4676	if (tps != null)
4178	4677	{
4179	4678	for (int i=0; i < tps.length; i++)
..	..	@@ -4182,10 +4681,8 @@
4182	4681
4183	4682	//if (child.parent != null)
4184	4683	//child.parent.addSelectee(child);
	4684	+ objEditor.SetMaterial(child);
4185	4685	group.addSelectee(child);
4186		- objEditor.SetMaterial(child); // .GetMaterial());
4187		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4188		- System.err.println("info : " + child.GetPath());
4189	4686	}
4190	4687	}
4191	4688	// else
..	..	@@ -4195,20 +4692,28 @@
4195	4692	// System.err.println("info : " + group.GetPath());
4196	4693	// }
4197	4694
4198		- objEditor.SetText(); // jan 2014
4199		-
4200		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4695	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4201	4696	CameraPane.flash = true;
4202	4697
4203		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4698	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4204	4699	// a camera
4205	4700	{
4206		- CameraPane.camerachangeframe = 0; // don't refuse it
4207		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4701	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4702	+ {
	4703	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4704	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4705	+ }
4208	4706	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4209	4707	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4210	4708	}
4211	4709
	4710	+ if (tps != null && tps.length == 1)
	4711	+ {
	4712	+ EditSelection(false);
	4713	+ }
	4714	+
	4715	+ SetPinStates(tps != null && tps.length > 0);
	4716	+
4212	4717	refreshContents();
4213	4718	//return true;
4214	4719	}
..	..	@@ -4217,6 +4722,35 @@
4217	4722
4218	4723	freezemodel = false;
4219	4724	}
	4725	+
	4726	+ void SetPinStates(boolean enabled)
	4727	+ {
	4728	+ editButton.setEnabled(enabled);
	4729	+ uneditButton.setEnabled(enabled);
	4730	+ unselectButton.setEnabled(enabled);
	4731	+ flashSelectionButton.setEnabled(enabled);
	4732	+ }
	4733	+
	4734	+ void refreshContents(boolean cp)
	4735	+ {
	4736	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4737	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4738	+ {
	4739	+ objEditor.ClearInfo(); // .GetMaterial());
	4740	+
	4741	+ for (int i=0; i < group.selection.Size(); i++)
	4742	+ {
	4743	+ Object3D child = (Object3D) group.selection.get(i);
	4744	+
	4745	+ objEditor.AddInfo(child, this, true);
	4746	+ System.err.println("info : " + child.GetPath());
	4747	+ }
	4748	+
	4749	+ objEditor.SetText(); // jan 2014
	4750	+ }
	4751	+
	4752	+ super.refreshContents(cp);
	4753	+ }
4220	4754
4221	4755	void linkSomething(Object3D thing)
4222	4756	{
..	..	@@ -4288,16 +4822,19 @@
4288	4822	{
4289	4823	if (group.selection.isEmpty())
4290	4824	return;
4291		- GrafreeD.clipboardIsTempGroup = false;
	4825	+
	4826	+ Grafreed.clipboardIsTempGroup = false;
4292	4827	Composite tGroup = null;
4293	4828	if (group.selection.size() > 0) // 1)
4294	4829	{
4295	4830	tGroup = new cGroup();
4296		- GrafreeD.clipboardIsTempGroup = true;
	4831	+ Grafreed.clipboardIsTempGroup = true;
4297	4832	}
4298	4833
4299	4834	if (cut)
4300	4835	{
	4836	+ if (Globals.SAVEONMAKE)
	4837	+ Save();
4301	4838	//int indices[] = jList.getSelectedIndices();
4302	4839	//for (int i = indices.length - 1; i >= 0; i--)
4303	4840	//jList.remove(indices[i]);
..	..	@@ -4333,16 +4870,16 @@
4333	4870	//System.out.println("cut " + child);
4334	4871	//System.out.println("parent = " + child.parent);
4335	4872	// tmp.addChild(child);
4336		- if (GrafreeD.clipboardIsTempGroup)
	4873	+ if (Grafreed.clipboardIsTempGroup)
4337	4874	tGroup.add/Child/(tmp);
4338	4875	else
4339		- GrafreeD.clipboard = tmp;
	4876	+ Grafreed.clipboard = tmp;
4340	4877	}
4341	4878	else
4342		- if (GrafreeD.clipboardIsTempGroup)
	4879	+ if (Grafreed.clipboardIsTempGroup)
4343	4880	tGroup.add/Child/(child);
4344	4881	else
4345		- GrafreeD.clipboard = child;
	4882	+ Grafreed.clipboard = child;
4346	4883	}
4347	4884
4348	4885	//ResetModel();
..	..	@@ -4374,21 +4911,23 @@
4374	4911	//System.out.println("cut " + elem);
4375	4912	//System.out.println("parent = " + elem.parent);
4376	4913	// tmp.addChild(elem);
4377		- if (GrafreeD.clipboardIsTempGroup)
	4914	+ if (Grafreed.clipboardIsTempGroup)
4378	4915	tGroup.add/Child/(tmp);
4379	4916	else
4380		- GrafreeD.clipboard = tmp;
	4917	+ Grafreed.clipboard = tmp;
4381	4918	}
4382	4919	else
4383		- if (GrafreeD.clipboardIsTempGroup)
	4920	+ if (Grafreed.clipboardIsTempGroup)
4384	4921	tGroup.add/Child/(child);
4385	4922	else
4386		- GrafreeD.clipboard = child;
	4923	+ Grafreed.clipboard = child;
4387	4924	}
4388	4925
4389	4926	}
4390		- if (GrafreeD.clipboardIsTempGroup)
4391		- GrafreeD.clipboard = tGroup;
	4927	+
	4928	+ if (Grafreed.clipboardIsTempGroup)
	4929	+ Grafreed.clipboard = tGroup;
	4930	+
4392	4931	if (cut)
4393	4932	{
4394	4933	ResetModel();
..	..	@@ -4402,7 +4941,7 @@
4402	4941	// return;
4403	4942	boolean first = true;
4404	4943
4405		- if (GrafreeD.clipboardIsTempGroup)
	4944	+ if (Grafreed.clipboardIsTempGroup)
4406	4945	{
4407	4946	Composite temp;
4408	4947
..	..	@@ -4413,7 +4952,7 @@
4413	4952	temp = (Composite)Applet3D.clipboard.deepCopy();
4414	4953	*/
4415	4954	Object3D elem;
4416		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4955	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4417	4956	{
4418	4957	Object3D child = (Object3D)e.nextElement();
4419	4958
..	..	@@ -4447,14 +4986,14 @@
4447	4986	//Object3D cb = Applet3D.clipboard;
4448	4987	//temp.addChild(cb);
4449	4988	//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());
	4989	+ assert(Grafreed.clipboard.parent == null);
	4990	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4991	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4992	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4993	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4455	4994	else
4456		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4457		- GrafreeD.clipboard.get(0).parent = keepparent;
	4995	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4996	+ Grafreed.clipboard.get(0).parent = keepparent;
4458	4997	}
4459	4998
4460	4999	ResetModel();
..	..	@@ -4503,9 +5042,9 @@
4503	5042	{
4504	5043	boolean first = true;
4505	5044
4506		- if (GrafreeD.clipboardIsTempGroup)
	5045	+ if (Grafreed.clipboardIsTempGroup)
4507	5046	{
4508		- Composite temp = (Composite)GrafreeD.clipboard;
	5047	+ Composite temp = (Composite)Grafreed.clipboard;
4509	5048	Object3D copy;
4510	5049	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4511	5050	{
..	..	@@ -4515,7 +5054,7 @@
4515	5054	}
4516	5055	} else
4517	5056	{
4518		- linkSomething(GrafreeD.clipboard); //.get(0));
	5057	+ linkSomething(Grafreed.clipboard); //.get(0));
4519	5058	}
4520	5059	}
4521	5060	}
..	..	@@ -4920,21 +5459,6 @@
4920	5459	}
4921	5460	*/
4922	5461
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	5462	/*
4939	5463	public void Callback(Object obj)
4940	5464	{
..	..	@@ -4958,26 +5482,9 @@
4958	5482	}
4959	5483	*/
4960	5484
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	5485	String GetFile(String dialogName)
4979	5486	{
4980		- if (GrafreeD.standAlone)
	5487	+ if (Grafreed.standAlone)
4981	5488	{
4982	5489	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4983	5490	browser.show();
..	..	@@ -5045,7 +5552,28 @@
5045	5552	cButton clearpanelButton;
5046	5553	cButton unselectButton;
5047	5554
	5555	+ cButton restoreCameraButton;
	5556	+
	5557	+ cButton saveButton;
5048	5558	cButton oneStepButton;
	5559	+
	5560	+ cButton groupButton;
	5561	+ cButton ungroupButton;
	5562	+ cButton compositeButton;
	5563	+ cButton switchButton;
	5564	+ cButton loopButton;
	5565	+ cButton textureButton;
	5566	+
	5567	+ cButton gridButton;
	5568	+ cButton boxButton;
	5569	+ cButton sphereButton;
	5570	+ cButton coneButton;
	5571	+ cButton torusButton;
	5572	+ cButton superButton;
	5573	+ cButton kleinButton;
	5574	+ cButton particlesButton;
	5575	+ cButton overlayButton;
	5576	+ cButton lightButton;
5049	5577
5050	5578	cButton screenfitButton;
5051	5579	cButton screenfitpointButton;
..	..	@@ -5058,14 +5586,6 @@
5058	5586
5059	5587	cButton setsupportButton;
5060	5588
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	5589	//
5070	5590	//Composite
5071	5591	Object3D // to do !!
..	..	@@ -5075,9 +5595,11 @@
5075	5595	//JTree jTree;
5076	5596	private MenuItem lookAtItem;
5077	5597	private MenuItem lookFromItem;
5078		- private MenuItem switchItem;
	5598	+ private MenuItem switchViewItem;
5079	5599	private MenuItem cutItem;
5080		- private MenuItem duplicateItem;
	5600	+ private MenuItem undoItem;
	5601	+ private MenuItem redoItem;
	5602	+ private JMenuItem duplicateItem;
5081	5603	private MenuItem cloneItem;
5082	5604	private MenuItem cloneSupportItem;
5083	5605	private MenuItem overwriteGeoItem;
..	..	@@ -5090,7 +5612,7 @@
5090	5612	private MenuItem linkverticesItem;
5091	5613	private MenuItem relinkverticesItem;
5092	5614	private MenuItem setMasterItem;
5093		- private MenuItem resetMeshItem;
	5615	+ private MenuItem resetAllItem;
5094	5616	private MenuItem stepAllItem;
5095	5617	private MenuItem revertMeshItem;
5096	5618	private MenuItem poseMeshItem;
..	..	@@ -5140,6 +5662,10 @@
5140	5662	private MenuItem showleavesItem;
5141	5663	private MenuItem markleavesItem;
5142	5664	private MenuItem unmarkleavesItem;
	5665	+ private MenuItem rewindleavesItem;
	5666	+ private MenuItem unrewindleavesItem;
	5667	+ private MenuItem randomleavesItem;
	5668	+ private MenuItem unrandomleavesItem;
5143	5669
5144	5670	private MenuItem flipVItem;
5145	5671	private MenuItem unflipVItem;
..	..	@@ -5151,15 +5677,17 @@
5151	5677	private MenuItem panoTexturesItem;
5152	5678
5153	5679	private MenuItem resetCentroidItem;
5154		- private MenuItem transformgeometryItem;
	5680	+ private MenuItem resetCentroidXZItem;
5155	5681	private MenuItem resetTransformItem;
	5682	+ private MenuItem transformGeometryItem;
	5683	+ private MenuItem transformChildrenItem;
5156	5684	private MenuItem hideItem;
5157	5685	private MenuItem grabItem;
5158	5686	private MenuItem backItem;
5159	5687	private MenuItem frontItem;
5160	5688	private MenuItem cameraItem;
5161	5689	private MenuItem compositeItem;
5162		- private MenuItem randomItem;
	5690	+ private MenuItem switchItem;
5163	5691	private MenuItem physicsItem;
5164	5692	private MenuItem frameselectorItem;
5165	5693	private MenuItem scriptNodeItem;
..	..	@@ -5221,11 +5749,6 @@
5221	5749	private MenuItem doubleItem;
5222	5750	private MenuItem tripleItem;
5223	5751
5224		- private MenuItem importGFDItem;
5225		- private MenuItem importVRMLX3DItem;
5226		- private MenuItem import3DSItem;
5227		- private MenuItem importOBJItem;
5228		-
5229	5752	private MenuItem computeAOItem;
5230	5753	private MenuItem recompileItem;
5231	5754	private MenuItem editScriptItem;
..	..	@@ -5235,4 +5758,8 @@
5235	5758	private MenuItem analyzeItem;
5236	5759	private MenuItem dumpItem;
5237	5760	//boolean freezemodel = false;
	5761	+
	5762	+ Menu cameraMenu;
	5763	+ MenuItem editCameraItem;
	5764	+ MenuItem restoreCameraItem;
5238	5765	}