~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -60,6 +60,12 @@
60	60	this.copy = this.group = group;
61	61	//selectees = this.group.selectees;
62	62
	63	+ if (copy.versions == null)
	64	+ {
	65	+ copy.versions = new byte[100][];
	66	+ copy.versionindex = -1;
	67	+ }
	68	+
63	69	if(ui)
64	70	SetupUI(objEditor);
65	71	}
..	..	@@ -74,7 +80,13 @@
74	80	this.copy = this.group = copy;
75	81	//selectees = this.group.selectees;
76	82
77		- SetupMenu2(objEditor);
	83	+ if (copy.versions == null)
	84	+ {
	85	+ copy.versions = new byte[100][];
	86	+ copy.versionindex = -1;
	87	+ }
	88	+
	89	+ SetupMenu2(this); //objEditor);
78	90	SetupUI2(objEditor);
79	91	objEditor.SetupUI(true);
80	92	SetupViews(objEditor);
..	..	@@ -84,6 +96,10 @@
84	96
85	97	void CloneSelection(boolean supports)
86	98	{
	99	+ if (Globals.REPLACEONMAKE)
	100	+ Save();
	101	+ boolean keep = Globals.REPLACEONMAKE;
	102	+ Globals.REPLACEONMAKE = false;
87	103	// Object3D keep = GrafreeD.clipboard;
88	104	//Object3D obj;
89	105	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +110,19 @@
94	110
95	111	makeSomething(clone, i==group.selection.size()-1);
96	112	}
	113	+ Globals.REPLACEONMAKE = keep;
97	114	}
98	115
99	116	void CloneClipboard(boolean supports)
100	117	{
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));
	118	+ assert(Grafreed.clipboard.parent == null);
	119	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	120	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	121	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	122	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	123	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	124	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	125	+ Grafreed.clipboard.get(0).parent = keepparent;
109	126	}
110	127
111	128	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +136,7 @@
119	136	// obj.support = null;
120	137	if (!supports)
121	138	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	139	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	140	obj.parent = parent;
124	141	// obj.support = support;
125	142	// clone.support = support; // aout 2013
..	..	@@ -148,28 +165,21 @@
148	165
149	166	//JTextField nameField;
150	167
151		- void SetupMenu2(ObjEditor oe)
	168	+ void SetupMenu2(GroupEditor oe)
152	169	{
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		-
	170	+ oe.jTree = new cTree();
	171	+
168	172	Menu menu;
169	173	oe.menuBar.add(menu = new Menu("Edit"));
170	174	//editItem = menu.add(new MenuItem("Edit"));
171	175	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	176	+
	177	+// undoItem = menu.add(new MenuItem("Undo"));
	178	+// undoItem.addActionListener(this);
	179	+// redoItem = menu.add(new MenuItem("Redo"));
	180	+// redoItem.addActionListener(this);
	181	+// menu.add("-");
	182	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	183	duplicateItem.addActionListener(this);
174	184	cloneItem = menu.add(new MenuItem("Clone"));
175	185	cloneItem.addActionListener(this);
..	..	@@ -185,7 +195,6 @@
185	195	copyItem.addActionListener(this);
186	196	pasteItem = menu.add(new MenuItem("Paste"));
187	197	pasteItem.addActionListener(this);
188		- menu.add("-");
189	198
190	199	menu.add("-");
191	200	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -197,8 +206,8 @@
197	206	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
198	207	// pasteExpandItem.addActionListener(this);
199	208	menu.add("-");
200		- clearItem = menu.add(new MenuItem("Clear"));
201		- clearItem.addActionListener(this);
	209	+ deleteItem = menu.add(new MenuItem("Delete"));
	210	+ deleteItem.addActionListener(this);
202	211
203	212	if (Globals.ADVANCED)
204	213	{
..	..	@@ -206,14 +215,97 @@
206	215	clearAllItem = menu.add(new MenuItem("Clear All"));
207	216	clearAllItem.addActionListener(this);
208	217	}
	218	+
	219	+ menuBar.add(cameraMenu = new Menu("View"));
	220	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	221	+ //zBufferItem.addActionListener(this);
	222	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	223	+ //normalLensItem.addActionListener(this);
	224	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	225	+ restoreCameraItem.addActionListener(this);
	226	+
	227	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	228	+// toggleFullScreenItem.addItemListener(this);
	229	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	230	+// cameraMenu.add("-");
	231	+//
	232	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	233	+// toggleTextureItem.addItemListener(this);
	234	+// toggleTextureItem.setState(CameraPane.textureon);
	235	+//
	236	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	237	+// toggleSwitchItem.addItemListener(this);
	238	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	239	+
	240	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	241	+ toggleHandleItem.addItemListener(this);
	242	+ toggleHandleItem.setState(CameraPane.HANDLES);
	243	+
	244	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	245	+ togglePaintItem.addItemListener(this);
	246	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	247	+
	248	+ if (Globals.ADVANCED)
	249	+ {
	250	+ cameraMenu.add("-");
	251	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	252	+ toggleLiveItem.addItemListener(this);
	253	+ toggleLiveItem.setState(Globals.isLIVE());
209	254
	255	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	256	+ stepItem.addActionListener(this);
	257	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	258	+ // toggleDLItem.addItemListener(this);
	259	+ // toggleDLItem.setState(false);
	260	+
	261	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	262	+ toggleRenderItem.addItemListener(this);
	263	+ toggleRenderItem.setState(!CameraPane.frozen);
	264	+
	265	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	266	+ toggleDebugItem.addItemListener(this);
	267	+ toggleDebugItem.setState(Globals.DEBUG);
	268	+
	269	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	270	+ toggleFrustumItem.addItemListener(this);
	271	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	272	+
	273	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	274	+ toggleFootContactItem.addItemListener(this);
	275	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	276	+
	277	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	278	+ toggleTimelineItem.addItemListener(this);
	279	+ }
	280	+
	281	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	282	+// toggleRootItem.addItemListener(this);
	283	+// toggleRootItem.setState(false);
	284	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	285	+// animationItem.addItemListener(this);
	286	+// animationItem.setState(CameraPane.ANIMATION);
	287	+ cameraMenu.add("-");
	288	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	289	+ editCameraItem.addActionListener(this);
	290	+
	291	+ if (Globals.ADVANCED)
	292	+ {
	293	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	294	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	295	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	296	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	297	+ oe.cameraMenu.add("-");
	298	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	299	+ openWindowItem.addActionListener(this);
	300	+ editLeafItem.addActionListener(this);
	301	+ lookAtItem.addActionListener(this);
	302	+ //lookFromItem.addActinoListener(this);
	303	+ //switchViewItem.addActionListener(this);
	304	+ }
	305	+
210	306	oe.menuBar.add(menu = new Menu("Setting"));
211	307	if (Globals.ADVANCED)
212	308	{
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	309	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218	310	revertMeshItem.addActionListener(this);
219	311	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -253,21 +345,29 @@
253	345	}
254	346
255	347	oe.menuBar.add(menu = new Menu("Group"));
256		- grabItem = menu.add(new MenuItem("Grab"));
257		- grabItem.addActionListener(this);
	348	+// grabItem = menu.add(new MenuItem("Grab"));
	349	+// grabItem.addActionListener(this);
258	350	backItem = menu.add(new MenuItem("Back"));
259	351	backItem.addActionListener(this);
260	352	frontItem = menu.add(new MenuItem("Front"));
261	353	frontItem.addActionListener(this);
262		- compositeItem = menu.add(new MenuItem("Composite"));
263		- compositeItem.addActionListener(this);
	354	+// compositeItem = menu.add(new MenuItem("Composite"));
	355	+// compositeItem.addActionListener(this);
	356	+
	357	+ if (Globals.ADVANCED)
	358	+ {
264	359	hideItem = menu.add(new MenuItem("Hidden Group"));
265	360	hideItem.addActionListener(this);
	361	+ }
266	362	ungroupItem = menu.add(new MenuItem("Ungroup"));
267	363	ungroupItem.addActionListener(this);
268		- menu.add("-");
269		- randomItem = menu.add(new MenuItem("Switch node"));
270		- randomItem.addActionListener(this);
	364	+
	365	+// menu.add("-");
	366	+//
	367	+// switchItem = menu.add(new MenuItem("Switch node"));
	368	+// switchItem.addActionListener(this);
	369	+ if (Globals.ADVANCED)
	370	+ {
271	371	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
272	372	switchGeoItem.addActionListener(this);
273	373	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -275,8 +375,6 @@
275	375	morphItem = menu.add(new MenuItem("Morph Group"));
276	376	morphItem.addActionListener(this);
277	377
278		- if (Globals.ADVANCED)
279		- {
280	378	menu.add("-");
281	379	physicsItem = menu.add(new MenuItem("Physics"));
282	380	physicsItem.addActionListener(this);
..	..	@@ -284,30 +382,29 @@
284	382	frameselectorItem.addActionListener(this);
285	383	scriptNodeItem = menu.add(new MenuItem("Script Node"));
286	384	scriptNodeItem.addActionListener(this);
287		- cameraItem = menu.add(new MenuItem("Camera"));
288		- cameraItem.addActionListener(this);
289	385	}
290	386
291	387	oe.menuBar.add(menu = new Menu("Object"));
292		- textureItem = menu.add(new MenuItem("Texture"));
293		- textureItem.addActionListener(this);
	388	+// textureItem = menu.add(new MenuItem("Texture"));
	389	+// textureItem.addActionListener(this);
294	390	billboardItem = menu.add(new MenuItem("Billboard"));
295	391	billboardItem.addActionListener(this);
296	392	csgItem = menu.add(new MenuItem("CSG"));
297	393	csgItem.addActionListener(this);
298		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	394	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
299	395	shadowXItem.addActionListener(this);
300		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	396	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
301	397	shadowYItem.addActionListener(this);
302		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	398	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
303	399	shadowZItem.addActionListener(this);
	400	+ attributeItem = menu.add(new MenuItem("Attribute"));
	401	+ attributeItem.addActionListener(this);
	402	+
304	403	if (Globals.ADVANCED)
305	404	{
306	405	menu.add("-");
307	406	linkerItem = menu.add(new MenuItem("Linker"));
308	407	linkerItem.addActionListener(this);
309		- attributeItem = menu.add(new MenuItem("Attribute"));
310		- attributeItem.addActionListener(this);
311	408	templateItem = menu.add(new MenuItem("Template"));
312	409	templateItem.addActionListener(this);
313	410	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -318,8 +415,12 @@
318	415	resetTransformItem.addActionListener(this);
319	416	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
320	417	resetCentroidItem.addActionListener(this);
321		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
322		- transformgeometryItem.addActionListener(this);
	418	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	419	+ resetCentroidXZItem.addActionListener(this);
	420	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	421	+ transformGeometryItem.addActionListener(this);
	422	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	423	+ transformChildrenItem.addActionListener(this);
323	424
324	425	oe.menuBar.add(menu = new Menu("Geometry"));
325	426	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -332,7 +433,7 @@
332	433	genNormalsMESHItem.addActionListener(this);
333	434	if (Globals.ADVANCED)
334	435	{
335		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	436	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
336	437	genNormalsMINEItem.addActionListener(this);
337	438	}
338	439	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -368,6 +469,10 @@
368	469	oe.menuBar.add(menu = new Menu("Attributes"));
369	470	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
370	471	clearMaterialsItem.addActionListener(this);
	472	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	473	+ resetAllItem.addActionListener(this);
	474	+ stepAllItem = menu.add(new MenuItem("Step All"));
	475	+ stepAllItem.addActionListener(this);
371	476	menu.add("-");
372	477	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
373	478	liveleavesItem.addActionListener(this);
..	..	@@ -388,6 +493,14 @@
388	493	markleavesItem.addActionListener(this);
389	494	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
390	495	unmarkleavesItem.addActionListener(this);
	496	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	497	+ rewindleavesItem.addActionListener(this);
	498	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	499	+ unrewindleavesItem.addActionListener(this);
	500	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	501	+ randomleavesItem.addActionListener(this);
	502	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	503	+ unrandomleavesItem.addActionListener(this);
391	504	menu.add("-");
392	505	flipVItem = menu.add(new MenuItem("Flip V"));
393	506	flipVItem.addActionListener(this);
..	..	@@ -422,38 +535,42 @@
422	535	sortbysizeItem.addActionListener(this);
423	536	sortbynameItem = menu.add(new MenuItem("Sort by name"));
424	537	sortbynameItem.addActionListener(this);
	538	+ menu.add("-");
	539	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	540	+ shareGeometriesItem.addActionListener(this);
	541	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	542	+ mergeGeometriesItem.addActionListener(this);
425	543	if (Globals.ADVANCED)
426	544	{
427		- menu.add("-");
	545	+ // Pretty much the same as duplicate and clone.
428	546	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
429	547	extractGeometriesItem.addActionListener(this);
430	548	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
431	549	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	550	}
437	551
438	552	oe.menuBar.add(menu = new Menu("Insert"));
439	553	buildCreateMenu(menu);
440	554
441		- oe.menuBar.add(menu = new Menu("Include"));
442		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
443		- importGFDItem.addActionListener(this);
444		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
445		- importVRMLX3DItem.addActionListener(this);
446		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
447		- importOBJItem.addActionListener(this);
448		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
449		- import3DSItem.addActionListener(this);
450		-
451	555	oe.menuBar.add(menu = new Menu("Tools"));
452	556	buildToolsMenu(menu);
453	557	}
454	558
	559	+
455	560	void SetupUI2(ObjEditor oe)
456	561	{
	562	+ // June 2019
	563	+ if (oe == null)
	564	+ {
	565	+ //super.SetupUI2(this);
	566	+ //return;
	567	+ }
	568	+
	569	+ if (copy != group)
	570	+ {
	571	+ //super.SetupUI2(this);
	572	+ }
	573	+
457	574	//new Exception().printStackTrace();
458	575
459	576	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -482,97 +599,230 @@
482	599	oe.radioPanel.add(dummyButton);
483	600	oe.buttonGroup.add(dummyButton);
484	601	*/
	602	+ cGridBag copyOptionsPanel = new cGridBag();
	603	+
	604	+ copyOptionsPanel.preferredHeight = 1;
	605	+
485	606	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
486	607
487		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
488		- liveCB.setToolTipText("Enabled animation");
	608	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ //minButton.setToolTipText("Minimize window");
	610	+ //minButton.addActionListener(this);
	611	+
	612	+ if (Globals.ADVANCED)
	613	+ {
	614	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ maxButton.setToolTipText("Maximize window");
	616	+ maxButton.addActionListener(this);
	617	+ }
	618	+
	619	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	620	+ fullButton.setToolTipText("Full-screen window");
	621	+ fullButton.addActionListener(this);
	622	+
	623	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ screenfitButton.setToolTipText("Screen fit");
	625	+ screenfitButton.addActionListener(this);
	626	+
	627	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	628	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	629	+ restoreCameraButton.addActionListener(this);
	630	+
	631	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	632	+ saveButton.setToolTipText("New version");
	633	+ saveButton.addActionListener(this);
	634	+
	635	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	636	+ undoButton.setToolTipText("Previous version");
	637	+ undoButton.addActionListener(this);
	638	+ undoButton.setEnabled(false);
	639	+
	640	+ cGridBag updown = new cGridBag().setVertical(true);
	641	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	642	+ restoreButton.setToolTipText("Restore current");
	643	+ restoreButton.addActionListener(this);
	644	+ restoreButton.setEnabled(false);
	645	+
	646	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	647	+ replaceButton.setToolTipText("Replace current");
	648	+ replaceButton.addActionListener(this);
	649	+ replaceButton.setEnabled(false);
	650	+
	651	+ copyOptionsPanel.add(updown);
	652	+
	653	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	654	+ redoButton.setToolTipText("Next version");
	655	+ redoButton.addActionListener(this);
	656	+ redoButton.setEnabled(false);
	657	+
	658	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	659	+ liveCB.setToolTipText("Enable animation");
489	660	liveCB.addItemListener(this);
490	661
491		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	662	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492	663	oneStepButton.setToolTipText("Animate one step forward");
493	664	oneStepButton.addActionListener(this);
494	665
495		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	666	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
496	667	fastCB.setToolTipText("Fast mode");
497	668	fastCB.addItemListener(this);
498	669
499		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
500		- trackCB.setToolTipText("Enable tracking");
501		- trackCB.addItemListener(this);
502		-
503		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
504		- screenfitButton.setToolTipText("Screen fit");
505		- screenfitButton.addActionListener(this);
	670	+ //oe.toolboxPanel.Return();
	671	+
	672	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	673	+// trackCB.setToolTipText("Enable tracking");
	674	+// trackCB.addItemListener(this);
506	675
507	676	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
508	677	// screenfitpointButton.addActionListener(this);
509	678
510	679	if (Globals.ADVANCED)
511	680	{
512		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	681	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
513	682	snapobjectButton.addActionListener(this);
514	683	snapobjectButton.setToolTipText("Snap Object");
515	684	}
516	685
517		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
518		- flashSelectionButton.setToolTipText("Show selection");
519		- flashSelectionButton.addActionListener(this);
	686	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
520	687
521		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
522		-
523		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
524		- twoButton.setToolTipText("Show center view only");
525		- twoButton.addActionListener(this);
526		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	688	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
527	689	fourButton.addActionListener(this);
528	690	fourButton.setToolTipText("Show left panel only");
529		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
530		- sixButton.setToolTipText("2-column layout left");
	691	+
	692	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	693	+ twoButton.setToolTipText("Show right view only");
	694	+ twoButton.addActionListener(this);
	695	+ this.fullscreenLayout = twoButton;
	696	+
	697	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	698	+ sixButton.setToolTipText("Show left and right");
531	699	sixButton.addActionListener(this);
532		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
533		- threeButton.setToolTipText("2-column layout right");
534		- threeButton.addActionListener(this);
535		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
536		- sevenButton.setToolTipText("3-column layout");
537		- sevenButton.addActionListener(this);
	700	+// oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	701	+// threeButton.setToolTipText("2-column layout right");
	702	+// threeButton.addActionListener(this);
	703	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	704	+// sevenButton.setToolTipText("3-column layout");
	705	+// sevenButton.addActionListener(this);
538	706	//
539	707
540		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
541		- rootButton.setToolTipText("Edit selection in new tab");
	708	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	709	+ rootButton.setToolTipText("Open selection in new tab");
542	710	rootButton.addActionListener(this);
543	711
544		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	712	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
545	713	closeButton.setToolTipText("Close tab");
546	714	closeButton.addActionListener(this);
547	715	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
548	716	//clearButton.addActionListener(this);
549		-
550		- cGridBag commandsPanel = new cGridBag();
	717	+
	718	+ // INSERT
	719	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	720	+ gridButton.setToolTipText("Create grid");
	721	+ gridButton.addActionListener(this);
	722	+
	723	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	724	+ boxButton.setToolTipText("Create box");
	725	+ boxButton.addActionListener(this);
	726	+
	727	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	728	+ sphereButton.setToolTipText("Create sphere");
	729	+ sphereButton.addActionListener(this);
	730	+
	731	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	732	+ coneButton.setToolTipText("Create cone");
	733	+ coneButton.addActionListener(this);
	734	+
	735	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	736	+ torusButton.setToolTipText("Create torus");
	737	+ torusButton.addActionListener(this);
	738	+
	739	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	740	+ superButton.setToolTipText("Create superellipsoid");
	741	+ superButton.addActionListener(this);
	742	+
	743	+ if (Globals.ADVANCED)
	744	+ {
	745	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	746	+ kleinButton.setToolTipText("Create Klein bottle");
	747	+ kleinButton.addActionListener(this);
	748	+ }
551	749
552		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
553		- editButton.setToolTipText("Edit selection");
	750	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	751	+ particlesButton.setToolTipText("Create particle system");
	752	+ particlesButton.addActionListener(this);
	753	+
	754	+ oe.toolboxPanel.Return();
	755	+
	756	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	757	+ groupButton.setToolTipText("Create group");
	758	+ groupButton.addActionListener(this);
	759	+
	760	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	761	+ compositeButton.setToolTipText("Create composite");
	762	+ compositeButton.addActionListener(this);
	763	+
	764	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	765	+ switchButton.setToolTipText("Create item switcher");
	766	+ switchButton.addActionListener(this);
	767	+
	768	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	769	+ loopButton.setToolTipText("Create loop");
	770	+ loopButton.addActionListener(this);
	771	+
	772	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	773	+ textureButton.setToolTipText("Create texture");
	774	+ textureButton.addActionListener(this);
	775	+
	776	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	777	+ overlayButton.setToolTipText("Create overlay");
	778	+ overlayButton.addActionListener(this);
	779	+
	780	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	781	+ lightButton.setToolTipText("Create light");
	782	+ lightButton.addActionListener(this);
	783	+
	784	+ for (int i=6; --i>=0;)
	785	+ {
	786	+ oe.toolboxPanel.Return();
	787	+ oe.toolboxPanel.add(new cGridBag());
	788	+ oe.toolboxPanel.add(new cGridBag());
	789	+ oe.toolboxPanel.add(new cGridBag());
	790	+ oe.toolboxPanel.add(new cGridBag());
	791	+ oe.toolboxPanel.add(new cGridBag());
	792	+ oe.toolboxPanel.add(new cGridBag());
	793	+ oe.toolboxPanel.add(new cGridBag());
	794	+ }
	795	+
	796	+ // EDIT panel
	797	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	798	+ editButton.setToolTipText("Pin selection controls");
554	799	editButton.addActionListener(this);
555	800
556		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
557		- uneditButton.setToolTipText("Unedit selection");
	801	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	802	+ uneditButton.setToolTipText("Remove selection controls");
558	803	uneditButton.addActionListener(this);
559	804
560		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
561		- allParamsButton.setToolTipText("Edit all params");
	805	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	806	+ allParamsButton.setToolTipText("Show all controle");
562	807	allParamsButton.addActionListener(this);
563	808
564		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	809	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565	810	clearPanelButton.setToolTipText("Clear edit panel");
566	811	clearPanelButton.addActionListener(this);
567	812
568		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	813	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569	814	unselectButton.setToolTipText("Unselect");
570	815	unselectButton.addActionListener(this);
571	816
572		- commandsPanel.preferredHeight = 1;
	817	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	818	+ flashSelectionButton.setToolTipText("Highlight selection");
	819	+ flashSelectionButton.addActionListener(this);
573	820
574		- oe.treePanel.add(commandsPanel);
575		- oe.treePanel.Return();
	821	+ editCommandsPanel.preferredHeight = 1;
	822	+
	823	+ SetPinStates(false);
	824	+// oe.treePanel.add(commandsPanel);
	825	+// oe.treePanel.Return();
576	826
577	827	// oe.aConstraints.gridx += 1;
578	828	// oe.aConstraints.weighty = 0;
..	..	@@ -589,29 +839,17 @@
589	839
590	840	JScrollPane jSP;
591	841	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
592		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	842	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
593	843	ResetModel();
594	844
595	845	oe.treePanel.add(jSPPanel);
596	846	oe.treePanel.Return();
597	847
598		- cGridBag copyOptionsPanel = new cGridBag();
599		-
600		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
601		- colorCB.setToolTipText("Copy color when dropped");
602		- colorCB.addItemListener(this);
603		-
604		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
605		- materialCB.setToolTipText("Copy material when dropped");
606		- materialCB.addItemListener(this);
607		-
608		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
609		- textureCB.setToolTipText("Copy texture when dropped");
610		- textureCB.addItemListener(this);
611		-
612		- copyOptionsPanel.preferredHeight = 1;
613	848	oe.treePanel.add(copyOptionsPanel);
614	849	oe.treePanel.Return();
	850	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	851	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	852	+ sliderPane.preferredHeight = 1;
615	853
616	854	// mainPanel.setDividerLocation(0.5); //1.0);
617	855	// mainPanel.setResizeWeight(0.5);
..	..	@@ -634,29 +872,49 @@
634	872	dgr.addDragGestureListener(this);
635	873	}catch(Exception e) {}
636	874	*/
637		- radio.layout = sevenButton;
	875	+ radio.layout = sixButton; // sevenButton;
638	876	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
639	877	}
640	878
641	879	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
642	880	{
	881	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	882	+ colorCB.setToolTipText("Copy color when dropped");
	883	+ colorCB.addItemListener(this);
	884	+
	885	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	886	+ materialCB.setToolTipText("Copy material when dropped");
	887	+ materialCB.addItemListener(this);
	888	+
	889	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	890	+ textureCB.setToolTipText("Copy texture when dropped");
	891	+ textureCB.addItemListener(this);
	892	+
	893	+ panel.Return();
	894	+
643	895	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
644	896	boxCB.setToolTipText("Display bounding boxes");
645	897	boxCB.addItemListener(this);
646	898
647	899	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
648		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	900	+ zoomBoxCB.setToolTipText("Display only for wheel");
649	901	zoomBoxCB.addItemListener(this);
650	902
651		- if (Globals.ADVANCED)
	903	+ if (true) // Globals.ADVANCED)
652	904	{
653		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
654		- supportCB.setToolTipText("Enable rigging");
655		- supportCB.addItemListener(this);
	905	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	906	+// supportCB.setToolTipText("Enable rigging");
	907	+// supportCB.addItemListener(this);
	908	+
	909	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	910	+ freezeCB.setToolTipText("Fast moving camera");
	911	+ freezeCB.addItemListener(this);
656	912
657	913	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
658	914	// localCB.addItemListener(this);
659	915
	916	+ panel.Return();
	917	+
660	918	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
661	919	crowdCB.setToolTipText("Used for crowds");
662	920	crowdCB.addItemListener(this);
..	..	@@ -673,6 +931,8 @@
673	931	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
674	932	// speakerMocapCB.addItemListener(this);
675	933
	934	+ panel.Return();
	935	+
676	936	if (false)
677	937	{
678	938	// handled in scripts
..	..	@@ -687,42 +947,85 @@
687	947	//constraints.gridy += 1;
688	948	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
689	949	smoothfocusCB.addItemListener(this);
	950	+ panel.Return();
690	951	}
691	952
692	953	//constraints.gridx += 1;
693	954	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
694	955	// debugCB.addItemListener(this);
695	956
	957	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	958	+ trackCB.setToolTipText("Enable tracking target");
	959	+ trackCB.addItemListener(this);
	960	+
696	961	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	962	+ oeilCB.setToolTipText("Move camera when tracking");
697	963	oeilCB.addItemListener(this);
698	964
	965	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	966	+ shadowCB.setToolTipText("When live compute shadows");
	967	+ shadowCB.addItemListener(this);
	968	+
	969	+ panel.Return();
	970	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	971	+ toggleTextureCB.setToolTipText("Load textures");
	972	+ toggleTextureCB.addItemListener(this);
	973	+
	974	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	975	+ toggleSwitchCB.setToolTipText("Choose a single item");
	976	+ toggleSwitchCB.addItemListener(this);
	977	+
	978	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	979	+ autokeepCB.setToolTipText("On structure change");
	980	+ autokeepCB.addItemListener(this);
	981	+
	982	+ panel.Return();
	983	+ if (Globals.ADVANCED)
	984	+ {
699	985	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
700	986	lookAtCB.setToolTipText("Look-at target");
701	987	lookAtCB.addItemListener(this);
	988	+ }
702	989
703	990	}
704	991
705	992	cGridBag fill = new cGridBag();
706		-
707	993	fill.preferredHeight = 200;
	994	+ cGridBag fill2 = new cGridBag();
	995	+ fill2.preferredHeight = 200;
	996	+ cGridBag fill3 = new cGridBag();
	997	+ fill3.preferredHeight = 200;
708	998
709	999	panel.add(fill);
	1000	+ panel.add(fill2);
	1001	+ panel.add(fill3);
710	1002
711	1003	}
712	1004
713	1005	void EditObject(Object3D obj)
714	1006	{
715	1007	cRadio radioButton = new cRadio(obj.name);
	1008	+
	1009	+ // June 2019. Patch to avoid bug with transparency.
	1010	+ radioButton.hadMaterial = obj.material != null;
	1011	+ if (!radioButton.hadMaterial)
	1012	+ {
	1013	+ obj.material = new cMaterial();
	1014	+ }
	1015	+
716	1016	radioButton.SetObject(obj);
717		- radioButton.layout = sevenButton;
	1017	+ radioButton.layout = sixButton; // sevenButton;
718	1018	radioButton.SetCamera(cameraView.renderCamera, false);
719	1019	radioButton.addActionListener(this);
720	1020	radioPanel.add(radioButton);
721	1021	buttonGroup.add(radioButton);
722	1022	radioButton.doClick();
723	1023	}
	1024	+
724	1025	void SetupViews(ObjEditor oe)
725	1026	{
	1027	+ theFrame = this;
	1028	+
726	1029	oe.SetupViews();
727	1030
728	1031	System.out.println("SetupViews");
..	..	@@ -731,23 +1034,28 @@
731	1034	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
732	1035	}
733	1036
734		- JCheckBox liveCB;
735		- JCheckBox supportCB;
736		- JCheckBox localCB;
737		- JCheckBox crowdCB;
738		- JCheckBox smoothCB;
739		- JCheckBox fastCB;
740		- JCheckBox slowCB;
741		- JCheckBox boxCB;
742		- JCheckBox zoomBoxCB;
743		- JCheckBox trackCB;
744		- JCheckBox smoothfocusCB;
	1037	+ cToggleButton liveCB;
	1038	+ cCheckBox supportCB;
	1039	+ cCheckBox localCB;
	1040	+ cCheckBox crowdCB;
	1041	+ cCheckBox smoothCB;
	1042	+ cToggleButton fastCB;
	1043	+ cCheckBox slowCB;
	1044	+ cCheckBox boxCB;
	1045	+ cCheckBox zoomBoxCB;
	1046	+ cCheckBox freezeCB;
	1047	+ //cToggleButton trackCB;
	1048	+ cCheckBox trackCB;
	1049	+ cCheckBox smoothfocusCB;
745	1050	// JCheckBox speakerMocapCB;
746		- JCheckBox speakerCameraCB;
747		- JCheckBox speakerFocusCB;
748		- JCheckBox debugCB;
749		- JCheckBox oeilCB;
750		- JCheckBox lookAtCB;
	1051	+ cCheckBox speakerCameraCB;
	1052	+ cCheckBox speakerFocusCB;
	1053	+ cCheckBox debugCB;
	1054	+
	1055	+ cCheckBox oeilCB;
	1056	+ cCheckBox shadowCB;
	1057	+ cCheckBox autokeepCB;
	1058	+ cCheckBox lookAtCB;
751	1059
752	1060	// static int COLOR = 1;
753	1061	// static int MATERIAL = 2;
..	..	@@ -755,9 +1063,9 @@
755	1063
756	1064	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
757	1065
758		- JCheckBox colorCB;
759		- JCheckBox materialCB;
760		- JCheckBox textureCB;
	1066	+ cCheckBox colorCB;
	1067	+ cCheckBox materialCB;
	1068	+ cCheckBox textureCB;
761	1069
762	1070	public void itemStateChanged(ItemEvent e)
763	1071	{
..	..	@@ -785,6 +1093,7 @@
785	1093	} else if(e.getSource() == liveCB)
786	1094	{
787	1095	cameraView.ToggleLive();
	1096	+ refreshContents(false);
788	1097	}
789	1098	else if(e.getSource() == supportCB)
790	1099	{
..	..	@@ -849,6 +1158,18 @@
849	1158	{
850	1159	cameraView.ToggleOeil();
851	1160	}
	1161	+ else if(e.getSource() == shadowCB)
	1162	+ {
	1163	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1164	+ }
	1165	+ else if(e.getSource() == freezeCB)
	1166	+ {
	1167	+ Globals.FREEZEONMOVE ^= true;
	1168	+ }
	1169	+ else if(e.getSource() == autokeepCB)
	1170	+ {
	1171	+ Globals.REPLACEONMAKE ^= true;
	1172	+ }
852	1173	else if(e.getSource() == lookAtCB)
853	1174	{
854	1175	cameraView.ToggleLookAt();
..	..	@@ -865,7 +1186,8 @@
865	1186
866	1187	/**/
867	1188	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
868		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1189	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1190	+ TreePath path = objEditor.jTree.getSelectionPath();
869	1191	if ((path == null) \|\| (path.getPathCount() <= 1)) {
870	1192	// We can't move the root node or an empty selection
871	1193	return;
..	..	@@ -928,8 +1250,6 @@
928	1250	}
929	1251	}
930	1252
931		- String string = (String) object;
932		-
933	1253	System.out.println("Transfer = " + object + "; drop : " + target);
934	1254	// if( object instanceof java.io.File[])
935	1255	// {
..	..	@@ -937,7 +1257,11 @@
937	1257	// objEditor.DropFile((java.io.File[]) object, true);
938	1258	// return;
939	1259	// }
940		- if (string.charAt(0) == '/')
	1260	+
	1261	+ String string = object.toString();
	1262	+
	1263	+ // File path for Mac and Windows
	1264	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
941	1265	{
942	1266	// file(s)
943	1267	String[] names = string.split("\n");
..	..	@@ -964,7 +1288,7 @@
964	1288
965	1289	flashIt = false;
966	1290	CameraPane pane = (CameraPane) target;
967		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1291	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
968	1292	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
969	1293
970	1294	if (group.selection.size() == 1)
..	..	@@ -980,23 +1304,33 @@
980	1304
981	1305	assert target == objEditor.jTree;
982	1306	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1307	+ Object3D destinationLeaf;
983	1308	try {
984		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1309	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
985	1310	} catch (Exception e) {
986	1311	System.out.println("destinationPath : " + destinationPath);
987	1312	return;
988	1313	}
989	1314
990		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1315	+ for (int i=group.selection.size(); --i>=0;)
991	1316	{
	1317	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1318	+
	1319	+ // Cannot move into itself
	1320	+ if (child == destinationLeaf)
	1321	+ return;
	1322	+ }
	1323	+
	1324	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1325	+// {
992	1326	loadClipboard(true);
993	1327	objEditor.jTree.setSelectionPath(destinationPath);
994	1328	pasteInto(false, false);
995		- } else {
996		- loadClipboard(false);
997		- objEditor.jTree.setSelectionPath(destinationPath);
998		- pasteInto(false, false); // true); // ???
999		- }
	1329	+// } else {
	1330	+// loadClipboard(false);
	1331	+// objEditor.jTree.setSelectionPath(destinationPath);
	1332	+// pasteInto(false, false); // true); // ???
	1333	+// }
1000	1334	}
1001	1335	public void dropActionChanged(DropTargetDragEvent dtde)
1002	1336	// Called if the user has modified the current drop gesture
..	..	@@ -1101,22 +1435,30 @@
1101	1435	{
1102	1436	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1103	1437	//heightFieldItem.addActionListener(this);
1104		- gridItem = menu.add(new MenuItem("Grid"));
1105		- gridItem.addActionListener(this);
1106		- rectoidItem = menu.add(new MenuItem("Box"));
1107		- rectoidItem.addActionListener(this);
1108		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1109		- ellipsoidItem.addActionListener(this);
1110		- coneItem = menu.add(new MenuItem("Cone"));
1111		- coneItem.addActionListener(this);
1112		- torusItem = menu.add(new MenuItem("Torus"));
1113		- torusItem.addActionListener(this);
1114		- superItem = menu.add(new MenuItem("Superellipsoid"));
1115		- superItem.addActionListener(this);
	1438	+// gridItem = menu.add(new MenuItem("Grid"));
	1439	+// gridItem.addActionListener(this);
	1440	+// rectoidItem = menu.add(new MenuItem("Box"));
	1441	+// rectoidItem.addActionListener(this);
	1442	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1443	+// ellipsoidItem.addActionListener(this);
	1444	+// coneItem = menu.add(new MenuItem("Cone"));
	1445	+// coneItem.addActionListener(this);
	1446	+// torusItem = menu.add(new MenuItem("Torus"));
	1447	+// torusItem.addActionListener(this);
	1448	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1449	+// superItem.addActionListener(this);
	1450	+
	1451	+ cameraItem = menu.add(new MenuItem("Camera"));
	1452	+ cameraItem.addActionListener(this);
	1453	+
	1454	+ if (!Globals.ADVANCED)
	1455	+ {
1116	1456	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1117	1457	kleinItem.addActionListener(this);
1118		- particleItem = menu.add(new MenuItem("Particle system"));
1119		- particleItem.addActionListener(this);
	1458	+ }
	1459	+
	1460	+// particleItem = menu.add(new MenuItem("Particle system"));
	1461	+// particleItem.addActionListener(this);
1120	1462	if (Globals.ADVANCED)
1121	1463	{
1122	1464	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1142,15 +1484,15 @@
1142	1484	}
1143	1485	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1144	1486	bezierItem.addActionListener(this);
1145		- overlayItem = menu.add(new MenuItem("Overlay"));
1146		- overlayItem.addActionListener(this);
1147		- lightItem = menu.add(new MenuItem("Light"));
1148		- lightItem.addActionListener(this);
	1487	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1488	+// overlayItem.addActionListener(this);
	1489	+// lightItem = menu.add(new MenuItem("Light"));
	1490	+// lightItem.addActionListener(this);
1149	1491	menu.add("-");
1150	1492	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1151	1493	//superLoopItem.addActionListener(this);
1152		- loopItem = menu.add(new MenuItem("Loop"));
1153		- loopItem.addActionListener(this);
	1494	+// loopItem = menu.add(new MenuItem("Loop"));
	1495	+// loopItem.addActionListener(this);
1154	1496	doubleItem = menu.add(new MenuItem("Fork"));
1155	1497	doubleItem.addActionListener(this);
1156	1498	if (Globals.ADVANCED)
..	..	@@ -1166,6 +1508,9 @@
1166	1508	animationItem.addItemListener(this);
1167	1509	animationItem.setState(Globals.ANIMATION);
1168	1510
	1511	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1512	+ archiveItem.addActionListener(this);
	1513	+
1169	1514	menu.add("-");
1170	1515	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1171	1516	parseverticesItem.addActionListener(this);
..	..	@@ -1178,6 +1523,8 @@
1178	1523	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1179	1524	reduce34MorphItem.addActionListener(this);
1180	1525	menu.add("-");
	1526	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1527	+ memoryItem.addActionListener(this);
1181	1528	menu.add(computeAOItem = new MenuItem("Compute AO"));
1182	1529	computeAOItem.addActionListener(this);
1183	1530
..	..	@@ -1186,11 +1533,9 @@
1186	1533	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1187	1534	mirrorItem.addActionListener(this);
1188	1535	menu.add("-");
1189		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1190		- memoryItem.addActionListener(this);
1191	1536	menu.add(analyzeItem = new MenuItem("Analyze"));
1192	1537	analyzeItem.addActionListener(this);
1193		- menu.add(dumpItem = new MenuItem("Dump"));
	1538	+ menu.add(dumpItem = new MenuItem("Print"));
1194	1539	dumpItem.addActionListener(this);
1195	1540	// menu.add(pathItem = new MenuItem("From-to path"));
1196	1541	// pathItem.addActionListener(this);
..	..	@@ -1331,9 +1676,34 @@
1331	1676	shadow.material = new cMaterial(obj.material);
1332	1677	shadow.material.diffuse = 0.0001f;
1333	1678	shadow.material.specular = 0.0001f;
	1679	+ //shadow.projectedVertices[1].x = 300;
1334	1680
1335	1681	makeSomething(shadow);
1336	1682	}
	1683	+
	1684	+ private void ClearUnpinned()
	1685	+ {
	1686	+ //for (Object3D obj : listUI)
	1687	+ for (int i=listUI.size(); --i>=0;)
	1688	+ {
	1689	+ Object3D obj = listUI.elementAt(i);
	1690	+ if (!obj.pinned)
	1691	+ {
	1692	+ obj.CloseUI();
	1693	+ listUI.remove(i);
	1694	+ }
	1695	+ }
	1696	+ }
	1697	+
	1698	+ private void EditElement(Object3D elem, boolean newWindow)
	1699	+ {
	1700	+ // if (!(elem instanceof Composite))
	1701	+ // newWindow = false;
	1702	+ listUI.add(elem);
	1703	+ elem.openEditWindow(this, newWindow); //, false);
	1704	+ System.out.println("edit : " + elem);
	1705	+ elem.editWindow.refreshContents(true); // ? new
	1706	+ }
1337	1707
1338	1708	/**
1339	1709	* applyExample
..	..	@@ -1537,9 +1907,9 @@
1537	1907
1538	1908	void Overwrite(int mask)
1539	1909	{
1540		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1910	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1541	1911	{
1542		- Object3D content = GrafreeD.clipboard.get(0);
	1912	+ Object3D content = Grafreed.clipboard.get(0);
1543	1913
1544	1914	if (content instanceof cGroup && ((cGroup)content).transientlink )
1545	1915	content = ((cGroup)content).get(0);
..	..	@@ -1578,7 +1948,7 @@
1578	1948	{
1579	1949	ScreenFit();
1580	1950	} else
1581		- if (source == switchItem)
	1951	+ if (source == switchViewItem)
1582	1952	{
1583	1953	cVector v1 = new cVector();
1584	1954	cVector v2 = new cVector();
..	..	@@ -1587,11 +1957,11 @@
1587	1957	objEditor.cameraView.renderCamera.setAim(v2, v1);
1588	1958	objEditor.cameraView.repaint();
1589	1959	} else
1590		- if (source == rectoidItem)
	1960	+ if (source == rectoidItem \|\| source == boxButton)
1591	1961	{
1592	1962	makeSomething(new Box());
1593	1963	} else
1594		- if (source == particleItem)
	1964	+ if (source == particleItem \|\| source == particlesButton)
1595	1965	{
1596	1966	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1597	1967	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1670,27 +2040,27 @@
1670	2040
1671	2041	makeSomething(obj);
1672	2042	} else
1673		- if (source == gridItem)
	2043	+ if (source == gridItem \|\| source == gridButton)
1674	2044	{
1675	2045	makeSomething(new Grid());
1676	2046	} else
1677		- if (source == ellipsoidItem)
	2047	+ if (source == ellipsoidItem \|\| source == sphereButton)
1678	2048	{
1679	2049	makeSomething(new Sphere());
1680	2050	} else
1681		- if (source == coneItem)
	2051	+ if (source == coneItem \|\| source == coneButton)
1682	2052	{
1683	2053	makeSomething(new Cone());
1684	2054	} else
1685		- if (source == torusItem)
	2055	+ if (source == torusItem \|\| source == torusButton)
1686	2056	{
1687	2057	makeSomething(new Torus());
1688	2058	} else
1689		- if (source == superItem)
	2059	+ if (source == superItem \|\| source == superButton)
1690	2060	{
1691	2061	makeSomething(new Superellipsoid());
1692	2062	} else
1693		- if (source == kleinItem)
	2063	+ if (source == kleinItem \|\| source == kleinButton)
1694	2064	{
1695	2065	makeSomething(new Klein());
1696	2066	} else
..	..	@@ -1710,7 +2080,7 @@
1710	2080	{
1711	2081	makeSomething(new BezierSurface());
1712	2082	} else
1713		- if (source == overlayItem)
	2083	+ if (source == overlayItem \|\| source == overlayButton)
1714	2084	{
1715	2085	/*
1716	2086	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1758,7 +2128,7 @@
1758	2128	s.setup();
1759	2129	makeSomething(s);
1760	2130	} else
1761		- if (source == lightItem)
	2131	+ if (source == lightItem \|\| source == lightButton)
1762	2132	{
1763	2133	makeSomething(new Light());
1764	2134	} else
..	..	@@ -1808,30 +2178,30 @@
1808	2178
1809	2179	group(g);
1810	2180	} else
1811		- if (source == loopItem)
	2181	+ if (source == loopItem \|\| source == loopButton)
1812	2182	{
1813	2183	Composite csg = new GroupLeaf();
1814	2184	csg.count = 5;
1815	2185	group(csg);
1816		- Composite child = new cGroup();
	2186	+ Composite child = new cGroup("Branch");
1817	2187	csg.addChild(child);
1818	2188	child.addChild(csg);
1819	2189	} else
1820	2190	if (source == doubleItem)
1821	2191	{
1822		- Composite csg = new GroupLeaf();
	2192	+ Composite csg = new GroupLeaf("Fork");
1823	2193	csg.count = 5;
1824	2194	group(csg);
1825		- Composite child = new cGroup();
	2195	+ Composite child = new cGroup("Branch A");
1826	2196	csg.addChild(child);
1827	2197	child.addChild(csg);
1828		- child = new cGroup();
	2198	+ child = new cGroup("Branch B");
1829	2199	csg.addChild(child);
1830	2200	child.addChild(csg);
1831	2201	} else
1832	2202	if (source == tripleItem)
1833	2203	{
1834		- Composite csg = new GroupLeaf();
	2204	+ Composite csg = new GroupLeaf("Trident");
1835	2205	csg.count = 4;
1836	2206	group(csg);
1837	2207	Composite child = new cGroup();
..	..	@@ -1843,23 +2213,6 @@
1843	2213	child = new cGroup();
1844	2214	csg.addChild(child);
1845	2215	child.addChild(csg);
1846		- } else
1847		-
1848		- if (source == importGFDItem)
1849		- {
1850		- ImportGFD();
1851		- } else
1852		- if (source == importVRMLX3DItem)
1853		- {
1854		- ImportVRMLX3D();
1855		- } else
1856		- if (source == import3DSItem)
1857		- {
1858		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1859		- } else
1860		- if (source == importOBJItem)
1861		- {
1862		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1863	2216	} else
1864	2217	if (source == computeAOItem)
1865	2218	{
..	..	@@ -1879,7 +2232,7 @@
1879	2232	if (source == invariantsItem)
1880	2233	{
1881	2234	System.out.println("Invariants:");
1882		- GrafreeD.grafreeD.universe.invariants();
	2235	+ Grafreed.grafreeD.universe.invariants();
1883	2236	} else
1884	2237	if (source == memoryItem)
1885	2238	{
..	..	@@ -1898,6 +2251,46 @@
1898	2251	{
1899	2252	DumpObject();
1900	2253	} else
	2254	+ if (source == minButton)
	2255	+ {
	2256	+ Minimize();
	2257	+ } else
	2258	+ if (source == maxButton)
	2259	+ {
	2260	+ Maximize();
	2261	+ } else
	2262	+ if (source == fullButton)
	2263	+ {
	2264	+ ToggleFullScreen();
	2265	+ } else
	2266	+ if (source == undoButton)
	2267	+ {
	2268	+ // Go to previous version
	2269	+ //if (!Undo())
	2270	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2271	+ Undo();
	2272	+ } else
	2273	+ if (source == restoreButton)
	2274	+ {
	2275	+ // Restore current version
	2276	+ Restore();
	2277	+ } else
	2278	+ if (source == replaceButton)
	2279	+ {
	2280	+ // Overwrite current version
	2281	+ Replace();
	2282	+ } else
	2283	+ if (source == redoButton)
	2284	+ {
	2285	+ // Go to next version
	2286	+ Redo();
	2287	+ } else
	2288	+ if (source == saveButton)
	2289	+ {
	2290	+ // Save a new version
	2291	+ if (!Save(true))
	2292	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2293	+ } else
1901	2294	if (source == oneStepButton)
1902	2295	{
1903	2296	Globals.ONESTEP = true;
..	..	@@ -1905,17 +2298,14 @@
1905	2298	} else
1906	2299	if (source == screenfitButton)
1907	2300	{
1908		- //Reload(lastConverter, lastFilename, true);
1909	2301	ScreenFit();
1910	2302	} else
1911	2303	if (source == screenfitpointButton)
1912	2304	{
1913		- //Reload(lastConverter, lastFilename, true);
1914	2305	ScreenFitPoint();
1915	2306	} else
1916	2307	if (source == snapobjectButton)
1917	2308	{
1918		- //Reload(lastConverter, lastFilename, true);
1919	2309	SnapObject();
1920	2310	} else
1921	2311	// if (event.getSource() == recompileButton)
..	..	@@ -1952,12 +2342,20 @@
1952	2342	{
1953	2343	loadClipboard(true);
1954	2344	} else
	2345	+ if (source == undoItem)
	2346	+ {
	2347	+ Undo();
	2348	+ } else
	2349	+ if (source == redoItem)
	2350	+ {
	2351	+ Redo();
	2352	+ } else
1955	2353	if (source == duplicateItem)
1956	2354	{
1957		- Object3D keep = GrafreeD.clipboard;
	2355	+ Object3D keep = Grafreed.clipboard;
1958	2356	loadClipboard(false);
1959	2357	paste(false);
1960		- GrafreeD.clipboard = keep;
	2358	+ Grafreed.clipboard = keep;
1961	2359	} else
1962	2360	if (source == cloneItem)
1963	2361	{
..	..	@@ -2177,9 +2575,9 @@
2177	2575	// group.selection.get(0).setMasterThis(content); // should be identity
2178	2576	// refreshContents();
2179	2577	// }
2180		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2578	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2181	2579	{
2182		- Object3D content = GrafreeD.clipboard.get(0);
	2580	+ Object3D content = Grafreed.clipboard.get(0);
2183	2581
2184	2582	if (content instanceof cGroup && ((cGroup)content).transientlink )
2185	2583	content = ((cGroup)content).get(0);
..	..	@@ -2229,9 +2627,9 @@
2229	2627	} else
2230	2628	if (source == setMasterItem)
2231	2629	{
2232		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2630	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2233	2631	{
2234		- Object3D content = GrafreeD.clipboard.get(0);
	2632	+ Object3D content = Grafreed.clipboard.get(0);
2235	2633
2236	2634	if (content instanceof cGroup && ((cGroup)content).transientlink )
2237	2635	content = ((cGroup)content).get(0);
..	..	@@ -2244,9 +2642,9 @@
2244	2642	{
2245	2643	if (group.selection.size() == 1)
2246	2644	{
2247		- if (GrafreeD.clipboard.size() == 1)
	2645	+ if (Grafreed.clipboard.size() == 1)
2248	2646	{
2249		- Object3D content = GrafreeD.clipboard.get(0);
	2647	+ Object3D content = Grafreed.clipboard.get(0);
2250	2648
2251	2649	if (content instanceof cGroup && ((cGroup)content).transientlink )
2252	2650	content = ((cGroup)content).get(0);
..	..	@@ -2263,7 +2661,7 @@
2263	2661	{
2264	2662	RevertMeshes();
2265	2663	} else
2266		- if (source == resetMeshItem)
	2664	+ if (source == resetAllItem)
2267	2665	{
2268	2666	ResetAll();
2269	2667	} else
..	..	@@ -2271,7 +2669,7 @@
2271	2669	{
2272	2670	StepAll();
2273	2671	} else
2274		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2672	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2275	2673	{
2276	2674	//int indices[] = jList.getSelectedIndices();
2277	2675	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2283,9 +2681,9 @@
2283	2681	{
2284	2682	ClearSelection(true);
2285	2683	} else
2286		- if (source == grabItem)
	2684	+ if (source == grabItem \|\| source == groupButton)
2287	2685	{
2288		- group(new cGroup(), true);
	2686	+ group(new cGroup(), false); // true);
2289	2687	} else
2290	2688	if (source == hideItem)
2291	2689	{
..	..	@@ -2303,11 +2701,11 @@
2303	2701	{
2304	2702	makeSomething(new Camera());
2305	2703	} else
2306		- if (source == compositeItem)
	2704	+ if (source == compositeItem \|\| source == compositeButton)
2307	2705	{
2308	2706	group(new Composite());
2309	2707	} else
2310		- if (source == randomItem)
	2708	+ if (source == switchItem \|\| source == switchButton)
2311	2709	{
2312	2710	RandomNode random = new RandomNode();
2313	2711	group(random);
..	..	@@ -2409,7 +2807,7 @@
2409	2807	{
2410	2808	group(new cLinker());
2411	2809	} else
2412		- if (source == textureItem)
	2810	+ if (source == textureItem \|\| source == textureButton)
2413	2811	{
2414	2812	group(new TextureNode());
2415	2813	} else
..	..	@@ -2429,17 +2827,30 @@
2429	2827	{
2430	2828	CastShadow(2);
2431	2829	} else
2432		- if (source == ungroupItem)
	2830	+ if (source == ungroupItem \|\| source == ungroupButton)
2433	2831	{
2434		- //ungroup();
	2832	+ boolean hasRoot = false;
	2833	+
2435	2834	for (int i=0; i<group.selection.size(); i++)
2436	2835	{
2437		- Ungroup(group.selection.get(i));
	2836	+ if (group.selection.get(i) == group)
	2837	+ {
	2838	+ hasRoot = true;
	2839	+ break;
	2840	+ }
2438	2841	}
2439	2842
2440		- ClearSelection(false);
2441		-
2442		- refreshContents();
	2843	+ if (!hasRoot)
	2844	+ {
	2845	+ for (int i=0; i<group.selection.size(); i++)
	2846	+ {
	2847	+ Ungroup(group.selection.get(i));
	2848	+ }
	2849	+
	2850	+ ClearSelection(false);
	2851	+
	2852	+ refreshContents();
	2853	+ }
2443	2854	} else
2444	2855	if (source == genUVItem)
2445	2856	{
..	..	@@ -2451,7 +2862,7 @@
2451	2862	} else
2452	2863	if (source == genNormalsMESHItem)
2453	2864	{
2454		- GenNormals(true); // TODO
	2865	+ GenNormalsMESH();
2455	2866	} else
2456	2867	if (source == genNormalsORGANItem)
2457	2868	{
..	..	@@ -2516,6 +2927,22 @@
2516	2927	if (source == unmarkleavesItem)
2517	2928	{
2518	2929	MarkLeaves(false);
	2930	+ } else
	2931	+ if (source == rewindleavesItem)
	2932	+ {
	2933	+ RewindLeaves(true);
	2934	+ } else
	2935	+ if (source == unrewindleavesItem)
	2936	+ {
	2937	+ RewindLeaves(false);
	2938	+ } else
	2939	+ if (source == randomleavesItem)
	2940	+ {
	2941	+ RandomLeaves(true);
	2942	+ } else
	2943	+ if (source == unrandomleavesItem)
	2944	+ {
	2945	+ RandomLeaves(false);
2519	2946	} else
2520	2947	if (source == flipVItem)
2521	2948	{
..	..	@@ -2601,9 +3028,13 @@
2601	3028	{
2602	3029	SmoothMesh();
2603	3030	} else
2604		- if (source == transformgeometryItem)
	3031	+ if (source == transformGeometryItem)
2605	3032	{
2606	3033	TransformGeometry();
	3034	+ } else
	3035	+ if (source == transformChildrenItem)
	3036	+ {
	3037	+ TransformChildren();
2607	3038	} else
2608	3039	if (source == resetTransformItem)
2609	3040	{
..	..	@@ -2611,7 +3042,11 @@
2611	3042	} else
2612	3043	if (source == resetCentroidItem)
2613	3044	{
2614		- ResetCentroid();
	3045	+ ResetCentroid(true);
	3046	+ } else
	3047	+ if (source == resetCentroidXZItem)
	3048	+ {
	3049	+ ResetCentroid(false);
2615	3050	} else
2616	3051	if (source == resetParentItem)
2617	3052	{
..	..	@@ -2743,6 +3178,10 @@
2743	3178	if (source == twoButton)
2744	3179	{
2745	3180	radio.layout = twoButton;
	3181	+
	3182	+ if (CameraPane.FULLSCREEN)
	3183	+ fullscreenLayout = radio.layout;
	3184	+
2746	3185	// bug
2747	3186	//gridPanel.setDividerLocation(1.0);
2748	3187	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2775,10 +3214,31 @@
2775	3214	bigThree.ClearUI();
2776	3215	bigThree.add(centralPanel);
2777	3216	bigThree.FlushUI();
	3217	+
	3218	+ cameraView.requestFocusInWindow();
	3219	+
	3220	+// refreshContents(true);
	3221	+//
	3222	+// try
	3223	+// {
	3224	+// java.awt.Robot bot = new java.awt.Robot();
	3225	+// int mask = InputEvent.BUTTON1_MASK;
	3226	+// bot.mouseMove(100, 100);
	3227	+// bot.mousePress(mask);
	3228	+// bot.mouseRelease(mask);
	3229	+// }
	3230	+// catch (Exception e)
	3231	+// {
	3232	+//
	3233	+// }
	3234	+
2778	3235	} else
2779	3236	if (source == threeButton)
2780	3237	{
2781	3238	radio.layout = threeButton;
	3239	+
	3240	+ if (CameraPane.FULLSCREEN)
	3241	+ fullscreenLayout = radio.layout;
2782	3242
2783	3243	// bigThree.remove(scenePanel);
2784	3244	// bigThree.remove(centralPanel);
..	..	@@ -2811,10 +3271,15 @@
2811	3271	bigThree.add(centralPanel);
2812	3272	bigThree.add(XYZPanel);
2813	3273	bigThree.FlushUI();
	3274	+
	3275	+ cameraView.requestFocusInWindow();
2814	3276	} else
2815	3277	if (source == fourButton)
2816	3278	{
2817	3279	radio.layout = fourButton;
	3280	+
	3281	+ if (CameraPane.FULLSCREEN)
	3282	+ fullscreenLayout = radio.layout;
2818	3283
2819	3284	// bigThree.remove(scenePanel);
2820	3285	// bigThree.remove(centralPanel);
..	..	@@ -2846,10 +3311,15 @@
2846	3311	bigThree.ClearUI();
2847	3312	bigThree.add(scenePanel);
2848	3313	bigThree.FlushUI();
	3314	+
	3315	+ cameraView.requestFocusInWindow();
2849	3316	} else
2850	3317	if (source == sixButton)
2851	3318	{
2852	3319	radio.layout = sixButton;
	3320	+
	3321	+ if (CameraPane.FULLSCREEN)
	3322	+ fullscreenLayout = radio.layout;
2853	3323
2854	3324	// bigThree.remove(scenePanel);
2855	3325	// bigThree.remove(centralPanel);
..	..	@@ -2882,10 +3352,15 @@
2882	3352	bigThree.add(scenePanel);
2883	3353	bigThree.add(centralPanel);
2884	3354	bigThree.FlushUI();
	3355	+
	3356	+ cameraView.requestFocusInWindow();
2885	3357	} else
2886	3358	if (source == sevenButton)
2887	3359	{
2888	3360	radio.layout = sevenButton;
	3361	+
	3362	+ if (CameraPane.FULLSCREEN)
	3363	+ fullscreenLayout = radio.layout;
2889	3364
2890	3365	// bigThree.remove(scenePanel);
2891	3366	// bigThree.remove(centralPanel);
..	..	@@ -2919,6 +3394,8 @@
2919	3394	bigThree.add(centralPanel);
2920	3395	bigThree.add(XYZPanel);
2921	3396	bigThree.FlushUI();
	3397	+
	3398	+ cameraView.requestFocusInWindow();
2922	3399	} else
2923	3400	if (source == rootButton)
2924	3401	{
..	..	@@ -2930,6 +3407,7 @@
2930	3407	EditObject(obj);
2931	3408	}
2932	3409
	3410	+ cameraView.requestFocusInWindow();
2933	3411	refreshContents(true);
2934	3412	} else
2935	3413	if (source == closeButton)
..	..	@@ -2939,22 +3417,37 @@
2939	3417	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2940	3418	{
2941	3419	ab = (cRadio)e.nextElement();
2942		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3420	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2943	3421	{
	3422	+ // Patch to avoid bug with transparency.
	3423	+ if (!ab.hadMaterial)
	3424	+ {
	3425	+ ab.object.material = null;
	3426	+ }
	3427	+
2944	3428	buttonGroup.remove(ab);
2945	3429	radioPanel.remove(ab);
2946	3430
2947		- ab.GetObject().editWindow = null;
	3431	+ //ab.GetObject().editWindow = null;
	3432	+ ab.GetObject().manipWindow = null;
2948	3433	// ab.GetObject().objectUI = null; // ?????????
2949	3434
2950	3435	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2951	3436	break;
2952	3437	}
2953	3438	}
	3439	+
	3440	+ cameraView.requestFocusInWindow();
2954	3441	refreshContents(true);
2955	3442	} else
2956	3443	if (source == editItem \|\| source == editButton)
2957	3444	{
	3445	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3446	+ {
	3447	+ Object3D child = (Object3D)e.nextElement();
	3448	+ child.pinned = true;
	3449	+ }
	3450	+
2958	3451	EditSelection(false);
2959	3452	} else
2960	3453	if (source == uneditButton)
..	..	@@ -2964,10 +3457,11 @@
2964	3457	Object3D child = (Object3D)e.nextElement();
2965	3458	if(child.editWindow != null)
2966	3459	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3460	+ child.pinned = false;
2967	3461	child.CloseUI();
2968	3462	listUI.remove(child);
2969	3463
2970		- child.editWindow = null; // ???????????
	3464	+ //child.editWindow = null; // ???????????
2971	3465	}
2972	3466	objEditor.ctrlPanel.FlushUI();
2973	3467	//objEditor.jTree.clearSelection();
..	..	@@ -2980,6 +3474,7 @@
2980	3474	//copy.ClearUI();
2981	3475	for (Object3D obj : listUI)
2982	3476	{
	3477	+ obj.pinned = false;
2983	3478	obj.CloseUI();
2984	3479	}
2985	3480	listUI.clear();
..	..	@@ -2989,7 +3484,7 @@
2989	3484	{
2990	3485	assert(copy == group);
2991	3486
2992		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3487	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2993	3488
2994	3489	for (Object3D obj : listUI)
2995	3490	{
..	..	@@ -3038,6 +3533,9 @@
3038	3533	}
3039	3534
3040	3535	copy = group;
	3536	+
	3537	+ SetUndoStates();
	3538	+
3041	3539	//Globals.theRenderer.object = group;
3042	3540	if(!useclient)
3043	3541	{
..	..	@@ -3053,20 +3551,46 @@
3053	3551	frontView.object = group;
3054	3552	sideView.object = group;
3055	3553	}
3056		- group.editWindow = this;
	3554	+
	3555	+// fix "+" issue
	3556	+ //group.editWindow = this;
	3557	+ group.manipWindow = this;
	3558	+
3057	3559	/*
3058	3560	currentLayout = radio.layout;
3059	3561	if (currentLayout == null)
3060	3562	currentLayout = sevenButton;
3061	3563	*/
3062	3564	radio.layout.doClick();
	3565	+
	3566	+ ClearUnpinned();
	3567	+ //Grafreed.Assert(group != null);
	3568	+ //Grafreed.Assert(group.selection != null);
	3569	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3570	+ if (group.selection == null \|\| group.selection.size() == 1)
	3571	+ EditSelection(false);
3063	3572	keepparent = group.parent;
3064	3573	// PARENT = NULL or not???
3065	3574	//group.parent = null; // ROOT
3066	3575	//group.attributes = -1;
3067	3576	ResetModel();
	3577	+
	3578	+ cameraView.requestFocusInWindow();
3068	3579	refreshContents(true);
3069		- }
	3580	+ } else if (event.getSource() == editCameraItem)
	3581	+ {
	3582	+ cameraView.ProtectCamera();
	3583	+ cameraView.repaint();
	3584	+ return;
	3585	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3586	+ {
	3587	+ cameraView.RevertCamera();
	3588	+ cameraView.repaint();
	3589	+ return;
	3590	+ // } else if (event.getSource() == textureButton)
	3591	+ // {
	3592	+ // return; // true;
	3593	+ }
3070	3594	else
3071	3595	{
3072	3596	//return super.action(event, arg);
..	..	@@ -3075,7 +3599,6 @@
3075	3599	}
3076	3600
3077	3601	boolean useclient = false;
3078		- cRadio radio;
3079	3602
3080	3603	void ToggleRoot()
3081	3604	{
..	..	@@ -3127,6 +3650,28 @@
3127	3650	refreshContents();
3128	3651	}
3129	3652
	3653	+ void TransformChildren()
	3654	+ {
	3655	+ Object3D obj;
	3656	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3657	+ {
	3658	+ obj = (Object3D)e.nextElement();
	3659	+ obj.KeepTextureMatrices();
	3660	+ obj.TransformChildren();
	3661	+ obj.RestoreTextureMatrices();
	3662	+
	3663	+// if (obj.parent == null)
	3664	+// {
	3665	+// System.out.println("NULL PARENT!");
	3666	+// new Exception().printStackTrace();
	3667	+// }
	3668	+// else
	3669	+// TouchTransform(obj);
	3670	+// //obj.parent.Touch();
	3671	+ }
	3672	+
	3673	+ refreshContents();
	3674	+ }
3130	3675
3131	3676	void ResetTransform()
3132	3677	{
..	..	@@ -3239,7 +3784,7 @@
3239	3784	refreshContents();
3240	3785	}
3241	3786
3242		- void ResetCentroid()
	3787	+ void ResetCentroid(boolean full)
3243	3788	{
3244	3789	Object3D obj;
3245	3790	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3254,12 +3799,16 @@
3254	3799	LA.matIdentity(Object3D.mat);
3255	3800	obj.getBounds(minima, maxima, false);
3256	3801	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3257		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3802	+ if (full)
	3803	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3258	3804	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3259	3805	obj.TransformMesh(Object3D.mat);
	3806	+
3260	3807	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3261		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3808	+ if (full)
	3809	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3262	3810	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3811	+
3263	3812	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3264	3813	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3265	3814	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3288,7 +3837,8 @@
3288	3837
3289	3838	int size = obj.MemorySize();
3290	3839
3291		- System.err.println((size/1024) + " KB is the size of " + obj);
	3840	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3841	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3292	3842	}
3293	3843	}
3294	3844	catch (Exception e)
..	..	@@ -3325,9 +3875,9 @@
3325	3875	obj = (Object3D)e.nextElement();
3326	3876
3327	3877	System.out.println("Object is: " + obj);
3328		- GrafreeD.AnalyzeObject(obj);
	3878	+ Grafreed.AnalyzeObject(obj);
3329	3879	System.out.println("Boundary rep: " + obj.bRep);
3330		- GrafreeD.AnalyzeObject(obj.bRep);
	3880	+ Grafreed.AnalyzeObject(obj.bRep);
3331	3881
3332	3882	// System.err.println((size/1024) + " KB is the size of " + obj);
3333	3883	}
..	..	@@ -3369,6 +3919,13 @@
3369	3919	void GenNormals(boolean crease)
3370	3920	{
3371	3921	group.GenNormalsS(crease);
	3922	+
	3923	+ refreshContents();
	3924	+ }
	3925	+
	3926	+ void GenNormalsMESH()
	3927	+ {
	3928	+ group.GenNormalsMeshS();
3372	3929
3373	3930	refreshContents();
3374	3931	}
..	..	@@ -3541,8 +4098,8 @@
3541	4098
3542	4099	void ParseVertices()
3543	4100	{
3544		- boolean epsequal = GrafreeD.epsequal;
3545		- GrafreeD.epsequal = true;
	4101	+ boolean epsequal = Grafreed.epsequal;
	4102	+ Grafreed.epsequal = true;
3546	4103
3547	4104	for (int i=0; i<group.selection.size(); i++)
3548	4105	{
..	..	@@ -3567,7 +4124,7 @@
3567	4124	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3568	4125	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3569	4126
3570		- g.add(GrafreeD.clipboard);
	4127	+ g.add(Grafreed.clipboard);
3571	4128
3572	4129	buffer.add(g);
3573	4130	}
..	..	@@ -3582,7 +4139,7 @@
3582	4139	makeSomething(buffer, i==group.selection.size()-1);
3583	4140	}
3584	4141
3585		- GrafreeD.epsequal = epsequal;
	4142	+ Grafreed.epsequal = epsequal;
3586	4143
3587	4144	refreshContents();
3588	4145	}
..	..	@@ -3600,7 +4157,16 @@
3600	4157	String pigment = Object3D.GetPigment(tex);
3601	4158	//String bump = Object3D.GetBump(tex);
3602	4159
3603		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4160	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4161	+
	4162	+ try
	4163	+ {
	4164	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4165	+ }
	4166	+ catch (Exception e)
	4167	+ {
	4168	+ System.err.println("FAIL: " + node);
	4169	+ }
3604	4170
3605	4171	double s = v.s;
3606	4172
..	..	@@ -3732,7 +4298,7 @@
3732	4298	return;
3733	4299
3734	4300	Object3D poses = group.selection.get(0);
3735		- Object3D ref = GrafreeD.clipboard.get(0);
	4301	+ Object3D ref = Grafreed.clipboard.get(0);
3736	4302
3737	4303	Object3D newgroup = new Object3D("Po:" + poses.name);
3738	4304
..	..	@@ -3926,9 +4492,9 @@
3926	4492
3927	4493	void ClipMesh()
3928	4494	{
3929		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4495	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3930	4496	{
3931		- Object3D content = GrafreeD.clipboard.get(0);
	4497	+ Object3D content = Grafreed.clipboard.get(0);
3932	4498
3933	4499	if (content instanceof cGroup && ((cGroup)content).transientlink )
3934	4500	content = ((cGroup)content).get(0);
..	..	@@ -3937,7 +4503,7 @@
3937	4503	// {
3938	4504	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3939	4505	// }
3940		- group.selection.ClipMesh(GrafreeD.clipboard);
	4506	+ group.selection.ClipMesh(Grafreed.clipboard);
3941	4507	}
3942	4508	// group.selection.ClipMesh(GrafreeD.clipboard);
3943	4509	System.out.println("DONE.");
..	..	@@ -3984,6 +4550,18 @@
3984	4550	void MarkLeaves(boolean hide)
3985	4551	{
3986	4552	group.selection.MarkLeaves(hide);
	4553	+ refreshContents();
	4554	+ }
	4555	+
	4556	+ void RewindLeaves(boolean hide)
	4557	+ {
	4558	+ group.selection.RewindLeaves(hide);
	4559	+ refreshContents();
	4560	+ }
	4561	+
	4562	+ void RandomLeaves(boolean hide)
	4563	+ {
	4564	+ group.selection.RandomLeaves(hide);
3987	4565	refreshContents();
3988	4566	}
3989	4567
..	..	@@ -4058,28 +4636,25 @@
4058	4636	// }
4059	4637	// }
4060	4638
4061		- static boolean allparams = true;
4062		-
4063		- static Vector<Object3D> listUI = new Vector<Object3D>();
4064		-
4065	4639	void EditSelection(boolean newWindow)
4066	4640	{
	4641	+ if (group.selection == null)
	4642	+ {
	4643	+ EditElement(group, newWindow); // ? new
	4644	+ return;
	4645	+ }
	4646	+
4067	4647	// aConstraints.gridy = 0;
4068	4648	for (int i=0; i<group.selection.size(); i++)
4069	4649	{
4070	4650	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4071	4651	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4072		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4652	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4073	4653
4074	4654	Object3D elem = (Object3D)group.selection.elementAt(i);
4075		- if(elem != group)
	4655	+ if(elem != group \|\| !newWindow)
4076	4656	{
4077		- // if (!(elem instanceof Composite))
4078		- // newWindow = false;
4079		- listUI.add(elem);
4080		- elem.openEditWindow(this, newWindow); //, false);
4081		- System.out.println("edit : " + elem);
4082		- elem.editWindow.refreshContents(true); // ? new
	4657	+ EditElement(elem, newWindow); // ? new
4083	4658	}
4084	4659	}
4085	4660	}
..	..	@@ -4154,7 +4729,8 @@
4154	4729	//new Exception().printStackTrace();
4155	4730
4156	4731	freezemodel = true;
4157		-
	4732	+ ClearUnpinned();
	4733	+
4158	4734	/**/
4159	4735	//switch (event.id)
4160	4736	{
..	..	@@ -4162,7 +4738,6 @@
4162	4738	//case 702: // Event.LIST_DESELECT
4163	4739	group.deselectAll();
4164	4740	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4165		- objEditor.ClearInfo(); // .GetMaterial());
4166	4741	if (tps != null)
4167	4742	{
4168	4743	for (int i=0; i < tps.length; i++)
..	..	@@ -4171,10 +4746,8 @@
4171	4746
4172	4747	//if (child.parent != null)
4173	4748	//child.parent.addSelectee(child);
	4749	+ objEditor.SetMaterial(child);
4174	4750	group.addSelectee(child);
4175		- objEditor.SetMaterial(child); // .GetMaterial());
4176		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4177		- System.err.println("info : " + child.GetPath());
4178	4751	}
4179	4752	}
4180	4753	// else
..	..	@@ -4184,20 +4757,28 @@
4184	4757	// System.err.println("info : " + group.GetPath());
4185	4758	// }
4186	4759
4187		- objEditor.SetText(); // jan 2014
4188		-
4189		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4760	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4190	4761	CameraPane.flash = true;
4191	4762
4192		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4763	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4193	4764	// a camera
4194	4765	{
4195		- CameraPane.camerachangeframe = 0; // don't refuse it
4196		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4766	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4767	+ {
	4768	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4769	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4770	+ }
4197	4771	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4198	4772	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4199	4773	}
4200	4774
	4775	+ if (tps != null && tps.length == 1)
	4776	+ {
	4777	+ EditSelection(false);
	4778	+ }
	4779	+
	4780	+ SetPinStates(tps != null && tps.length > 0);
	4781	+
4201	4782	refreshContents();
4202	4783	//return true;
4203	4784	}
..	..	@@ -4206,6 +4787,35 @@
4206	4787
4207	4788	freezemodel = false;
4208	4789	}
	4790	+
	4791	+ void SetPinStates(boolean enabled)
	4792	+ {
	4793	+ editButton.setEnabled(enabled);
	4794	+ uneditButton.setEnabled(enabled);
	4795	+ unselectButton.setEnabled(enabled);
	4796	+ flashSelectionButton.setEnabled(enabled);
	4797	+ }
	4798	+
	4799	+ void refreshContents(boolean cp)
	4800	+ {
	4801	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4802	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4803	+ {
	4804	+ objEditor.ClearInfo(); // .GetMaterial());
	4805	+
	4806	+ for (int i=0; i < group.selection.Size(); i++)
	4807	+ {
	4808	+ Object3D child = (Object3D) group.selection.get(i);
	4809	+
	4810	+ objEditor.AddInfo(child, this, true);
	4811	+ System.err.println("info : " + child.GetPath());
	4812	+ }
	4813	+
	4814	+ objEditor.SetText(); // jan 2014
	4815	+ }
	4816	+
	4817	+ super.refreshContents(cp);
	4818	+ }
4209	4819
4210	4820	void linkSomething(Object3D thing)
4211	4821	{
..	..	@@ -4277,16 +4887,19 @@
4277	4887	{
4278	4888	if (group.selection.isEmpty())
4279	4889	return;
4280		- GrafreeD.clipboardIsTempGroup = false;
	4890	+
	4891	+ Grafreed.clipboardIsTempGroup = false;
4281	4892	Composite tGroup = null;
4282	4893	if (group.selection.size() > 0) // 1)
4283	4894	{
4284	4895	tGroup = new cGroup();
4285		- GrafreeD.clipboardIsTempGroup = true;
	4896	+ Grafreed.clipboardIsTempGroup = true;
4286	4897	}
4287	4898
4288	4899	if (cut)
4289	4900	{
	4901	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4902	+// Save();
4290	4903	//int indices[] = jList.getSelectedIndices();
4291	4904	//for (int i = indices.length - 1; i >= 0; i--)
4292	4905	//jList.remove(indices[i]);
..	..	@@ -4322,16 +4935,16 @@
4322	4935	//System.out.println("cut " + child);
4323	4936	//System.out.println("parent = " + child.parent);
4324	4937	// tmp.addChild(child);
4325		- if (GrafreeD.clipboardIsTempGroup)
	4938	+ if (Grafreed.clipboardIsTempGroup)
4326	4939	tGroup.add/Child/(tmp);
4327	4940	else
4328		- GrafreeD.clipboard = tmp;
	4941	+ Grafreed.clipboard = tmp;
4329	4942	}
4330	4943	else
4331		- if (GrafreeD.clipboardIsTempGroup)
	4944	+ if (Grafreed.clipboardIsTempGroup)
4332	4945	tGroup.add/Child/(child);
4333	4946	else
4334		- GrafreeD.clipboard = child;
	4947	+ Grafreed.clipboard = child;
4335	4948	}
4336	4949
4337	4950	//ResetModel();
..	..	@@ -4363,21 +4976,23 @@
4363	4976	//System.out.println("cut " + elem);
4364	4977	//System.out.println("parent = " + elem.parent);
4365	4978	// tmp.addChild(elem);
4366		- if (GrafreeD.clipboardIsTempGroup)
	4979	+ if (Grafreed.clipboardIsTempGroup)
4367	4980	tGroup.add/Child/(tmp);
4368	4981	else
4369		- GrafreeD.clipboard = tmp;
	4982	+ Grafreed.clipboard = tmp;
4370	4983	}
4371	4984	else
4372		- if (GrafreeD.clipboardIsTempGroup)
	4985	+ if (Grafreed.clipboardIsTempGroup)
4373	4986	tGroup.add/Child/(child);
4374	4987	else
4375		- GrafreeD.clipboard = child;
	4988	+ Grafreed.clipboard = child;
4376	4989	}
4377	4990
4378	4991	}
4379		- if (GrafreeD.clipboardIsTempGroup)
4380		- GrafreeD.clipboard = tGroup;
	4992	+
	4993	+ if (Grafreed.clipboardIsTempGroup)
	4994	+ Grafreed.clipboard = tGroup;
	4995	+
4381	4996	if (cut)
4382	4997	{
4383	4998	ResetModel();
..	..	@@ -4387,11 +5002,15 @@
4387	5002
4388	5003	void paste(boolean expand)
4389	5004	{
	5005	+ if (Globals.REPLACEONMAKE)
	5006	+ Save();
	5007	+ boolean keep = Globals.REPLACEONMAKE;
	5008	+ Globals.REPLACEONMAKE = false;
4390	5009	// if (GrafreeD.clipboard == null)
4391	5010	// return;
4392	5011	boolean first = true;
4393	5012
4394		- if (GrafreeD.clipboardIsTempGroup)
	5013	+ if (Grafreed.clipboardIsTempGroup)
4395	5014	{
4396	5015	Composite temp;
4397	5016
..	..	@@ -4402,7 +5021,7 @@
4402	5021	temp = (Composite)Applet3D.clipboard.deepCopy();
4403	5022	*/
4404	5023	Object3D elem;
4405		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5024	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4406	5025	{
4407	5026	Object3D child = (Object3D)e.nextElement();
4408	5027
..	..	@@ -4436,16 +5055,17 @@
4436	5055	//Object3D cb = Applet3D.clipboard;
4437	5056	//temp.addChild(cb);
4438	5057	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4439		- assert(GrafreeD.clipboard.parent == null);
4440		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4441		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4442		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4443		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5058	+ assert(Grafreed.clipboard.parent == null);
	5059	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5060	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5061	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5062	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4444	5063	else
4445		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4446		- GrafreeD.clipboard.get(0).parent = keepparent;
	5064	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5065	+ Grafreed.clipboard.get(0).parent = keepparent;
4447	5066	}
4448	5067
	5068	+ Globals.REPLACEONMAKE = keep;
4449	5069	ResetModel();
4450	5070	refreshContents();
4451	5071	}
..	..	@@ -4492,9 +5112,9 @@
4492	5112	{
4493	5113	boolean first = true;
4494	5114
4495		- if (GrafreeD.clipboardIsTempGroup)
	5115	+ if (Grafreed.clipboardIsTempGroup)
4496	5116	{
4497		- Composite temp = (Composite)GrafreeD.clipboard;
	5117	+ Composite temp = (Composite)Grafreed.clipboard;
4498	5118	Object3D copy;
4499	5119	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4500	5120	{
..	..	@@ -4504,7 +5124,7 @@
4504	5124	}
4505	5125	} else
4506	5126	{
4507		- linkSomething(GrafreeD.clipboard); //.get(0));
	5127	+ linkSomething(Grafreed.clipboard); //.get(0));
4508	5128	}
4509	5129	}
4510	5130	}
..	..	@@ -4581,6 +5201,10 @@
4581	5201
4582	5202	void group(Object3D csg, boolean grab)
4583	5203	{
	5204	+ if (Globals.REPLACEONMAKE)
	5205	+ Save();
	5206	+ boolean keep = Globals.REPLACEONMAKE;
	5207	+ Globals.REPLACEONMAKE = false;
4584	5208	if (//false) // why??
4585	5209	!group.selection.isEmpty())
4586	5210	{
..	..	@@ -4694,10 +5318,15 @@
4694	5318	//node.add(csg);
4695	5319	//makeSomething(node);
4696	5320	makeSomething(csg);
	5321	+ Globals.REPLACEONMAKE = keep;
4697	5322	}
4698	5323
4699	5324	void Ungroup(Object3D g)
4700	5325	{
	5326	+ if (Globals.REPLACEONMAKE)
	5327	+ Save();
	5328	+ boolean keep = Globals.REPLACEONMAKE;
	5329	+ Globals.REPLACEONMAKE = false;
4701	5330	if (g instanceof HiddenObject)
4702	5331	{
4703	5332	HiddenObject h = (HiddenObject) g;
..	..	@@ -4714,6 +5343,7 @@
4714	5343	objEditor.makeSomething(g.get(i), false);
4715	5344	}
4716	5345	}
	5346	+ Globals.REPLACEONMAKE = keep;
4717	5347	}
4718	5348
4719	5349	void ungroup()
..	..	@@ -4909,21 +5539,6 @@
4909	5539	}
4910	5540	*/
4911	5541
4912		- void ImportGFD()
4913		- {
4914		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4915		- browser.show();
4916		- String filename = browser.getFile();
4917		- if (filename != null && filename.length() > 0)
4918		- {
4919		- String fullname = browser.getDirectory() + filename;
4920		-
4921		- //Object3D readobj =
4922		- objEditor.ReadGFD(fullname, objEditor);
4923		- //makeSomething(readobj);
4924		- }
4925		- }
4926		-
4927	5542	/*
4928	5543	public void Callback(Object obj)
4929	5544	{
..	..	@@ -4947,26 +5562,9 @@
4947	5562	}
4948	5563	*/
4949	5564
4950		- void ImportVRMLX3D()
4951		- {
4952		- if (GrafreeD.standAlone)
4953		- {
4954		- /**/
4955		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4956		- browser.show();
4957		- String filename = browser.getFile();
4958		- if (filename != null && filename.length() > 0)
4959		- {
4960		- String fullname = browser.getDirectory() + filename;
4961		- LoadVRMLX3D(fullname);
4962		- }
4963		- /**/
4964		- }
4965		- }
4966		-
4967	5565	String GetFile(String dialogName)
4968	5566	{
4969		- if (GrafreeD.standAlone)
	5567	+ if (Grafreed.standAlone)
4970	5568	{
4971	5569	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4972	5570	browser.show();
..	..	@@ -5034,7 +5632,28 @@
5034	5632	cButton clearpanelButton;
5035	5633	cButton unselectButton;
5036	5634
	5635	+ cButton restoreCameraButton;
	5636	+
	5637	+ cButton saveButton;
5037	5638	cButton oneStepButton;
	5639	+
	5640	+ cButton groupButton;
	5641	+ cButton ungroupButton;
	5642	+ cButton compositeButton;
	5643	+ cButton switchButton;
	5644	+ cButton loopButton;
	5645	+ cButton textureButton;
	5646	+
	5647	+ cButton gridButton;
	5648	+ cButton boxButton;
	5649	+ cButton sphereButton;
	5650	+ cButton coneButton;
	5651	+ cButton torusButton;
	5652	+ cButton superButton;
	5653	+ cButton kleinButton;
	5654	+ cButton particlesButton;
	5655	+ cButton overlayButton;
	5656	+ cButton lightButton;
5038	5657
5039	5658	cButton screenfitButton;
5040	5659	cButton screenfitpointButton;
..	..	@@ -5047,14 +5666,6 @@
5047	5666
5048	5667	cButton setsupportButton;
5049	5668
5050		- cButton twoButton;
5051		- cButton sixButton;
5052		- cButton threeButton;
5053		- cButton sevenButton;
5054		- cButton fourButton; // full panel
5055		- cButton oneButton; // full XYZ
5056		- //cButton currentLayout;
5057		-
5058	5669	//
5059	5670	//Composite
5060	5671	Object3D // to do !!
..	..	@@ -5064,9 +5675,11 @@
5064	5675	//JTree jTree;
5065	5676	private MenuItem lookAtItem;
5066	5677	private MenuItem lookFromItem;
5067		- private MenuItem switchItem;
	5678	+ private MenuItem switchViewItem;
5068	5679	private MenuItem cutItem;
5069		- private MenuItem duplicateItem;
	5680	+ private MenuItem undoItem;
	5681	+ private MenuItem redoItem;
	5682	+ private JMenuItem duplicateItem;
5070	5683	private MenuItem cloneItem;
5071	5684	private MenuItem cloneSupportItem;
5072	5685	private MenuItem overwriteGeoItem;
..	..	@@ -5079,7 +5692,7 @@
5079	5692	private MenuItem linkverticesItem;
5080	5693	private MenuItem relinkverticesItem;
5081	5694	private MenuItem setMasterItem;
5082		- private MenuItem resetMeshItem;
	5695	+ private MenuItem resetAllItem;
5083	5696	private MenuItem stepAllItem;
5084	5697	private MenuItem revertMeshItem;
5085	5698	private MenuItem poseMeshItem;
..	..	@@ -5094,7 +5707,7 @@
5094	5707	private MenuItem pasteLinkItem;
5095	5708	private MenuItem pasteCloneItem;
5096	5709	private MenuItem pasteExpandItem;
5097		- private MenuItem clearItem;
	5710	+ private MenuItem deleteItem;
5098	5711	private MenuItem clearAllItem;
5099	5712	private MenuItem genUVItem;
5100	5713	private MenuItem genNormalsMESHItem;
..	..	@@ -5129,6 +5742,10 @@
5129	5742	private MenuItem showleavesItem;
5130	5743	private MenuItem markleavesItem;
5131	5744	private MenuItem unmarkleavesItem;
	5745	+ private MenuItem rewindleavesItem;
	5746	+ private MenuItem unrewindleavesItem;
	5747	+ private MenuItem randomleavesItem;
	5748	+ private MenuItem unrandomleavesItem;
5132	5749
5133	5750	private MenuItem flipVItem;
5134	5751	private MenuItem unflipVItem;
..	..	@@ -5140,15 +5757,17 @@
5140	5757	private MenuItem panoTexturesItem;
5141	5758
5142	5759	private MenuItem resetCentroidItem;
5143		- private MenuItem transformgeometryItem;
	5760	+ private MenuItem resetCentroidXZItem;
5144	5761	private MenuItem resetTransformItem;
	5762	+ private MenuItem transformGeometryItem;
	5763	+ private MenuItem transformChildrenItem;
5145	5764	private MenuItem hideItem;
5146	5765	private MenuItem grabItem;
5147	5766	private MenuItem backItem;
5148	5767	private MenuItem frontItem;
5149	5768	private MenuItem cameraItem;
5150	5769	private MenuItem compositeItem;
5151		- private MenuItem randomItem;
	5770	+ private MenuItem switchItem;
5152	5771	private MenuItem physicsItem;
5153	5772	private MenuItem frameselectorItem;
5154	5773	private MenuItem scriptNodeItem;
..	..	@@ -5210,11 +5829,6 @@
5210	5829	private MenuItem doubleItem;
5211	5830	private MenuItem tripleItem;
5212	5831
5213		- private MenuItem importGFDItem;
5214		- private MenuItem importVRMLX3DItem;
5215		- private MenuItem import3DSItem;
5216		- private MenuItem importOBJItem;
5217		-
5218	5832	private MenuItem computeAOItem;
5219	5833	private MenuItem recompileItem;
5220	5834	private MenuItem editScriptItem;
..	..	@@ -5224,4 +5838,8 @@
5224	5838	private MenuItem analyzeItem;
5225	5839	private MenuItem dumpItem;
5226	5840	//boolean freezemodel = false;
	5841	+
	5842	+ Menu cameraMenu;
	5843	+ MenuItem editCameraItem;
	5844	+ MenuItem restoreCameraItem;
5227	5845	}