~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,40 +148,37 @@
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);
	167	+ cloneItem = menu.add(new MenuItem("Clone"));
	168	+ cloneItem.addActionListener(this);
	169	+ if (Globals.ADVANCED)
	170	+ {
	171	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	172	+ cloneSupportItem.addActionListener(this);
	173	+ }
	174	+ menu.add("-");
174	175	cutItem = menu.add(new MenuItem("Cut"));
175	176	cutItem.addActionListener(this);
176	177	copyItem = menu.add(new MenuItem("Copy"));
177	178	copyItem.addActionListener(this);
178	179	pasteItem = menu.add(new MenuItem("Paste"));
179	180	pasteItem.addActionListener(this);
180		- menu.add("-");
181		- cloneItem = menu.add(new MenuItem("Clone"));
182		- cloneItem.addActionListener(this);
183		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
184		- cloneSupportItem.addActionListener(this);
	181	+
185	182	menu.add("-");
186	183	pasteIntoItem = menu.add(new MenuItem("Paste into"));
187	184	pasteIntoItem.addActionListener(this);
..	..	@@ -201,14 +198,97 @@
201	198	clearAllItem = menu.add(new MenuItem("Clear All"));
202	199	clearAllItem.addActionListener(this);
203	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());
204	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	+
205	289	oe.menuBar.add(menu = new Menu("Setting"));
206	290	if (Globals.ADVANCED)
207	291	{
208		- resetMeshItem = menu.add(new MenuItem("Reset All"));
209		- resetMeshItem.addActionListener(this);
210		- stepAllItem = menu.add(new MenuItem("Step All"));
211		- stepAllItem.addActionListener(this);
212	292	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
213	293	revertMeshItem.addActionListener(this);
214	294	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -248,21 +328,29 @@
248	328	}
249	329
250	330	oe.menuBar.add(menu = new Menu("Group"));
251		- grabItem = menu.add(new MenuItem("Grab"));
252		- grabItem.addActionListener(this);
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
253	333	backItem = menu.add(new MenuItem("Back"));
254	334	backItem.addActionListener(this);
255	335	frontItem = menu.add(new MenuItem("Front"));
256	336	frontItem.addActionListener(this);
257		- compositeItem = menu.add(new MenuItem("Composite"));
258		- compositeItem.addActionListener(this);
	337	+// compositeItem = menu.add(new MenuItem("Composite"));
	338	+// compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
259	342	hideItem = menu.add(new MenuItem("Hidden Group"));
260	343	hideItem.addActionListener(this);
	344	+ }
261	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
262	346	ungroupItem.addActionListener(this);
263		- menu.add("-");
264		- randomItem = menu.add(new MenuItem("Switch node"));
265		- 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	+ {
266	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
267	355	switchGeoItem.addActionListener(this);
268	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -270,33 +358,31 @@
270	358	morphItem = menu.add(new MenuItem("Morph Group"));
271	359	morphItem.addActionListener(this);
272	360
273		- if (Globals.ADVANCED)
274		- {
	361	+ menu.add("-");
275	362	physicsItem = menu.add(new MenuItem("Physics"));
276	363	physicsItem.addActionListener(this);
277	364	frameselectorItem = menu.add(new MenuItem("Frame Selector"));
278	365	frameselectorItem.addActionListener(this);
279	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
280	367	scriptNodeItem.addActionListener(this);
281		- cameraItem = menu.add(new MenuItem("Camera"));
282		- cameraItem.addActionListener(this);
283	368	}
284	369
285	370	oe.menuBar.add(menu = new Menu("Object"));
286		- textureItem = menu.add(new MenuItem("Texture"));
287		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
288	373	billboardItem = menu.add(new MenuItem("Billboard"));
289	374	billboardItem.addActionListener(this);
290	375	csgItem = menu.add(new MenuItem("CSG"));
291	376	csgItem.addActionListener(this);
292		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	377	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
293	378	shadowXItem.addActionListener(this);
294		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	379	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
295	380	shadowYItem.addActionListener(this);
296		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	381	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
297	382	shadowZItem.addActionListener(this);
298	383	if (Globals.ADVANCED)
299	384	{
	385	+ menu.add("-");
300	386	linkerItem = menu.add(new MenuItem("Linker"));
301	387	linkerItem.addActionListener(this);
302	388	attributeItem = menu.add(new MenuItem("Attribute"));
..	..	@@ -305,14 +391,18 @@
305	391	templateItem.addActionListener(this);
306	392	pointflowItem = menu.add(new MenuItem("Point Flow"));
307	393	pointflowItem.addActionListener(this);
308		- menu.add("-");
309	394	}
	395	+ menu.add("-");
310	396	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
311	397	resetTransformItem.addActionListener(this);
312	398	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
313	399	resetCentroidItem.addActionListener(this);
314		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
315		- 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);
316	406
317	407	oe.menuBar.add(menu = new Menu("Geometry"));
318	408	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -361,6 +451,10 @@
361	451	oe.menuBar.add(menu = new Menu("Attributes"));
362	452	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
363	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);
364	458	menu.add("-");
365	459	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
366	460	liveleavesItem.addActionListener(this);
..	..	@@ -381,6 +475,14 @@
381	475	markleavesItem.addActionListener(this);
382	476	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
383	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);
384	486	menu.add("-");
385	487	flipVItem = menu.add(new MenuItem("Flip V"));
386	488	flipVItem.addActionListener(this);
..	..	@@ -415,38 +517,41 @@
415	517	sortbysizeItem.addActionListener(this);
416	518	sortbynameItem = menu.add(new MenuItem("Sort by name"));
417	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);
418	525	if (Globals.ADVANCED)
419	526	{
420		- menu.add("-");
	527	+ // Pretty much the same as duplicate and clone.
421	528	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
422	529	extractGeometriesItem.addActionListener(this);
423	530	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
424	531	cloneGeometriesItem.addActionListener(this);
425		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
426		- shareGeometriesItem.addActionListener(this);
427		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
428		- mergeGeometriesItem.addActionListener(this);
429	532	}
430	533
431	534	oe.menuBar.add(menu = new Menu("Insert"));
432	535	buildCreateMenu(menu);
433	536
434		- oe.menuBar.add(menu = new Menu("Include"));
435		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
436		- importGFDItem.addActionListener(this);
437		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
438		- importVRMLX3DItem.addActionListener(this);
439		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
440		- importOBJItem.addActionListener(this);
441		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
442		- import3DSItem.addActionListener(this);
443		-
444	537	oe.menuBar.add(menu = new Menu("Tools"));
445	538	buildToolsMenu(menu);
446	539	}
447	540
448	541	void SetupUI2(ObjEditor oe)
449	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	+
450	555	//new Exception().printStackTrace();
451	556
452	557	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -475,97 +580,213 @@
475	580	oe.radioPanel.add(dummyButton);
476	581	oe.buttonGroup.add(dummyButton);
477	582	*/
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 1;
	586	+
478	587	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
479	588
480		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
481		- 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");
482	621	liveCB.addItemListener(this);
483	622
484		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	623	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	624	oneStepButton.setToolTipText("Animate one step forward");
486	625	oneStepButton.addActionListener(this);
487	626
488		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	627	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
489	628	fastCB.setToolTipText("Fast mode");
490	629	fastCB.addItemListener(this);
491	630
492		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
493		- trackCB.setToolTipText("Enable tracking");
494		- trackCB.addItemListener(this);
495		-
496		- 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);
497	634	screenfitButton.setToolTipText("Screen fit");
498	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);
499	640
500	641	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
501	642	// screenfitpointButton.addActionListener(this);
502	643
503	644	if (Globals.ADVANCED)
504	645	{
505		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	646	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
506	647	snapobjectButton.addActionListener(this);
507	648	snapobjectButton.setToolTipText("Snap Object");
508	649	}
509	650
510		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
511		- flashSelectionButton.setToolTipText("Show selection");
512		- flashSelectionButton.addActionListener(this);
	651	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
513	652
514		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
515		-
516		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	653	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
517	654	twoButton.setToolTipText("Show center view only");
518	655	twoButton.addActionListener(this);
519		- 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);
520	659	fourButton.addActionListener(this);
521	660	fourButton.setToolTipText("Show left panel only");
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	661	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
523	662	sixButton.setToolTipText("2-column layout left");
524	663	sixButton.addActionListener(this);
525		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
526	665	threeButton.setToolTipText("2-column layout right");
527	666	threeButton.addActionListener(this);
528		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	667	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
529	668	sevenButton.setToolTipText("3-column layout");
530	669	sevenButton.addActionListener(this);
531	670	//
532	671
533		- 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);
534	673	rootButton.setToolTipText("Edit selection in new tab");
535	674	rootButton.addActionListener(this);
536	675
537		- 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);
538	677	closeButton.setToolTipText("Close tab");
539	678	closeButton.addActionListener(this);
540	679	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
541	680	//clearButton.addActionListener(this);
542		-
543		- 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	+ }
544	713
545		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
546		- 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");
547	763	editButton.addActionListener(this);
548	764
549		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
550		- uneditButton.setToolTipText("Unedit selection");
	765	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	766	+ uneditButton.setToolTipText("Remove selection controls");
551	767	uneditButton.addActionListener(this);
552	768
553		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
554		- allParamsButton.setToolTipText("Edit all params");
	769	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	770	+ allParamsButton.setToolTipText("Show all controle");
555	771	allParamsButton.addActionListener(this);
556	772
557		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	773	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
558	774	clearPanelButton.setToolTipText("Clear edit panel");
559	775	clearPanelButton.addActionListener(this);
560	776
561		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	777	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
562	778	unselectButton.setToolTipText("Unselect");
563	779	unselectButton.addActionListener(this);
564	780
565		- 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);
566	784
567		- oe.treePanel.add(commandsPanel);
568		- oe.treePanel.Return();
	785	+ editCommandsPanel.preferredHeight = 1;
	786	+
	787	+ SetPinStates(false);
	788	+// oe.treePanel.add(commandsPanel);
	789	+// oe.treePanel.Return();
569	790
570	791	// oe.aConstraints.gridx += 1;
571	792	// oe.aConstraints.weighty = 0;
..	..	@@ -582,27 +803,12 @@
582	803
583	804	JScrollPane jSP;
584	805	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
585		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	806	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
586	807	ResetModel();
587	808
588	809	oe.treePanel.add(jSPPanel);
589	810	oe.treePanel.Return();
590	811
591		- cGridBag copyOptionsPanel = new cGridBag();
592		-
593		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
594		- colorCB.setToolTipText("Copy color when dropped");
595		- colorCB.addItemListener(this);
596		-
597		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
598		- materialCB.setToolTipText("Copy material when dropped");
599		- materialCB.addItemListener(this);
600		-
601		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
602		- textureCB.setToolTipText("Copy texture when dropped");
603		- textureCB.addItemListener(this);
604		-
605		- copyOptionsPanel.preferredHeight = 1;
606	812	oe.treePanel.add(copyOptionsPanel);
607	813	oe.treePanel.Return();
608	814
..	..	@@ -633,23 +839,43 @@
633	839
634	840	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
635	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	+
636	856	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
637	857	boxCB.setToolTipText("Display bounding boxes");
638	858	boxCB.addItemListener(this);
639	859
640	860	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
641		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	861	+ zoomBoxCB.setToolTipText("Display only for wheel");
642	862	zoomBoxCB.addItemListener(this);
643	863
644		- if (Globals.ADVANCED)
	864	+ if (true) // Globals.ADVANCED)
645	865	{
646		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
647		- supportCB.setToolTipText("Enable rigging");
648		- 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);
649	873
650	874	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
651	875	// localCB.addItemListener(this);
652	876
	877	+ panel.Return();
	878	+
653	879	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
654	880	crowdCB.setToolTipText("Used for crowds");
655	881	crowdCB.addItemListener(this);
..	..	@@ -666,6 +892,8 @@
666	892	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
667	893	// speakerMocapCB.addItemListener(this);
668	894
	895	+ panel.Return();
	896	+
669	897	if (false)
670	898	{
671	899	// handled in scripts
..	..	@@ -680,32 +908,72 @@
680	908	//constraints.gridy += 1;
681	909	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
682	910	smoothfocusCB.addItemListener(this);
	911	+ panel.Return();
683	912	}
684	913
685	914	//constraints.gridx += 1;
686	915	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
687	916	// debugCB.addItemListener(this);
688	917
	918	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	919	+ trackCB.setToolTipText("Enable tracking target");
	920	+ trackCB.addItemListener(this);
	921	+
689	922	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	923	+ oeilCB.setToolTipText("Move camera when tracking");
690	924	oeilCB.addItemListener(this);
691	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	+ {
692	946	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
693	947	lookAtCB.setToolTipText("Look-at target");
694	948	lookAtCB.addItemListener(this);
	949	+ }
695	950
696	951	}
697	952
698	953	cGridBag fill = new cGridBag();
699		-
700	954	fill.preferredHeight = 200;
	955	+ cGridBag fill2 = new cGridBag();
	956	+ fill2.preferredHeight = 200;
	957	+ cGridBag fill3 = new cGridBag();
	958	+ fill3.preferredHeight = 200;
701	959
702	960	panel.add(fill);
	961	+ panel.add(fill2);
	962	+ panel.add(fill3);
703	963
704	964	}
705	965
706	966	void EditObject(Object3D obj)
707	967	{
708	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	+
709	977	radioButton.SetObject(obj);
710	978	radioButton.layout = sevenButton;
711	979	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -714,8 +982,11 @@
714	982	buttonGroup.add(radioButton);
715	983	radioButton.doClick();
716	984	}
	985	+
717	986	void SetupViews(ObjEditor oe)
718	987	{
	988	+ theFrame = this;
	989	+
719	990	oe.SetupViews();
720	991
721	992	System.out.println("SetupViews");
..	..	@@ -724,23 +995,28 @@
724	995	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
725	996	}
726	997
727		- JCheckBox liveCB;
728		- JCheckBox supportCB;
729		- JCheckBox localCB;
730		- JCheckBox crowdCB;
731		- JCheckBox smoothCB;
732		- JCheckBox fastCB;
733		- JCheckBox slowCB;
734		- JCheckBox boxCB;
735		- JCheckBox zoomBoxCB;
736		- JCheckBox trackCB;
737		- 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;
738	1011	// JCheckBox speakerMocapCB;
739		- JCheckBox speakerCameraCB;
740		- JCheckBox speakerFocusCB;
741		- JCheckBox debugCB;
742		- JCheckBox oeilCB;
743		- JCheckBox lookAtCB;
	1012	+ cCheckBox speakerCameraCB;
	1013	+ cCheckBox speakerFocusCB;
	1014	+ cCheckBox debugCB;
	1015	+
	1016	+ cCheckBox oeilCB;
	1017	+ cCheckBox shadowCB;
	1018	+ cCheckBox autosaveCB;
	1019	+ cCheckBox lookAtCB;
744	1020
745	1021	// static int COLOR = 1;
746	1022	// static int MATERIAL = 2;
..	..	@@ -748,9 +1024,9 @@
748	1024
749	1025	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
750	1026
751		- JCheckBox colorCB;
752		- JCheckBox materialCB;
753		- JCheckBox textureCB;
	1027	+ cCheckBox colorCB;
	1028	+ cCheckBox materialCB;
	1029	+ cCheckBox textureCB;
754	1030
755	1031	public void itemStateChanged(ItemEvent e)
756	1032	{
..	..	@@ -778,6 +1054,7 @@
778	1054	} else if(e.getSource() == liveCB)
779	1055	{
780	1056	cameraView.ToggleLive();
	1057	+ refreshContents(false);
781	1058	}
782	1059	else if(e.getSource() == supportCB)
783	1060	{
..	..	@@ -842,6 +1119,18 @@
842	1119	{
843	1120	cameraView.ToggleOeil();
844	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	+ }
845	1134	else if(e.getSource() == lookAtCB)
846	1135	{
847	1136	cameraView.ToggleLookAt();
..	..	@@ -858,7 +1147,8 @@
858	1147
859	1148	/**/
860	1149	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
861		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1150	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1151	+ TreePath path = objEditor.jTree.getSelectionPath();
862	1152	if ((path == null) \|\| (path.getPathCount() <= 1)) {
863	1153	// We can't move the root node or an empty selection
864	1154	return;
..	..	@@ -930,7 +1220,9 @@
930	1220	// objEditor.DropFile((java.io.File[]) object, true);
931	1221	// return;
932	1222	// }
933		- if (string.charAt(0) == '/')
	1223	+
	1224	+ // File path for Mac and Windows
	1225	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
934	1226	{
935	1227	// file(s)
936	1228	String[] names = string.split("\n");
..	..	@@ -957,7 +1249,7 @@
957	1249
958	1250	flashIt = false;
959	1251	CameraPane pane = (CameraPane) target;
960		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1252	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
961	1253	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
962	1254
963	1255	if (group.selection.size() == 1)
..	..	@@ -973,23 +1265,33 @@
973	1265
974	1266	assert target == objEditor.jTree;
975	1267	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1268	+ Object3D destinationLeaf;
976	1269	try {
977		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1270	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
978	1271	} catch (Exception e) {
979	1272	System.out.println("destinationPath : " + destinationPath);
980	1273	return;
981	1274	}
982	1275
983		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1276	+ for (int i=group.selection.size(); --i>=0;)
984	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	+// {
985	1287	loadClipboard(true);
986	1288	objEditor.jTree.setSelectionPath(destinationPath);
987	1289	pasteInto(false, false);
988		- } else {
989		- loadClipboard(false);
990		- objEditor.jTree.setSelectionPath(destinationPath);
991		- pasteInto(false, false); // true); // ???
992		- }
	1290	+// } else {
	1291	+// loadClipboard(false);
	1292	+// objEditor.jTree.setSelectionPath(destinationPath);
	1293	+// pasteInto(false, false); // true); // ???
	1294	+// }
993	1295	}
994	1296	public void dropActionChanged(DropTargetDragEvent dtde)
995	1297	// Called if the user has modified the current drop gesture
..	..	@@ -1094,22 +1396,30 @@
1094	1396	{
1095	1397	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1096	1398	//heightFieldItem.addActionListener(this);
1097		- gridItem = menu.add(new MenuItem("Grid"));
1098		- gridItem.addActionListener(this);
1099		- rectoidItem = menu.add(new MenuItem("Box"));
1100		- rectoidItem.addActionListener(this);
1101		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1102		- ellipsoidItem.addActionListener(this);
1103		- coneItem = menu.add(new MenuItem("Cone"));
1104		- coneItem.addActionListener(this);
1105		- torusItem = menu.add(new MenuItem("Torus"));
1106		- torusItem.addActionListener(this);
1107		- superItem = menu.add(new MenuItem("Superellipsoid"));
1108		- 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	+ {
1109	1417	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1110	1418	kleinItem.addActionListener(this);
1111		- particleItem = menu.add(new MenuItem("Particle system"));
1112		- particleItem.addActionListener(this);
	1419	+ }
	1420	+
	1421	+// particleItem = menu.add(new MenuItem("Particle system"));
	1422	+// particleItem.addActionListener(this);
1113	1423	if (Globals.ADVANCED)
1114	1424	{
1115	1425	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1135,15 +1445,15 @@
1135	1445	}
1136	1446	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1137	1447	bezierItem.addActionListener(this);
1138		- overlayItem = menu.add(new MenuItem("Overlay"));
1139		- overlayItem.addActionListener(this);
1140		- lightItem = menu.add(new MenuItem("Light"));
1141		- 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);
1142	1452	menu.add("-");
1143	1453	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1144	1454	//superLoopItem.addActionListener(this);
1145		- loopItem = menu.add(new MenuItem("Loop"));
1146		- loopItem.addActionListener(this);
	1455	+// loopItem = menu.add(new MenuItem("Loop"));
	1456	+// loopItem.addActionListener(this);
1147	1457	doubleItem = menu.add(new MenuItem("Fork"));
1148	1458	doubleItem.addActionListener(this);
1149	1459	if (Globals.ADVANCED)
..	..	@@ -1164,13 +1474,13 @@
1164	1474	parseverticesItem.addActionListener(this);
1165	1475	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1166	1476	textureFieldItem.addActionListener(this);
1167		- alignItem = menu.add(new MenuItem("Align Object"));
	1477	+ alignItem = menu.add(new MenuItem("Align Objects"));
1168	1478	alignItem.addActionListener(this);
1169	1479	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1170	1480	reduceMorphItem.addActionListener(this);
1171	1481	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1172	1482	reduce34MorphItem.addActionListener(this);
1173		-
	1483	+ menu.add("-");
1174	1484	menu.add(computeAOItem = new MenuItem("Compute AO"));
1175	1485	computeAOItem.addActionListener(this);
1176	1486
..	..	@@ -1183,7 +1493,7 @@
1183	1493	memoryItem.addActionListener(this);
1184	1494	menu.add(analyzeItem = new MenuItem("Analyze"));
1185	1495	analyzeItem.addActionListener(this);
1186		- menu.add(dumpItem = new MenuItem("Dump"));
	1496	+ menu.add(dumpItem = new MenuItem("Print"));
1187	1497	dumpItem.addActionListener(this);
1188	1498	// menu.add(pathItem = new MenuItem("From-to path"));
1189	1499	// pathItem.addActionListener(this);
..	..	@@ -1324,9 +1634,24 @@
1324	1634	shadow.material = new cMaterial(obj.material);
1325	1635	shadow.material.diffuse = 0.0001f;
1326	1636	shadow.material.specular = 0.0001f;
	1637	+ //shadow.projectedVertices[1].x = 300;
1327	1638
1328	1639	makeSomething(shadow);
1329	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	+ }
1330	1655
1331	1656	/**
1332	1657	* applyExample
..	..	@@ -1530,9 +1855,9 @@
1530	1855
1531	1856	void Overwrite(int mask)
1532	1857	{
1533		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1858	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1534	1859	{
1535		- Object3D content = GrafreeD.clipboard.get(0);
	1860	+ Object3D content = Grafreed.clipboard.get(0);
1536	1861
1537	1862	if (content instanceof cGroup && ((cGroup)content).transientlink )
1538	1863	content = ((cGroup)content).get(0);
..	..	@@ -1571,7 +1896,7 @@
1571	1896	{
1572	1897	ScreenFit();
1573	1898	} else
1574		- if (source == switchItem)
	1899	+ if (source == switchViewItem)
1575	1900	{
1576	1901	cVector v1 = new cVector();
1577	1902	cVector v2 = new cVector();
..	..	@@ -1580,11 +1905,11 @@
1580	1905	objEditor.cameraView.renderCamera.setAim(v2, v1);
1581	1906	objEditor.cameraView.repaint();
1582	1907	} else
1583		- if (source == rectoidItem)
	1908	+ if (source == rectoidItem \|\| source == boxButton)
1584	1909	{
1585	1910	makeSomething(new Box());
1586	1911	} else
1587		- if (source == particleItem)
	1912	+ if (source == particleItem \|\| source == particlesButton)
1588	1913	{
1589	1914	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1590	1915	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1663,27 +1988,27 @@
1663	1988
1664	1989	makeSomething(obj);
1665	1990	} else
1666		- if (source == gridItem)
	1991	+ if (source == gridItem \|\| source == gridButton)
1667	1992	{
1668	1993	makeSomething(new Grid());
1669	1994	} else
1670		- if (source == ellipsoidItem)
	1995	+ if (source == ellipsoidItem \|\| source == sphereButton)
1671	1996	{
1672	1997	makeSomething(new Sphere());
1673	1998	} else
1674		- if (source == coneItem)
	1999	+ if (source == coneItem \|\| source == coneButton)
1675	2000	{
1676	2001	makeSomething(new Cone());
1677	2002	} else
1678		- if (source == torusItem)
	2003	+ if (source == torusItem \|\| source == torusButton)
1679	2004	{
1680	2005	makeSomething(new Torus());
1681	2006	} else
1682		- if (source == superItem)
	2007	+ if (source == superItem \|\| source == superButton)
1683	2008	{
1684	2009	makeSomething(new Superellipsoid());
1685	2010	} else
1686		- if (source == kleinItem)
	2011	+ if (source == kleinItem \|\| source == kleinButton)
1687	2012	{
1688	2013	makeSomething(new Klein());
1689	2014	} else
..	..	@@ -1703,7 +2028,7 @@
1703	2028	{
1704	2029	makeSomething(new BezierSurface());
1705	2030	} else
1706		- if (source == overlayItem)
	2031	+ if (source == overlayItem \|\| source == overlayButton)
1707	2032	{
1708	2033	/*
1709	2034	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1751,7 +2076,7 @@
1751	2076	s.setup();
1752	2077	makeSomething(s);
1753	2078	} else
1754		- if (source == lightItem)
	2079	+ if (source == lightItem \|\| source == lightButton)
1755	2080	{
1756	2081	makeSomething(new Light());
1757	2082	} else
..	..	@@ -1801,30 +2126,30 @@
1801	2126
1802	2127	group(g);
1803	2128	} else
1804		- if (source == loopItem)
	2129	+ if (source == loopItem \|\| source == loopButton)
1805	2130	{
1806	2131	Composite csg = new GroupLeaf();
1807	2132	csg.count = 5;
1808	2133	group(csg);
1809		- Composite child = new cGroup();
	2134	+ Composite child = new cGroup("Branch");
1810	2135	csg.addChild(child);
1811	2136	child.addChild(csg);
1812	2137	} else
1813	2138	if (source == doubleItem)
1814	2139	{
1815		- Composite csg = new GroupLeaf();
	2140	+ Composite csg = new GroupLeaf("Fork");
1816	2141	csg.count = 5;
1817	2142	group(csg);
1818		- Composite child = new cGroup();
	2143	+ Composite child = new cGroup("Branch A");
1819	2144	csg.addChild(child);
1820	2145	child.addChild(csg);
1821		- child = new cGroup();
	2146	+ child = new cGroup("Branch B");
1822	2147	csg.addChild(child);
1823	2148	child.addChild(csg);
1824	2149	} else
1825	2150	if (source == tripleItem)
1826	2151	{
1827		- Composite csg = new GroupLeaf();
	2152	+ Composite csg = new GroupLeaf("Trident");
1828	2153	csg.count = 4;
1829	2154	group(csg);
1830	2155	Composite child = new cGroup();
..	..	@@ -1836,23 +2161,6 @@
1836	2161	child = new cGroup();
1837	2162	csg.addChild(child);
1838	2163	child.addChild(csg);
1839		- } else
1840		-
1841		- if (source == importGFDItem)
1842		- {
1843		- ImportGFD();
1844		- } else
1845		- if (source == importVRMLX3DItem)
1846		- {
1847		- ImportVRMLX3D();
1848		- } else
1849		- if (source == import3DSItem)
1850		- {
1851		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1852		- } else
1853		- if (source == importOBJItem)
1854		- {
1855		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1856	2164	} else
1857	2165	if (source == computeAOItem)
1858	2166	{
..	..	@@ -1872,7 +2180,7 @@
1872	2180	if (source == invariantsItem)
1873	2181	{
1874	2182	System.out.println("Invariants:");
1875		- GrafreeD.grafreeD.universe.invariants();
	2183	+ Grafreed.grafreeD.universe.invariants();
1876	2184	} else
1877	2185	if (source == memoryItem)
1878	2186	{
..	..	@@ -1890,6 +2198,30 @@
1890	2198	if (source == dumpItem)
1891	2199	{
1892	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();
1893	2225	} else
1894	2226	if (source == oneStepButton)
1895	2227	{
..	..	@@ -1945,12 +2277,20 @@
1945	2277	{
1946	2278	loadClipboard(true);
1947	2279	} else
	2280	+ if (source == undoItem)
	2281	+ {
	2282	+ Undo();
	2283	+ } else
	2284	+ if (source == redoItem)
	2285	+ {
	2286	+ Redo();
	2287	+ } else
1948	2288	if (source == duplicateItem)
1949	2289	{
1950		- Object3D keep = GrafreeD.clipboard;
	2290	+ Object3D keep = Grafreed.clipboard;
1951	2291	loadClipboard(false);
1952	2292	paste(false);
1953		- GrafreeD.clipboard = keep;
	2293	+ Grafreed.clipboard = keep;
1954	2294	} else
1955	2295	if (source == cloneItem)
1956	2296	{
..	..	@@ -2170,9 +2510,9 @@
2170	2510	// group.selection.get(0).setMasterThis(content); // should be identity
2171	2511	// refreshContents();
2172	2512	// }
2173		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2513	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2174	2514	{
2175		- Object3D content = GrafreeD.clipboard.get(0);
	2515	+ Object3D content = Grafreed.clipboard.get(0);
2176	2516
2177	2517	if (content instanceof cGroup && ((cGroup)content).transientlink )
2178	2518	content = ((cGroup)content).get(0);
..	..	@@ -2222,9 +2562,9 @@
2222	2562	} else
2223	2563	if (source == setMasterItem)
2224	2564	{
2225		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2565	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2226	2566	{
2227		- Object3D content = GrafreeD.clipboard.get(0);
	2567	+ Object3D content = Grafreed.clipboard.get(0);
2228	2568
2229	2569	if (content instanceof cGroup && ((cGroup)content).transientlink )
2230	2570	content = ((cGroup)content).get(0);
..	..	@@ -2237,9 +2577,9 @@
2237	2577	{
2238	2578	if (group.selection.size() == 1)
2239	2579	{
2240		- if (GrafreeD.clipboard.size() == 1)
	2580	+ if (Grafreed.clipboard.size() == 1)
2241	2581	{
2242		- Object3D content = GrafreeD.clipboard.get(0);
	2582	+ Object3D content = Grafreed.clipboard.get(0);
2243	2583
2244	2584	if (content instanceof cGroup && ((cGroup)content).transientlink )
2245	2585	content = ((cGroup)content).get(0);
..	..	@@ -2256,7 +2596,7 @@
2256	2596	{
2257	2597	RevertMeshes();
2258	2598	} else
2259		- if (source == resetMeshItem)
	2599	+ if (source == resetAllItem)
2260	2600	{
2261	2601	ResetAll();
2262	2602	} else
..	..	@@ -2276,9 +2616,9 @@
2276	2616	{
2277	2617	ClearSelection(true);
2278	2618	} else
2279		- if (source == grabItem)
	2619	+ if (source == grabItem \|\| source == groupButton)
2280	2620	{
2281		- group(new cGroup(), true);
	2621	+ group(new cGroup(), false); // true);
2282	2622	} else
2283	2623	if (source == hideItem)
2284	2624	{
..	..	@@ -2296,11 +2636,11 @@
2296	2636	{
2297	2637	makeSomething(new Camera());
2298	2638	} else
2299		- if (source == compositeItem)
	2639	+ if (source == compositeItem \|\| source == compositeButton)
2300	2640	{
2301	2641	group(new Composite());
2302	2642	} else
2303		- if (source == randomItem)
	2643	+ if (source == switchItem \|\| source == switchButton)
2304	2644	{
2305	2645	RandomNode random = new RandomNode();
2306	2646	group(random);
..	..	@@ -2402,7 +2742,7 @@
2402	2742	{
2403	2743	group(new cLinker());
2404	2744	} else
2405		- if (source == textureItem)
	2745	+ if (source == textureItem \|\| source == textureButton)
2406	2746	{
2407	2747	group(new TextureNode());
2408	2748	} else
..	..	@@ -2422,17 +2762,30 @@
2422	2762	{
2423	2763	CastShadow(2);
2424	2764	} else
2425		- if (source == ungroupItem)
	2765	+ if (source == ungroupItem \|\| source == ungroupButton)
2426	2766	{
2427		- //ungroup();
	2767	+ boolean hasRoot = false;
	2768	+
2428	2769	for (int i=0; i<group.selection.size(); i++)
2429	2770	{
2430		- Ungroup(group.selection.get(i));
	2771	+ if (group.selection.get(i) == group)
	2772	+ {
	2773	+ hasRoot = true;
	2774	+ break;
	2775	+ }
2431	2776	}
2432	2777
2433		- ClearSelection(false);
2434		-
2435		- 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	+ }
2436	2789	} else
2437	2790	if (source == genUVItem)
2438	2791	{
..	..	@@ -2444,7 +2797,7 @@
2444	2797	} else
2445	2798	if (source == genNormalsMESHItem)
2446	2799	{
2447		- GenNormals(true); // TODO
	2800	+ GenNormalsMESH();
2448	2801	} else
2449	2802	if (source == genNormalsORGANItem)
2450	2803	{
..	..	@@ -2509,6 +2862,22 @@
2509	2862	if (source == unmarkleavesItem)
2510	2863	{
2511	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);
2512	2881	} else
2513	2882	if (source == flipVItem)
2514	2883	{
..	..	@@ -2594,9 +2963,13 @@
2594	2963	{
2595	2964	SmoothMesh();
2596	2965	} else
2597		- if (source == transformgeometryItem)
	2966	+ if (source == transformGeometryItem)
2598	2967	{
2599	2968	TransformGeometry();
	2969	+ } else
	2970	+ if (source == transformChildrenItem)
	2971	+ {
	2972	+ TransformChildren();
2600	2973	} else
2601	2974	if (source == resetTransformItem)
2602	2975	{
..	..	@@ -2604,7 +2977,11 @@
2604	2977	} else
2605	2978	if (source == resetCentroidItem)
2606	2979	{
2607		- ResetCentroid();
	2980	+ ResetCentroid(true);
	2981	+ } else
	2982	+ if (source == resetCentroidXZItem)
	2983	+ {
	2984	+ ResetCentroid(false);
2608	2985	} else
2609	2986	if (source == resetParentItem)
2610	2987	{
..	..	@@ -2736,6 +3113,10 @@
2736	3113	if (source == twoButton)
2737	3114	{
2738	3115	radio.layout = twoButton;
	3116	+
	3117	+ if (CameraPane.FULLSCREEN)
	3118	+ fullscreenLayout = radio.layout;
	3119	+
2739	3120	// bug
2740	3121	//gridPanel.setDividerLocation(1.0);
2741	3122	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2768,10 +3149,31 @@
2768	3149	bigThree.ClearUI();
2769	3150	bigThree.add(centralPanel);
2770	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	+
2771	3170	} else
2772	3171	if (source == threeButton)
2773	3172	{
2774	3173	radio.layout = threeButton;
	3174	+
	3175	+ if (CameraPane.FULLSCREEN)
	3176	+ fullscreenLayout = radio.layout;
2775	3177
2776	3178	// bigThree.remove(scenePanel);
2777	3179	// bigThree.remove(centralPanel);
..	..	@@ -2804,10 +3206,15 @@
2804	3206	bigThree.add(centralPanel);
2805	3207	bigThree.add(XYZPanel);
2806	3208	bigThree.FlushUI();
	3209	+
	3210	+ cameraView.requestFocusInWindow();
2807	3211	} else
2808	3212	if (source == fourButton)
2809	3213	{
2810	3214	radio.layout = fourButton;
	3215	+
	3216	+ if (CameraPane.FULLSCREEN)
	3217	+ fullscreenLayout = radio.layout;
2811	3218
2812	3219	// bigThree.remove(scenePanel);
2813	3220	// bigThree.remove(centralPanel);
..	..	@@ -2839,10 +3246,15 @@
2839	3246	bigThree.ClearUI();
2840	3247	bigThree.add(scenePanel);
2841	3248	bigThree.FlushUI();
	3249	+
	3250	+ cameraView.requestFocusInWindow();
2842	3251	} else
2843	3252	if (source == sixButton)
2844	3253	{
2845	3254	radio.layout = sixButton;
	3255	+
	3256	+ if (CameraPane.FULLSCREEN)
	3257	+ fullscreenLayout = radio.layout;
2846	3258
2847	3259	// bigThree.remove(scenePanel);
2848	3260	// bigThree.remove(centralPanel);
..	..	@@ -2875,10 +3287,15 @@
2875	3287	bigThree.add(scenePanel);
2876	3288	bigThree.add(centralPanel);
2877	3289	bigThree.FlushUI();
	3290	+
	3291	+ cameraView.requestFocusInWindow();
2878	3292	} else
2879	3293	if (source == sevenButton)
2880	3294	{
2881	3295	radio.layout = sevenButton;
	3296	+
	3297	+ if (CameraPane.FULLSCREEN)
	3298	+ fullscreenLayout = radio.layout;
2882	3299
2883	3300	// bigThree.remove(scenePanel);
2884	3301	// bigThree.remove(centralPanel);
..	..	@@ -2912,6 +3329,8 @@
2912	3329	bigThree.add(centralPanel);
2913	3330	bigThree.add(XYZPanel);
2914	3331	bigThree.FlushUI();
	3332	+
	3333	+ cameraView.requestFocusInWindow();
2915	3334	} else
2916	3335	if (source == rootButton)
2917	3336	{
..	..	@@ -2923,6 +3342,7 @@
2923	3342	EditObject(obj);
2924	3343	}
2925	3344
	3345	+ cameraView.requestFocusInWindow();
2926	3346	refreshContents(true);
2927	3347	} else
2928	3348	if (source == closeButton)
..	..	@@ -2932,22 +3352,37 @@
2932	3352	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2933	3353	{
2934	3354	ab = (cRadio)e.nextElement();
2935		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3355	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2936	3356	{
	3357	+ // Patch to avoid bug with transparency.
	3358	+ if (!ab.hadMaterial)
	3359	+ {
	3360	+ ab.object.material = null;
	3361	+ }
	3362	+
2937	3363	buttonGroup.remove(ab);
2938	3364	radioPanel.remove(ab);
2939	3365
2940		- ab.GetObject().editWindow = null;
	3366	+ //ab.GetObject().editWindow = null;
	3367	+ ab.GetObject().manipWindow = null;
2941	3368	// ab.GetObject().objectUI = null; // ?????????
2942	3369
2943	3370	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2944	3371	break;
2945	3372	}
2946	3373	}
	3374	+
	3375	+ cameraView.requestFocusInWindow();
2947	3376	refreshContents(true);
2948	3377	} else
2949	3378	if (source == editItem \|\| source == editButton)
2950	3379	{
	3380	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3381	+ {
	3382	+ Object3D child = (Object3D)e.nextElement();
	3383	+ child.pinned = true;
	3384	+ }
	3385	+
2951	3386	EditSelection(false);
2952	3387	} else
2953	3388	if (source == uneditButton)
..	..	@@ -2957,10 +3392,11 @@
2957	3392	Object3D child = (Object3D)e.nextElement();
2958	3393	if(child.editWindow != null)
2959	3394	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3395	+ child.pinned = false;
2960	3396	child.CloseUI();
2961	3397	listUI.remove(child);
2962	3398
2963		- child.editWindow = null; // ???????????
	3399	+ //child.editWindow = null; // ???????????
2964	3400	}
2965	3401	objEditor.ctrlPanel.FlushUI();
2966	3402	//objEditor.jTree.clearSelection();
..	..	@@ -2973,6 +3409,7 @@
2973	3409	//copy.ClearUI();
2974	3410	for (Object3D obj : listUI)
2975	3411	{
	3412	+ obj.pinned = false;
2976	3413	obj.CloseUI();
2977	3414	}
2978	3415	listUI.clear();
..	..	@@ -2982,7 +3419,7 @@
2982	3419	{
2983	3420	assert(copy == group);
2984	3421
2985		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3422	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2986	3423
2987	3424	for (Object3D obj : listUI)
2988	3425	{
..	..	@@ -3046,20 +3483,44 @@
3046	3483	frontView.object = group;
3047	3484	sideView.object = group;
3048	3485	}
3049		- group.editWindow = this;
	3486	+
	3487	+// fix "+" issue
	3488	+ //group.editWindow = this;
	3489	+ group.manipWindow = this;
	3490	+
3050	3491	/*
3051	3492	currentLayout = radio.layout;
3052	3493	if (currentLayout == null)
3053	3494	currentLayout = sevenButton;
3054	3495	*/
3055	3496	radio.layout.doClick();
	3497	+
	3498	+ ClearUnpinned();
	3499	+ SetPinStates(group.selection.size() > 0);
	3500	+ if (group.selection.size() == 1)
	3501	+ EditSelection(false);
3056	3502	keepparent = group.parent;
3057	3503	// PARENT = NULL or not???
3058	3504	//group.parent = null; // ROOT
3059	3505	//group.attributes = -1;
3060	3506	ResetModel();
	3507	+
	3508	+ cameraView.requestFocusInWindow();
3061	3509	refreshContents(true);
3062		- }
	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	+ }
3063	3524	else
3064	3525	{
3065	3526	//return super.action(event, arg);
..	..	@@ -3068,7 +3529,6 @@
3068	3529	}
3069	3530
3070	3531	boolean useclient = false;
3071		- cRadio radio;
3072	3532
3073	3533	void ToggleRoot()
3074	3534	{
..	..	@@ -3120,6 +3580,28 @@
3120	3580	refreshContents();
3121	3581	}
3122	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	+ }
3123	3605
3124	3606	void ResetTransform()
3125	3607	{
..	..	@@ -3232,7 +3714,7 @@
3232	3714	refreshContents();
3233	3715	}
3234	3716
3235		- void ResetCentroid()
	3717	+ void ResetCentroid(boolean full)
3236	3718	{
3237	3719	Object3D obj;
3238	3720	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3247,12 +3729,16 @@
3247	3729	LA.matIdentity(Object3D.mat);
3248	3730	obj.getBounds(minima, maxima, false);
3249	3731	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3250		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3732	+ if (full)
	3733	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3251	3734	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3252	3735	obj.TransformMesh(Object3D.mat);
	3736	+
3253	3737	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3254		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3738	+ if (full)
	3739	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3255	3740	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3741	+
3256	3742	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3257	3743	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3258	3744	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3281,7 +3767,8 @@
3281	3767
3282	3768	int size = obj.MemorySize();
3283	3769
3284		- 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)");
3285	3772	}
3286	3773	}
3287	3774	catch (Exception e)
..	..	@@ -3318,9 +3805,9 @@
3318	3805	obj = (Object3D)e.nextElement();
3319	3806
3320	3807	System.out.println("Object is: " + obj);
3321		- GrafreeD.AnalyzeObject(obj);
	3808	+ Grafreed.AnalyzeObject(obj);
3322	3809	System.out.println("Boundary rep: " + obj.bRep);
3323		- GrafreeD.AnalyzeObject(obj.bRep);
	3810	+ Grafreed.AnalyzeObject(obj.bRep);
3324	3811
3325	3812	// System.err.println((size/1024) + " KB is the size of " + obj);
3326	3813	}
..	..	@@ -3362,6 +3849,13 @@
3362	3849	void GenNormals(boolean crease)
3363	3850	{
3364	3851	group.GenNormalsS(crease);
	3852	+
	3853	+ refreshContents();
	3854	+ }
	3855	+
	3856	+ void GenNormalsMESH()
	3857	+ {
	3858	+ group.GenNormalsMeshS();
3365	3859
3366	3860	refreshContents();
3367	3861	}
..	..	@@ -3534,8 +4028,8 @@
3534	4028
3535	4029	void ParseVertices()
3536	4030	{
3537		- boolean epsequal = GrafreeD.epsequal;
3538		- GrafreeD.epsequal = true;
	4031	+ boolean epsequal = Grafreed.epsequal;
	4032	+ Grafreed.epsequal = true;
3539	4033
3540	4034	for (int i=0; i<group.selection.size(); i++)
3541	4035	{
..	..	@@ -3560,7 +4054,7 @@
3560	4054	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3561	4055	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3562	4056
3563		- g.add(GrafreeD.clipboard);
	4057	+ g.add(Grafreed.clipboard);
3564	4058
3565	4059	buffer.add(g);
3566	4060	}
..	..	@@ -3575,7 +4069,7 @@
3575	4069	makeSomething(buffer, i==group.selection.size()-1);
3576	4070	}
3577	4071
3578		- GrafreeD.epsequal = epsequal;
	4072	+ Grafreed.epsequal = epsequal;
3579	4073
3580	4074	refreshContents();
3581	4075	}
..	..	@@ -3593,7 +4087,16 @@
3593	4087	String pigment = Object3D.GetPigment(tex);
3594	4088	//String bump = Object3D.GetBump(tex);
3595	4089
3596		- 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	+ }
3597	4100
3598	4101	double s = v.s;
3599	4102
..	..	@@ -3725,7 +4228,7 @@
3725	4228	return;
3726	4229
3727	4230	Object3D poses = group.selection.get(0);
3728		- Object3D ref = GrafreeD.clipboard.get(0);
	4231	+ Object3D ref = Grafreed.clipboard.get(0);
3729	4232
3730	4233	Object3D newgroup = new Object3D("Po:" + poses.name);
3731	4234
..	..	@@ -3919,9 +4422,9 @@
3919	4422
3920	4423	void ClipMesh()
3921	4424	{
3922		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4425	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3923	4426	{
3924		- Object3D content = GrafreeD.clipboard.get(0);
	4427	+ Object3D content = Grafreed.clipboard.get(0);
3925	4428
3926	4429	if (content instanceof cGroup && ((cGroup)content).transientlink )
3927	4430	content = ((cGroup)content).get(0);
..	..	@@ -3930,7 +4433,7 @@
3930	4433	// {
3931	4434	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3932	4435	// }
3933		- group.selection.ClipMesh(GrafreeD.clipboard);
	4436	+ group.selection.ClipMesh(Grafreed.clipboard);
3934	4437	}
3935	4438	// group.selection.ClipMesh(GrafreeD.clipboard);
3936	4439	System.out.println("DONE.");
..	..	@@ -3977,6 +4480,18 @@
3977	4480	void MarkLeaves(boolean hide)
3978	4481	{
3979	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);
3980	4495	refreshContents();
3981	4496	}
3982	4497
..	..	@@ -4051,10 +4566,6 @@
4051	4566	// }
4052	4567	// }
4053	4568
4054		- static boolean allparams = true;
4055		-
4056		- static Vector<Object3D> listUI = new Vector<Object3D>();
4057		-
4058	4569	void EditSelection(boolean newWindow)
4059	4570	{
4060	4571	// aConstraints.gridy = 0;
..	..	@@ -4062,10 +4573,10 @@
4062	4573	{
4063	4574	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4064	4575	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4065		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4576	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4066	4577
4067	4578	Object3D elem = (Object3D)group.selection.elementAt(i);
4068		- if(elem != group)
	4579	+ if(elem != group \|\| !newWindow)
4069	4580	{
4070	4581	// if (!(elem instanceof Composite))
4071	4582	// newWindow = false;
..	..	@@ -4147,7 +4658,8 @@
4147	4658	//new Exception().printStackTrace();
4148	4659
4149	4660	freezemodel = true;
4150		-
	4661	+ ClearUnpinned();
	4662	+
4151	4663	/**/
4152	4664	//switch (event.id)
4153	4665	{
..	..	@@ -4155,7 +4667,6 @@
4155	4667	//case 702: // Event.LIST_DESELECT
4156	4668	group.deselectAll();
4157	4669	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4158		- objEditor.ClearInfo(); // .GetMaterial());
4159	4670	if (tps != null)
4160	4671	{
4161	4672	for (int i=0; i < tps.length; i++)
..	..	@@ -4164,10 +4675,8 @@
4164	4675
4165	4676	//if (child.parent != null)
4166	4677	//child.parent.addSelectee(child);
	4678	+ objEditor.SetMaterial(child);
4167	4679	group.addSelectee(child);
4168		- objEditor.SetMaterial(child); // .GetMaterial());
4169		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4170		- System.err.println("info : " + child.GetPath());
4171	4680	}
4172	4681	}
4173	4682	// else
..	..	@@ -4177,20 +4686,28 @@
4177	4686	// System.err.println("info : " + group.GetPath());
4178	4687	// }
4179	4688
4180		- objEditor.SetText(); // jan 2014
4181		-
4182		- 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))
4183	4690	CameraPane.flash = true;
4184	4691
4185		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4692	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4186	4693	// a camera
4187	4694	{
4188		- CameraPane.camerachangeframe = 0; // don't refuse it
4189		- 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	+ }
4190	4700	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4191	4701	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4192	4702	}
4193	4703
	4704	+ if (tps != null && tps.length == 1)
	4705	+ {
	4706	+ EditSelection(false);
	4707	+ }
	4708	+
	4709	+ SetPinStates(tps != null && tps.length > 0);
	4710	+
4194	4711	refreshContents();
4195	4712	//return true;
4196	4713	}
..	..	@@ -4199,6 +4716,35 @@
4199	4716
4200	4717	freezemodel = false;
4201	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	+ }
4202	4748
4203	4749	void linkSomething(Object3D thing)
4204	4750	{
..	..	@@ -4270,16 +4816,19 @@
4270	4816	{
4271	4817	if (group.selection.isEmpty())
4272	4818	return;
4273		- GrafreeD.clipboardIsTempGroup = false;
	4819	+
	4820	+ Grafreed.clipboardIsTempGroup = false;
4274	4821	Composite tGroup = null;
4275	4822	if (group.selection.size() > 0) // 1)
4276	4823	{
4277	4824	tGroup = new cGroup();
4278		- GrafreeD.clipboardIsTempGroup = true;
	4825	+ Grafreed.clipboardIsTempGroup = true;
4279	4826	}
4280	4827
4281	4828	if (cut)
4282	4829	{
	4830	+ if (Globals.SAVEONMAKE)
	4831	+ Save();
4283	4832	//int indices[] = jList.getSelectedIndices();
4284	4833	//for (int i = indices.length - 1; i >= 0; i--)
4285	4834	//jList.remove(indices[i]);
..	..	@@ -4315,16 +4864,16 @@
4315	4864	//System.out.println("cut " + child);
4316	4865	//System.out.println("parent = " + child.parent);
4317	4866	// tmp.addChild(child);
4318		- if (GrafreeD.clipboardIsTempGroup)
	4867	+ if (Grafreed.clipboardIsTempGroup)
4319	4868	tGroup.add/Child/(tmp);
4320	4869	else
4321		- GrafreeD.clipboard = tmp;
	4870	+ Grafreed.clipboard = tmp;
4322	4871	}
4323	4872	else
4324		- if (GrafreeD.clipboardIsTempGroup)
	4873	+ if (Grafreed.clipboardIsTempGroup)
4325	4874	tGroup.add/Child/(child);
4326	4875	else
4327		- GrafreeD.clipboard = child;
	4876	+ Grafreed.clipboard = child;
4328	4877	}
4329	4878
4330	4879	//ResetModel();
..	..	@@ -4356,21 +4905,23 @@
4356	4905	//System.out.println("cut " + elem);
4357	4906	//System.out.println("parent = " + elem.parent);
4358	4907	// tmp.addChild(elem);
4359		- if (GrafreeD.clipboardIsTempGroup)
	4908	+ if (Grafreed.clipboardIsTempGroup)
4360	4909	tGroup.add/Child/(tmp);
4361	4910	else
4362		- GrafreeD.clipboard = tmp;
	4911	+ Grafreed.clipboard = tmp;
4363	4912	}
4364	4913	else
4365		- if (GrafreeD.clipboardIsTempGroup)
	4914	+ if (Grafreed.clipboardIsTempGroup)
4366	4915	tGroup.add/Child/(child);
4367	4916	else
4368		- GrafreeD.clipboard = child;
	4917	+ Grafreed.clipboard = child;
4369	4918	}
4370	4919
4371	4920	}
4372		- if (GrafreeD.clipboardIsTempGroup)
4373		- GrafreeD.clipboard = tGroup;
	4921	+
	4922	+ if (Grafreed.clipboardIsTempGroup)
	4923	+ Grafreed.clipboard = tGroup;
	4924	+
4374	4925	if (cut)
4375	4926	{
4376	4927	ResetModel();
..	..	@@ -4384,7 +4935,7 @@
4384	4935	// return;
4385	4936	boolean first = true;
4386	4937
4387		- if (GrafreeD.clipboardIsTempGroup)
	4938	+ if (Grafreed.clipboardIsTempGroup)
4388	4939	{
4389	4940	Composite temp;
4390	4941
..	..	@@ -4395,7 +4946,7 @@
4395	4946	temp = (Composite)Applet3D.clipboard.deepCopy();
4396	4947	*/
4397	4948	Object3D elem;
4398		- 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))
4399	4950	{
4400	4951	Object3D child = (Object3D)e.nextElement();
4401	4952
..	..	@@ -4429,14 +4980,14 @@
4429	4980	//Object3D cb = Applet3D.clipboard;
4430	4981	//temp.addChild(cb);
4431	4982	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4432		- assert(GrafreeD.clipboard.parent == null);
4433		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4434		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4435		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4436		- 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());
4437	4988	else
4438		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4439		- GrafreeD.clipboard.get(0).parent = keepparent;
	4989	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4990	+ Grafreed.clipboard.get(0).parent = keepparent;
4440	4991	}
4441	4992
4442	4993	ResetModel();
..	..	@@ -4485,9 +5036,9 @@
4485	5036	{
4486	5037	boolean first = true;
4487	5038
4488		- if (GrafreeD.clipboardIsTempGroup)
	5039	+ if (Grafreed.clipboardIsTempGroup)
4489	5040	{
4490		- Composite temp = (Composite)GrafreeD.clipboard;
	5041	+ Composite temp = (Composite)Grafreed.clipboard;
4491	5042	Object3D copy;
4492	5043	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4493	5044	{
..	..	@@ -4497,7 +5048,7 @@
4497	5048	}
4498	5049	} else
4499	5050	{
4500		- linkSomething(GrafreeD.clipboard); //.get(0));
	5051	+ linkSomething(Grafreed.clipboard); //.get(0));
4501	5052	}
4502	5053	}
4503	5054	}
..	..	@@ -4902,21 +5453,6 @@
4902	5453	}
4903	5454	*/
4904	5455
4905		- void ImportGFD()
4906		- {
4907		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4908		- browser.show();
4909		- String filename = browser.getFile();
4910		- if (filename != null && filename.length() > 0)
4911		- {
4912		- String fullname = browser.getDirectory() + filename;
4913		-
4914		- //Object3D readobj =
4915		- objEditor.ReadGFD(fullname, objEditor);
4916		- //makeSomething(readobj);
4917		- }
4918		- }
4919		-
4920	5456	/*
4921	5457	public void Callback(Object obj)
4922	5458	{
..	..	@@ -4940,26 +5476,9 @@
4940	5476	}
4941	5477	*/
4942	5478
4943		- void ImportVRMLX3D()
4944		- {
4945		- if (GrafreeD.standAlone)
4946		- {
4947		- /**/
4948		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4949		- browser.show();
4950		- String filename = browser.getFile();
4951		- if (filename != null && filename.length() > 0)
4952		- {
4953		- String fullname = browser.getDirectory() + filename;
4954		- LoadVRMLX3D(fullname);
4955		- }
4956		- /**/
4957		- }
4958		- }
4959		-
4960	5479	String GetFile(String dialogName)
4961	5480	{
4962		- if (GrafreeD.standAlone)
	5481	+ if (Grafreed.standAlone)
4963	5482	{
4964	5483	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4965	5484	browser.show();
..	..	@@ -5027,7 +5546,28 @@
5027	5546	cButton clearpanelButton;
5028	5547	cButton unselectButton;
5029	5548
	5549	+ cButton restoreCameraButton;
	5550	+
	5551	+ cButton saveButton;
5030	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;
5031	5571
5032	5572	cButton screenfitButton;
5033	5573	cButton screenfitpointButton;
..	..	@@ -5040,14 +5580,6 @@
5040	5580
5041	5581	cButton setsupportButton;
5042	5582
5043		- cButton twoButton;
5044		- cButton sixButton;
5045		- cButton threeButton;
5046		- cButton sevenButton;
5047		- cButton fourButton; // full panel
5048		- cButton oneButton; // full XYZ
5049		- //cButton currentLayout;
5050		-
5051	5583	//
5052	5584	//Composite
5053	5585	Object3D // to do !!
..	..	@@ -5057,9 +5589,11 @@
5057	5589	//JTree jTree;
5058	5590	private MenuItem lookAtItem;
5059	5591	private MenuItem lookFromItem;
5060		- private MenuItem switchItem;
	5592	+ private MenuItem switchViewItem;
5061	5593	private MenuItem cutItem;
5062		- private MenuItem duplicateItem;
	5594	+ private MenuItem undoItem;
	5595	+ private MenuItem redoItem;
	5596	+ private JMenuItem duplicateItem;
5063	5597	private MenuItem cloneItem;
5064	5598	private MenuItem cloneSupportItem;
5065	5599	private MenuItem overwriteGeoItem;
..	..	@@ -5072,7 +5606,7 @@
5072	5606	private MenuItem linkverticesItem;
5073	5607	private MenuItem relinkverticesItem;
5074	5608	private MenuItem setMasterItem;
5075		- private MenuItem resetMeshItem;
	5609	+ private MenuItem resetAllItem;
5076	5610	private MenuItem stepAllItem;
5077	5611	private MenuItem revertMeshItem;
5078	5612	private MenuItem poseMeshItem;
..	..	@@ -5122,6 +5656,10 @@
5122	5656	private MenuItem showleavesItem;
5123	5657	private MenuItem markleavesItem;
5124	5658	private MenuItem unmarkleavesItem;
	5659	+ private MenuItem rewindleavesItem;
	5660	+ private MenuItem unrewindleavesItem;
	5661	+ private MenuItem randomleavesItem;
	5662	+ private MenuItem unrandomleavesItem;
5125	5663
5126	5664	private MenuItem flipVItem;
5127	5665	private MenuItem unflipVItem;
..	..	@@ -5133,15 +5671,17 @@
5133	5671	private MenuItem panoTexturesItem;
5134	5672
5135	5673	private MenuItem resetCentroidItem;
5136		- private MenuItem transformgeometryItem;
	5674	+ private MenuItem resetCentroidXZItem;
5137	5675	private MenuItem resetTransformItem;
	5676	+ private MenuItem transformGeometryItem;
	5677	+ private MenuItem transformChildrenItem;
5138	5678	private MenuItem hideItem;
5139	5679	private MenuItem grabItem;
5140	5680	private MenuItem backItem;
5141	5681	private MenuItem frontItem;
5142	5682	private MenuItem cameraItem;
5143	5683	private MenuItem compositeItem;
5144		- private MenuItem randomItem;
	5684	+ private MenuItem switchItem;
5145	5685	private MenuItem physicsItem;
5146	5686	private MenuItem frameselectorItem;
5147	5687	private MenuItem scriptNodeItem;
..	..	@@ -5203,11 +5743,6 @@
5203	5743	private MenuItem doubleItem;
5204	5744	private MenuItem tripleItem;
5205	5745
5206		- private MenuItem importGFDItem;
5207		- private MenuItem importVRMLX3DItem;
5208		- private MenuItem import3DSItem;
5209		- private MenuItem importOBJItem;
5210		-
5211	5746	private MenuItem computeAOItem;
5212	5747	private MenuItem recompileItem;
5213	5748	private MenuItem editScriptItem;
..	..	@@ -5217,4 +5752,8 @@
5217	5752	private MenuItem analyzeItem;
5218	5753	private MenuItem dumpItem;
5219	5754	//boolean freezemodel = false;
	5755	+
	5756	+ Menu cameraMenu;
	5757	+ MenuItem editCameraItem;
	5758	+ MenuItem restoreCameraItem;
5220	5759	}