~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -74,7 +74,7 @@
74	74	this.copy = this.group = copy;
75	75	//selectees = this.group.selectees;
76	76
77		- SetupMenu2(objEditor);
	77	+ SetupMenu2(this); //objEditor);
78	78	SetupUI2(objEditor);
79	79	objEditor.SetupUI(true);
80	80	SetupViews(objEditor);
..	..	@@ -98,14 +98,14 @@
98	98
99	99	void CloneClipboard(boolean supports)
100	100	{
101		- assert(GrafreeD.clipboard.parent == null);
102		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
103		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
105		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	101	+ assert(Grafreed.clipboard.parent == null);
	102	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	103	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	104	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	105	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	106	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	108	+ Grafreed.clipboard.get(0).parent = keepparent;
109	109	}
110	110
111	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +119,7 @@
119	119	// obj.support = null;
120	120	if (!supports)
121	121	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	122	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	123	obj.parent = parent;
124	124	// obj.support = support;
125	125	// clone.support = support; // aout 2013
..	..	@@ -148,28 +148,21 @@
148	148
149	149	//JTextField nameField;
150	150
151		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
152	152	{
153		- if (Globals.ADVANCED)
154		- {
155		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
156		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
157		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
158		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
159		- oe.cameraMenu.add("-");
160		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
161		- openWindowItem.addActionListener(this);
162		- editLeafItem.addActionListener(this);
163		- lookAtItem.addActionListener(this);
164		- //lookFromItem.addActinoListener(this);
165		- //switchItem.addActionListener(this);
166		- }
167		-
	153	+ oe.jTree = new cTree();
	154	+
168	155	Menu menu;
169	156	oe.menuBar.add(menu = new Menu("Edit"));
170	157	//editItem = menu.add(new MenuItem("Edit"));
171	158	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	159	+
	160	+// undoItem = menu.add(new MenuItem("Undo"));
	161	+// undoItem.addActionListener(this);
	162	+// redoItem = menu.add(new MenuItem("Redo"));
	163	+// redoItem.addActionListener(this);
	164	+// menu.add("-");
	165	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	166	duplicateItem.addActionListener(this);
174	167	cloneItem = menu.add(new MenuItem("Clone"));
175	168	cloneItem.addActionListener(this);
..	..	@@ -185,7 +178,6 @@
185	178	copyItem.addActionListener(this);
186	179	pasteItem = menu.add(new MenuItem("Paste"));
187	180	pasteItem.addActionListener(this);
188		- menu.add("-");
189	181
190	182	menu.add("-");
191	183	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -206,14 +198,97 @@
206	198	clearAllItem = menu.add(new MenuItem("Clear All"));
207	199	clearAllItem.addActionListener(this);
208	200	}
	201	+
	202	+ menuBar.add(cameraMenu = new Menu("View"));
	203	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	204	+ //zBufferItem.addActionListener(this);
	205	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	206	+ //normalLensItem.addActionListener(this);
	207	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ restoreCameraItem.addActionListener(this);
	209	+
	210	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	211	+// toggleFullScreenItem.addItemListener(this);
	212	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	213	+// cameraMenu.add("-");
	214	+//
	215	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	216	+// toggleTextureItem.addItemListener(this);
	217	+// toggleTextureItem.setState(CameraPane.textureon);
	218	+//
	219	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	220	+// toggleSwitchItem.addItemListener(this);
	221	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	222	+
	223	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	224	+ toggleHandleItem.addItemListener(this);
	225	+ toggleHandleItem.setState(CameraPane.HANDLES);
	226	+
	227	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	228	+ togglePaintItem.addItemListener(this);
	229	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	230	+
	231	+ if (Globals.ADVANCED)
	232	+ {
	233	+ cameraMenu.add("-");
	234	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	235	+ toggleLiveItem.addItemListener(this);
	236	+ toggleLiveItem.setState(Globals.isLIVE());
209	237
	238	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	239	+ stepItem.addActionListener(this);
	240	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	241	+ // toggleDLItem.addItemListener(this);
	242	+ // toggleDLItem.setState(false);
	243	+
	244	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	245	+ toggleRenderItem.addItemListener(this);
	246	+ toggleRenderItem.setState(!CameraPane.frozen);
	247	+
	248	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	249	+ toggleDebugItem.addItemListener(this);
	250	+ toggleDebugItem.setState(Globals.DEBUG);
	251	+
	252	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	253	+ toggleFrustumItem.addItemListener(this);
	254	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	255	+
	256	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	257	+ toggleFootContactItem.addItemListener(this);
	258	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	259	+
	260	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	261	+ toggleTimelineItem.addItemListener(this);
	262	+ }
	263	+
	264	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	265	+// toggleRootItem.addItemListener(this);
	266	+// toggleRootItem.setState(false);
	267	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	268	+// animationItem.addItemListener(this);
	269	+// animationItem.setState(CameraPane.ANIMATION);
	270	+ cameraMenu.add("-");
	271	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	272	+ editCameraItem.addActionListener(this);
	273	+
	274	+ if (Globals.ADVANCED)
	275	+ {
	276	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	277	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	278	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	279	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	280	+ oe.cameraMenu.add("-");
	281	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	282	+ openWindowItem.addActionListener(this);
	283	+ editLeafItem.addActionListener(this);
	284	+ lookAtItem.addActionListener(this);
	285	+ //lookFromItem.addActinoListener(this);
	286	+ //switchViewItem.addActionListener(this);
	287	+ }
	288	+
210	289	oe.menuBar.add(menu = new Menu("Setting"));
211	290	if (Globals.ADVANCED)
212	291	{
213		- resetMeshItem = menu.add(new MenuItem("Reset All"));
214		- resetMeshItem.addActionListener(this);
215		- stepAllItem = menu.add(new MenuItem("Step All"));
216		- stepAllItem.addActionListener(this);
217	292	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218	293	revertMeshItem.addActionListener(this);
219	294	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -253,21 +328,29 @@
253	328	}
254	329
255	330	oe.menuBar.add(menu = new Menu("Group"));
256		- grabItem = menu.add(new MenuItem("Grab"));
257		- grabItem.addActionListener(this);
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
258	333	backItem = menu.add(new MenuItem("Back"));
259	334	backItem.addActionListener(this);
260	335	frontItem = menu.add(new MenuItem("Front"));
261	336	frontItem.addActionListener(this);
262		- compositeItem = menu.add(new MenuItem("Composite"));
263		- compositeItem.addActionListener(this);
	337	+// compositeItem = menu.add(new MenuItem("Composite"));
	338	+// compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
264	342	hideItem = menu.add(new MenuItem("Hidden Group"));
265	343	hideItem.addActionListener(this);
	344	+ }
266	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
267	346	ungroupItem.addActionListener(this);
268		- menu.add("-");
269		- randomItem = menu.add(new MenuItem("Switch node"));
270		- randomItem.addActionListener(this);
	347	+
	348	+// menu.add("-");
	349	+//
	350	+// switchItem = menu.add(new MenuItem("Switch node"));
	351	+// switchItem.addActionListener(this);
	352	+ if (Globals.ADVANCED)
	353	+ {
271	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
272	355	switchGeoItem.addActionListener(this);
273	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -275,8 +358,6 @@
275	358	morphItem = menu.add(new MenuItem("Morph Group"));
276	359	morphItem.addActionListener(this);
277	360
278		- if (Globals.ADVANCED)
279		- {
280	361	menu.add("-");
281	362	physicsItem = menu.add(new MenuItem("Physics"));
282	363	physicsItem.addActionListener(this);
..	..	@@ -284,22 +365,20 @@
284	365	frameselectorItem.addActionListener(this);
285	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
286	367	scriptNodeItem.addActionListener(this);
287		- cameraItem = menu.add(new MenuItem("Camera"));
288		- cameraItem.addActionListener(this);
289	368	}
290	369
291	370	oe.menuBar.add(menu = new Menu("Object"));
292		- textureItem = menu.add(new MenuItem("Texture"));
293		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
294	373	billboardItem = menu.add(new MenuItem("Billboard"));
295	374	billboardItem.addActionListener(this);
296	375	csgItem = menu.add(new MenuItem("CSG"));
297	376	csgItem.addActionListener(this);
298		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	377	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
299	378	shadowXItem.addActionListener(this);
300		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	379	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
301	380	shadowYItem.addActionListener(this);
302		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	381	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
303	382	shadowZItem.addActionListener(this);
304	383	if (Globals.ADVANCED)
305	384	{
..	..	@@ -318,8 +397,12 @@
318	397	resetTransformItem.addActionListener(this);
319	398	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
320	399	resetCentroidItem.addActionListener(this);
321		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
322		- transformgeometryItem.addActionListener(this);
	400	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	401	+ resetCentroidXZItem.addActionListener(this);
	402	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	403	+ transformGeometryItem.addActionListener(this);
	404	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	405	+ transformChildrenItem.addActionListener(this);
323	406
324	407	oe.menuBar.add(menu = new Menu("Geometry"));
325	408	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -368,6 +451,10 @@
368	451	oe.menuBar.add(menu = new Menu("Attributes"));
369	452	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
370	453	clearMaterialsItem.addActionListener(this);
	454	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	455	+ resetAllItem.addActionListener(this);
	456	+ stepAllItem = menu.add(new MenuItem("Step All"));
	457	+ stepAllItem.addActionListener(this);
371	458	menu.add("-");
372	459	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
373	460	liveleavesItem.addActionListener(this);
..	..	@@ -388,6 +475,14 @@
388	475	markleavesItem.addActionListener(this);
389	476	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
390	477	unmarkleavesItem.addActionListener(this);
	478	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	479	+ rewindleavesItem.addActionListener(this);
	480	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	481	+ unrewindleavesItem.addActionListener(this);
	482	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	483	+ randomleavesItem.addActionListener(this);
	484	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	485	+ unrandomleavesItem.addActionListener(this);
391	486	menu.add("-");
392	487	flipVItem = menu.add(new MenuItem("Flip V"));
393	488	flipVItem.addActionListener(this);
..	..	@@ -422,41 +517,41 @@
422	517	sortbysizeItem.addActionListener(this);
423	518	sortbynameItem = menu.add(new MenuItem("Sort by name"));
424	519	sortbynameItem.addActionListener(this);
	520	+ menu.add("-");
	521	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	522	+ shareGeometriesItem.addActionListener(this);
	523	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	524	+ mergeGeometriesItem.addActionListener(this);
425	525	if (Globals.ADVANCED)
426	526	{
427		- menu.add("-");
	527	+ // Pretty much the same as duplicate and clone.
428	528	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
429	529	extractGeometriesItem.addActionListener(this);
430	530	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
431	531	cloneGeometriesItem.addActionListener(this);
432		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
433		- shareGeometriesItem.addActionListener(this);
434		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
435		- mergeGeometriesItem.addActionListener(this);
436	532	}
437	533
438	534	oe.menuBar.add(menu = new Menu("Insert"));
439	535	buildCreateMenu(menu);
440	536
441		- oe.menuBar.add(menu = new Menu("Include"));
442		- importOBJItem = menu.add(new MenuItem("OBJ file..."));
443		- importOBJItem.addActionListener(this);
444		- menu.add("-");
445		- import3DSItem = menu.add(new MenuItem("3DS file..."));
446		- import3DSItem.addActionListener(this);
447		- menu.add("-");
448		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
449		- importVRMLX3DItem.addActionListener(this);
450		- menu.add("-");
451		- importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
452		- importGFDItem.addActionListener(this);
453		-
454	537	oe.menuBar.add(menu = new Menu("Tools"));
455	538	buildToolsMenu(menu);
456	539	}
457	540
458	541	void SetupUI2(ObjEditor oe)
459	542	{
	543	+ // June 2019
	544	+ if (oe == null)
	545	+ {
	546	+ //super.SetupUI2(this);
	547	+ //return;
	548	+ }
	549	+
	550	+ if (copy != group)
	551	+ {
	552	+ //super.SetupUI2(this);
	553	+ }
	554	+
460	555	//new Exception().printStackTrace();
461	556
462	557	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -485,97 +580,213 @@
485	580	oe.radioPanel.add(dummyButton);
486	581	oe.buttonGroup.add(dummyButton);
487	582	*/
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 2;
	586	+
488	587	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
489	588
490		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
491		- liveCB.setToolTipText("Enabled animation");
	589	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	590	+ //minButton.setToolTipText("Minimize window");
	591	+ //minButton.addActionListener(this);
	592	+
	593	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	594	+ maxButton.setToolTipText("Maximize window");
	595	+ maxButton.addActionListener(this);
	596	+
	597	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	598	+ fullButton.setToolTipText("Full-screen window");
	599	+ fullButton.addActionListener(this);
	600	+
	601	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	602	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	603	+ restoreCameraButton.addActionListener(this);
	604	+
	605	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	606	+ undoButton.setToolTipText("Undo changes");
	607	+ undoButton.addActionListener(this);
	608	+ undoButton.setEnabled(false);
	609	+
	610	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	611	+ redoButton.setToolTipText("Redo changes");
	612	+ redoButton.addActionListener(this);
	613	+ redoButton.setEnabled(false);
	614	+
	615	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	616	+ saveButton.setToolTipText("Save changes");
	617	+ saveButton.addActionListener(this);
	618	+
	619	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	620	+ liveCB.setToolTipText("Enable animation");
492	621	liveCB.addItemListener(this);
493	622
494		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	623	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
495	624	oneStepButton.setToolTipText("Animate one step forward");
496	625	oneStepButton.addActionListener(this);
497	626
498		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	627	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
499	628	fastCB.setToolTipText("Fast mode");
500	629	fastCB.addItemListener(this);
501	630
502		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
503		- trackCB.setToolTipText("Enable tracking");
504		- trackCB.addItemListener(this);
505		-
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	631	+ //oe.toolboxPanel.Return();
	632	+
	633	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
507	634	screenfitButton.setToolTipText("Screen fit");
508	635	screenfitButton.addActionListener(this);
	636	+
	637	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	638	+// trackCB.setToolTipText("Enable tracking");
	639	+// trackCB.addItemListener(this);
509	640
510	641	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
511	642	// screenfitpointButton.addActionListener(this);
512	643
513	644	if (Globals.ADVANCED)
514	645	{
515		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	646	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
516	647	snapobjectButton.addActionListener(this);
517	648	snapobjectButton.setToolTipText("Snap Object");
518	649	}
519	650
520		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
521		- flashSelectionButton.setToolTipText("Show selection");
522		- flashSelectionButton.addActionListener(this);
	651	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
523	652
524		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
525		-
526		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	653	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
527	654	twoButton.setToolTipText("Show center view only");
528	655	twoButton.addActionListener(this);
529		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	656	+ this.fullscreenLayout = twoButton;
	657	+
	658	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
530	659	fourButton.addActionListener(this);
531	660	fourButton.setToolTipText("Show left panel only");
532		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	661	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
533	662	sixButton.setToolTipText("2-column layout left");
534	663	sixButton.addActionListener(this);
535		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
536	665	threeButton.setToolTipText("2-column layout right");
537	666	threeButton.addActionListener(this);
538		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	667	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
539	668	sevenButton.setToolTipText("3-column layout");
540	669	sevenButton.addActionListener(this);
541	670	//
542	671
543		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	672	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
544	673	rootButton.setToolTipText("Edit selection in new tab");
545	674	rootButton.addActionListener(this);
546	675
547		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	676	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
548	677	closeButton.setToolTipText("Close tab");
549	678	closeButton.addActionListener(this);
550	679	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
551	680	//clearButton.addActionListener(this);
552		-
553		- cGridBag commandsPanel = new cGridBag();
	681	+
	682	+ // INSERT
	683	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	684	+ gridButton.setToolTipText("Create grid");
	685	+ gridButton.addActionListener(this);
	686	+
	687	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	688	+ boxButton.setToolTipText("Create box");
	689	+ boxButton.addActionListener(this);
	690	+
	691	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	692	+ sphereButton.setToolTipText("Create sphere");
	693	+ sphereButton.addActionListener(this);
	694	+
	695	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	696	+ coneButton.setToolTipText("Create cone");
	697	+ coneButton.addActionListener(this);
	698	+
	699	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ torusButton.setToolTipText("Create torus");
	701	+ torusButton.addActionListener(this);
	702	+
	703	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	704	+ superButton.setToolTipText("Create superellipsoid");
	705	+ superButton.addActionListener(this);
	706	+
	707	+ if (Globals.ADVANCED)
	708	+ {
	709	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	710	+ kleinButton.setToolTipText("Create Klein bottle");
	711	+ kleinButton.addActionListener(this);
	712	+ }
554	713
555		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
556		- editButton.setToolTipText("Edit selection");
	714	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	715	+ particlesButton.setToolTipText("Create particle system");
	716	+ particlesButton.addActionListener(this);
	717	+
	718	+ oe.toolboxPanel.Return();
	719	+
	720	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	721	+ groupButton.setToolTipText("Create group");
	722	+ groupButton.addActionListener(this);
	723	+
	724	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	725	+ compositeButton.setToolTipText("Create composite");
	726	+ compositeButton.addActionListener(this);
	727	+
	728	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	729	+ switchButton.setToolTipText("Create switch");
	730	+ switchButton.addActionListener(this);
	731	+
	732	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	733	+ loopButton.setToolTipText("Create loop");
	734	+ loopButton.addActionListener(this);
	735	+
	736	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	737	+ textureButton.setToolTipText("Create texture");
	738	+ textureButton.addActionListener(this);
	739	+
	740	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	741	+ overlayButton.setToolTipText("Create overlay");
	742	+ overlayButton.addActionListener(this);
	743	+
	744	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	745	+ lightButton.setToolTipText("Create light");
	746	+ lightButton.addActionListener(this);
	747	+
	748	+ for (int i=6; --i>=0;)
	749	+ {
	750	+ oe.toolboxPanel.Return();
	751	+ oe.toolboxPanel.add(new cGridBag());
	752	+ oe.toolboxPanel.add(new cGridBag());
	753	+ oe.toolboxPanel.add(new cGridBag());
	754	+ oe.toolboxPanel.add(new cGridBag());
	755	+ oe.toolboxPanel.add(new cGridBag());
	756	+ oe.toolboxPanel.add(new cGridBag());
	757	+ oe.toolboxPanel.add(new cGridBag());
	758	+ }
	759	+
	760	+ // EDIT panel
	761	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	762	+ editButton.setToolTipText("Pin selection controls");
557	763	editButton.addActionListener(this);
558	764
559		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
560		- uneditButton.setToolTipText("Unedit selection");
	765	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	766	+ uneditButton.setToolTipText("Remove selection controls");
561	767	uneditButton.addActionListener(this);
562	768
563		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
564		- allParamsButton.setToolTipText("Edit all params");
	769	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	770	+ allParamsButton.setToolTipText("Show all controle");
565	771	allParamsButton.addActionListener(this);
566	772
567		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	773	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
568	774	clearPanelButton.setToolTipText("Clear edit panel");
569	775	clearPanelButton.addActionListener(this);
570	776
571		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	777	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
572	778	unselectButton.setToolTipText("Unselect");
573	779	unselectButton.addActionListener(this);
574	780
575		- commandsPanel.preferredHeight = 1;
	781	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	782	+ flashSelectionButton.setToolTipText("Highlight selection");
	783	+ flashSelectionButton.addActionListener(this);
576	784
577		- oe.treePanel.add(commandsPanel);
578		- oe.treePanel.Return();
	785	+ editCommandsPanel.preferredHeight = 1;
	786	+
	787	+ SetPinStates(false);
	788	+// oe.treePanel.add(commandsPanel);
	789	+// oe.treePanel.Return();
579	790
580	791	// oe.aConstraints.gridx += 1;
581	792	// oe.aConstraints.weighty = 0;
..	..	@@ -592,27 +803,12 @@
592	803
593	804	JScrollPane jSP;
594	805	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
595		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	806	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
596	807	ResetModel();
597	808
598	809	oe.treePanel.add(jSPPanel);
599	810	oe.treePanel.Return();
600	811
601		- cGridBag copyOptionsPanel = new cGridBag();
602		-
603		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
604		- colorCB.setToolTipText("Copy color when dropped");
605		- colorCB.addItemListener(this);
606		-
607		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
608		- materialCB.setToolTipText("Copy material when dropped");
609		- materialCB.addItemListener(this);
610		-
611		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
612		- textureCB.setToolTipText("Copy texture when dropped");
613		- textureCB.addItemListener(this);
614		-
615		- copyOptionsPanel.preferredHeight = 1;
616	812	oe.treePanel.add(copyOptionsPanel);
617	813	oe.treePanel.Return();
618	814
..	..	@@ -643,15 +839,29 @@
643	839
644	840	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
645	841	{
	842	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	843	+ colorCB.setToolTipText("Copy color when dropped");
	844	+ colorCB.addItemListener(this);
	845	+
	846	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	847	+ materialCB.setToolTipText("Copy material when dropped");
	848	+ materialCB.addItemListener(this);
	849	+
	850	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	851	+ textureCB.setToolTipText("Copy texture when dropped");
	852	+ textureCB.addItemListener(this);
	853	+
	854	+ panel.Return();
	855	+
646	856	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
647	857	boxCB.setToolTipText("Display bounding boxes");
648	858	boxCB.addItemListener(this);
649	859
650	860	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
651		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	861	+ zoomBoxCB.setToolTipText("Display only for wheel");
652	862	zoomBoxCB.addItemListener(this);
653	863
654		- if (Globals.ADVANCED)
	864	+ if (true) // Globals.ADVANCED)
655	865	{
656	866	panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
657	867	supportCB.setToolTipText("Enable rigging");
..	..	@@ -660,6 +870,8 @@
660	870	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
661	871	// localCB.addItemListener(this);
662	872
	873	+ panel.Return();
	874	+
663	875	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
664	876	crowdCB.setToolTipText("Used for crowds");
665	877	crowdCB.addItemListener(this);
..	..	@@ -676,6 +888,8 @@
676	888	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
677	889	// speakerMocapCB.addItemListener(this);
678	890
	891	+ panel.Return();
	892	+
679	893	if (false)
680	894	{
681	895	// handled in scripts
..	..	@@ -690,32 +904,72 @@
690	904	//constraints.gridy += 1;
691	905	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
692	906	smoothfocusCB.addItemListener(this);
	907	+ panel.Return();
693	908	}
694	909
695	910	//constraints.gridx += 1;
696	911	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
697	912	// debugCB.addItemListener(this);
698	913
	914	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	915	+ trackCB.setToolTipText("Enable tracking target");
	916	+ trackCB.addItemListener(this);
	917	+
699	918	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	919	+ oeilCB.setToolTipText("Move camera when tracking");
700	920	oeilCB.addItemListener(this);
701	921
	922	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	923	+ shadowCB.setToolTipText("When live compute shadows");
	924	+ shadowCB.addItemListener(this);
	925	+
	926	+ panel.Return();
	927	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	928	+ toggleTextureCB.setToolTipText("Load textures");
	929	+ toggleTextureCB.addItemListener(this);
	930	+
	931	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	932	+ toggleSwitchCB.setToolTipText("Use switch");
	933	+ toggleSwitchCB.addItemListener(this);
	934	+
	935	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	936	+ autosaveCB.setToolTipText("On structure change");
	937	+ autosaveCB.addItemListener(this);
	938	+
	939	+ panel.Return();
	940	+ if (Globals.ADVANCED)
	941	+ {
702	942	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
703	943	lookAtCB.setToolTipText("Look-at target");
704	944	lookAtCB.addItemListener(this);
	945	+ }
705	946
706	947	}
707	948
708	949	cGridBag fill = new cGridBag();
709		-
710	950	fill.preferredHeight = 200;
	951	+ cGridBag fill2 = new cGridBag();
	952	+ fill2.preferredHeight = 200;
	953	+ cGridBag fill3 = new cGridBag();
	954	+ fill3.preferredHeight = 200;
711	955
712	956	panel.add(fill);
	957	+ panel.add(fill2);
	958	+ panel.add(fill3);
713	959
714	960	}
715	961
716	962	void EditObject(Object3D obj)
717	963	{
718	964	cRadio radioButton = new cRadio(obj.name);
	965	+
	966	+ // Patch to avoid bug with transparency.
	967	+ radioButton.hadMaterial = obj.material != null;
	968	+ if (!radioButton.hadMaterial)
	969	+ {
	970	+ obj.material = new cMaterial();
	971	+ }
	972	+
719	973	radioButton.SetObject(obj);
720	974	radioButton.layout = sevenButton;
721	975	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -724,8 +978,11 @@
724	978	buttonGroup.add(radioButton);
725	979	radioButton.doClick();
726	980	}
	981	+
727	982	void SetupViews(ObjEditor oe)
728	983	{
	984	+ theFrame = this;
	985	+
729	986	oe.SetupViews();
730	987
731	988	System.out.println("SetupViews");
..	..	@@ -734,23 +991,27 @@
734	991	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
735	992	}
736	993
737		- JCheckBox liveCB;
738		- JCheckBox supportCB;
739		- JCheckBox localCB;
740		- JCheckBox crowdCB;
741		- JCheckBox smoothCB;
742		- JCheckBox fastCB;
743		- JCheckBox slowCB;
744		- JCheckBox boxCB;
745		- JCheckBox zoomBoxCB;
746		- JCheckBox trackCB;
747		- JCheckBox smoothfocusCB;
	994	+ cToggleButton liveCB;
	995	+ cCheckBox supportCB;
	996	+ cCheckBox localCB;
	997	+ cCheckBox crowdCB;
	998	+ cCheckBox smoothCB;
	999	+ cToggleButton fastCB;
	1000	+ cCheckBox slowCB;
	1001	+ cCheckBox boxCB;
	1002	+ cCheckBox zoomBoxCB;
	1003	+ //cToggleButton trackCB;
	1004	+ cCheckBox trackCB;
	1005	+ cCheckBox smoothfocusCB;
748	1006	// JCheckBox speakerMocapCB;
749		- JCheckBox speakerCameraCB;
750		- JCheckBox speakerFocusCB;
751		- JCheckBox debugCB;
752		- JCheckBox oeilCB;
753		- JCheckBox lookAtCB;
	1007	+ cCheckBox speakerCameraCB;
	1008	+ cCheckBox speakerFocusCB;
	1009	+ cCheckBox debugCB;
	1010	+
	1011	+ cCheckBox oeilCB;
	1012	+ cCheckBox shadowCB;
	1013	+ cCheckBox autosaveCB;
	1014	+ cCheckBox lookAtCB;
754	1015
755	1016	// static int COLOR = 1;
756	1017	// static int MATERIAL = 2;
..	..	@@ -758,9 +1019,9 @@
758	1019
759	1020	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
760	1021
761		- JCheckBox colorCB;
762		- JCheckBox materialCB;
763		- JCheckBox textureCB;
	1022	+ cCheckBox colorCB;
	1023	+ cCheckBox materialCB;
	1024	+ cCheckBox textureCB;
764	1025
765	1026	public void itemStateChanged(ItemEvent e)
766	1027	{
..	..	@@ -788,6 +1049,7 @@
788	1049	} else if(e.getSource() == liveCB)
789	1050	{
790	1051	cameraView.ToggleLive();
	1052	+ refreshContents(false);
791	1053	}
792	1054	else if(e.getSource() == supportCB)
793	1055	{
..	..	@@ -852,6 +1114,14 @@
852	1114	{
853	1115	cameraView.ToggleOeil();
854	1116	}
	1117	+ else if(e.getSource() == shadowCB)
	1118	+ {
	1119	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1120	+ }
	1121	+ else if(e.getSource() == autosaveCB)
	1122	+ {
	1123	+ Globals.SAVEONMAKE ^= true;
	1124	+ }
855	1125	else if(e.getSource() == lookAtCB)
856	1126	{
857	1127	cameraView.ToggleLookAt();
..	..	@@ -868,7 +1138,8 @@
868	1138
869	1139	/**/
870	1140	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
871		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1141	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1142	+ TreePath path = objEditor.jTree.getSelectionPath();
872	1143	if ((path == null) \|\| (path.getPathCount() <= 1)) {
873	1144	// We can't move the root node or an empty selection
874	1145	return;
..	..	@@ -940,7 +1211,9 @@
940	1211	// objEditor.DropFile((java.io.File[]) object, true);
941	1212	// return;
942	1213	// }
943		- if (string.charAt(0) == '/')
	1214	+
	1215	+ // File path for Mac and Windows
	1216	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
944	1217	{
945	1218	// file(s)
946	1219	String[] names = string.split("\n");
..	..	@@ -967,7 +1240,7 @@
967	1240
968	1241	flashIt = false;
969	1242	CameraPane pane = (CameraPane) target;
970		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1243	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
971	1244	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
972	1245
973	1246	if (group.selection.size() == 1)
..	..	@@ -983,23 +1256,33 @@
983	1256
984	1257	assert target == objEditor.jTree;
985	1258	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1259	+ Object3D destinationLeaf;
986	1260	try {
987		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1261	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
988	1262	} catch (Exception e) {
989	1263	System.out.println("destinationPath : " + destinationPath);
990	1264	return;
991	1265	}
992	1266
993		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1267	+ for (int i=group.selection.size(); --i>=0;)
994	1268	{
	1269	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1270	+
	1271	+ // Cannot move into itself
	1272	+ if (child == destinationLeaf)
	1273	+ return;
	1274	+ }
	1275	+
	1276	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1277	+// {
995	1278	loadClipboard(true);
996	1279	objEditor.jTree.setSelectionPath(destinationPath);
997	1280	pasteInto(false, false);
998		- } else {
999		- loadClipboard(false);
1000		- objEditor.jTree.setSelectionPath(destinationPath);
1001		- pasteInto(false, false); // true); // ???
1002		- }
	1281	+// } else {
	1282	+// loadClipboard(false);
	1283	+// objEditor.jTree.setSelectionPath(destinationPath);
	1284	+// pasteInto(false, false); // true); // ???
	1285	+// }
1003	1286	}
1004	1287	public void dropActionChanged(DropTargetDragEvent dtde)
1005	1288	// Called if the user has modified the current drop gesture
..	..	@@ -1104,22 +1387,30 @@
1104	1387	{
1105	1388	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1106	1389	//heightFieldItem.addActionListener(this);
1107		- gridItem = menu.add(new MenuItem("Grid"));
1108		- gridItem.addActionListener(this);
1109		- rectoidItem = menu.add(new MenuItem("Box"));
1110		- rectoidItem.addActionListener(this);
1111		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1112		- ellipsoidItem.addActionListener(this);
1113		- coneItem = menu.add(new MenuItem("Cone"));
1114		- coneItem.addActionListener(this);
1115		- torusItem = menu.add(new MenuItem("Torus"));
1116		- torusItem.addActionListener(this);
1117		- superItem = menu.add(new MenuItem("Superellipsoid"));
1118		- superItem.addActionListener(this);
	1390	+// gridItem = menu.add(new MenuItem("Grid"));
	1391	+// gridItem.addActionListener(this);
	1392	+// rectoidItem = menu.add(new MenuItem("Box"));
	1393	+// rectoidItem.addActionListener(this);
	1394	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1395	+// ellipsoidItem.addActionListener(this);
	1396	+// coneItem = menu.add(new MenuItem("Cone"));
	1397	+// coneItem.addActionListener(this);
	1398	+// torusItem = menu.add(new MenuItem("Torus"));
	1399	+// torusItem.addActionListener(this);
	1400	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1401	+// superItem.addActionListener(this);
	1402	+
	1403	+ cameraItem = menu.add(new MenuItem("Camera"));
	1404	+ cameraItem.addActionListener(this);
	1405	+
	1406	+ if (!Globals.ADVANCED)
	1407	+ {
1119	1408	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1120	1409	kleinItem.addActionListener(this);
1121		- particleItem = menu.add(new MenuItem("Particle system"));
1122		- particleItem.addActionListener(this);
	1410	+ }
	1411	+
	1412	+// particleItem = menu.add(new MenuItem("Particle system"));
	1413	+// particleItem.addActionListener(this);
1123	1414	if (Globals.ADVANCED)
1124	1415	{
1125	1416	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1145,15 +1436,15 @@
1145	1436	}
1146	1437	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1147	1438	bezierItem.addActionListener(this);
1148		- overlayItem = menu.add(new MenuItem("Overlay"));
1149		- overlayItem.addActionListener(this);
1150		- lightItem = menu.add(new MenuItem("Light"));
1151		- lightItem.addActionListener(this);
	1439	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1440	+// overlayItem.addActionListener(this);
	1441	+// lightItem = menu.add(new MenuItem("Light"));
	1442	+// lightItem.addActionListener(this);
1152	1443	menu.add("-");
1153	1444	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1154	1445	//superLoopItem.addActionListener(this);
1155		- loopItem = menu.add(new MenuItem("Loop"));
1156		- loopItem.addActionListener(this);
	1446	+// loopItem = menu.add(new MenuItem("Loop"));
	1447	+// loopItem.addActionListener(this);
1157	1448	doubleItem = menu.add(new MenuItem("Fork"));
1158	1449	doubleItem.addActionListener(this);
1159	1450	if (Globals.ADVANCED)
..	..	@@ -1193,7 +1484,7 @@
1193	1484	memoryItem.addActionListener(this);
1194	1485	menu.add(analyzeItem = new MenuItem("Analyze"));
1195	1486	analyzeItem.addActionListener(this);
1196		- menu.add(dumpItem = new MenuItem("Dump"));
	1487	+ menu.add(dumpItem = new MenuItem("Print"));
1197	1488	dumpItem.addActionListener(this);
1198	1489	// menu.add(pathItem = new MenuItem("From-to path"));
1199	1490	// pathItem.addActionListener(this);
..	..	@@ -1334,9 +1625,24 @@
1334	1625	shadow.material = new cMaterial(obj.material);
1335	1626	shadow.material.diffuse = 0.0001f;
1336	1627	shadow.material.specular = 0.0001f;
	1628	+ //shadow.projectedVertices[1].x = 300;
1337	1629
1338	1630	makeSomething(shadow);
1339	1631	}
	1632	+
	1633	+ private void ClearUnpinned()
	1634	+ {
	1635	+ //for (Object3D obj : listUI)
	1636	+ for (int i=listUI.size(); --i>=0;)
	1637	+ {
	1638	+ Object3D obj = listUI.elementAt(i);
	1639	+ if (!obj.pinned)
	1640	+ {
	1641	+ obj.CloseUI();
	1642	+ listUI.remove(i);
	1643	+ }
	1644	+ }
	1645	+ }
1340	1646
1341	1647	/**
1342	1648	* applyExample
..	..	@@ -1540,9 +1846,9 @@
1540	1846
1541	1847	void Overwrite(int mask)
1542	1848	{
1543		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1849	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1544	1850	{
1545		- Object3D content = GrafreeD.clipboard.get(0);
	1851	+ Object3D content = Grafreed.clipboard.get(0);
1546	1852
1547	1853	if (content instanceof cGroup && ((cGroup)content).transientlink )
1548	1854	content = ((cGroup)content).get(0);
..	..	@@ -1581,7 +1887,7 @@
1581	1887	{
1582	1888	ScreenFit();
1583	1889	} else
1584		- if (source == switchItem)
	1890	+ if (source == switchViewItem)
1585	1891	{
1586	1892	cVector v1 = new cVector();
1587	1893	cVector v2 = new cVector();
..	..	@@ -1590,11 +1896,11 @@
1590	1896	objEditor.cameraView.renderCamera.setAim(v2, v1);
1591	1897	objEditor.cameraView.repaint();
1592	1898	} else
1593		- if (source == rectoidItem)
	1899	+ if (source == rectoidItem \|\| source == boxButton)
1594	1900	{
1595	1901	makeSomething(new Box());
1596	1902	} else
1597		- if (source == particleItem)
	1903	+ if (source == particleItem \|\| source == particlesButton)
1598	1904	{
1599	1905	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1600	1906	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1673,27 +1979,27 @@
1673	1979
1674	1980	makeSomething(obj);
1675	1981	} else
1676		- if (source == gridItem)
	1982	+ if (source == gridItem \|\| source == gridButton)
1677	1983	{
1678	1984	makeSomething(new Grid());
1679	1985	} else
1680		- if (source == ellipsoidItem)
	1986	+ if (source == ellipsoidItem \|\| source == sphereButton)
1681	1987	{
1682	1988	makeSomething(new Sphere());
1683	1989	} else
1684		- if (source == coneItem)
	1990	+ if (source == coneItem \|\| source == coneButton)
1685	1991	{
1686	1992	makeSomething(new Cone());
1687	1993	} else
1688		- if (source == torusItem)
	1994	+ if (source == torusItem \|\| source == torusButton)
1689	1995	{
1690	1996	makeSomething(new Torus());
1691	1997	} else
1692		- if (source == superItem)
	1998	+ if (source == superItem \|\| source == superButton)
1693	1999	{
1694	2000	makeSomething(new Superellipsoid());
1695	2001	} else
1696		- if (source == kleinItem)
	2002	+ if (source == kleinItem \|\| source == kleinButton)
1697	2003	{
1698	2004	makeSomething(new Klein());
1699	2005	} else
..	..	@@ -1713,7 +2019,7 @@
1713	2019	{
1714	2020	makeSomething(new BezierSurface());
1715	2021	} else
1716		- if (source == overlayItem)
	2022	+ if (source == overlayItem \|\| source == overlayButton)
1717	2023	{
1718	2024	/*
1719	2025	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1761,7 +2067,7 @@
1761	2067	s.setup();
1762	2068	makeSomething(s);
1763	2069	} else
1764		- if (source == lightItem)
	2070	+ if (source == lightItem \|\| source == lightButton)
1765	2071	{
1766	2072	makeSomething(new Light());
1767	2073	} else
..	..	@@ -1811,7 +2117,7 @@
1811	2117
1812	2118	group(g);
1813	2119	} else
1814		- if (source == loopItem)
	2120	+ if (source == loopItem \|\| source == loopButton)
1815	2121	{
1816	2122	Composite csg = new GroupLeaf();
1817	2123	csg.count = 5;
..	..	@@ -1847,31 +2153,6 @@
1847	2153	csg.addChild(child);
1848	2154	child.addChild(csg);
1849	2155	} else
1850		-
1851		- if (source == importGFDItem)
1852		- {
1853		- ImportGFD();
1854		- } else
1855		- if (source == importVRMLX3DItem)
1856		- {
1857		- ImportVRMLX3D();
1858		- } else
1859		- if (source == import3DSItem)
1860		- {
1861		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1862		- } else
1863		- if (source == importOBJItem)
1864		- {
1865		- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1866		- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1867		- browser.setVisible(true);
1868		- String filename = browser.getFile();
1869		- if (filename != null && filename.length() > 0)
1870		- {
1871		- String fullname = browser.getDirectory() + filename;
1872		- makeSomething(ReadOBJ(fullname), true);
1873		- }
1874		- } else
1875	2156	if (source == computeAOItem)
1876	2157	{
1877	2158	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1890,7 +2171,7 @@
1890	2171	if (source == invariantsItem)
1891	2172	{
1892	2173	System.out.println("Invariants:");
1893		- GrafreeD.grafreeD.universe.invariants();
	2174	+ Grafreed.grafreeD.universe.invariants();
1894	2175	} else
1895	2176	if (source == memoryItem)
1896	2177	{
..	..	@@ -1908,6 +2189,30 @@
1908	2189	if (source == dumpItem)
1909	2190	{
1910	2191	DumpObject();
	2192	+ } else
	2193	+ if (source == minButton)
	2194	+ {
	2195	+ Minimize();
	2196	+ } else
	2197	+ if (source == maxButton)
	2198	+ {
	2199	+ Maximize();
	2200	+ } else
	2201	+ if (source == fullButton)
	2202	+ {
	2203	+ ToggleFullScreen();
	2204	+ } else
	2205	+ if (source == undoButton)
	2206	+ {
	2207	+ Undo();
	2208	+ } else
	2209	+ if (source == redoButton)
	2210	+ {
	2211	+ Redo();
	2212	+ } else
	2213	+ if (source == saveButton)
	2214	+ {
	2215	+ Save();
1911	2216	} else
1912	2217	if (source == oneStepButton)
1913	2218	{
..	..	@@ -1963,12 +2268,20 @@
1963	2268	{
1964	2269	loadClipboard(true);
1965	2270	} else
	2271	+ if (source == undoItem)
	2272	+ {
	2273	+ Undo();
	2274	+ } else
	2275	+ if (source == redoItem)
	2276	+ {
	2277	+ Redo();
	2278	+ } else
1966	2279	if (source == duplicateItem)
1967	2280	{
1968		- Object3D keep = GrafreeD.clipboard;
	2281	+ Object3D keep = Grafreed.clipboard;
1969	2282	loadClipboard(false);
1970	2283	paste(false);
1971		- GrafreeD.clipboard = keep;
	2284	+ Grafreed.clipboard = keep;
1972	2285	} else
1973	2286	if (source == cloneItem)
1974	2287	{
..	..	@@ -2188,9 +2501,9 @@
2188	2501	// group.selection.get(0).setMasterThis(content); // should be identity
2189	2502	// refreshContents();
2190	2503	// }
2191		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2504	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2192	2505	{
2193		- Object3D content = GrafreeD.clipboard.get(0);
	2506	+ Object3D content = Grafreed.clipboard.get(0);
2194	2507
2195	2508	if (content instanceof cGroup && ((cGroup)content).transientlink )
2196	2509	content = ((cGroup)content).get(0);
..	..	@@ -2240,9 +2553,9 @@
2240	2553	} else
2241	2554	if (source == setMasterItem)
2242	2555	{
2243		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2556	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2244	2557	{
2245		- Object3D content = GrafreeD.clipboard.get(0);
	2558	+ Object3D content = Grafreed.clipboard.get(0);
2246	2559
2247	2560	if (content instanceof cGroup && ((cGroup)content).transientlink )
2248	2561	content = ((cGroup)content).get(0);
..	..	@@ -2255,9 +2568,9 @@
2255	2568	{
2256	2569	if (group.selection.size() == 1)
2257	2570	{
2258		- if (GrafreeD.clipboard.size() == 1)
	2571	+ if (Grafreed.clipboard.size() == 1)
2259	2572	{
2260		- Object3D content = GrafreeD.clipboard.get(0);
	2573	+ Object3D content = Grafreed.clipboard.get(0);
2261	2574
2262	2575	if (content instanceof cGroup && ((cGroup)content).transientlink )
2263	2576	content = ((cGroup)content).get(0);
..	..	@@ -2274,7 +2587,7 @@
2274	2587	{
2275	2588	RevertMeshes();
2276	2589	} else
2277		- if (source == resetMeshItem)
	2590	+ if (source == resetAllItem)
2278	2591	{
2279	2592	ResetAll();
2280	2593	} else
..	..	@@ -2294,9 +2607,9 @@
2294	2607	{
2295	2608	ClearSelection(true);
2296	2609	} else
2297		- if (source == grabItem)
	2610	+ if (source == grabItem \|\| source == groupButton)
2298	2611	{
2299		- group(new cGroup(), true);
	2612	+ group(new cGroup(), false); // true);
2300	2613	} else
2301	2614	if (source == hideItem)
2302	2615	{
..	..	@@ -2314,11 +2627,11 @@
2314	2627	{
2315	2628	makeSomething(new Camera());
2316	2629	} else
2317		- if (source == compositeItem)
	2630	+ if (source == compositeItem \|\| source == compositeButton)
2318	2631	{
2319	2632	group(new Composite());
2320	2633	} else
2321		- if (source == randomItem)
	2634	+ if (source == switchItem \|\| source == switchButton)
2322	2635	{
2323	2636	RandomNode random = new RandomNode();
2324	2637	group(random);
..	..	@@ -2420,7 +2733,7 @@
2420	2733	{
2421	2734	group(new cLinker());
2422	2735	} else
2423		- if (source == textureItem)
	2736	+ if (source == textureItem \|\| source == textureButton)
2424	2737	{
2425	2738	group(new TextureNode());
2426	2739	} else
..	..	@@ -2440,7 +2753,7 @@
2440	2753	{
2441	2754	CastShadow(2);
2442	2755	} else
2443		- if (source == ungroupItem)
	2756	+ if (source == ungroupItem \|\| source == ungroupButton)
2444	2757	{
2445	2758	//ungroup();
2446	2759	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2462,7 +2775,7 @@
2462	2775	} else
2463	2776	if (source == genNormalsMESHItem)
2464	2777	{
2465		- GenNormals(true); // TODO
	2778	+ GenNormalsMESH();
2466	2779	} else
2467	2780	if (source == genNormalsORGANItem)
2468	2781	{
..	..	@@ -2527,6 +2840,22 @@
2527	2840	if (source == unmarkleavesItem)
2528	2841	{
2529	2842	MarkLeaves(false);
	2843	+ } else
	2844	+ if (source == rewindleavesItem)
	2845	+ {
	2846	+ RewindLeaves(true);
	2847	+ } else
	2848	+ if (source == unrewindleavesItem)
	2849	+ {
	2850	+ RewindLeaves(false);
	2851	+ } else
	2852	+ if (source == randomleavesItem)
	2853	+ {
	2854	+ RandomLeaves(true);
	2855	+ } else
	2856	+ if (source == unrandomleavesItem)
	2857	+ {
	2858	+ RandomLeaves(false);
2530	2859	} else
2531	2860	if (source == flipVItem)
2532	2861	{
..	..	@@ -2612,9 +2941,13 @@
2612	2941	{
2613	2942	SmoothMesh();
2614	2943	} else
2615		- if (source == transformgeometryItem)
	2944	+ if (source == transformGeometryItem)
2616	2945	{
2617	2946	TransformGeometry();
	2947	+ } else
	2948	+ if (source == transformChildrenItem)
	2949	+ {
	2950	+ TransformChildren();
2618	2951	} else
2619	2952	if (source == resetTransformItem)
2620	2953	{
..	..	@@ -2622,7 +2955,11 @@
2622	2955	} else
2623	2956	if (source == resetCentroidItem)
2624	2957	{
2625		- ResetCentroid();
	2958	+ ResetCentroid(true);
	2959	+ } else
	2960	+ if (source == resetCentroidXZItem)
	2961	+ {
	2962	+ ResetCentroid(false);
2626	2963	} else
2627	2964	if (source == resetParentItem)
2628	2965	{
..	..	@@ -2754,6 +3091,10 @@
2754	3091	if (source == twoButton)
2755	3092	{
2756	3093	radio.layout = twoButton;
	3094	+
	3095	+ if (CameraPane.FULLSCREEN)
	3096	+ fullscreenLayout = radio.layout;
	3097	+
2757	3098	// bug
2758	3099	//gridPanel.setDividerLocation(1.0);
2759	3100	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2786,10 +3127,31 @@
2786	3127	bigThree.ClearUI();
2787	3128	bigThree.add(centralPanel);
2788	3129	bigThree.FlushUI();
	3130	+
	3131	+ cameraView.requestFocusInWindow();
	3132	+
	3133	+// refreshContents(true);
	3134	+//
	3135	+// try
	3136	+// {
	3137	+// java.awt.Robot bot = new java.awt.Robot();
	3138	+// int mask = InputEvent.BUTTON1_MASK;
	3139	+// bot.mouseMove(100, 100);
	3140	+// bot.mousePress(mask);
	3141	+// bot.mouseRelease(mask);
	3142	+// }
	3143	+// catch (Exception e)
	3144	+// {
	3145	+//
	3146	+// }
	3147	+
2789	3148	} else
2790	3149	if (source == threeButton)
2791	3150	{
2792	3151	radio.layout = threeButton;
	3152	+
	3153	+ if (CameraPane.FULLSCREEN)
	3154	+ fullscreenLayout = radio.layout;
2793	3155
2794	3156	// bigThree.remove(scenePanel);
2795	3157	// bigThree.remove(centralPanel);
..	..	@@ -2822,10 +3184,15 @@
2822	3184	bigThree.add(centralPanel);
2823	3185	bigThree.add(XYZPanel);
2824	3186	bigThree.FlushUI();
	3187	+
	3188	+ cameraView.requestFocusInWindow();
2825	3189	} else
2826	3190	if (source == fourButton)
2827	3191	{
2828	3192	radio.layout = fourButton;
	3193	+
	3194	+ if (CameraPane.FULLSCREEN)
	3195	+ fullscreenLayout = radio.layout;
2829	3196
2830	3197	// bigThree.remove(scenePanel);
2831	3198	// bigThree.remove(centralPanel);
..	..	@@ -2857,10 +3224,15 @@
2857	3224	bigThree.ClearUI();
2858	3225	bigThree.add(scenePanel);
2859	3226	bigThree.FlushUI();
	3227	+
	3228	+ cameraView.requestFocusInWindow();
2860	3229	} else
2861	3230	if (source == sixButton)
2862	3231	{
2863	3232	radio.layout = sixButton;
	3233	+
	3234	+ if (CameraPane.FULLSCREEN)
	3235	+ fullscreenLayout = radio.layout;
2864	3236
2865	3237	// bigThree.remove(scenePanel);
2866	3238	// bigThree.remove(centralPanel);
..	..	@@ -2893,10 +3265,15 @@
2893	3265	bigThree.add(scenePanel);
2894	3266	bigThree.add(centralPanel);
2895	3267	bigThree.FlushUI();
	3268	+
	3269	+ cameraView.requestFocusInWindow();
2896	3270	} else
2897	3271	if (source == sevenButton)
2898	3272	{
2899	3273	radio.layout = sevenButton;
	3274	+
	3275	+ if (CameraPane.FULLSCREEN)
	3276	+ fullscreenLayout = radio.layout;
2900	3277
2901	3278	// bigThree.remove(scenePanel);
2902	3279	// bigThree.remove(centralPanel);
..	..	@@ -2930,6 +3307,8 @@
2930	3307	bigThree.add(centralPanel);
2931	3308	bigThree.add(XYZPanel);
2932	3309	bigThree.FlushUI();
	3310	+
	3311	+ cameraView.requestFocusInWindow();
2933	3312	} else
2934	3313	if (source == rootButton)
2935	3314	{
..	..	@@ -2941,6 +3320,7 @@
2941	3320	EditObject(obj);
2942	3321	}
2943	3322
	3323	+ cameraView.requestFocusInWindow();
2944	3324	refreshContents(true);
2945	3325	} else
2946	3326	if (source == closeButton)
..	..	@@ -2950,22 +3330,37 @@
2950	3330	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2951	3331	{
2952	3332	ab = (cRadio)e.nextElement();
2953		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3333	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2954	3334	{
	3335	+ // Patch to avoid bug with transparency.
	3336	+ if (!ab.hadMaterial)
	3337	+ {
	3338	+ ab.object.material = null;
	3339	+ }
	3340	+
2955	3341	buttonGroup.remove(ab);
2956	3342	radioPanel.remove(ab);
2957	3343
2958		- ab.GetObject().editWindow = null;
	3344	+ //ab.GetObject().editWindow = null;
	3345	+ ab.GetObject().manipWindow = null;
2959	3346	// ab.GetObject().objectUI = null; // ?????????
2960	3347
2961	3348	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2962	3349	break;
2963	3350	}
2964	3351	}
	3352	+
	3353	+ cameraView.requestFocusInWindow();
2965	3354	refreshContents(true);
2966	3355	} else
2967	3356	if (source == editItem \|\| source == editButton)
2968	3357	{
	3358	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3359	+ {
	3360	+ Object3D child = (Object3D)e.nextElement();
	3361	+ child.pinned = true;
	3362	+ }
	3363	+
2969	3364	EditSelection(false);
2970	3365	} else
2971	3366	if (source == uneditButton)
..	..	@@ -2975,10 +3370,11 @@
2975	3370	Object3D child = (Object3D)e.nextElement();
2976	3371	if(child.editWindow != null)
2977	3372	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3373	+ child.pinned = false;
2978	3374	child.CloseUI();
2979	3375	listUI.remove(child);
2980	3376
2981		- child.editWindow = null; // ???????????
	3377	+ //child.editWindow = null; // ???????????
2982	3378	}
2983	3379	objEditor.ctrlPanel.FlushUI();
2984	3380	//objEditor.jTree.clearSelection();
..	..	@@ -2991,6 +3387,7 @@
2991	3387	//copy.ClearUI();
2992	3388	for (Object3D obj : listUI)
2993	3389	{
	3390	+ obj.pinned = false;
2994	3391	obj.CloseUI();
2995	3392	}
2996	3393	listUI.clear();
..	..	@@ -3000,7 +3397,7 @@
3000	3397	{
3001	3398	assert(copy == group);
3002	3399
3003		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3400	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3004	3401
3005	3402	for (Object3D obj : listUI)
3006	3403	{
..	..	@@ -3064,20 +3461,44 @@
3064	3461	frontView.object = group;
3065	3462	sideView.object = group;
3066	3463	}
3067		- group.editWindow = this;
	3464	+
	3465	+// fix "+" issue
	3466	+ //group.editWindow = this;
	3467	+ group.manipWindow = this;
	3468	+
3068	3469	/*
3069	3470	currentLayout = radio.layout;
3070	3471	if (currentLayout == null)
3071	3472	currentLayout = sevenButton;
3072	3473	*/
3073	3474	radio.layout.doClick();
	3475	+
	3476	+ ClearUnpinned();
	3477	+ SetPinStates(group.selection.size() > 0);
	3478	+ if (group.selection.size() == 1)
	3479	+ EditSelection(false);
3074	3480	keepparent = group.parent;
3075	3481	// PARENT = NULL or not???
3076	3482	//group.parent = null; // ROOT
3077	3483	//group.attributes = -1;
3078	3484	ResetModel();
	3485	+
	3486	+ cameraView.requestFocusInWindow();
3079	3487	refreshContents(true);
3080		- }
	3488	+ } else if (event.getSource() == editCameraItem)
	3489	+ {
	3490	+ cameraView.ProtectCamera();
	3491	+ cameraView.repaint();
	3492	+ return;
	3493	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3494	+ {
	3495	+ cameraView.RevertCamera();
	3496	+ cameraView.repaint();
	3497	+ return;
	3498	+ // } else if (event.getSource() == textureButton)
	3499	+ // {
	3500	+ // return; // true;
	3501	+ }
3081	3502	else
3082	3503	{
3083	3504	//return super.action(event, arg);
..	..	@@ -3086,7 +3507,6 @@
3086	3507	}
3087	3508
3088	3509	boolean useclient = false;
3089		- cRadio radio;
3090	3510
3091	3511	void ToggleRoot()
3092	3512	{
..	..	@@ -3138,6 +3558,28 @@
3138	3558	refreshContents();
3139	3559	}
3140	3560
	3561	+ void TransformChildren()
	3562	+ {
	3563	+ Object3D obj;
	3564	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3565	+ {
	3566	+ obj = (Object3D)e.nextElement();
	3567	+ obj.KeepTextureMatrices();
	3568	+ obj.TransformChildren();
	3569	+ obj.RestoreTextureMatrices();
	3570	+
	3571	+// if (obj.parent == null)
	3572	+// {
	3573	+// System.out.println("NULL PARENT!");
	3574	+// new Exception().printStackTrace();
	3575	+// }
	3576	+// else
	3577	+// TouchTransform(obj);
	3578	+// //obj.parent.Touch();
	3579	+ }
	3580	+
	3581	+ refreshContents();
	3582	+ }
3141	3583
3142	3584	void ResetTransform()
3143	3585	{
..	..	@@ -3250,7 +3692,7 @@
3250	3692	refreshContents();
3251	3693	}
3252	3694
3253		- void ResetCentroid()
	3695	+ void ResetCentroid(boolean full)
3254	3696	{
3255	3697	Object3D obj;
3256	3698	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3265,12 +3707,16 @@
3265	3707	LA.matIdentity(Object3D.mat);
3266	3708	obj.getBounds(minima, maxima, false);
3267	3709	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3268		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3710	+ if (full)
	3711	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3269	3712	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3270	3713	obj.TransformMesh(Object3D.mat);
	3714	+
3271	3715	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3272		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3716	+ if (full)
	3717	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3273	3718	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3719	+
3274	3720	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3275	3721	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3276	3722	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3299,7 +3745,8 @@
3299	3745
3300	3746	int size = obj.MemorySize();
3301	3747
3302		- System.err.println((size/1024) + " KB is the size of " + obj);
	3748	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3749	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3303	3750	}
3304	3751	}
3305	3752	catch (Exception e)
..	..	@@ -3336,9 +3783,9 @@
3336	3783	obj = (Object3D)e.nextElement();
3337	3784
3338	3785	System.out.println("Object is: " + obj);
3339		- GrafreeD.AnalyzeObject(obj);
	3786	+ Grafreed.AnalyzeObject(obj);
3340	3787	System.out.println("Boundary rep: " + obj.bRep);
3341		- GrafreeD.AnalyzeObject(obj.bRep);
	3788	+ Grafreed.AnalyzeObject(obj.bRep);
3342	3789
3343	3790	// System.err.println((size/1024) + " KB is the size of " + obj);
3344	3791	}
..	..	@@ -3380,6 +3827,13 @@
3380	3827	void GenNormals(boolean crease)
3381	3828	{
3382	3829	group.GenNormalsS(crease);
	3830	+
	3831	+ refreshContents();
	3832	+ }
	3833	+
	3834	+ void GenNormalsMESH()
	3835	+ {
	3836	+ group.GenNormalsMeshS();
3383	3837
3384	3838	refreshContents();
3385	3839	}
..	..	@@ -3552,8 +4006,8 @@
3552	4006
3553	4007	void ParseVertices()
3554	4008	{
3555		- boolean epsequal = GrafreeD.epsequal;
3556		- GrafreeD.epsequal = true;
	4009	+ boolean epsequal = Grafreed.epsequal;
	4010	+ Grafreed.epsequal = true;
3557	4011
3558	4012	for (int i=0; i<group.selection.size(); i++)
3559	4013	{
..	..	@@ -3578,7 +4032,7 @@
3578	4032	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3579	4033	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3580	4034
3581		- g.add(GrafreeD.clipboard);
	4035	+ g.add(Grafreed.clipboard);
3582	4036
3583	4037	buffer.add(g);
3584	4038	}
..	..	@@ -3593,7 +4047,7 @@
3593	4047	makeSomething(buffer, i==group.selection.size()-1);
3594	4048	}
3595	4049
3596		- GrafreeD.epsequal = epsequal;
	4050	+ Grafreed.epsequal = epsequal;
3597	4051
3598	4052	refreshContents();
3599	4053	}
..	..	@@ -3611,7 +4065,16 @@
3611	4065	String pigment = Object3D.GetPigment(tex);
3612	4066	//String bump = Object3D.GetBump(tex);
3613	4067
3614		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4068	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4069	+
	4070	+ try
	4071	+ {
	4072	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4073	+ }
	4074	+ catch (Exception e)
	4075	+ {
	4076	+ System.err.println("FAIL: " + node);
	4077	+ }
3615	4078
3616	4079	double s = v.s;
3617	4080
..	..	@@ -3743,7 +4206,7 @@
3743	4206	return;
3744	4207
3745	4208	Object3D poses = group.selection.get(0);
3746		- Object3D ref = GrafreeD.clipboard.get(0);
	4209	+ Object3D ref = Grafreed.clipboard.get(0);
3747	4210
3748	4211	Object3D newgroup = new Object3D("Po:" + poses.name);
3749	4212
..	..	@@ -3937,9 +4400,9 @@
3937	4400
3938	4401	void ClipMesh()
3939	4402	{
3940		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4403	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3941	4404	{
3942		- Object3D content = GrafreeD.clipboard.get(0);
	4405	+ Object3D content = Grafreed.clipboard.get(0);
3943	4406
3944	4407	if (content instanceof cGroup && ((cGroup)content).transientlink )
3945	4408	content = ((cGroup)content).get(0);
..	..	@@ -3948,7 +4411,7 @@
3948	4411	// {
3949	4412	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3950	4413	// }
3951		- group.selection.ClipMesh(GrafreeD.clipboard);
	4414	+ group.selection.ClipMesh(Grafreed.clipboard);
3952	4415	}
3953	4416	// group.selection.ClipMesh(GrafreeD.clipboard);
3954	4417	System.out.println("DONE.");
..	..	@@ -3995,6 +4458,18 @@
3995	4458	void MarkLeaves(boolean hide)
3996	4459	{
3997	4460	group.selection.MarkLeaves(hide);
	4461	+ refreshContents();
	4462	+ }
	4463	+
	4464	+ void RewindLeaves(boolean hide)
	4465	+ {
	4466	+ group.selection.RewindLeaves(hide);
	4467	+ refreshContents();
	4468	+ }
	4469	+
	4470	+ void RandomLeaves(boolean hide)
	4471	+ {
	4472	+ group.selection.RandomLeaves(hide);
3998	4473	refreshContents();
3999	4474	}
4000	4475
..	..	@@ -4069,10 +4544,6 @@
4069	4544	// }
4070	4545	// }
4071	4546
4072		- static boolean allparams = true;
4073		-
4074		- static Vector<Object3D> listUI = new Vector<Object3D>();
4075		-
4076	4547	void EditSelection(boolean newWindow)
4077	4548	{
4078	4549	// aConstraints.gridy = 0;
..	..	@@ -4080,10 +4551,10 @@
4080	4551	{
4081	4552	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4082	4553	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4083		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4554	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4084	4555
4085	4556	Object3D elem = (Object3D)group.selection.elementAt(i);
4086		- if(elem != group)
	4557	+ if(elem != group \|\| !newWindow)
4087	4558	{
4088	4559	// if (!(elem instanceof Composite))
4089	4560	// newWindow = false;
..	..	@@ -4165,7 +4636,8 @@
4165	4636	//new Exception().printStackTrace();
4166	4637
4167	4638	freezemodel = true;
4168		-
	4639	+ ClearUnpinned();
	4640	+
4169	4641	/**/
4170	4642	//switch (event.id)
4171	4643	{
..	..	@@ -4173,7 +4645,6 @@
4173	4645	//case 702: // Event.LIST_DESELECT
4174	4646	group.deselectAll();
4175	4647	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4176		- objEditor.ClearInfo(); // .GetMaterial());
4177	4648	if (tps != null)
4178	4649	{
4179	4650	for (int i=0; i < tps.length; i++)
..	..	@@ -4182,10 +4653,8 @@
4182	4653
4183	4654	//if (child.parent != null)
4184	4655	//child.parent.addSelectee(child);
	4656	+ objEditor.SetMaterial(child);
4185	4657	group.addSelectee(child);
4186		- objEditor.SetMaterial(child); // .GetMaterial());
4187		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4188		- System.err.println("info : " + child.GetPath());
4189	4658	}
4190	4659	}
4191	4660	// else
..	..	@@ -4195,20 +4664,28 @@
4195	4664	// System.err.println("info : " + group.GetPath());
4196	4665	// }
4197	4666
4198		- objEditor.SetText(); // jan 2014
4199		-
4200		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4667	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4201	4668	CameraPane.flash = true;
4202	4669
4203		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4670	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4204	4671	// a camera
4205	4672	{
4206		- CameraPane.camerachangeframe = 0; // don't refuse it
4207		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4673	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4674	+ {
	4675	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4676	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4677	+ }
4208	4678	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4209	4679	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4210	4680	}
4211	4681
	4682	+ if (tps != null && tps.length == 1)
	4683	+ {
	4684	+ EditSelection(false);
	4685	+ }
	4686	+
	4687	+ SetPinStates(tps != null && tps.length > 0);
	4688	+
4212	4689	refreshContents();
4213	4690	//return true;
4214	4691	}
..	..	@@ -4217,6 +4694,35 @@
4217	4694
4218	4695	freezemodel = false;
4219	4696	}
	4697	+
	4698	+ void SetPinStates(boolean enabled)
	4699	+ {
	4700	+ editButton.setEnabled(enabled);
	4701	+ uneditButton.setEnabled(enabled);
	4702	+ unselectButton.setEnabled(enabled);
	4703	+ flashSelectionButton.setEnabled(enabled);
	4704	+ }
	4705	+
	4706	+ void refreshContents(boolean cp)
	4707	+ {
	4708	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4709	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4710	+ {
	4711	+ objEditor.ClearInfo(); // .GetMaterial());
	4712	+
	4713	+ for (int i=0; i < group.selection.Size(); i++)
	4714	+ {
	4715	+ Object3D child = (Object3D) group.selection.get(i);
	4716	+
	4717	+ objEditor.AddInfo(child, this, true);
	4718	+ System.err.println("info : " + child.GetPath());
	4719	+ }
	4720	+
	4721	+ objEditor.SetText(); // jan 2014
	4722	+ }
	4723	+
	4724	+ super.refreshContents(cp);
	4725	+ }
4220	4726
4221	4727	void linkSomething(Object3D thing)
4222	4728	{
..	..	@@ -4288,16 +4794,19 @@
4288	4794	{
4289	4795	if (group.selection.isEmpty())
4290	4796	return;
4291		- GrafreeD.clipboardIsTempGroup = false;
	4797	+
	4798	+ Grafreed.clipboardIsTempGroup = false;
4292	4799	Composite tGroup = null;
4293	4800	if (group.selection.size() > 0) // 1)
4294	4801	{
4295	4802	tGroup = new cGroup();
4296		- GrafreeD.clipboardIsTempGroup = true;
	4803	+ Grafreed.clipboardIsTempGroup = true;
4297	4804	}
4298	4805
4299	4806	if (cut)
4300	4807	{
	4808	+ if (Globals.SAVEONMAKE)
	4809	+ Save();
4301	4810	//int indices[] = jList.getSelectedIndices();
4302	4811	//for (int i = indices.length - 1; i >= 0; i--)
4303	4812	//jList.remove(indices[i]);
..	..	@@ -4333,16 +4842,16 @@
4333	4842	//System.out.println("cut " + child);
4334	4843	//System.out.println("parent = " + child.parent);
4335	4844	// tmp.addChild(child);
4336		- if (GrafreeD.clipboardIsTempGroup)
	4845	+ if (Grafreed.clipboardIsTempGroup)
4337	4846	tGroup.add/Child/(tmp);
4338	4847	else
4339		- GrafreeD.clipboard = tmp;
	4848	+ Grafreed.clipboard = tmp;
4340	4849	}
4341	4850	else
4342		- if (GrafreeD.clipboardIsTempGroup)
	4851	+ if (Grafreed.clipboardIsTempGroup)
4343	4852	tGroup.add/Child/(child);
4344	4853	else
4345		- GrafreeD.clipboard = child;
	4854	+ Grafreed.clipboard = child;
4346	4855	}
4347	4856
4348	4857	//ResetModel();
..	..	@@ -4374,21 +4883,23 @@
4374	4883	//System.out.println("cut " + elem);
4375	4884	//System.out.println("parent = " + elem.parent);
4376	4885	// tmp.addChild(elem);
4377		- if (GrafreeD.clipboardIsTempGroup)
	4886	+ if (Grafreed.clipboardIsTempGroup)
4378	4887	tGroup.add/Child/(tmp);
4379	4888	else
4380		- GrafreeD.clipboard = tmp;
	4889	+ Grafreed.clipboard = tmp;
4381	4890	}
4382	4891	else
4383		- if (GrafreeD.clipboardIsTempGroup)
	4892	+ if (Grafreed.clipboardIsTempGroup)
4384	4893	tGroup.add/Child/(child);
4385	4894	else
4386		- GrafreeD.clipboard = child;
	4895	+ Grafreed.clipboard = child;
4387	4896	}
4388	4897
4389	4898	}
4390		- if (GrafreeD.clipboardIsTempGroup)
4391		- GrafreeD.clipboard = tGroup;
	4899	+
	4900	+ if (Grafreed.clipboardIsTempGroup)
	4901	+ Grafreed.clipboard = tGroup;
	4902	+
4392	4903	if (cut)
4393	4904	{
4394	4905	ResetModel();
..	..	@@ -4402,7 +4913,7 @@
4402	4913	// return;
4403	4914	boolean first = true;
4404	4915
4405		- if (GrafreeD.clipboardIsTempGroup)
	4916	+ if (Grafreed.clipboardIsTempGroup)
4406	4917	{
4407	4918	Composite temp;
4408	4919
..	..	@@ -4413,7 +4924,7 @@
4413	4924	temp = (Composite)Applet3D.clipboard.deepCopy();
4414	4925	*/
4415	4926	Object3D elem;
4416		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4927	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4417	4928	{
4418	4929	Object3D child = (Object3D)e.nextElement();
4419	4930
..	..	@@ -4447,14 +4958,14 @@
4447	4958	//Object3D cb = Applet3D.clipboard;
4448	4959	//temp.addChild(cb);
4449	4960	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4450		- assert(GrafreeD.clipboard.parent == null);
4451		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4452		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4453		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4454		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4961	+ assert(Grafreed.clipboard.parent == null);
	4962	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4963	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4964	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4965	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4455	4966	else
4456		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4457		- GrafreeD.clipboard.get(0).parent = keepparent;
	4967	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4968	+ Grafreed.clipboard.get(0).parent = keepparent;
4458	4969	}
4459	4970
4460	4971	ResetModel();
..	..	@@ -4503,9 +5014,9 @@
4503	5014	{
4504	5015	boolean first = true;
4505	5016
4506		- if (GrafreeD.clipboardIsTempGroup)
	5017	+ if (Grafreed.clipboardIsTempGroup)
4507	5018	{
4508		- Composite temp = (Composite)GrafreeD.clipboard;
	5019	+ Composite temp = (Composite)Grafreed.clipboard;
4509	5020	Object3D copy;
4510	5021	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4511	5022	{
..	..	@@ -4515,7 +5026,7 @@
4515	5026	}
4516	5027	} else
4517	5028	{
4518		- linkSomething(GrafreeD.clipboard); //.get(0));
	5029	+ linkSomething(Grafreed.clipboard); //.get(0));
4519	5030	}
4520	5031	}
4521	5032	}
..	..	@@ -4920,21 +5431,6 @@
4920	5431	}
4921	5432	*/
4922	5433
4923		- void ImportGFD()
4924		- {
4925		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4926		- browser.show();
4927		- String filename = browser.getFile();
4928		- if (filename != null && filename.length() > 0)
4929		- {
4930		- String fullname = browser.getDirectory() + filename;
4931		-
4932		- //Object3D readobj =
4933		- objEditor.ReadGFD(fullname, objEditor);
4934		- //makeSomething(readobj);
4935		- }
4936		- }
4937		-
4938	5434	/*
4939	5435	public void Callback(Object obj)
4940	5436	{
..	..	@@ -4958,26 +5454,9 @@
4958	5454	}
4959	5455	*/
4960	5456
4961		- void ImportVRMLX3D()
4962		- {
4963		- if (GrafreeD.standAlone)
4964		- {
4965		- /**/
4966		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4967		- browser.show();
4968		- String filename = browser.getFile();
4969		- if (filename != null && filename.length() > 0)
4970		- {
4971		- String fullname = browser.getDirectory() + filename;
4972		- LoadVRMLX3D(fullname);
4973		- }
4974		- /**/
4975		- }
4976		- }
4977		-
4978	5457	String GetFile(String dialogName)
4979	5458	{
4980		- if (GrafreeD.standAlone)
	5459	+ if (Grafreed.standAlone)
4981	5460	{
4982	5461	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4983	5462	browser.show();
..	..	@@ -5045,7 +5524,31 @@
5045	5524	cButton clearpanelButton;
5046	5525	cButton unselectButton;
5047	5526
	5527	+ cButton restoreCameraButton;
	5528	+
	5529	+ cButton minButton;
	5530	+ cButton maxButton;
	5531	+ cButton fullButton;
	5532	+ cButton saveButton;
5048	5533	cButton oneStepButton;
	5534	+
	5535	+ cButton groupButton;
	5536	+ cButton ungroupButton;
	5537	+ cButton compositeButton;
	5538	+ cButton switchButton;
	5539	+ cButton loopButton;
	5540	+ cButton textureButton;
	5541	+
	5542	+ cButton gridButton;
	5543	+ cButton boxButton;
	5544	+ cButton sphereButton;
	5545	+ cButton coneButton;
	5546	+ cButton torusButton;
	5547	+ cButton superButton;
	5548	+ cButton kleinButton;
	5549	+ cButton particlesButton;
	5550	+ cButton overlayButton;
	5551	+ cButton lightButton;
5049	5552
5050	5553	cButton screenfitButton;
5051	5554	cButton screenfitpointButton;
..	..	@@ -5058,14 +5561,6 @@
5058	5561
5059	5562	cButton setsupportButton;
5060	5563
5061		- cButton twoButton;
5062		- cButton sixButton;
5063		- cButton threeButton;
5064		- cButton sevenButton;
5065		- cButton fourButton; // full panel
5066		- cButton oneButton; // full XYZ
5067		- //cButton currentLayout;
5068		-
5069	5564	//
5070	5565	//Composite
5071	5566	Object3D // to do !!
..	..	@@ -5075,9 +5570,11 @@
5075	5570	//JTree jTree;
5076	5571	private MenuItem lookAtItem;
5077	5572	private MenuItem lookFromItem;
5078		- private MenuItem switchItem;
	5573	+ private MenuItem switchViewItem;
5079	5574	private MenuItem cutItem;
5080		- private MenuItem duplicateItem;
	5575	+ private MenuItem undoItem;
	5576	+ private MenuItem redoItem;
	5577	+ private JMenuItem duplicateItem;
5081	5578	private MenuItem cloneItem;
5082	5579	private MenuItem cloneSupportItem;
5083	5580	private MenuItem overwriteGeoItem;
..	..	@@ -5090,7 +5587,7 @@
5090	5587	private MenuItem linkverticesItem;
5091	5588	private MenuItem relinkverticesItem;
5092	5589	private MenuItem setMasterItem;
5093		- private MenuItem resetMeshItem;
	5590	+ private MenuItem resetAllItem;
5094	5591	private MenuItem stepAllItem;
5095	5592	private MenuItem revertMeshItem;
5096	5593	private MenuItem poseMeshItem;
..	..	@@ -5140,6 +5637,10 @@
5140	5637	private MenuItem showleavesItem;
5141	5638	private MenuItem markleavesItem;
5142	5639	private MenuItem unmarkleavesItem;
	5640	+ private MenuItem rewindleavesItem;
	5641	+ private MenuItem unrewindleavesItem;
	5642	+ private MenuItem randomleavesItem;
	5643	+ private MenuItem unrandomleavesItem;
5143	5644
5144	5645	private MenuItem flipVItem;
5145	5646	private MenuItem unflipVItem;
..	..	@@ -5151,15 +5652,17 @@
5151	5652	private MenuItem panoTexturesItem;
5152	5653
5153	5654	private MenuItem resetCentroidItem;
5154		- private MenuItem transformgeometryItem;
	5655	+ private MenuItem resetCentroidXZItem;
5155	5656	private MenuItem resetTransformItem;
	5657	+ private MenuItem transformGeometryItem;
	5658	+ private MenuItem transformChildrenItem;
5156	5659	private MenuItem hideItem;
5157	5660	private MenuItem grabItem;
5158	5661	private MenuItem backItem;
5159	5662	private MenuItem frontItem;
5160	5663	private MenuItem cameraItem;
5161	5664	private MenuItem compositeItem;
5162		- private MenuItem randomItem;
	5665	+ private MenuItem switchItem;
5163	5666	private MenuItem physicsItem;
5164	5667	private MenuItem frameselectorItem;
5165	5668	private MenuItem scriptNodeItem;
..	..	@@ -5221,11 +5724,6 @@
5221	5724	private MenuItem doubleItem;
5222	5725	private MenuItem tripleItem;
5223	5726
5224		- private MenuItem importGFDItem;
5225		- private MenuItem importVRMLX3DItem;
5226		- private MenuItem import3DSItem;
5227		- private MenuItem importOBJItem;
5228		-
5229	5727	private MenuItem computeAOItem;
5230	5728	private MenuItem recompileItem;
5231	5729	private MenuItem editScriptItem;
..	..	@@ -5235,4 +5733,8 @@
5235	5733	private MenuItem analyzeItem;
5236	5734	private MenuItem dumpItem;
5237	5735	//boolean freezemodel = false;
	5736	+
	5737	+ Menu cameraMenu;
	5738	+ MenuItem editCameraItem;
	5739	+ MenuItem restoreCameraItem;
5238	5740	}