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