~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("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 = 2;
	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 switch");
	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,15 +839,29 @@
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	866	panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
647	867	supportCB.setToolTipText("Enable rigging");
..	..	@@ -650,6 +870,8 @@
650	870	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
651	871	// localCB.addItemListener(this);
652	872
	873	+ panel.Return();
	874	+
653	875	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
654	876	crowdCB.setToolTipText("Used for crowds");
655	877	crowdCB.addItemListener(this);
..	..	@@ -666,6 +888,8 @@
666	888	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
667	889	// speakerMocapCB.addItemListener(this);
668	890
	891	+ panel.Return();
	892	+
669	893	if (false)
670	894	{
671	895	// handled in scripts
..	..	@@ -680,32 +904,72 @@
680	904	//constraints.gridy += 1;
681	905	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
682	906	smoothfocusCB.addItemListener(this);
	907	+ panel.Return();
683	908	}
684	909
685	910	//constraints.gridx += 1;
686	911	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
687	912	// debugCB.addItemListener(this);
688	913
	914	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	915	+ trackCB.setToolTipText("Enable tracking target");
	916	+ trackCB.addItemListener(this);
	917	+
689	918	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	919	+ oeilCB.setToolTipText("Move camera when tracking");
690	920	oeilCB.addItemListener(this);
691	921
	922	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	923	+ shadowCB.setToolTipText("When live compute shadows");
	924	+ shadowCB.addItemListener(this);
	925	+
	926	+ panel.Return();
	927	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	928	+ toggleTextureCB.setToolTipText("Load textures");
	929	+ toggleTextureCB.addItemListener(this);
	930	+
	931	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	932	+ toggleSwitchCB.setToolTipText("Use switch");
	933	+ toggleSwitchCB.addItemListener(this);
	934	+
	935	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	936	+ autosaveCB.setToolTipText("On structure change");
	937	+ autosaveCB.addItemListener(this);
	938	+
	939	+ panel.Return();
	940	+ if (Globals.ADVANCED)
	941	+ {
692	942	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
693	943	lookAtCB.setToolTipText("Look-at target");
694	944	lookAtCB.addItemListener(this);
	945	+ }
695	946
696	947	}
697	948
698	949	cGridBag fill = new cGridBag();
699		-
700	950	fill.preferredHeight = 200;
	951	+ cGridBag fill2 = new cGridBag();
	952	+ fill2.preferredHeight = 200;
	953	+ cGridBag fill3 = new cGridBag();
	954	+ fill3.preferredHeight = 200;
701	955
702	956	panel.add(fill);
	957	+ panel.add(fill2);
	958	+ panel.add(fill3);
703	959
704	960	}
705	961
706	962	void EditObject(Object3D obj)
707	963	{
708	964	cRadio radioButton = new cRadio(obj.name);
	965	+
	966	+ // Patch to avoid bug with transparency.
	967	+ radioButton.hadMaterial = obj.material != null;
	968	+ if (!radioButton.hadMaterial)
	969	+ {
	970	+ obj.material = new cMaterial();
	971	+ }
	972	+
709	973	radioButton.SetObject(obj);
710	974	radioButton.layout = sevenButton;
711	975	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -714,8 +978,11 @@
714	978	buttonGroup.add(radioButton);
715	979	radioButton.doClick();
716	980	}
	981	+
717	982	void SetupViews(ObjEditor oe)
718	983	{
	984	+ theFrame = this;
	985	+
719	986	oe.SetupViews();
720	987
721	988	System.out.println("SetupViews");
..	..	@@ -724,23 +991,27 @@
724	991	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
725	992	}
726	993
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;
	994	+ cToggleButton liveCB;
	995	+ cCheckBox supportCB;
	996	+ cCheckBox localCB;
	997	+ cCheckBox crowdCB;
	998	+ cCheckBox smoothCB;
	999	+ cToggleButton fastCB;
	1000	+ cCheckBox slowCB;
	1001	+ cCheckBox boxCB;
	1002	+ cCheckBox zoomBoxCB;
	1003	+ //cToggleButton trackCB;
	1004	+ cCheckBox trackCB;
	1005	+ cCheckBox smoothfocusCB;
738	1006	// JCheckBox speakerMocapCB;
739		- JCheckBox speakerCameraCB;
740		- JCheckBox speakerFocusCB;
741		- JCheckBox debugCB;
742		- JCheckBox oeilCB;
743		- JCheckBox lookAtCB;
	1007	+ cCheckBox speakerCameraCB;
	1008	+ cCheckBox speakerFocusCB;
	1009	+ cCheckBox debugCB;
	1010	+
	1011	+ cCheckBox oeilCB;
	1012	+ cCheckBox shadowCB;
	1013	+ cCheckBox autosaveCB;
	1014	+ cCheckBox lookAtCB;
744	1015
745	1016	// static int COLOR = 1;
746	1017	// static int MATERIAL = 2;
..	..	@@ -748,9 +1019,9 @@
748	1019
749	1020	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
750	1021
751		- JCheckBox colorCB;
752		- JCheckBox materialCB;
753		- JCheckBox textureCB;
	1022	+ cCheckBox colorCB;
	1023	+ cCheckBox materialCB;
	1024	+ cCheckBox textureCB;
754	1025
755	1026	public void itemStateChanged(ItemEvent e)
756	1027	{
..	..	@@ -778,6 +1049,7 @@
778	1049	} else if(e.getSource() == liveCB)
779	1050	{
780	1051	cameraView.ToggleLive();
	1052	+ refreshContents(false);
781	1053	}
782	1054	else if(e.getSource() == supportCB)
783	1055	{
..	..	@@ -842,6 +1114,14 @@
842	1114	{
843	1115	cameraView.ToggleOeil();
844	1116	}
	1117	+ else if(e.getSource() == shadowCB)
	1118	+ {
	1119	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1120	+ }
	1121	+ else if(e.getSource() == autosaveCB)
	1122	+ {
	1123	+ Globals.SAVEONMAKE ^= true;
	1124	+ }
845	1125	else if(e.getSource() == lookAtCB)
846	1126	{
847	1127	cameraView.ToggleLookAt();
..	..	@@ -858,7 +1138,8 @@
858	1138
859	1139	/**/
860	1140	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
861		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1141	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1142	+ TreePath path = objEditor.jTree.getSelectionPath();
862	1143	if ((path == null) \|\| (path.getPathCount() <= 1)) {
863	1144	// We can't move the root node or an empty selection
864	1145	return;
..	..	@@ -930,7 +1211,9 @@
930	1211	// objEditor.DropFile((java.io.File[]) object, true);
931	1212	// return;
932	1213	// }
933		- if (string.charAt(0) == '/')
	1214	+
	1215	+ // File path for Mac and Windows
	1216	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
934	1217	{
935	1218	// file(s)
936	1219	String[] names = string.split("\n");
..	..	@@ -957,7 +1240,7 @@
957	1240
958	1241	flashIt = false;
959	1242	CameraPane pane = (CameraPane) target;
960		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1243	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
961	1244	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
962	1245
963	1246	if (group.selection.size() == 1)
..	..	@@ -973,23 +1256,33 @@
973	1256
974	1257	assert target == objEditor.jTree;
975	1258	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1259	+ Object3D destinationLeaf;
976	1260	try {
977		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1261	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
978	1262	} catch (Exception e) {
979	1263	System.out.println("destinationPath : " + destinationPath);
980	1264	return;
981	1265	}
982	1266
983		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1267	+ for (int i=group.selection.size(); --i>=0;)
984	1268	{
	1269	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1270	+
	1271	+ // Cannot move into itself
	1272	+ if (child == destinationLeaf)
	1273	+ return;
	1274	+ }
	1275	+
	1276	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1277	+// {
985	1278	loadClipboard(true);
986	1279	objEditor.jTree.setSelectionPath(destinationPath);
987	1280	pasteInto(false, false);
988		- } else {
989		- loadClipboard(false);
990		- objEditor.jTree.setSelectionPath(destinationPath);
991		- pasteInto(false, false); // true); // ???
992		- }
	1281	+// } else {
	1282	+// loadClipboard(false);
	1283	+// objEditor.jTree.setSelectionPath(destinationPath);
	1284	+// pasteInto(false, false); // true); // ???
	1285	+// }
993	1286	}
994	1287	public void dropActionChanged(DropTargetDragEvent dtde)
995	1288	// Called if the user has modified the current drop gesture
..	..	@@ -1094,22 +1387,30 @@
1094	1387	{
1095	1388	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1096	1389	//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);
	1390	+// gridItem = menu.add(new MenuItem("Grid"));
	1391	+// gridItem.addActionListener(this);
	1392	+// rectoidItem = menu.add(new MenuItem("Box"));
	1393	+// rectoidItem.addActionListener(this);
	1394	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1395	+// ellipsoidItem.addActionListener(this);
	1396	+// coneItem = menu.add(new MenuItem("Cone"));
	1397	+// coneItem.addActionListener(this);
	1398	+// torusItem = menu.add(new MenuItem("Torus"));
	1399	+// torusItem.addActionListener(this);
	1400	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1401	+// superItem.addActionListener(this);
	1402	+
	1403	+ cameraItem = menu.add(new MenuItem("Camera"));
	1404	+ cameraItem.addActionListener(this);
	1405	+
	1406	+ if (!Globals.ADVANCED)
	1407	+ {
1109	1408	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1110	1409	kleinItem.addActionListener(this);
1111		- particleItem = menu.add(new MenuItem("Particle system"));
1112		- particleItem.addActionListener(this);
	1410	+ }
	1411	+
	1412	+// particleItem = menu.add(new MenuItem("Particle system"));
	1413	+// particleItem.addActionListener(this);
1113	1414	if (Globals.ADVANCED)
1114	1415	{
1115	1416	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1135,15 +1436,15 @@
1135	1436	}
1136	1437	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1137	1438	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);
	1439	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1440	+// overlayItem.addActionListener(this);
	1441	+// lightItem = menu.add(new MenuItem("Light"));
	1442	+// lightItem.addActionListener(this);
1142	1443	menu.add("-");
1143	1444	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1144	1445	//superLoopItem.addActionListener(this);
1145		- loopItem = menu.add(new MenuItem("Loop"));
1146		- loopItem.addActionListener(this);
	1446	+// loopItem = menu.add(new MenuItem("Loop"));
	1447	+// loopItem.addActionListener(this);
1147	1448	doubleItem = menu.add(new MenuItem("Fork"));
1148	1449	doubleItem.addActionListener(this);
1149	1450	if (Globals.ADVANCED)
..	..	@@ -1164,13 +1465,13 @@
1164	1465	parseverticesItem.addActionListener(this);
1165	1466	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1166	1467	textureFieldItem.addActionListener(this);
1167		- alignItem = menu.add(new MenuItem("Align Object"));
	1468	+ alignItem = menu.add(new MenuItem("Align Objects"));
1168	1469	alignItem.addActionListener(this);
1169	1470	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1170	1471	reduceMorphItem.addActionListener(this);
1171	1472	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1172	1473	reduce34MorphItem.addActionListener(this);
1173		-
	1474	+ menu.add("-");
1174	1475	menu.add(computeAOItem = new MenuItem("Compute AO"));
1175	1476	computeAOItem.addActionListener(this);
1176	1477
..	..	@@ -1183,7 +1484,7 @@
1183	1484	memoryItem.addActionListener(this);
1184	1485	menu.add(analyzeItem = new MenuItem("Analyze"));
1185	1486	analyzeItem.addActionListener(this);
1186		- menu.add(dumpItem = new MenuItem("Dump"));
	1487	+ menu.add(dumpItem = new MenuItem("Print"));
1187	1488	dumpItem.addActionListener(this);
1188	1489	// menu.add(pathItem = new MenuItem("From-to path"));
1189	1490	// pathItem.addActionListener(this);
..	..	@@ -1324,9 +1625,24 @@
1324	1625	shadow.material = new cMaterial(obj.material);
1325	1626	shadow.material.diffuse = 0.0001f;
1326	1627	shadow.material.specular = 0.0001f;
	1628	+ //shadow.projectedVertices[1].x = 300;
1327	1629
1328	1630	makeSomething(shadow);
1329	1631	}
	1632	+
	1633	+ private void ClearUnpinned()
	1634	+ {
	1635	+ //for (Object3D obj : listUI)
	1636	+ for (int i=listUI.size(); --i>=0;)
	1637	+ {
	1638	+ Object3D obj = listUI.elementAt(i);
	1639	+ if (!obj.pinned)
	1640	+ {
	1641	+ obj.CloseUI();
	1642	+ listUI.remove(i);
	1643	+ }
	1644	+ }
	1645	+ }
1330	1646
1331	1647	/**
1332	1648	* applyExample
..	..	@@ -1530,9 +1846,9 @@
1530	1846
1531	1847	void Overwrite(int mask)
1532	1848	{
1533		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1849	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1534	1850	{
1535		- Object3D content = GrafreeD.clipboard.get(0);
	1851	+ Object3D content = Grafreed.clipboard.get(0);
1536	1852
1537	1853	if (content instanceof cGroup && ((cGroup)content).transientlink )
1538	1854	content = ((cGroup)content).get(0);
..	..	@@ -1571,7 +1887,7 @@
1571	1887	{
1572	1888	ScreenFit();
1573	1889	} else
1574		- if (source == switchItem)
	1890	+ if (source == switchViewItem)
1575	1891	{
1576	1892	cVector v1 = new cVector();
1577	1893	cVector v2 = new cVector();
..	..	@@ -1580,11 +1896,11 @@
1580	1896	objEditor.cameraView.renderCamera.setAim(v2, v1);
1581	1897	objEditor.cameraView.repaint();
1582	1898	} else
1583		- if (source == rectoidItem)
	1899	+ if (source == rectoidItem \|\| source == boxButton)
1584	1900	{
1585	1901	makeSomething(new Box());
1586	1902	} else
1587		- if (source == particleItem)
	1903	+ if (source == particleItem \|\| source == particlesButton)
1588	1904	{
1589	1905	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1590	1906	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1663,27 +1979,27 @@
1663	1979
1664	1980	makeSomething(obj);
1665	1981	} else
1666		- if (source == gridItem)
	1982	+ if (source == gridItem \|\| source == gridButton)
1667	1983	{
1668	1984	makeSomething(new Grid());
1669	1985	} else
1670		- if (source == ellipsoidItem)
	1986	+ if (source == ellipsoidItem \|\| source == sphereButton)
1671	1987	{
1672	1988	makeSomething(new Sphere());
1673	1989	} else
1674		- if (source == coneItem)
	1990	+ if (source == coneItem \|\| source == coneButton)
1675	1991	{
1676	1992	makeSomething(new Cone());
1677	1993	} else
1678		- if (source == torusItem)
	1994	+ if (source == torusItem \|\| source == torusButton)
1679	1995	{
1680	1996	makeSomething(new Torus());
1681	1997	} else
1682		- if (source == superItem)
	1998	+ if (source == superItem \|\| source == superButton)
1683	1999	{
1684	2000	makeSomething(new Superellipsoid());
1685	2001	} else
1686		- if (source == kleinItem)
	2002	+ if (source == kleinItem \|\| source == kleinButton)
1687	2003	{
1688	2004	makeSomething(new Klein());
1689	2005	} else
..	..	@@ -1703,7 +2019,7 @@
1703	2019	{
1704	2020	makeSomething(new BezierSurface());
1705	2021	} else
1706		- if (source == overlayItem)
	2022	+ if (source == overlayItem \|\| source == overlayButton)
1707	2023	{
1708	2024	/*
1709	2025	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1751,7 +2067,7 @@
1751	2067	s.setup();
1752	2068	makeSomething(s);
1753	2069	} else
1754		- if (source == lightItem)
	2070	+ if (source == lightItem \|\| source == lightButton)
1755	2071	{
1756	2072	makeSomething(new Light());
1757	2073	} else
..	..	@@ -1801,7 +2117,7 @@
1801	2117
1802	2118	group(g);
1803	2119	} else
1804		- if (source == loopItem)
	2120	+ if (source == loopItem \|\| source == loopButton)
1805	2121	{
1806	2122	Composite csg = new GroupLeaf();
1807	2123	csg.count = 5;
..	..	@@ -1837,23 +2153,6 @@
1837	2153	csg.addChild(child);
1838	2154	child.addChild(csg);
1839	2155	} 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		- } else
1857	2156	if (source == computeAOItem)
1858	2157	{
1859	2158	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1872,7 +2171,7 @@
1872	2171	if (source == invariantsItem)
1873	2172	{
1874	2173	System.out.println("Invariants:");
1875		- GrafreeD.grafreeD.universe.invariants();
	2174	+ Grafreed.grafreeD.universe.invariants();
1876	2175	} else
1877	2176	if (source == memoryItem)
1878	2177	{
..	..	@@ -1890,6 +2189,30 @@
1890	2189	if (source == dumpItem)
1891	2190	{
1892	2191	DumpObject();
	2192	+ } else
	2193	+ if (source == minButton)
	2194	+ {
	2195	+ Minimize();
	2196	+ } else
	2197	+ if (source == maxButton)
	2198	+ {
	2199	+ Maximize();
	2200	+ } else
	2201	+ if (source == fullButton)
	2202	+ {
	2203	+ ToggleFullScreen();
	2204	+ } else
	2205	+ if (source == undoButton)
	2206	+ {
	2207	+ Undo();
	2208	+ } else
	2209	+ if (source == redoButton)
	2210	+ {
	2211	+ Redo();
	2212	+ } else
	2213	+ if (source == saveButton)
	2214	+ {
	2215	+ Save();
1893	2216	} else
1894	2217	if (source == oneStepButton)
1895	2218	{
..	..	@@ -1945,12 +2268,20 @@
1945	2268	{
1946	2269	loadClipboard(true);
1947	2270	} else
	2271	+ if (source == undoItem)
	2272	+ {
	2273	+ Undo();
	2274	+ } else
	2275	+ if (source == redoItem)
	2276	+ {
	2277	+ Redo();
	2278	+ } else
1948	2279	if (source == duplicateItem)
1949	2280	{
1950		- Object3D keep = GrafreeD.clipboard;
	2281	+ Object3D keep = Grafreed.clipboard;
1951	2282	loadClipboard(false);
1952	2283	paste(false);
1953		- GrafreeD.clipboard = keep;
	2284	+ Grafreed.clipboard = keep;
1954	2285	} else
1955	2286	if (source == cloneItem)
1956	2287	{
..	..	@@ -2170,9 +2501,9 @@
2170	2501	// group.selection.get(0).setMasterThis(content); // should be identity
2171	2502	// refreshContents();
2172	2503	// }
2173		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2504	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2174	2505	{
2175		- Object3D content = GrafreeD.clipboard.get(0);
	2506	+ Object3D content = Grafreed.clipboard.get(0);
2176	2507
2177	2508	if (content instanceof cGroup && ((cGroup)content).transientlink )
2178	2509	content = ((cGroup)content).get(0);
..	..	@@ -2222,9 +2553,9 @@
2222	2553	} else
2223	2554	if (source == setMasterItem)
2224	2555	{
2225		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2556	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2226	2557	{
2227		- Object3D content = GrafreeD.clipboard.get(0);
	2558	+ Object3D content = Grafreed.clipboard.get(0);
2228	2559
2229	2560	if (content instanceof cGroup && ((cGroup)content).transientlink )
2230	2561	content = ((cGroup)content).get(0);
..	..	@@ -2237,9 +2568,9 @@
2237	2568	{
2238	2569	if (group.selection.size() == 1)
2239	2570	{
2240		- if (GrafreeD.clipboard.size() == 1)
	2571	+ if (Grafreed.clipboard.size() == 1)
2241	2572	{
2242		- Object3D content = GrafreeD.clipboard.get(0);
	2573	+ Object3D content = Grafreed.clipboard.get(0);
2243	2574
2244	2575	if (content instanceof cGroup && ((cGroup)content).transientlink )
2245	2576	content = ((cGroup)content).get(0);
..	..	@@ -2256,7 +2587,7 @@
2256	2587	{
2257	2588	RevertMeshes();
2258	2589	} else
2259		- if (source == resetMeshItem)
	2590	+ if (source == resetAllItem)
2260	2591	{
2261	2592	ResetAll();
2262	2593	} else
..	..	@@ -2276,9 +2607,9 @@
2276	2607	{
2277	2608	ClearSelection(true);
2278	2609	} else
2279		- if (source == grabItem)
	2610	+ if (source == grabItem \|\| source == groupButton)
2280	2611	{
2281		- group(new cGroup(), true);
	2612	+ group(new cGroup(), false); // true);
2282	2613	} else
2283	2614	if (source == hideItem)
2284	2615	{
..	..	@@ -2296,11 +2627,11 @@
2296	2627	{
2297	2628	makeSomething(new Camera());
2298	2629	} else
2299		- if (source == compositeItem)
	2630	+ if (source == compositeItem \|\| source == compositeButton)
2300	2631	{
2301	2632	group(new Composite());
2302	2633	} else
2303		- if (source == randomItem)
	2634	+ if (source == switchItem \|\| source == switchButton)
2304	2635	{
2305	2636	RandomNode random = new RandomNode();
2306	2637	group(random);
..	..	@@ -2402,7 +2733,7 @@
2402	2733	{
2403	2734	group(new cLinker());
2404	2735	} else
2405		- if (source == textureItem)
	2736	+ if (source == textureItem \|\| source == textureButton)
2406	2737	{
2407	2738	group(new TextureNode());
2408	2739	} else
..	..	@@ -2422,7 +2753,7 @@
2422	2753	{
2423	2754	CastShadow(2);
2424	2755	} else
2425		- if (source == ungroupItem)
	2756	+ if (source == ungroupItem \|\| source == ungroupButton)
2426	2757	{
2427	2758	//ungroup();
2428	2759	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2444,7 +2775,7 @@
2444	2775	} else
2445	2776	if (source == genNormalsMESHItem)
2446	2777	{
2447		- GenNormals(true); // TODO
	2778	+ GenNormalsMESH();
2448	2779	} else
2449	2780	if (source == genNormalsORGANItem)
2450	2781	{
..	..	@@ -2509,6 +2840,22 @@
2509	2840	if (source == unmarkleavesItem)
2510	2841	{
2511	2842	MarkLeaves(false);
	2843	+ } else
	2844	+ if (source == rewindleavesItem)
	2845	+ {
	2846	+ RewindLeaves(true);
	2847	+ } else
	2848	+ if (source == unrewindleavesItem)
	2849	+ {
	2850	+ RewindLeaves(false);
	2851	+ } else
	2852	+ if (source == randomleavesItem)
	2853	+ {
	2854	+ RandomLeaves(true);
	2855	+ } else
	2856	+ if (source == unrandomleavesItem)
	2857	+ {
	2858	+ RandomLeaves(false);
2512	2859	} else
2513	2860	if (source == flipVItem)
2514	2861	{
..	..	@@ -2594,9 +2941,13 @@
2594	2941	{
2595	2942	SmoothMesh();
2596	2943	} else
2597		- if (source == transformgeometryItem)
	2944	+ if (source == transformGeometryItem)
2598	2945	{
2599	2946	TransformGeometry();
	2947	+ } else
	2948	+ if (source == transformChildrenItem)
	2949	+ {
	2950	+ TransformChildren();
2600	2951	} else
2601	2952	if (source == resetTransformItem)
2602	2953	{
..	..	@@ -2604,7 +2955,11 @@
2604	2955	} else
2605	2956	if (source == resetCentroidItem)
2606	2957	{
2607		- ResetCentroid();
	2958	+ ResetCentroid(true);
	2959	+ } else
	2960	+ if (source == resetCentroidXZItem)
	2961	+ {
	2962	+ ResetCentroid(false);
2608	2963	} else
2609	2964	if (source == resetParentItem)
2610	2965	{
..	..	@@ -2736,6 +3091,10 @@
2736	3091	if (source == twoButton)
2737	3092	{
2738	3093	radio.layout = twoButton;
	3094	+
	3095	+ if (CameraPane.FULLSCREEN)
	3096	+ fullscreenLayout = radio.layout;
	3097	+
2739	3098	// bug
2740	3099	//gridPanel.setDividerLocation(1.0);
2741	3100	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2768,10 +3127,31 @@
2768	3127	bigThree.ClearUI();
2769	3128	bigThree.add(centralPanel);
2770	3129	bigThree.FlushUI();
	3130	+
	3131	+ cameraView.requestFocusInWindow();
	3132	+
	3133	+// refreshContents(true);
	3134	+//
	3135	+// try
	3136	+// {
	3137	+// java.awt.Robot bot = new java.awt.Robot();
	3138	+// int mask = InputEvent.BUTTON1_MASK;
	3139	+// bot.mouseMove(100, 100);
	3140	+// bot.mousePress(mask);
	3141	+// bot.mouseRelease(mask);
	3142	+// }
	3143	+// catch (Exception e)
	3144	+// {
	3145	+//
	3146	+// }
	3147	+
2771	3148	} else
2772	3149	if (source == threeButton)
2773	3150	{
2774	3151	radio.layout = threeButton;
	3152	+
	3153	+ if (CameraPane.FULLSCREEN)
	3154	+ fullscreenLayout = radio.layout;
2775	3155
2776	3156	// bigThree.remove(scenePanel);
2777	3157	// bigThree.remove(centralPanel);
..	..	@@ -2804,10 +3184,15 @@
2804	3184	bigThree.add(centralPanel);
2805	3185	bigThree.add(XYZPanel);
2806	3186	bigThree.FlushUI();
	3187	+
	3188	+ cameraView.requestFocusInWindow();
2807	3189	} else
2808	3190	if (source == fourButton)
2809	3191	{
2810	3192	radio.layout = fourButton;
	3193	+
	3194	+ if (CameraPane.FULLSCREEN)
	3195	+ fullscreenLayout = radio.layout;
2811	3196
2812	3197	// bigThree.remove(scenePanel);
2813	3198	// bigThree.remove(centralPanel);
..	..	@@ -2839,10 +3224,15 @@
2839	3224	bigThree.ClearUI();
2840	3225	bigThree.add(scenePanel);
2841	3226	bigThree.FlushUI();
	3227	+
	3228	+ cameraView.requestFocusInWindow();
2842	3229	} else
2843	3230	if (source == sixButton)
2844	3231	{
2845	3232	radio.layout = sixButton;
	3233	+
	3234	+ if (CameraPane.FULLSCREEN)
	3235	+ fullscreenLayout = radio.layout;
2846	3236
2847	3237	// bigThree.remove(scenePanel);
2848	3238	// bigThree.remove(centralPanel);
..	..	@@ -2875,10 +3265,15 @@
2875	3265	bigThree.add(scenePanel);
2876	3266	bigThree.add(centralPanel);
2877	3267	bigThree.FlushUI();
	3268	+
	3269	+ cameraView.requestFocusInWindow();
2878	3270	} else
2879	3271	if (source == sevenButton)
2880	3272	{
2881	3273	radio.layout = sevenButton;
	3274	+
	3275	+ if (CameraPane.FULLSCREEN)
	3276	+ fullscreenLayout = radio.layout;
2882	3277
2883	3278	// bigThree.remove(scenePanel);
2884	3279	// bigThree.remove(centralPanel);
..	..	@@ -2912,6 +3307,8 @@
2912	3307	bigThree.add(centralPanel);
2913	3308	bigThree.add(XYZPanel);
2914	3309	bigThree.FlushUI();
	3310	+
	3311	+ cameraView.requestFocusInWindow();
2915	3312	} else
2916	3313	if (source == rootButton)
2917	3314	{
..	..	@@ -2923,6 +3320,7 @@
2923	3320	EditObject(obj);
2924	3321	}
2925	3322
	3323	+ cameraView.requestFocusInWindow();
2926	3324	refreshContents(true);
2927	3325	} else
2928	3326	if (source == closeButton)
..	..	@@ -2932,22 +3330,37 @@
2932	3330	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2933	3331	{
2934	3332	ab = (cRadio)e.nextElement();
2935		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3333	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2936	3334	{
	3335	+ // Patch to avoid bug with transparency.
	3336	+ if (!ab.hadMaterial)
	3337	+ {
	3338	+ ab.object.material = null;
	3339	+ }
	3340	+
2937	3341	buttonGroup.remove(ab);
2938	3342	radioPanel.remove(ab);
2939	3343
2940		- ab.GetObject().editWindow = null;
	3344	+ //ab.GetObject().editWindow = null;
	3345	+ ab.GetObject().manipWindow = null;
2941	3346	// ab.GetObject().objectUI = null; // ?????????
2942	3347
2943	3348	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2944	3349	break;
2945	3350	}
2946	3351	}
	3352	+
	3353	+ cameraView.requestFocusInWindow();
2947	3354	refreshContents(true);
2948	3355	} else
2949	3356	if (source == editItem \|\| source == editButton)
2950	3357	{
	3358	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3359	+ {
	3360	+ Object3D child = (Object3D)e.nextElement();
	3361	+ child.pinned = true;
	3362	+ }
	3363	+
2951	3364	EditSelection(false);
2952	3365	} else
2953	3366	if (source == uneditButton)
..	..	@@ -2957,10 +3370,11 @@
2957	3370	Object3D child = (Object3D)e.nextElement();
2958	3371	if(child.editWindow != null)
2959	3372	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3373	+ child.pinned = false;
2960	3374	child.CloseUI();
2961	3375	listUI.remove(child);
2962	3376
2963		- child.editWindow = null; // ???????????
	3377	+ //child.editWindow = null; // ???????????
2964	3378	}
2965	3379	objEditor.ctrlPanel.FlushUI();
2966	3380	//objEditor.jTree.clearSelection();
..	..	@@ -2973,6 +3387,7 @@
2973	3387	//copy.ClearUI();
2974	3388	for (Object3D obj : listUI)
2975	3389	{
	3390	+ obj.pinned = false;
2976	3391	obj.CloseUI();
2977	3392	}
2978	3393	listUI.clear();
..	..	@@ -2982,7 +3397,7 @@
2982	3397	{
2983	3398	assert(copy == group);
2984	3399
2985		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3400	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2986	3401
2987	3402	for (Object3D obj : listUI)
2988	3403	{
..	..	@@ -3046,20 +3461,44 @@
3046	3461	frontView.object = group;
3047	3462	sideView.object = group;
3048	3463	}
3049		- group.editWindow = this;
	3464	+
	3465	+// fix "+" issue
	3466	+ //group.editWindow = this;
	3467	+ group.manipWindow = this;
	3468	+
3050	3469	/*
3051	3470	currentLayout = radio.layout;
3052	3471	if (currentLayout == null)
3053	3472	currentLayout = sevenButton;
3054	3473	*/
3055	3474	radio.layout.doClick();
	3475	+
	3476	+ ClearUnpinned();
	3477	+ SetPinStates(group.selection.size() > 0);
	3478	+ if (group.selection.size() == 1)
	3479	+ EditSelection(false);
3056	3480	keepparent = group.parent;
3057	3481	// PARENT = NULL or not???
3058	3482	//group.parent = null; // ROOT
3059	3483	//group.attributes = -1;
3060	3484	ResetModel();
	3485	+
	3486	+ cameraView.requestFocusInWindow();
3061	3487	refreshContents(true);
3062		- }
	3488	+ } else if (event.getSource() == editCameraItem)
	3489	+ {
	3490	+ cameraView.ProtectCamera();
	3491	+ cameraView.repaint();
	3492	+ return;
	3493	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3494	+ {
	3495	+ cameraView.RevertCamera();
	3496	+ cameraView.repaint();
	3497	+ return;
	3498	+ // } else if (event.getSource() == textureButton)
	3499	+ // {
	3500	+ // return; // true;
	3501	+ }
3063	3502	else
3064	3503	{
3065	3504	//return super.action(event, arg);
..	..	@@ -3068,7 +3507,6 @@
3068	3507	}
3069	3508
3070	3509	boolean useclient = false;
3071		- cRadio radio;
3072	3510
3073	3511	void ToggleRoot()
3074	3512	{
..	..	@@ -3120,6 +3558,28 @@
3120	3558	refreshContents();
3121	3559	}
3122	3560
	3561	+ void TransformChildren()
	3562	+ {
	3563	+ Object3D obj;
	3564	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3565	+ {
	3566	+ obj = (Object3D)e.nextElement();
	3567	+ obj.KeepTextureMatrices();
	3568	+ obj.TransformChildren();
	3569	+ obj.RestoreTextureMatrices();
	3570	+
	3571	+// if (obj.parent == null)
	3572	+// {
	3573	+// System.out.println("NULL PARENT!");
	3574	+// new Exception().printStackTrace();
	3575	+// }
	3576	+// else
	3577	+// TouchTransform(obj);
	3578	+// //obj.parent.Touch();
	3579	+ }
	3580	+
	3581	+ refreshContents();
	3582	+ }
3123	3583
3124	3584	void ResetTransform()
3125	3585	{
..	..	@@ -3232,7 +3692,7 @@
3232	3692	refreshContents();
3233	3693	}
3234	3694
3235		- void ResetCentroid()
	3695	+ void ResetCentroid(boolean full)
3236	3696	{
3237	3697	Object3D obj;
3238	3698	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3247,12 +3707,16 @@
3247	3707	LA.matIdentity(Object3D.mat);
3248	3708	obj.getBounds(minima, maxima, false);
3249	3709	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3250		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3710	+ if (full)
	3711	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3251	3712	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3252	3713	obj.TransformMesh(Object3D.mat);
	3714	+
3253	3715	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3254		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3716	+ if (full)
	3717	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3255	3718	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3719	+
3256	3720	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3257	3721	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3258	3722	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3281,7 +3745,8 @@
3281	3745
3282	3746	int size = obj.MemorySize();
3283	3747
3284		- System.err.println((size/1024) + " KB is the size of " + obj);
	3748	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3749	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3285	3750	}
3286	3751	}
3287	3752	catch (Exception e)
..	..	@@ -3318,9 +3783,9 @@
3318	3783	obj = (Object3D)e.nextElement();
3319	3784
3320	3785	System.out.println("Object is: " + obj);
3321		- GrafreeD.AnalyzeObject(obj);
	3786	+ Grafreed.AnalyzeObject(obj);
3322	3787	System.out.println("Boundary rep: " + obj.bRep);
3323		- GrafreeD.AnalyzeObject(obj.bRep);
	3788	+ Grafreed.AnalyzeObject(obj.bRep);
3324	3789
3325	3790	// System.err.println((size/1024) + " KB is the size of " + obj);
3326	3791	}
..	..	@@ -3362,6 +3827,13 @@
3362	3827	void GenNormals(boolean crease)
3363	3828	{
3364	3829	group.GenNormalsS(crease);
	3830	+
	3831	+ refreshContents();
	3832	+ }
	3833	+
	3834	+ void GenNormalsMESH()
	3835	+ {
	3836	+ group.GenNormalsMeshS();
3365	3837
3366	3838	refreshContents();
3367	3839	}
..	..	@@ -3534,8 +4006,8 @@
3534	4006
3535	4007	void ParseVertices()
3536	4008	{
3537		- boolean epsequal = GrafreeD.epsequal;
3538		- GrafreeD.epsequal = true;
	4009	+ boolean epsequal = Grafreed.epsequal;
	4010	+ Grafreed.epsequal = true;
3539	4011
3540	4012	for (int i=0; i<group.selection.size(); i++)
3541	4013	{
..	..	@@ -3560,7 +4032,7 @@
3560	4032	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3561	4033	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3562	4034
3563		- g.add(GrafreeD.clipboard);
	4035	+ g.add(Grafreed.clipboard);
3564	4036
3565	4037	buffer.add(g);
3566	4038	}
..	..	@@ -3575,7 +4047,7 @@
3575	4047	makeSomething(buffer, i==group.selection.size()-1);
3576	4048	}
3577	4049
3578		- GrafreeD.epsequal = epsequal;
	4050	+ Grafreed.epsequal = epsequal;
3579	4051
3580	4052	refreshContents();
3581	4053	}
..	..	@@ -3593,7 +4065,16 @@
3593	4065	String pigment = Object3D.GetPigment(tex);
3594	4066	//String bump = Object3D.GetBump(tex);
3595	4067
3596		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4068	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4069	+
	4070	+ try
	4071	+ {
	4072	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4073	+ }
	4074	+ catch (Exception e)
	4075	+ {
	4076	+ System.err.println("FAIL: " + node);
	4077	+ }
3597	4078
3598	4079	double s = v.s;
3599	4080
..	..	@@ -3725,7 +4206,7 @@
3725	4206	return;
3726	4207
3727	4208	Object3D poses = group.selection.get(0);
3728		- Object3D ref = GrafreeD.clipboard.get(0);
	4209	+ Object3D ref = Grafreed.clipboard.get(0);
3729	4210
3730	4211	Object3D newgroup = new Object3D("Po:" + poses.name);
3731	4212
..	..	@@ -3919,9 +4400,9 @@
3919	4400
3920	4401	void ClipMesh()
3921	4402	{
3922		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4403	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3923	4404	{
3924		- Object3D content = GrafreeD.clipboard.get(0);
	4405	+ Object3D content = Grafreed.clipboard.get(0);
3925	4406
3926	4407	if (content instanceof cGroup && ((cGroup)content).transientlink )
3927	4408	content = ((cGroup)content).get(0);
..	..	@@ -3930,7 +4411,7 @@
3930	4411	// {
3931	4412	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3932	4413	// }
3933		- group.selection.ClipMesh(GrafreeD.clipboard);
	4414	+ group.selection.ClipMesh(Grafreed.clipboard);
3934	4415	}
3935	4416	// group.selection.ClipMesh(GrafreeD.clipboard);
3936	4417	System.out.println("DONE.");
..	..	@@ -3977,6 +4458,18 @@
3977	4458	void MarkLeaves(boolean hide)
3978	4459	{
3979	4460	group.selection.MarkLeaves(hide);
	4461	+ refreshContents();
	4462	+ }
	4463	+
	4464	+ void RewindLeaves(boolean hide)
	4465	+ {
	4466	+ group.selection.RewindLeaves(hide);
	4467	+ refreshContents();
	4468	+ }
	4469	+
	4470	+ void RandomLeaves(boolean hide)
	4471	+ {
	4472	+ group.selection.RandomLeaves(hide);
3980	4473	refreshContents();
3981	4474	}
3982	4475
..	..	@@ -4051,10 +4544,6 @@
4051	4544	// }
4052	4545	// }
4053	4546
4054		- static boolean allparams = true;
4055		-
4056		- static Vector<Object3D> listUI = new Vector<Object3D>();
4057		-
4058	4547	void EditSelection(boolean newWindow)
4059	4548	{
4060	4549	// aConstraints.gridy = 0;
..	..	@@ -4062,10 +4551,10 @@
4062	4551	{
4063	4552	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4064	4553	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4065		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4554	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4066	4555
4067	4556	Object3D elem = (Object3D)group.selection.elementAt(i);
4068		- if(elem != group)
	4557	+ if(elem != group \|\| !newWindow)
4069	4558	{
4070	4559	// if (!(elem instanceof Composite))
4071	4560	// newWindow = false;
..	..	@@ -4147,7 +4636,8 @@
4147	4636	//new Exception().printStackTrace();
4148	4637
4149	4638	freezemodel = true;
4150		-
	4639	+ ClearUnpinned();
	4640	+
4151	4641	/**/
4152	4642	//switch (event.id)
4153	4643	{
..	..	@@ -4155,7 +4645,6 @@
4155	4645	//case 702: // Event.LIST_DESELECT
4156	4646	group.deselectAll();
4157	4647	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4158		- objEditor.ClearInfo(); // .GetMaterial());
4159	4648	if (tps != null)
4160	4649	{
4161	4650	for (int i=0; i < tps.length; i++)
..	..	@@ -4164,10 +4653,8 @@
4164	4653
4165	4654	//if (child.parent != null)
4166	4655	//child.parent.addSelectee(child);
	4656	+ objEditor.SetMaterial(child);
4167	4657	group.addSelectee(child);
4168		- objEditor.SetMaterial(child); // .GetMaterial());
4169		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4170		- System.err.println("info : " + child.GetPath());
4171	4658	}
4172	4659	}
4173	4660	// else
..	..	@@ -4177,20 +4664,28 @@
4177	4664	// System.err.println("info : " + group.GetPath());
4178	4665	// }
4179	4666
4180		- objEditor.SetText(); // jan 2014
4181		-
4182		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4667	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4183	4668	CameraPane.flash = true;
4184	4669
4185		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4670	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4186	4671	// a camera
4187	4672	{
4188		- CameraPane.camerachangeframe = 0; // don't refuse it
4189		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4673	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4674	+ {
	4675	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4676	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4677	+ }
4190	4678	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4191	4679	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4192	4680	}
4193	4681
	4682	+ if (tps != null && tps.length == 1)
	4683	+ {
	4684	+ EditSelection(false);
	4685	+ }
	4686	+
	4687	+ SetPinStates(tps != null && tps.length > 0);
	4688	+
4194	4689	refreshContents();
4195	4690	//return true;
4196	4691	}
..	..	@@ -4199,6 +4694,35 @@
4199	4694
4200	4695	freezemodel = false;
4201	4696	}
	4697	+
	4698	+ void SetPinStates(boolean enabled)
	4699	+ {
	4700	+ editButton.setEnabled(enabled);
	4701	+ uneditButton.setEnabled(enabled);
	4702	+ unselectButton.setEnabled(enabled);
	4703	+ flashSelectionButton.setEnabled(enabled);
	4704	+ }
	4705	+
	4706	+ void refreshContents(boolean cp)
	4707	+ {
	4708	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4709	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4710	+ {
	4711	+ objEditor.ClearInfo(); // .GetMaterial());
	4712	+
	4713	+ for (int i=0; i < group.selection.Size(); i++)
	4714	+ {
	4715	+ Object3D child = (Object3D) group.selection.get(i);
	4716	+
	4717	+ objEditor.AddInfo(child, this, true);
	4718	+ System.err.println("info : " + child.GetPath());
	4719	+ }
	4720	+
	4721	+ objEditor.SetText(); // jan 2014
	4722	+ }
	4723	+
	4724	+ super.refreshContents(cp);
	4725	+ }
4202	4726
4203	4727	void linkSomething(Object3D thing)
4204	4728	{
..	..	@@ -4270,16 +4794,19 @@
4270	4794	{
4271	4795	if (group.selection.isEmpty())
4272	4796	return;
4273		- GrafreeD.clipboardIsTempGroup = false;
	4797	+
	4798	+ Grafreed.clipboardIsTempGroup = false;
4274	4799	Composite tGroup = null;
4275	4800	if (group.selection.size() > 0) // 1)
4276	4801	{
4277	4802	tGroup = new cGroup();
4278		- GrafreeD.clipboardIsTempGroup = true;
	4803	+ Grafreed.clipboardIsTempGroup = true;
4279	4804	}
4280	4805
4281	4806	if (cut)
4282	4807	{
	4808	+ if (Globals.SAVEONMAKE)
	4809	+ Save();
4283	4810	//int indices[] = jList.getSelectedIndices();
4284	4811	//for (int i = indices.length - 1; i >= 0; i--)
4285	4812	//jList.remove(indices[i]);
..	..	@@ -4315,16 +4842,16 @@
4315	4842	//System.out.println("cut " + child);
4316	4843	//System.out.println("parent = " + child.parent);
4317	4844	// tmp.addChild(child);
4318		- if (GrafreeD.clipboardIsTempGroup)
	4845	+ if (Grafreed.clipboardIsTempGroup)
4319	4846	tGroup.add/Child/(tmp);
4320	4847	else
4321		- GrafreeD.clipboard = tmp;
	4848	+ Grafreed.clipboard = tmp;
4322	4849	}
4323	4850	else
4324		- if (GrafreeD.clipboardIsTempGroup)
	4851	+ if (Grafreed.clipboardIsTempGroup)
4325	4852	tGroup.add/Child/(child);
4326	4853	else
4327		- GrafreeD.clipboard = child;
	4854	+ Grafreed.clipboard = child;
4328	4855	}
4329	4856
4330	4857	//ResetModel();
..	..	@@ -4356,21 +4883,23 @@
4356	4883	//System.out.println("cut " + elem);
4357	4884	//System.out.println("parent = " + elem.parent);
4358	4885	// tmp.addChild(elem);
4359		- if (GrafreeD.clipboardIsTempGroup)
	4886	+ if (Grafreed.clipboardIsTempGroup)
4360	4887	tGroup.add/Child/(tmp);
4361	4888	else
4362		- GrafreeD.clipboard = tmp;
	4889	+ Grafreed.clipboard = tmp;
4363	4890	}
4364	4891	else
4365		- if (GrafreeD.clipboardIsTempGroup)
	4892	+ if (Grafreed.clipboardIsTempGroup)
4366	4893	tGroup.add/Child/(child);
4367	4894	else
4368		- GrafreeD.clipboard = child;
	4895	+ Grafreed.clipboard = child;
4369	4896	}
4370	4897
4371	4898	}
4372		- if (GrafreeD.clipboardIsTempGroup)
4373		- GrafreeD.clipboard = tGroup;
	4899	+
	4900	+ if (Grafreed.clipboardIsTempGroup)
	4901	+ Grafreed.clipboard = tGroup;
	4902	+
4374	4903	if (cut)
4375	4904	{
4376	4905	ResetModel();
..	..	@@ -4384,7 +4913,7 @@
4384	4913	// return;
4385	4914	boolean first = true;
4386	4915
4387		- if (GrafreeD.clipboardIsTempGroup)
	4916	+ if (Grafreed.clipboardIsTempGroup)
4388	4917	{
4389	4918	Composite temp;
4390	4919
..	..	@@ -4395,7 +4924,7 @@
4395	4924	temp = (Composite)Applet3D.clipboard.deepCopy();
4396	4925	*/
4397	4926	Object3D elem;
4398		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4927	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4399	4928	{
4400	4929	Object3D child = (Object3D)e.nextElement();
4401	4930
..	..	@@ -4429,14 +4958,14 @@
4429	4958	//Object3D cb = Applet3D.clipboard;
4430	4959	//temp.addChild(cb);
4431	4960	//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());
	4961	+ assert(Grafreed.clipboard.parent == null);
	4962	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4963	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4964	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4965	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4437	4966	else
4438		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4439		- GrafreeD.clipboard.get(0).parent = keepparent;
	4967	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4968	+ Grafreed.clipboard.get(0).parent = keepparent;
4440	4969	}
4441	4970
4442	4971	ResetModel();
..	..	@@ -4485,9 +5014,9 @@
4485	5014	{
4486	5015	boolean first = true;
4487	5016
4488		- if (GrafreeD.clipboardIsTempGroup)
	5017	+ if (Grafreed.clipboardIsTempGroup)
4489	5018	{
4490		- Composite temp = (Composite)GrafreeD.clipboard;
	5019	+ Composite temp = (Composite)Grafreed.clipboard;
4491	5020	Object3D copy;
4492	5021	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4493	5022	{
..	..	@@ -4497,7 +5026,7 @@
4497	5026	}
4498	5027	} else
4499	5028	{
4500		- linkSomething(GrafreeD.clipboard); //.get(0));
	5029	+ linkSomething(Grafreed.clipboard); //.get(0));
4501	5030	}
4502	5031	}
4503	5032	}
..	..	@@ -4902,21 +5431,6 @@
4902	5431	}
4903	5432	*/
4904	5433
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	5434	/*
4921	5435	public void Callback(Object obj)
4922	5436	{
..	..	@@ -4940,26 +5454,9 @@
4940	5454	}
4941	5455	*/
4942	5456
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	5457	String GetFile(String dialogName)
4961	5458	{
4962		- if (GrafreeD.standAlone)
	5459	+ if (Grafreed.standAlone)
4963	5460	{
4964	5461	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4965	5462	browser.show();
..	..	@@ -5027,7 +5524,31 @@
5027	5524	cButton clearpanelButton;
5028	5525	cButton unselectButton;
5029	5526
	5527	+ cButton restoreCameraButton;
	5528	+
	5529	+ cButton minButton;
	5530	+ cButton maxButton;
	5531	+ cButton fullButton;
	5532	+ cButton saveButton;
5030	5533	cButton oneStepButton;
	5534	+
	5535	+ cButton groupButton;
	5536	+ cButton ungroupButton;
	5537	+ cButton compositeButton;
	5538	+ cButton switchButton;
	5539	+ cButton loopButton;
	5540	+ cButton textureButton;
	5541	+
	5542	+ cButton gridButton;
	5543	+ cButton boxButton;
	5544	+ cButton sphereButton;
	5545	+ cButton coneButton;
	5546	+ cButton torusButton;
	5547	+ cButton superButton;
	5548	+ cButton kleinButton;
	5549	+ cButton particlesButton;
	5550	+ cButton overlayButton;
	5551	+ cButton lightButton;
5031	5552
5032	5553	cButton screenfitButton;
5033	5554	cButton screenfitpointButton;
..	..	@@ -5040,14 +5561,6 @@
5040	5561
5041	5562	cButton setsupportButton;
5042	5563
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	5564	//
5052	5565	//Composite
5053	5566	Object3D // to do !!
..	..	@@ -5057,9 +5570,11 @@
5057	5570	//JTree jTree;
5058	5571	private MenuItem lookAtItem;
5059	5572	private MenuItem lookFromItem;
5060		- private MenuItem switchItem;
	5573	+ private MenuItem switchViewItem;
5061	5574	private MenuItem cutItem;
5062		- private MenuItem duplicateItem;
	5575	+ private MenuItem undoItem;
	5576	+ private MenuItem redoItem;
	5577	+ private JMenuItem duplicateItem;
5063	5578	private MenuItem cloneItem;
5064	5579	private MenuItem cloneSupportItem;
5065	5580	private MenuItem overwriteGeoItem;
..	..	@@ -5072,7 +5587,7 @@
5072	5587	private MenuItem linkverticesItem;
5073	5588	private MenuItem relinkverticesItem;
5074	5589	private MenuItem setMasterItem;
5075		- private MenuItem resetMeshItem;
	5590	+ private MenuItem resetAllItem;
5076	5591	private MenuItem stepAllItem;
5077	5592	private MenuItem revertMeshItem;
5078	5593	private MenuItem poseMeshItem;
..	..	@@ -5122,6 +5637,10 @@
5122	5637	private MenuItem showleavesItem;
5123	5638	private MenuItem markleavesItem;
5124	5639	private MenuItem unmarkleavesItem;
	5640	+ private MenuItem rewindleavesItem;
	5641	+ private MenuItem unrewindleavesItem;
	5642	+ private MenuItem randomleavesItem;
	5643	+ private MenuItem unrandomleavesItem;
5125	5644
5126	5645	private MenuItem flipVItem;
5127	5646	private MenuItem unflipVItem;
..	..	@@ -5133,15 +5652,17 @@
5133	5652	private MenuItem panoTexturesItem;
5134	5653
5135	5654	private MenuItem resetCentroidItem;
5136		- private MenuItem transformgeometryItem;
	5655	+ private MenuItem resetCentroidXZItem;
5137	5656	private MenuItem resetTransformItem;
	5657	+ private MenuItem transformGeometryItem;
	5658	+ private MenuItem transformChildrenItem;
5138	5659	private MenuItem hideItem;
5139	5660	private MenuItem grabItem;
5140	5661	private MenuItem backItem;
5141	5662	private MenuItem frontItem;
5142	5663	private MenuItem cameraItem;
5143	5664	private MenuItem compositeItem;
5144		- private MenuItem randomItem;
	5665	+ private MenuItem switchItem;
5145	5666	private MenuItem physicsItem;
5146	5667	private MenuItem frameselectorItem;
5147	5668	private MenuItem scriptNodeItem;
..	..	@@ -5203,11 +5724,6 @@
5203	5724	private MenuItem doubleItem;
5204	5725	private MenuItem tripleItem;
5205	5726
5206		- private MenuItem importGFDItem;
5207		- private MenuItem importVRMLX3DItem;
5208		- private MenuItem import3DSItem;
5209		- private MenuItem importOBJItem;
5210		-
5211	5727	private MenuItem computeAOItem;
5212	5728	private MenuItem recompileItem;
5213	5729	private MenuItem editScriptItem;
..	..	@@ -5217,4 +5733,8 @@
5217	5733	private MenuItem analyzeItem;
5218	5734	private MenuItem dumpItem;
5219	5735	//boolean freezemodel = false;
	5736	+
	5737	+ Menu cameraMenu;
	5738	+ MenuItem editCameraItem;
	5739	+ MenuItem restoreCameraItem;
5220	5740	}