~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,216 @@
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	+ if (Globals.ADVANCED)
	594	+ {
	595	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ maxButton.setToolTipText("Maximize window");
	597	+ maxButton.addActionListener(this);
	598	+ }
	599	+
	600	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	601	+ fullButton.setToolTipText("Full-screen window");
	602	+ fullButton.addActionListener(this);
	603	+
	604	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	605	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	606	+ restoreCameraButton.addActionListener(this);
	607	+
	608	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ undoButton.setToolTipText("Undo changes");
	610	+ undoButton.addActionListener(this);
	611	+ undoButton.setEnabled(false);
	612	+
	613	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	614	+ redoButton.setToolTipText("Redo changes");
	615	+ redoButton.addActionListener(this);
	616	+ redoButton.setEnabled(false);
	617	+
	618	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	619	+ saveButton.setToolTipText("Save changes");
	620	+ saveButton.addActionListener(this);
	621	+
	622	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	623	+ liveCB.setToolTipText("Enable animation");
482	624	liveCB.addItemListener(this);
483	625
484		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	626	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	627	oneStepButton.setToolTipText("Animate one step forward");
486	628	oneStepButton.addActionListener(this);
487	629
488		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	630	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
489	631	fastCB.setToolTipText("Fast mode");
490	632	fastCB.addItemListener(this);
491	633
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);
	634	+ //oe.toolboxPanel.Return();
	635	+
	636	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
497	637	screenfitButton.setToolTipText("Screen fit");
498	638	screenfitButton.addActionListener(this);
	639	+
	640	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	641	+// trackCB.setToolTipText("Enable tracking");
	642	+// trackCB.addItemListener(this);
499	643
500	644	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
501	645	// screenfitpointButton.addActionListener(this);
502	646
503	647	if (Globals.ADVANCED)
504	648	{
505		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	649	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
506	650	snapobjectButton.addActionListener(this);
507	651	snapobjectButton.setToolTipText("Snap Object");
508	652	}
509	653
510		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
511		- flashSelectionButton.setToolTipText("Show selection");
512		- flashSelectionButton.addActionListener(this);
	654	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
513	655
514		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
515		-
516		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	656	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
517	657	twoButton.setToolTipText("Show center view only");
518	658	twoButton.addActionListener(this);
519		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	659	+ this.fullscreenLayout = twoButton;
	660	+
	661	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
520	662	fourButton.addActionListener(this);
521	663	fourButton.setToolTipText("Show left panel only");
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
523	665	sixButton.setToolTipText("2-column layout left");
524	666	sixButton.addActionListener(this);
525		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	667	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
526	668	threeButton.setToolTipText("2-column layout right");
527	669	threeButton.addActionListener(this);
528		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	670	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
529	671	sevenButton.setToolTipText("3-column layout");
530	672	sevenButton.addActionListener(this);
531	673	//
532	674
533		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	675	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
534	676	rootButton.setToolTipText("Edit selection in new tab");
535	677	rootButton.addActionListener(this);
536	678
537		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	679	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
538	680	closeButton.setToolTipText("Close tab");
539	681	closeButton.addActionListener(this);
540	682	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
541	683	//clearButton.addActionListener(this);
542		-
543		- cGridBag commandsPanel = new cGridBag();
	684	+
	685	+ // INSERT
	686	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	687	+ gridButton.setToolTipText("Create grid");
	688	+ gridButton.addActionListener(this);
	689	+
	690	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	691	+ boxButton.setToolTipText("Create box");
	692	+ boxButton.addActionListener(this);
	693	+
	694	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	695	+ sphereButton.setToolTipText("Create sphere");
	696	+ sphereButton.addActionListener(this);
	697	+
	698	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	699	+ coneButton.setToolTipText("Create cone");
	700	+ coneButton.addActionListener(this);
	701	+
	702	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	703	+ torusButton.setToolTipText("Create torus");
	704	+ torusButton.addActionListener(this);
	705	+
	706	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	707	+ superButton.setToolTipText("Create superellipsoid");
	708	+ superButton.addActionListener(this);
	709	+
	710	+ if (Globals.ADVANCED)
	711	+ {
	712	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	713	+ kleinButton.setToolTipText("Create Klein bottle");
	714	+ kleinButton.addActionListener(this);
	715	+ }
544	716
545		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
546		- editButton.setToolTipText("Edit selection");
	717	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	718	+ particlesButton.setToolTipText("Create particle system");
	719	+ particlesButton.addActionListener(this);
	720	+
	721	+ oe.toolboxPanel.Return();
	722	+
	723	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	724	+ groupButton.setToolTipText("Create group");
	725	+ groupButton.addActionListener(this);
	726	+
	727	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	728	+ compositeButton.setToolTipText("Create composite");
	729	+ compositeButton.addActionListener(this);
	730	+
	731	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	732	+ switchButton.setToolTipText("Create item switcher");
	733	+ switchButton.addActionListener(this);
	734	+
	735	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	736	+ loopButton.setToolTipText("Create loop");
	737	+ loopButton.addActionListener(this);
	738	+
	739	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	740	+ textureButton.setToolTipText("Create texture");
	741	+ textureButton.addActionListener(this);
	742	+
	743	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	744	+ overlayButton.setToolTipText("Create overlay");
	745	+ overlayButton.addActionListener(this);
	746	+
	747	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	748	+ lightButton.setToolTipText("Create light");
	749	+ lightButton.addActionListener(this);
	750	+
	751	+ for (int i=6; --i>=0;)
	752	+ {
	753	+ oe.toolboxPanel.Return();
	754	+ oe.toolboxPanel.add(new cGridBag());
	755	+ oe.toolboxPanel.add(new cGridBag());
	756	+ oe.toolboxPanel.add(new cGridBag());
	757	+ oe.toolboxPanel.add(new cGridBag());
	758	+ oe.toolboxPanel.add(new cGridBag());
	759	+ oe.toolboxPanel.add(new cGridBag());
	760	+ oe.toolboxPanel.add(new cGridBag());
	761	+ }
	762	+
	763	+ // EDIT panel
	764	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	765	+ editButton.setToolTipText("Pin selection controls");
547	766	editButton.addActionListener(this);
548	767
549		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
550		- uneditButton.setToolTipText("Unedit selection");
	768	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	769	+ uneditButton.setToolTipText("Remove selection controls");
551	770	uneditButton.addActionListener(this);
552	771
553		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
554		- allParamsButton.setToolTipText("Edit all params");
	772	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	773	+ allParamsButton.setToolTipText("Show all controle");
555	774	allParamsButton.addActionListener(this);
556	775
557		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	776	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
558	777	clearPanelButton.setToolTipText("Clear edit panel");
559	778	clearPanelButton.addActionListener(this);
560	779
561		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	780	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
562	781	unselectButton.setToolTipText("Unselect");
563	782	unselectButton.addActionListener(this);
564	783
565		- commandsPanel.preferredHeight = 1;
	784	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	785	+ flashSelectionButton.setToolTipText("Highlight selection");
	786	+ flashSelectionButton.addActionListener(this);
566	787
567		- oe.treePanel.add(commandsPanel);
568		- oe.treePanel.Return();
	788	+ editCommandsPanel.preferredHeight = 1;
	789	+
	790	+ SetPinStates(false);
	791	+// oe.treePanel.add(commandsPanel);
	792	+// oe.treePanel.Return();
569	793
570	794	// oe.aConstraints.gridx += 1;
571	795	// oe.aConstraints.weighty = 0;
..	..	@@ -582,27 +806,12 @@
582	806
583	807	JScrollPane jSP;
584	808	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
585		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	809	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
586	810	ResetModel();
587	811
588	812	oe.treePanel.add(jSPPanel);
589	813	oe.treePanel.Return();
590	814
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	815	oe.treePanel.add(copyOptionsPanel);
607	816	oe.treePanel.Return();
608	817
..	..	@@ -633,23 +842,43 @@
633	842
634	843	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
635	844	{
	845	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	846	+ colorCB.setToolTipText("Copy color when dropped");
	847	+ colorCB.addItemListener(this);
	848	+
	849	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	850	+ materialCB.setToolTipText("Copy material when dropped");
	851	+ materialCB.addItemListener(this);
	852	+
	853	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	854	+ textureCB.setToolTipText("Copy texture when dropped");
	855	+ textureCB.addItemListener(this);
	856	+
	857	+ panel.Return();
	858	+
636	859	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
637	860	boxCB.setToolTipText("Display bounding boxes");
638	861	boxCB.addItemListener(this);
639	862
640	863	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
641		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	864	+ zoomBoxCB.setToolTipText("Display only for wheel");
642	865	zoomBoxCB.addItemListener(this);
643	866
644		- if (Globals.ADVANCED)
	867	+ if (true) // Globals.ADVANCED)
645	868	{
646		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
647		- supportCB.setToolTipText("Enable rigging");
648		- supportCB.addItemListener(this);
	869	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	870	+// supportCB.setToolTipText("Enable rigging");
	871	+// supportCB.addItemListener(this);
	872	+
	873	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	874	+ freezeCB.setToolTipText("Fast moving camera");
	875	+ freezeCB.addItemListener(this);
649	876
650	877	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
651	878	// localCB.addItemListener(this);
652	879
	880	+ panel.Return();
	881	+
653	882	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
654	883	crowdCB.setToolTipText("Used for crowds");
655	884	crowdCB.addItemListener(this);
..	..	@@ -666,6 +895,8 @@
666	895	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
667	896	// speakerMocapCB.addItemListener(this);
668	897
	898	+ panel.Return();
	899	+
669	900	if (false)
670	901	{
671	902	// handled in scripts
..	..	@@ -680,32 +911,72 @@
680	911	//constraints.gridy += 1;
681	912	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
682	913	smoothfocusCB.addItemListener(this);
	914	+ panel.Return();
683	915	}
684	916
685	917	//constraints.gridx += 1;
686	918	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
687	919	// debugCB.addItemListener(this);
688	920
	921	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	922	+ trackCB.setToolTipText("Enable tracking target");
	923	+ trackCB.addItemListener(this);
	924	+
689	925	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	926	+ oeilCB.setToolTipText("Move camera when tracking");
690	927	oeilCB.addItemListener(this);
691	928
	929	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	930	+ shadowCB.setToolTipText("When live compute shadows");
	931	+ shadowCB.addItemListener(this);
	932	+
	933	+ panel.Return();
	934	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	935	+ toggleTextureCB.setToolTipText("Load textures");
	936	+ toggleTextureCB.addItemListener(this);
	937	+
	938	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	939	+ toggleSwitchCB.setToolTipText("Choose a single item");
	940	+ toggleSwitchCB.addItemListener(this);
	941	+
	942	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	943	+ autosaveCB.setToolTipText("On structure change");
	944	+ autosaveCB.addItemListener(this);
	945	+
	946	+ panel.Return();
	947	+ if (Globals.ADVANCED)
	948	+ {
692	949	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
693	950	lookAtCB.setToolTipText("Look-at target");
694	951	lookAtCB.addItemListener(this);
	952	+ }
695	953
696	954	}
697	955
698	956	cGridBag fill = new cGridBag();
699		-
700	957	fill.preferredHeight = 200;
	958	+ cGridBag fill2 = new cGridBag();
	959	+ fill2.preferredHeight = 200;
	960	+ cGridBag fill3 = new cGridBag();
	961	+ fill3.preferredHeight = 200;
701	962
702	963	panel.add(fill);
	964	+ panel.add(fill2);
	965	+ panel.add(fill3);
703	966
704	967	}
705	968
706	969	void EditObject(Object3D obj)
707	970	{
708	971	cRadio radioButton = new cRadio(obj.name);
	972	+
	973	+ // Patch to avoid bug with transparency.
	974	+ radioButton.hadMaterial = obj.material != null;
	975	+ if (!radioButton.hadMaterial)
	976	+ {
	977	+ obj.material = new cMaterial();
	978	+ }
	979	+
709	980	radioButton.SetObject(obj);
710	981	radioButton.layout = sevenButton;
711	982	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -714,8 +985,11 @@
714	985	buttonGroup.add(radioButton);
715	986	radioButton.doClick();
716	987	}
	988	+
717	989	void SetupViews(ObjEditor oe)
718	990	{
	991	+ theFrame = this;
	992	+
719	993	oe.SetupViews();
720	994
721	995	System.out.println("SetupViews");
..	..	@@ -724,23 +998,28 @@
724	998	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
725	999	}
726	1000
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;
	1001	+ cToggleButton liveCB;
	1002	+ cCheckBox supportCB;
	1003	+ cCheckBox localCB;
	1004	+ cCheckBox crowdCB;
	1005	+ cCheckBox smoothCB;
	1006	+ cToggleButton fastCB;
	1007	+ cCheckBox slowCB;
	1008	+ cCheckBox boxCB;
	1009	+ cCheckBox zoomBoxCB;
	1010	+ cCheckBox freezeCB;
	1011	+ //cToggleButton trackCB;
	1012	+ cCheckBox trackCB;
	1013	+ cCheckBox smoothfocusCB;
738	1014	// JCheckBox speakerMocapCB;
739		- JCheckBox speakerCameraCB;
740		- JCheckBox speakerFocusCB;
741		- JCheckBox debugCB;
742		- JCheckBox oeilCB;
743		- JCheckBox lookAtCB;
	1015	+ cCheckBox speakerCameraCB;
	1016	+ cCheckBox speakerFocusCB;
	1017	+ cCheckBox debugCB;
	1018	+
	1019	+ cCheckBox oeilCB;
	1020	+ cCheckBox shadowCB;
	1021	+ cCheckBox autosaveCB;
	1022	+ cCheckBox lookAtCB;
744	1023
745	1024	// static int COLOR = 1;
746	1025	// static int MATERIAL = 2;
..	..	@@ -748,9 +1027,9 @@
748	1027
749	1028	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
750	1029
751		- JCheckBox colorCB;
752		- JCheckBox materialCB;
753		- JCheckBox textureCB;
	1030	+ cCheckBox colorCB;
	1031	+ cCheckBox materialCB;
	1032	+ cCheckBox textureCB;
754	1033
755	1034	public void itemStateChanged(ItemEvent e)
756	1035	{
..	..	@@ -778,6 +1057,7 @@
778	1057	} else if(e.getSource() == liveCB)
779	1058	{
780	1059	cameraView.ToggleLive();
	1060	+ refreshContents(false);
781	1061	}
782	1062	else if(e.getSource() == supportCB)
783	1063	{
..	..	@@ -842,6 +1122,18 @@
842	1122	{
843	1123	cameraView.ToggleOeil();
844	1124	}
	1125	+ else if(e.getSource() == shadowCB)
	1126	+ {
	1127	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1128	+ }
	1129	+ else if(e.getSource() == freezeCB)
	1130	+ {
	1131	+ Globals.FREEZEONMOVE ^= true;
	1132	+ }
	1133	+ else if(e.getSource() == autosaveCB)
	1134	+ {
	1135	+ Globals.SAVEONMAKE ^= true;
	1136	+ }
845	1137	else if(e.getSource() == lookAtCB)
846	1138	{
847	1139	cameraView.ToggleLookAt();
..	..	@@ -858,7 +1150,8 @@
858	1150
859	1151	/**/
860	1152	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
861		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1153	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1154	+ TreePath path = objEditor.jTree.getSelectionPath();
862	1155	if ((path == null) \|\| (path.getPathCount() <= 1)) {
863	1156	// We can't move the root node or an empty selection
864	1157	return;
..	..	@@ -930,7 +1223,9 @@
930	1223	// objEditor.DropFile((java.io.File[]) object, true);
931	1224	// return;
932	1225	// }
933		- if (string.charAt(0) == '/')
	1226	+
	1227	+ // File path for Mac and Windows
	1228	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
934	1229	{
935	1230	// file(s)
936	1231	String[] names = string.split("\n");
..	..	@@ -957,7 +1252,7 @@
957	1252
958	1253	flashIt = false;
959	1254	CameraPane pane = (CameraPane) target;
960		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1255	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
961	1256	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
962	1257
963	1258	if (group.selection.size() == 1)
..	..	@@ -973,23 +1268,33 @@
973	1268
974	1269	assert target == objEditor.jTree;
975	1270	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1271	+ Object3D destinationLeaf;
976	1272	try {
977		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1273	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
978	1274	} catch (Exception e) {
979	1275	System.out.println("destinationPath : " + destinationPath);
980	1276	return;
981	1277	}
982	1278
983		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1279	+ for (int i=group.selection.size(); --i>=0;)
984	1280	{
	1281	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1282	+
	1283	+ // Cannot move into itself
	1284	+ if (child == destinationLeaf)
	1285	+ return;
	1286	+ }
	1287	+
	1288	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1289	+// {
985	1290	loadClipboard(true);
986	1291	objEditor.jTree.setSelectionPath(destinationPath);
987	1292	pasteInto(false, false);
988		- } else {
989		- loadClipboard(false);
990		- objEditor.jTree.setSelectionPath(destinationPath);
991		- pasteInto(false, false); // true); // ???
992		- }
	1293	+// } else {
	1294	+// loadClipboard(false);
	1295	+// objEditor.jTree.setSelectionPath(destinationPath);
	1296	+// pasteInto(false, false); // true); // ???
	1297	+// }
993	1298	}
994	1299	public void dropActionChanged(DropTargetDragEvent dtde)
995	1300	// Called if the user has modified the current drop gesture
..	..	@@ -1094,22 +1399,30 @@
1094	1399	{
1095	1400	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1096	1401	//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);
	1402	+// gridItem = menu.add(new MenuItem("Grid"));
	1403	+// gridItem.addActionListener(this);
	1404	+// rectoidItem = menu.add(new MenuItem("Box"));
	1405	+// rectoidItem.addActionListener(this);
	1406	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1407	+// ellipsoidItem.addActionListener(this);
	1408	+// coneItem = menu.add(new MenuItem("Cone"));
	1409	+// coneItem.addActionListener(this);
	1410	+// torusItem = menu.add(new MenuItem("Torus"));
	1411	+// torusItem.addActionListener(this);
	1412	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1413	+// superItem.addActionListener(this);
	1414	+
	1415	+ cameraItem = menu.add(new MenuItem("Camera"));
	1416	+ cameraItem.addActionListener(this);
	1417	+
	1418	+ if (!Globals.ADVANCED)
	1419	+ {
1109	1420	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1110	1421	kleinItem.addActionListener(this);
1111		- particleItem = menu.add(new MenuItem("Particle system"));
1112		- particleItem.addActionListener(this);
	1422	+ }
	1423	+
	1424	+// particleItem = menu.add(new MenuItem("Particle system"));
	1425	+// particleItem.addActionListener(this);
1113	1426	if (Globals.ADVANCED)
1114	1427	{
1115	1428	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1135,15 +1448,15 @@
1135	1448	}
1136	1449	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1137	1450	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);
	1451	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1452	+// overlayItem.addActionListener(this);
	1453	+// lightItem = menu.add(new MenuItem("Light"));
	1454	+// lightItem.addActionListener(this);
1142	1455	menu.add("-");
1143	1456	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1144	1457	//superLoopItem.addActionListener(this);
1145		- loopItem = menu.add(new MenuItem("Loop"));
1146		- loopItem.addActionListener(this);
	1458	+// loopItem = menu.add(new MenuItem("Loop"));
	1459	+// loopItem.addActionListener(this);
1147	1460	doubleItem = menu.add(new MenuItem("Fork"));
1148	1461	doubleItem.addActionListener(this);
1149	1462	if (Globals.ADVANCED)
..	..	@@ -1164,13 +1477,13 @@
1164	1477	parseverticesItem.addActionListener(this);
1165	1478	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1166	1479	textureFieldItem.addActionListener(this);
1167		- alignItem = menu.add(new MenuItem("Align Object"));
	1480	+ alignItem = menu.add(new MenuItem("Align Objects"));
1168	1481	alignItem.addActionListener(this);
1169	1482	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1170	1483	reduceMorphItem.addActionListener(this);
1171	1484	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1172	1485	reduce34MorphItem.addActionListener(this);
1173		-
	1486	+ menu.add("-");
1174	1487	menu.add(computeAOItem = new MenuItem("Compute AO"));
1175	1488	computeAOItem.addActionListener(this);
1176	1489
..	..	@@ -1183,7 +1496,7 @@
1183	1496	memoryItem.addActionListener(this);
1184	1497	menu.add(analyzeItem = new MenuItem("Analyze"));
1185	1498	analyzeItem.addActionListener(this);
1186		- menu.add(dumpItem = new MenuItem("Dump"));
	1499	+ menu.add(dumpItem = new MenuItem("Print"));
1187	1500	dumpItem.addActionListener(this);
1188	1501	// menu.add(pathItem = new MenuItem("From-to path"));
1189	1502	// pathItem.addActionListener(this);
..	..	@@ -1324,9 +1637,24 @@
1324	1637	shadow.material = new cMaterial(obj.material);
1325	1638	shadow.material.diffuse = 0.0001f;
1326	1639	shadow.material.specular = 0.0001f;
	1640	+ //shadow.projectedVertices[1].x = 300;
1327	1641
1328	1642	makeSomething(shadow);
1329	1643	}
	1644	+
	1645	+ private void ClearUnpinned()
	1646	+ {
	1647	+ //for (Object3D obj : listUI)
	1648	+ for (int i=listUI.size(); --i>=0;)
	1649	+ {
	1650	+ Object3D obj = listUI.elementAt(i);
	1651	+ if (!obj.pinned)
	1652	+ {
	1653	+ obj.CloseUI();
	1654	+ listUI.remove(i);
	1655	+ }
	1656	+ }
	1657	+ }
1330	1658
1331	1659	/**
1332	1660	* applyExample
..	..	@@ -1530,9 +1858,9 @@
1530	1858
1531	1859	void Overwrite(int mask)
1532	1860	{
1533		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1861	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1534	1862	{
1535		- Object3D content = GrafreeD.clipboard.get(0);
	1863	+ Object3D content = Grafreed.clipboard.get(0);
1536	1864
1537	1865	if (content instanceof cGroup && ((cGroup)content).transientlink )
1538	1866	content = ((cGroup)content).get(0);
..	..	@@ -1571,7 +1899,7 @@
1571	1899	{
1572	1900	ScreenFit();
1573	1901	} else
1574		- if (source == switchItem)
	1902	+ if (source == switchViewItem)
1575	1903	{
1576	1904	cVector v1 = new cVector();
1577	1905	cVector v2 = new cVector();
..	..	@@ -1580,11 +1908,11 @@
1580	1908	objEditor.cameraView.renderCamera.setAim(v2, v1);
1581	1909	objEditor.cameraView.repaint();
1582	1910	} else
1583		- if (source == rectoidItem)
	1911	+ if (source == rectoidItem \|\| source == boxButton)
1584	1912	{
1585	1913	makeSomething(new Box());
1586	1914	} else
1587		- if (source == particleItem)
	1915	+ if (source == particleItem \|\| source == particlesButton)
1588	1916	{
1589	1917	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1590	1918	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1663,27 +1991,27 @@
1663	1991
1664	1992	makeSomething(obj);
1665	1993	} else
1666		- if (source == gridItem)
	1994	+ if (source == gridItem \|\| source == gridButton)
1667	1995	{
1668	1996	makeSomething(new Grid());
1669	1997	} else
1670		- if (source == ellipsoidItem)
	1998	+ if (source == ellipsoidItem \|\| source == sphereButton)
1671	1999	{
1672	2000	makeSomething(new Sphere());
1673	2001	} else
1674		- if (source == coneItem)
	2002	+ if (source == coneItem \|\| source == coneButton)
1675	2003	{
1676	2004	makeSomething(new Cone());
1677	2005	} else
1678		- if (source == torusItem)
	2006	+ if (source == torusItem \|\| source == torusButton)
1679	2007	{
1680	2008	makeSomething(new Torus());
1681	2009	} else
1682		- if (source == superItem)
	2010	+ if (source == superItem \|\| source == superButton)
1683	2011	{
1684	2012	makeSomething(new Superellipsoid());
1685	2013	} else
1686		- if (source == kleinItem)
	2014	+ if (source == kleinItem \|\| source == kleinButton)
1687	2015	{
1688	2016	makeSomething(new Klein());
1689	2017	} else
..	..	@@ -1703,7 +2031,7 @@
1703	2031	{
1704	2032	makeSomething(new BezierSurface());
1705	2033	} else
1706		- if (source == overlayItem)
	2034	+ if (source == overlayItem \|\| source == overlayButton)
1707	2035	{
1708	2036	/*
1709	2037	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1751,7 +2079,7 @@
1751	2079	s.setup();
1752	2080	makeSomething(s);
1753	2081	} else
1754		- if (source == lightItem)
	2082	+ if (source == lightItem \|\| source == lightButton)
1755	2083	{
1756	2084	makeSomething(new Light());
1757	2085	} else
..	..	@@ -1801,30 +2129,30 @@
1801	2129
1802	2130	group(g);
1803	2131	} else
1804		- if (source == loopItem)
	2132	+ if (source == loopItem \|\| source == loopButton)
1805	2133	{
1806	2134	Composite csg = new GroupLeaf();
1807	2135	csg.count = 5;
1808	2136	group(csg);
1809		- Composite child = new cGroup();
	2137	+ Composite child = new cGroup("Branch");
1810	2138	csg.addChild(child);
1811	2139	child.addChild(csg);
1812	2140	} else
1813	2141	if (source == doubleItem)
1814	2142	{
1815		- Composite csg = new GroupLeaf();
	2143	+ Composite csg = new GroupLeaf("Fork");
1816	2144	csg.count = 5;
1817	2145	group(csg);
1818		- Composite child = new cGroup();
	2146	+ Composite child = new cGroup("Branch A");
1819	2147	csg.addChild(child);
1820	2148	child.addChild(csg);
1821		- child = new cGroup();
	2149	+ child = new cGroup("Branch B");
1822	2150	csg.addChild(child);
1823	2151	child.addChild(csg);
1824	2152	} else
1825	2153	if (source == tripleItem)
1826	2154	{
1827		- Composite csg = new GroupLeaf();
	2155	+ Composite csg = new GroupLeaf("Trident");
1828	2156	csg.count = 4;
1829	2157	group(csg);
1830	2158	Composite child = new cGroup();
..	..	@@ -1836,23 +2164,6 @@
1836	2164	child = new cGroup();
1837	2165	csg.addChild(child);
1838	2166	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	2167	} else
1857	2168	if (source == computeAOItem)
1858	2169	{
..	..	@@ -1872,7 +2183,7 @@
1872	2183	if (source == invariantsItem)
1873	2184	{
1874	2185	System.out.println("Invariants:");
1875		- GrafreeD.grafreeD.universe.invariants();
	2186	+ Grafreed.grafreeD.universe.invariants();
1876	2187	} else
1877	2188	if (source == memoryItem)
1878	2189	{
..	..	@@ -1890,6 +2201,30 @@
1890	2201	if (source == dumpItem)
1891	2202	{
1892	2203	DumpObject();
	2204	+ } else
	2205	+ if (source == minButton)
	2206	+ {
	2207	+ Minimize();
	2208	+ } else
	2209	+ if (source == maxButton)
	2210	+ {
	2211	+ Maximize();
	2212	+ } else
	2213	+ if (source == fullButton)
	2214	+ {
	2215	+ ToggleFullScreen();
	2216	+ } else
	2217	+ if (source == undoButton)
	2218	+ {
	2219	+ Undo();
	2220	+ } else
	2221	+ if (source == redoButton)
	2222	+ {
	2223	+ Redo();
	2224	+ } else
	2225	+ if (source == saveButton)
	2226	+ {
	2227	+ Save();
1893	2228	} else
1894	2229	if (source == oneStepButton)
1895	2230	{
..	..	@@ -1945,12 +2280,20 @@
1945	2280	{
1946	2281	loadClipboard(true);
1947	2282	} else
	2283	+ if (source == undoItem)
	2284	+ {
	2285	+ Undo();
	2286	+ } else
	2287	+ if (source == redoItem)
	2288	+ {
	2289	+ Redo();
	2290	+ } else
1948	2291	if (source == duplicateItem)
1949	2292	{
1950		- Object3D keep = GrafreeD.clipboard;
	2293	+ Object3D keep = Grafreed.clipboard;
1951	2294	loadClipboard(false);
1952	2295	paste(false);
1953		- GrafreeD.clipboard = keep;
	2296	+ Grafreed.clipboard = keep;
1954	2297	} else
1955	2298	if (source == cloneItem)
1956	2299	{
..	..	@@ -2170,9 +2513,9 @@
2170	2513	// group.selection.get(0).setMasterThis(content); // should be identity
2171	2514	// refreshContents();
2172	2515	// }
2173		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2516	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2174	2517	{
2175		- Object3D content = GrafreeD.clipboard.get(0);
	2518	+ Object3D content = Grafreed.clipboard.get(0);
2176	2519
2177	2520	if (content instanceof cGroup && ((cGroup)content).transientlink )
2178	2521	content = ((cGroup)content).get(0);
..	..	@@ -2222,9 +2565,9 @@
2222	2565	} else
2223	2566	if (source == setMasterItem)
2224	2567	{
2225		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2568	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2226	2569	{
2227		- Object3D content = GrafreeD.clipboard.get(0);
	2570	+ Object3D content = Grafreed.clipboard.get(0);
2228	2571
2229	2572	if (content instanceof cGroup && ((cGroup)content).transientlink )
2230	2573	content = ((cGroup)content).get(0);
..	..	@@ -2237,9 +2580,9 @@
2237	2580	{
2238	2581	if (group.selection.size() == 1)
2239	2582	{
2240		- if (GrafreeD.clipboard.size() == 1)
	2583	+ if (Grafreed.clipboard.size() == 1)
2241	2584	{
2242		- Object3D content = GrafreeD.clipboard.get(0);
	2585	+ Object3D content = Grafreed.clipboard.get(0);
2243	2586
2244	2587	if (content instanceof cGroup && ((cGroup)content).transientlink )
2245	2588	content = ((cGroup)content).get(0);
..	..	@@ -2256,7 +2599,7 @@
2256	2599	{
2257	2600	RevertMeshes();
2258	2601	} else
2259		- if (source == resetMeshItem)
	2602	+ if (source == resetAllItem)
2260	2603	{
2261	2604	ResetAll();
2262	2605	} else
..	..	@@ -2276,9 +2619,9 @@
2276	2619	{
2277	2620	ClearSelection(true);
2278	2621	} else
2279		- if (source == grabItem)
	2622	+ if (source == grabItem \|\| source == groupButton)
2280	2623	{
2281		- group(new cGroup(), true);
	2624	+ group(new cGroup(), false); // true);
2282	2625	} else
2283	2626	if (source == hideItem)
2284	2627	{
..	..	@@ -2296,11 +2639,11 @@
2296	2639	{
2297	2640	makeSomething(new Camera());
2298	2641	} else
2299		- if (source == compositeItem)
	2642	+ if (source == compositeItem \|\| source == compositeButton)
2300	2643	{
2301	2644	group(new Composite());
2302	2645	} else
2303		- if (source == randomItem)
	2646	+ if (source == switchItem \|\| source == switchButton)
2304	2647	{
2305	2648	RandomNode random = new RandomNode();
2306	2649	group(random);
..	..	@@ -2402,7 +2745,7 @@
2402	2745	{
2403	2746	group(new cLinker());
2404	2747	} else
2405		- if (source == textureItem)
	2748	+ if (source == textureItem \|\| source == textureButton)
2406	2749	{
2407	2750	group(new TextureNode());
2408	2751	} else
..	..	@@ -2422,17 +2765,30 @@
2422	2765	{
2423	2766	CastShadow(2);
2424	2767	} else
2425		- if (source == ungroupItem)
	2768	+ if (source == ungroupItem \|\| source == ungroupButton)
2426	2769	{
2427		- //ungroup();
	2770	+ boolean hasRoot = false;
	2771	+
2428	2772	for (int i=0; i<group.selection.size(); i++)
2429	2773	{
2430		- Ungroup(group.selection.get(i));
	2774	+ if (group.selection.get(i) == group)
	2775	+ {
	2776	+ hasRoot = true;
	2777	+ break;
	2778	+ }
2431	2779	}
2432	2780
2433		- ClearSelection(false);
2434		-
2435		- refreshContents();
	2781	+ if (!hasRoot)
	2782	+ {
	2783	+ for (int i=0; i<group.selection.size(); i++)
	2784	+ {
	2785	+ Ungroup(group.selection.get(i));
	2786	+ }
	2787	+
	2788	+ ClearSelection(false);
	2789	+
	2790	+ refreshContents();
	2791	+ }
2436	2792	} else
2437	2793	if (source == genUVItem)
2438	2794	{
..	..	@@ -2444,7 +2800,7 @@
2444	2800	} else
2445	2801	if (source == genNormalsMESHItem)
2446	2802	{
2447		- GenNormals(true); // TODO
	2803	+ GenNormalsMESH();
2448	2804	} else
2449	2805	if (source == genNormalsORGANItem)
2450	2806	{
..	..	@@ -2509,6 +2865,22 @@
2509	2865	if (source == unmarkleavesItem)
2510	2866	{
2511	2867	MarkLeaves(false);
	2868	+ } else
	2869	+ if (source == rewindleavesItem)
	2870	+ {
	2871	+ RewindLeaves(true);
	2872	+ } else
	2873	+ if (source == unrewindleavesItem)
	2874	+ {
	2875	+ RewindLeaves(false);
	2876	+ } else
	2877	+ if (source == randomleavesItem)
	2878	+ {
	2879	+ RandomLeaves(true);
	2880	+ } else
	2881	+ if (source == unrandomleavesItem)
	2882	+ {
	2883	+ RandomLeaves(false);
2512	2884	} else
2513	2885	if (source == flipVItem)
2514	2886	{
..	..	@@ -2594,9 +2966,13 @@
2594	2966	{
2595	2967	SmoothMesh();
2596	2968	} else
2597		- if (source == transformgeometryItem)
	2969	+ if (source == transformGeometryItem)
2598	2970	{
2599	2971	TransformGeometry();
	2972	+ } else
	2973	+ if (source == transformChildrenItem)
	2974	+ {
	2975	+ TransformChildren();
2600	2976	} else
2601	2977	if (source == resetTransformItem)
2602	2978	{
..	..	@@ -2604,7 +2980,11 @@
2604	2980	} else
2605	2981	if (source == resetCentroidItem)
2606	2982	{
2607		- ResetCentroid();
	2983	+ ResetCentroid(true);
	2984	+ } else
	2985	+ if (source == resetCentroidXZItem)
	2986	+ {
	2987	+ ResetCentroid(false);
2608	2988	} else
2609	2989	if (source == resetParentItem)
2610	2990	{
..	..	@@ -2736,6 +3116,10 @@
2736	3116	if (source == twoButton)
2737	3117	{
2738	3118	radio.layout = twoButton;
	3119	+
	3120	+ if (CameraPane.FULLSCREEN)
	3121	+ fullscreenLayout = radio.layout;
	3122	+
2739	3123	// bug
2740	3124	//gridPanel.setDividerLocation(1.0);
2741	3125	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2768,10 +3152,31 @@
2768	3152	bigThree.ClearUI();
2769	3153	bigThree.add(centralPanel);
2770	3154	bigThree.FlushUI();
	3155	+
	3156	+ cameraView.requestFocusInWindow();
	3157	+
	3158	+// refreshContents(true);
	3159	+//
	3160	+// try
	3161	+// {
	3162	+// java.awt.Robot bot = new java.awt.Robot();
	3163	+// int mask = InputEvent.BUTTON1_MASK;
	3164	+// bot.mouseMove(100, 100);
	3165	+// bot.mousePress(mask);
	3166	+// bot.mouseRelease(mask);
	3167	+// }
	3168	+// catch (Exception e)
	3169	+// {
	3170	+//
	3171	+// }
	3172	+
2771	3173	} else
2772	3174	if (source == threeButton)
2773	3175	{
2774	3176	radio.layout = threeButton;
	3177	+
	3178	+ if (CameraPane.FULLSCREEN)
	3179	+ fullscreenLayout = radio.layout;
2775	3180
2776	3181	// bigThree.remove(scenePanel);
2777	3182	// bigThree.remove(centralPanel);
..	..	@@ -2804,10 +3209,15 @@
2804	3209	bigThree.add(centralPanel);
2805	3210	bigThree.add(XYZPanel);
2806	3211	bigThree.FlushUI();
	3212	+
	3213	+ cameraView.requestFocusInWindow();
2807	3214	} else
2808	3215	if (source == fourButton)
2809	3216	{
2810	3217	radio.layout = fourButton;
	3218	+
	3219	+ if (CameraPane.FULLSCREEN)
	3220	+ fullscreenLayout = radio.layout;
2811	3221
2812	3222	// bigThree.remove(scenePanel);
2813	3223	// bigThree.remove(centralPanel);
..	..	@@ -2839,10 +3249,15 @@
2839	3249	bigThree.ClearUI();
2840	3250	bigThree.add(scenePanel);
2841	3251	bigThree.FlushUI();
	3252	+
	3253	+ cameraView.requestFocusInWindow();
2842	3254	} else
2843	3255	if (source == sixButton)
2844	3256	{
2845	3257	radio.layout = sixButton;
	3258	+
	3259	+ if (CameraPane.FULLSCREEN)
	3260	+ fullscreenLayout = radio.layout;
2846	3261
2847	3262	// bigThree.remove(scenePanel);
2848	3263	// bigThree.remove(centralPanel);
..	..	@@ -2875,10 +3290,15 @@
2875	3290	bigThree.add(scenePanel);
2876	3291	bigThree.add(centralPanel);
2877	3292	bigThree.FlushUI();
	3293	+
	3294	+ cameraView.requestFocusInWindow();
2878	3295	} else
2879	3296	if (source == sevenButton)
2880	3297	{
2881	3298	radio.layout = sevenButton;
	3299	+
	3300	+ if (CameraPane.FULLSCREEN)
	3301	+ fullscreenLayout = radio.layout;
2882	3302
2883	3303	// bigThree.remove(scenePanel);
2884	3304	// bigThree.remove(centralPanel);
..	..	@@ -2912,6 +3332,8 @@
2912	3332	bigThree.add(centralPanel);
2913	3333	bigThree.add(XYZPanel);
2914	3334	bigThree.FlushUI();
	3335	+
	3336	+ cameraView.requestFocusInWindow();
2915	3337	} else
2916	3338	if (source == rootButton)
2917	3339	{
..	..	@@ -2923,6 +3345,7 @@
2923	3345	EditObject(obj);
2924	3346	}
2925	3347
	3348	+ cameraView.requestFocusInWindow();
2926	3349	refreshContents(true);
2927	3350	} else
2928	3351	if (source == closeButton)
..	..	@@ -2932,22 +3355,37 @@
2932	3355	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2933	3356	{
2934	3357	ab = (cRadio)e.nextElement();
2935		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3358	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2936	3359	{
	3360	+ // Patch to avoid bug with transparency.
	3361	+ if (!ab.hadMaterial)
	3362	+ {
	3363	+ ab.object.material = null;
	3364	+ }
	3365	+
2937	3366	buttonGroup.remove(ab);
2938	3367	radioPanel.remove(ab);
2939	3368
2940		- ab.GetObject().editWindow = null;
	3369	+ //ab.GetObject().editWindow = null;
	3370	+ ab.GetObject().manipWindow = null;
2941	3371	// ab.GetObject().objectUI = null; // ?????????
2942	3372
2943	3373	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2944	3374	break;
2945	3375	}
2946	3376	}
	3377	+
	3378	+ cameraView.requestFocusInWindow();
2947	3379	refreshContents(true);
2948	3380	} else
2949	3381	if (source == editItem \|\| source == editButton)
2950	3382	{
	3383	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3384	+ {
	3385	+ Object3D child = (Object3D)e.nextElement();
	3386	+ child.pinned = true;
	3387	+ }
	3388	+
2951	3389	EditSelection(false);
2952	3390	} else
2953	3391	if (source == uneditButton)
..	..	@@ -2957,10 +3395,11 @@
2957	3395	Object3D child = (Object3D)e.nextElement();
2958	3396	if(child.editWindow != null)
2959	3397	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3398	+ child.pinned = false;
2960	3399	child.CloseUI();
2961	3400	listUI.remove(child);
2962	3401
2963		- child.editWindow = null; // ???????????
	3402	+ //child.editWindow = null; // ???????????
2964	3403	}
2965	3404	objEditor.ctrlPanel.FlushUI();
2966	3405	//objEditor.jTree.clearSelection();
..	..	@@ -2973,6 +3412,7 @@
2973	3412	//copy.ClearUI();
2974	3413	for (Object3D obj : listUI)
2975	3414	{
	3415	+ obj.pinned = false;
2976	3416	obj.CloseUI();
2977	3417	}
2978	3418	listUI.clear();
..	..	@@ -2982,7 +3422,7 @@
2982	3422	{
2983	3423	assert(copy == group);
2984	3424
2985		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3425	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2986	3426
2987	3427	for (Object3D obj : listUI)
2988	3428	{
..	..	@@ -3046,20 +3486,44 @@
3046	3486	frontView.object = group;
3047	3487	sideView.object = group;
3048	3488	}
3049		- group.editWindow = this;
	3489	+
	3490	+// fix "+" issue
	3491	+ //group.editWindow = this;
	3492	+ group.manipWindow = this;
	3493	+
3050	3494	/*
3051	3495	currentLayout = radio.layout;
3052	3496	if (currentLayout == null)
3053	3497	currentLayout = sevenButton;
3054	3498	*/
3055	3499	radio.layout.doClick();
	3500	+
	3501	+ ClearUnpinned();
	3502	+ SetPinStates(group.selection.size() > 0);
	3503	+ if (group.selection.size() == 1)
	3504	+ EditSelection(false);
3056	3505	keepparent = group.parent;
3057	3506	// PARENT = NULL or not???
3058	3507	//group.parent = null; // ROOT
3059	3508	//group.attributes = -1;
3060	3509	ResetModel();
	3510	+
	3511	+ cameraView.requestFocusInWindow();
3061	3512	refreshContents(true);
3062		- }
	3513	+ } else if (event.getSource() == editCameraItem)
	3514	+ {
	3515	+ cameraView.ProtectCamera();
	3516	+ cameraView.repaint();
	3517	+ return;
	3518	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3519	+ {
	3520	+ cameraView.RevertCamera();
	3521	+ cameraView.repaint();
	3522	+ return;
	3523	+ // } else if (event.getSource() == textureButton)
	3524	+ // {
	3525	+ // return; // true;
	3526	+ }
3063	3527	else
3064	3528	{
3065	3529	//return super.action(event, arg);
..	..	@@ -3068,7 +3532,6 @@
3068	3532	}
3069	3533
3070	3534	boolean useclient = false;
3071		- cRadio radio;
3072	3535
3073	3536	void ToggleRoot()
3074	3537	{
..	..	@@ -3120,6 +3583,28 @@
3120	3583	refreshContents();
3121	3584	}
3122	3585
	3586	+ void TransformChildren()
	3587	+ {
	3588	+ Object3D obj;
	3589	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3590	+ {
	3591	+ obj = (Object3D)e.nextElement();
	3592	+ obj.KeepTextureMatrices();
	3593	+ obj.TransformChildren();
	3594	+ obj.RestoreTextureMatrices();
	3595	+
	3596	+// if (obj.parent == null)
	3597	+// {
	3598	+// System.out.println("NULL PARENT!");
	3599	+// new Exception().printStackTrace();
	3600	+// }
	3601	+// else
	3602	+// TouchTransform(obj);
	3603	+// //obj.parent.Touch();
	3604	+ }
	3605	+
	3606	+ refreshContents();
	3607	+ }
3123	3608
3124	3609	void ResetTransform()
3125	3610	{
..	..	@@ -3232,7 +3717,7 @@
3232	3717	refreshContents();
3233	3718	}
3234	3719
3235		- void ResetCentroid()
	3720	+ void ResetCentroid(boolean full)
3236	3721	{
3237	3722	Object3D obj;
3238	3723	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3247,12 +3732,16 @@
3247	3732	LA.matIdentity(Object3D.mat);
3248	3733	obj.getBounds(minima, maxima, false);
3249	3734	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3250		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3735	+ if (full)
	3736	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3251	3737	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3252	3738	obj.TransformMesh(Object3D.mat);
	3739	+
3253	3740	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3254		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3741	+ if (full)
	3742	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3255	3743	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3744	+
3256	3745	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3257	3746	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3258	3747	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3281,7 +3770,8 @@
3281	3770
3282	3771	int size = obj.MemorySize();
3283	3772
3284		- System.err.println((size/1024) + " KB is the size of " + obj);
	3773	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3774	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3285	3775	}
3286	3776	}
3287	3777	catch (Exception e)
..	..	@@ -3318,9 +3808,9 @@
3318	3808	obj = (Object3D)e.nextElement();
3319	3809
3320	3810	System.out.println("Object is: " + obj);
3321		- GrafreeD.AnalyzeObject(obj);
	3811	+ Grafreed.AnalyzeObject(obj);
3322	3812	System.out.println("Boundary rep: " + obj.bRep);
3323		- GrafreeD.AnalyzeObject(obj.bRep);
	3813	+ Grafreed.AnalyzeObject(obj.bRep);
3324	3814
3325	3815	// System.err.println((size/1024) + " KB is the size of " + obj);
3326	3816	}
..	..	@@ -3362,6 +3852,13 @@
3362	3852	void GenNormals(boolean crease)
3363	3853	{
3364	3854	group.GenNormalsS(crease);
	3855	+
	3856	+ refreshContents();
	3857	+ }
	3858	+
	3859	+ void GenNormalsMESH()
	3860	+ {
	3861	+ group.GenNormalsMeshS();
3365	3862
3366	3863	refreshContents();
3367	3864	}
..	..	@@ -3534,8 +4031,8 @@
3534	4031
3535	4032	void ParseVertices()
3536	4033	{
3537		- boolean epsequal = GrafreeD.epsequal;
3538		- GrafreeD.epsequal = true;
	4034	+ boolean epsequal = Grafreed.epsequal;
	4035	+ Grafreed.epsequal = true;
3539	4036
3540	4037	for (int i=0; i<group.selection.size(); i++)
3541	4038	{
..	..	@@ -3560,7 +4057,7 @@
3560	4057	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3561	4058	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3562	4059
3563		- g.add(GrafreeD.clipboard);
	4060	+ g.add(Grafreed.clipboard);
3564	4061
3565	4062	buffer.add(g);
3566	4063	}
..	..	@@ -3575,7 +4072,7 @@
3575	4072	makeSomething(buffer, i==group.selection.size()-1);
3576	4073	}
3577	4074
3578		- GrafreeD.epsequal = epsequal;
	4075	+ Grafreed.epsequal = epsequal;
3579	4076
3580	4077	refreshContents();
3581	4078	}
..	..	@@ -3593,7 +4090,16 @@
3593	4090	String pigment = Object3D.GetPigment(tex);
3594	4091	//String bump = Object3D.GetBump(tex);
3595	4092
3596		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4093	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4094	+
	4095	+ try
	4096	+ {
	4097	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4098	+ }
	4099	+ catch (Exception e)
	4100	+ {
	4101	+ System.err.println("FAIL: " + node);
	4102	+ }
3597	4103
3598	4104	double s = v.s;
3599	4105
..	..	@@ -3725,7 +4231,7 @@
3725	4231	return;
3726	4232
3727	4233	Object3D poses = group.selection.get(0);
3728		- Object3D ref = GrafreeD.clipboard.get(0);
	4234	+ Object3D ref = Grafreed.clipboard.get(0);
3729	4235
3730	4236	Object3D newgroup = new Object3D("Po:" + poses.name);
3731	4237
..	..	@@ -3919,9 +4425,9 @@
3919	4425
3920	4426	void ClipMesh()
3921	4427	{
3922		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4428	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3923	4429	{
3924		- Object3D content = GrafreeD.clipboard.get(0);
	4430	+ Object3D content = Grafreed.clipboard.get(0);
3925	4431
3926	4432	if (content instanceof cGroup && ((cGroup)content).transientlink )
3927	4433	content = ((cGroup)content).get(0);
..	..	@@ -3930,7 +4436,7 @@
3930	4436	// {
3931	4437	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3932	4438	// }
3933		- group.selection.ClipMesh(GrafreeD.clipboard);
	4439	+ group.selection.ClipMesh(Grafreed.clipboard);
3934	4440	}
3935	4441	// group.selection.ClipMesh(GrafreeD.clipboard);
3936	4442	System.out.println("DONE.");
..	..	@@ -3977,6 +4483,18 @@
3977	4483	void MarkLeaves(boolean hide)
3978	4484	{
3979	4485	group.selection.MarkLeaves(hide);
	4486	+ refreshContents();
	4487	+ }
	4488	+
	4489	+ void RewindLeaves(boolean hide)
	4490	+ {
	4491	+ group.selection.RewindLeaves(hide);
	4492	+ refreshContents();
	4493	+ }
	4494	+
	4495	+ void RandomLeaves(boolean hide)
	4496	+ {
	4497	+ group.selection.RandomLeaves(hide);
3980	4498	refreshContents();
3981	4499	}
3982	4500
..	..	@@ -4051,10 +4569,6 @@
4051	4569	// }
4052	4570	// }
4053	4571
4054		- static boolean allparams = true;
4055		-
4056		- static Vector<Object3D> listUI = new Vector<Object3D>();
4057		-
4058	4572	void EditSelection(boolean newWindow)
4059	4573	{
4060	4574	// aConstraints.gridy = 0;
..	..	@@ -4062,10 +4576,10 @@
4062	4576	{
4063	4577	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4064	4578	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4065		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4579	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4066	4580
4067	4581	Object3D elem = (Object3D)group.selection.elementAt(i);
4068		- if(elem != group)
	4582	+ if(elem != group \|\| !newWindow)
4069	4583	{
4070	4584	// if (!(elem instanceof Composite))
4071	4585	// newWindow = false;
..	..	@@ -4147,7 +4661,8 @@
4147	4661	//new Exception().printStackTrace();
4148	4662
4149	4663	freezemodel = true;
4150		-
	4664	+ ClearUnpinned();
	4665	+
4151	4666	/**/
4152	4667	//switch (event.id)
4153	4668	{
..	..	@@ -4155,7 +4670,6 @@
4155	4670	//case 702: // Event.LIST_DESELECT
4156	4671	group.deselectAll();
4157	4672	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4158		- objEditor.ClearInfo(); // .GetMaterial());
4159	4673	if (tps != null)
4160	4674	{
4161	4675	for (int i=0; i < tps.length; i++)
..	..	@@ -4164,10 +4678,8 @@
4164	4678
4165	4679	//if (child.parent != null)
4166	4680	//child.parent.addSelectee(child);
	4681	+ objEditor.SetMaterial(child);
4167	4682	group.addSelectee(child);
4168		- objEditor.SetMaterial(child); // .GetMaterial());
4169		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4170		- System.err.println("info : " + child.GetPath());
4171	4683	}
4172	4684	}
4173	4685	// else
..	..	@@ -4177,20 +4689,28 @@
4177	4689	// System.err.println("info : " + group.GetPath());
4178	4690	// }
4179	4691
4180		- objEditor.SetText(); // jan 2014
4181		-
4182		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4692	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4183	4693	CameraPane.flash = true;
4184	4694
4185		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4695	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4186	4696	// a camera
4187	4697	{
4188		- CameraPane.camerachangeframe = 0; // don't refuse it
4189		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4698	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4699	+ {
	4700	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4701	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4702	+ }
4190	4703	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4191	4704	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4192	4705	}
4193	4706
	4707	+ if (tps != null && tps.length == 1)
	4708	+ {
	4709	+ EditSelection(false);
	4710	+ }
	4711	+
	4712	+ SetPinStates(tps != null && tps.length > 0);
	4713	+
4194	4714	refreshContents();
4195	4715	//return true;
4196	4716	}
..	..	@@ -4199,6 +4719,35 @@
4199	4719
4200	4720	freezemodel = false;
4201	4721	}
	4722	+
	4723	+ void SetPinStates(boolean enabled)
	4724	+ {
	4725	+ editButton.setEnabled(enabled);
	4726	+ uneditButton.setEnabled(enabled);
	4727	+ unselectButton.setEnabled(enabled);
	4728	+ flashSelectionButton.setEnabled(enabled);
	4729	+ }
	4730	+
	4731	+ void refreshContents(boolean cp)
	4732	+ {
	4733	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4734	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4735	+ {
	4736	+ objEditor.ClearInfo(); // .GetMaterial());
	4737	+
	4738	+ for (int i=0; i < group.selection.Size(); i++)
	4739	+ {
	4740	+ Object3D child = (Object3D) group.selection.get(i);
	4741	+
	4742	+ objEditor.AddInfo(child, this, true);
	4743	+ System.err.println("info : " + child.GetPath());
	4744	+ }
	4745	+
	4746	+ objEditor.SetText(); // jan 2014
	4747	+ }
	4748	+
	4749	+ super.refreshContents(cp);
	4750	+ }
4202	4751
4203	4752	void linkSomething(Object3D thing)
4204	4753	{
..	..	@@ -4270,16 +4819,19 @@
4270	4819	{
4271	4820	if (group.selection.isEmpty())
4272	4821	return;
4273		- GrafreeD.clipboardIsTempGroup = false;
	4822	+
	4823	+ Grafreed.clipboardIsTempGroup = false;
4274	4824	Composite tGroup = null;
4275	4825	if (group.selection.size() > 0) // 1)
4276	4826	{
4277	4827	tGroup = new cGroup();
4278		- GrafreeD.clipboardIsTempGroup = true;
	4828	+ Grafreed.clipboardIsTempGroup = true;
4279	4829	}
4280	4830
4281	4831	if (cut)
4282	4832	{
	4833	+ if (Globals.SAVEONMAKE)
	4834	+ Save();
4283	4835	//int indices[] = jList.getSelectedIndices();
4284	4836	//for (int i = indices.length - 1; i >= 0; i--)
4285	4837	//jList.remove(indices[i]);
..	..	@@ -4315,16 +4867,16 @@
4315	4867	//System.out.println("cut " + child);
4316	4868	//System.out.println("parent = " + child.parent);
4317	4869	// tmp.addChild(child);
4318		- if (GrafreeD.clipboardIsTempGroup)
	4870	+ if (Grafreed.clipboardIsTempGroup)
4319	4871	tGroup.add/Child/(tmp);
4320	4872	else
4321		- GrafreeD.clipboard = tmp;
	4873	+ Grafreed.clipboard = tmp;
4322	4874	}
4323	4875	else
4324		- if (GrafreeD.clipboardIsTempGroup)
	4876	+ if (Grafreed.clipboardIsTempGroup)
4325	4877	tGroup.add/Child/(child);
4326	4878	else
4327		- GrafreeD.clipboard = child;
	4879	+ Grafreed.clipboard = child;
4328	4880	}
4329	4881
4330	4882	//ResetModel();
..	..	@@ -4356,21 +4908,23 @@
4356	4908	//System.out.println("cut " + elem);
4357	4909	//System.out.println("parent = " + elem.parent);
4358	4910	// tmp.addChild(elem);
4359		- if (GrafreeD.clipboardIsTempGroup)
	4911	+ if (Grafreed.clipboardIsTempGroup)
4360	4912	tGroup.add/Child/(tmp);
4361	4913	else
4362		- GrafreeD.clipboard = tmp;
	4914	+ Grafreed.clipboard = tmp;
4363	4915	}
4364	4916	else
4365		- if (GrafreeD.clipboardIsTempGroup)
	4917	+ if (Grafreed.clipboardIsTempGroup)
4366	4918	tGroup.add/Child/(child);
4367	4919	else
4368		- GrafreeD.clipboard = child;
	4920	+ Grafreed.clipboard = child;
4369	4921	}
4370	4922
4371	4923	}
4372		- if (GrafreeD.clipboardIsTempGroup)
4373		- GrafreeD.clipboard = tGroup;
	4924	+
	4925	+ if (Grafreed.clipboardIsTempGroup)
	4926	+ Grafreed.clipboard = tGroup;
	4927	+
4374	4928	if (cut)
4375	4929	{
4376	4930	ResetModel();
..	..	@@ -4384,7 +4938,7 @@
4384	4938	// return;
4385	4939	boolean first = true;
4386	4940
4387		- if (GrafreeD.clipboardIsTempGroup)
	4941	+ if (Grafreed.clipboardIsTempGroup)
4388	4942	{
4389	4943	Composite temp;
4390	4944
..	..	@@ -4395,7 +4949,7 @@
4395	4949	temp = (Composite)Applet3D.clipboard.deepCopy();
4396	4950	*/
4397	4951	Object3D elem;
4398		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4952	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4399	4953	{
4400	4954	Object3D child = (Object3D)e.nextElement();
4401	4955
..	..	@@ -4429,14 +4983,14 @@
4429	4983	//Object3D cb = Applet3D.clipboard;
4430	4984	//temp.addChild(cb);
4431	4985	//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());
	4986	+ assert(Grafreed.clipboard.parent == null);
	4987	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4988	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4989	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4990	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4437	4991	else
4438		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4439		- GrafreeD.clipboard.get(0).parent = keepparent;
	4992	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4993	+ Grafreed.clipboard.get(0).parent = keepparent;
4440	4994	}
4441	4995
4442	4996	ResetModel();
..	..	@@ -4485,9 +5039,9 @@
4485	5039	{
4486	5040	boolean first = true;
4487	5041
4488		- if (GrafreeD.clipboardIsTempGroup)
	5042	+ if (Grafreed.clipboardIsTempGroup)
4489	5043	{
4490		- Composite temp = (Composite)GrafreeD.clipboard;
	5044	+ Composite temp = (Composite)Grafreed.clipboard;
4491	5045	Object3D copy;
4492	5046	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4493	5047	{
..	..	@@ -4497,7 +5051,7 @@
4497	5051	}
4498	5052	} else
4499	5053	{
4500		- linkSomething(GrafreeD.clipboard); //.get(0));
	5054	+ linkSomething(Grafreed.clipboard); //.get(0));
4501	5055	}
4502	5056	}
4503	5057	}
..	..	@@ -4902,21 +5456,6 @@
4902	5456	}
4903	5457	*/
4904	5458
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	5459	/*
4921	5460	public void Callback(Object obj)
4922	5461	{
..	..	@@ -4940,26 +5479,9 @@
4940	5479	}
4941	5480	*/
4942	5481
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	5482	String GetFile(String dialogName)
4961	5483	{
4962		- if (GrafreeD.standAlone)
	5484	+ if (Grafreed.standAlone)
4963	5485	{
4964	5486	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4965	5487	browser.show();
..	..	@@ -5027,7 +5549,28 @@
5027	5549	cButton clearpanelButton;
5028	5550	cButton unselectButton;
5029	5551
	5552	+ cButton restoreCameraButton;
	5553	+
	5554	+ cButton saveButton;
5030	5555	cButton oneStepButton;
	5556	+
	5557	+ cButton groupButton;
	5558	+ cButton ungroupButton;
	5559	+ cButton compositeButton;
	5560	+ cButton switchButton;
	5561	+ cButton loopButton;
	5562	+ cButton textureButton;
	5563	+
	5564	+ cButton gridButton;
	5565	+ cButton boxButton;
	5566	+ cButton sphereButton;
	5567	+ cButton coneButton;
	5568	+ cButton torusButton;
	5569	+ cButton superButton;
	5570	+ cButton kleinButton;
	5571	+ cButton particlesButton;
	5572	+ cButton overlayButton;
	5573	+ cButton lightButton;
5031	5574
5032	5575	cButton screenfitButton;
5033	5576	cButton screenfitpointButton;
..	..	@@ -5040,14 +5583,6 @@
5040	5583
5041	5584	cButton setsupportButton;
5042	5585
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	5586	//
5052	5587	//Composite
5053	5588	Object3D // to do !!
..	..	@@ -5057,9 +5592,11 @@
5057	5592	//JTree jTree;
5058	5593	private MenuItem lookAtItem;
5059	5594	private MenuItem lookFromItem;
5060		- private MenuItem switchItem;
	5595	+ private MenuItem switchViewItem;
5061	5596	private MenuItem cutItem;
5062		- private MenuItem duplicateItem;
	5597	+ private MenuItem undoItem;
	5598	+ private MenuItem redoItem;
	5599	+ private JMenuItem duplicateItem;
5063	5600	private MenuItem cloneItem;
5064	5601	private MenuItem cloneSupportItem;
5065	5602	private MenuItem overwriteGeoItem;
..	..	@@ -5072,7 +5609,7 @@
5072	5609	private MenuItem linkverticesItem;
5073	5610	private MenuItem relinkverticesItem;
5074	5611	private MenuItem setMasterItem;
5075		- private MenuItem resetMeshItem;
	5612	+ private MenuItem resetAllItem;
5076	5613	private MenuItem stepAllItem;
5077	5614	private MenuItem revertMeshItem;
5078	5615	private MenuItem poseMeshItem;
..	..	@@ -5122,6 +5659,10 @@
5122	5659	private MenuItem showleavesItem;
5123	5660	private MenuItem markleavesItem;
5124	5661	private MenuItem unmarkleavesItem;
	5662	+ private MenuItem rewindleavesItem;
	5663	+ private MenuItem unrewindleavesItem;
	5664	+ private MenuItem randomleavesItem;
	5665	+ private MenuItem unrandomleavesItem;
5125	5666
5126	5667	private MenuItem flipVItem;
5127	5668	private MenuItem unflipVItem;
..	..	@@ -5133,15 +5674,17 @@
5133	5674	private MenuItem panoTexturesItem;
5134	5675
5135	5676	private MenuItem resetCentroidItem;
5136		- private MenuItem transformgeometryItem;
	5677	+ private MenuItem resetCentroidXZItem;
5137	5678	private MenuItem resetTransformItem;
	5679	+ private MenuItem transformGeometryItem;
	5680	+ private MenuItem transformChildrenItem;
5138	5681	private MenuItem hideItem;
5139	5682	private MenuItem grabItem;
5140	5683	private MenuItem backItem;
5141	5684	private MenuItem frontItem;
5142	5685	private MenuItem cameraItem;
5143	5686	private MenuItem compositeItem;
5144		- private MenuItem randomItem;
	5687	+ private MenuItem switchItem;
5145	5688	private MenuItem physicsItem;
5146	5689	private MenuItem frameselectorItem;
5147	5690	private MenuItem scriptNodeItem;
..	..	@@ -5203,11 +5746,6 @@
5203	5746	private MenuItem doubleItem;
5204	5747	private MenuItem tripleItem;
5205	5748
5206		- private MenuItem importGFDItem;
5207		- private MenuItem importVRMLX3DItem;
5208		- private MenuItem import3DSItem;
5209		- private MenuItem importOBJItem;
5210		-
5211	5749	private MenuItem computeAOItem;
5212	5750	private MenuItem recompileItem;
5213	5751	private MenuItem editScriptItem;
..	..	@@ -5217,4 +5755,8 @@
5217	5755	private MenuItem analyzeItem;
5218	5756	private MenuItem dumpItem;
5219	5757	//boolean freezemodel = false;
	5758	+
	5759	+ Menu cameraMenu;
	5760	+ MenuItem editCameraItem;
	5761	+ MenuItem restoreCameraItem;
5220	5762	}