~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,41 +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		- importOBJItem = menu.add(new MenuItem("OBJ file..."));
443		- importOBJItem.addActionListener(this);
444		- menu.add("-");
445		- import3DSItem = menu.add(new MenuItem("3DS file..."));
446		- import3DSItem.addActionListener(this);
447		- menu.add("-");
448		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
449		- importVRMLX3DItem.addActionListener(this);
450		- menu.add("-");
451		- importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
452		- importGFDItem.addActionListener(this);
453		-
454	555	oe.menuBar.add(menu = new Menu("Tools"));
455	556	buildToolsMenu(menu);
456	557	}
457	558
	559	+
458	560	void SetupUI2(ObjEditor oe)
459	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	+
460	574	//new Exception().printStackTrace();
461	575
462	576	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -485,97 +599,230 @@
485	599	oe.radioPanel.add(dummyButton);
486	600	oe.buttonGroup.add(dummyButton);
487	601	*/
	602	+ cGridBag copyOptionsPanel = new cGridBag();
	603	+
	604	+ copyOptionsPanel.preferredHeight = 1;
	605	+
488	606	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
489	607
490		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
491		- 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");
492	660	liveCB.addItemListener(this);
493	661
494		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	662	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
495	663	oneStepButton.setToolTipText("Animate one step forward");
496	664	oneStepButton.addActionListener(this);
497	665
498		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	666	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
499	667	fastCB.setToolTipText("Fast mode");
500	668	fastCB.addItemListener(this);
501	669
502		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
503		- trackCB.setToolTipText("Enable tracking");
504		- trackCB.addItemListener(this);
505		-
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
507		- screenfitButton.setToolTipText("Screen fit");
508		- 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);
509	675
510	676	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
511	677	// screenfitpointButton.addActionListener(this);
512	678
513	679	if (Globals.ADVANCED)
514	680	{
515		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	681	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
516	682	snapobjectButton.addActionListener(this);
517	683	snapobjectButton.setToolTipText("Snap Object");
518	684	}
519	685
520		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
521		- flashSelectionButton.setToolTipText("Show selection");
522		- flashSelectionButton.addActionListener(this);
	686	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
523	687
524		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
525		-
526		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
527		- twoButton.setToolTipText("Show center view only");
528		- twoButton.addActionListener(this);
529		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	688	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
530	689	fourButton.addActionListener(this);
531	690	fourButton.setToolTipText("Show left panel only");
532		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
533		- 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");
534	699	sixButton.addActionListener(this);
535		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
536		- threeButton.setToolTipText("2-column layout right");
537		- threeButton.addActionListener(this);
538		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
539		- sevenButton.setToolTipText("3-column layout");
540		- 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);
541	706	//
542	707
543		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
544		- 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");
545	710	rootButton.addActionListener(this);
546	711
547		- 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);
548	713	closeButton.setToolTipText("Close tab");
549	714	closeButton.addActionListener(this);
550	715	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
551	716	//clearButton.addActionListener(this);
552		-
553		- 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	+ }
554	749
555		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
556		- 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");
557	799	editButton.addActionListener(this);
558	800
559		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
560		- uneditButton.setToolTipText("Unedit selection");
	801	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	802	+ uneditButton.setToolTipText("Remove selection controls");
561	803	uneditButton.addActionListener(this);
562	804
563		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
564		- allParamsButton.setToolTipText("Edit all params");
	805	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	806	+ allParamsButton.setToolTipText("Show all controle");
565	807	allParamsButton.addActionListener(this);
566	808
567		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	809	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
568	810	clearPanelButton.setToolTipText("Clear edit panel");
569	811	clearPanelButton.addActionListener(this);
570	812
571		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	813	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
572	814	unselectButton.setToolTipText("Unselect");
573	815	unselectButton.addActionListener(this);
574	816
575		- 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);
576	820
577		- oe.treePanel.add(commandsPanel);
578		- oe.treePanel.Return();
	821	+ editCommandsPanel.preferredHeight = 1;
	822	+
	823	+ SetPinStates(false);
	824	+// oe.treePanel.add(commandsPanel);
	825	+// oe.treePanel.Return();
579	826
580	827	// oe.aConstraints.gridx += 1;
581	828	// oe.aConstraints.weighty = 0;
..	..	@@ -592,29 +839,17 @@
592	839
593	840	JScrollPane jSP;
594	841	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
595		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	842	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
596	843	ResetModel();
597	844
598	845	oe.treePanel.add(jSPPanel);
599	846	oe.treePanel.Return();
600	847
601		- cGridBag copyOptionsPanel = new cGridBag();
602		-
603		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
604		- colorCB.setToolTipText("Copy color when dropped");
605		- colorCB.addItemListener(this);
606		-
607		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
608		- materialCB.setToolTipText("Copy material when dropped");
609		- materialCB.addItemListener(this);
610		-
611		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
612		- textureCB.setToolTipText("Copy texture when dropped");
613		- textureCB.addItemListener(this);
614		-
615		- copyOptionsPanel.preferredHeight = 1;
616	848	oe.treePanel.add(copyOptionsPanel);
617	849	oe.treePanel.Return();
	850	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	851	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	852	+ sliderPane.preferredHeight = 1;
618	853
619	854	// mainPanel.setDividerLocation(0.5); //1.0);
620	855	// mainPanel.setResizeWeight(0.5);
..	..	@@ -637,29 +872,49 @@
637	872	dgr.addDragGestureListener(this);
638	873	}catch(Exception e) {}
639	874	*/
640		- radio.layout = sevenButton;
	875	+ radio.layout = sixButton; // sevenButton;
641	876	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
642	877	}
643	878
644	879	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
645	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	+
646	895	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
647	896	boxCB.setToolTipText("Display bounding boxes");
648	897	boxCB.addItemListener(this);
649	898
650	899	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
651		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	900	+ zoomBoxCB.setToolTipText("Display only for wheel");
652	901	zoomBoxCB.addItemListener(this);
653	902
654		- if (Globals.ADVANCED)
	903	+ if (true) // Globals.ADVANCED)
655	904	{
656		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
657		- supportCB.setToolTipText("Enable rigging");
658		- 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);
659	912
660	913	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
661	914	// localCB.addItemListener(this);
662	915
	916	+ panel.Return();
	917	+
663	918	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
664	919	crowdCB.setToolTipText("Used for crowds");
665	920	crowdCB.addItemListener(this);
..	..	@@ -676,6 +931,8 @@
676	931	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
677	932	// speakerMocapCB.addItemListener(this);
678	933
	934	+ panel.Return();
	935	+
679	936	if (false)
680	937	{
681	938	// handled in scripts
..	..	@@ -690,42 +947,85 @@
690	947	//constraints.gridy += 1;
691	948	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
692	949	smoothfocusCB.addItemListener(this);
	950	+ panel.Return();
693	951	}
694	952
695	953	//constraints.gridx += 1;
696	954	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
697	955	// debugCB.addItemListener(this);
698	956
	957	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	958	+ trackCB.setToolTipText("Enable tracking target");
	959	+ trackCB.addItemListener(this);
	960	+
699	961	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	962	+ oeilCB.setToolTipText("Move camera when tracking");
700	963	oeilCB.addItemListener(this);
701	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	+ {
702	985	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
703	986	lookAtCB.setToolTipText("Look-at target");
704	987	lookAtCB.addItemListener(this);
	988	+ }
705	989
706	990	}
707	991
708	992	cGridBag fill = new cGridBag();
709		-
710	993	fill.preferredHeight = 200;
	994	+ cGridBag fill2 = new cGridBag();
	995	+ fill2.preferredHeight = 200;
	996	+ cGridBag fill3 = new cGridBag();
	997	+ fill3.preferredHeight = 200;
711	998
712	999	panel.add(fill);
	1000	+ panel.add(fill2);
	1001	+ panel.add(fill3);
713	1002
714	1003	}
715	1004
716	1005	void EditObject(Object3D obj)
717	1006	{
718	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	+
719	1016	radioButton.SetObject(obj);
720		- radioButton.layout = sevenButton;
	1017	+ radioButton.layout = sixButton; // sevenButton;
721	1018	radioButton.SetCamera(cameraView.renderCamera, false);
722	1019	radioButton.addActionListener(this);
723	1020	radioPanel.add(radioButton);
724	1021	buttonGroup.add(radioButton);
725	1022	radioButton.doClick();
726	1023	}
	1024	+
727	1025	void SetupViews(ObjEditor oe)
728	1026	{
	1027	+ theFrame = this;
	1028	+
729	1029	oe.SetupViews();
730	1030
731	1031	System.out.println("SetupViews");
..	..	@@ -734,23 +1034,28 @@
734	1034	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
735	1035	}
736	1036
737		- JCheckBox liveCB;
738		- JCheckBox supportCB;
739		- JCheckBox localCB;
740		- JCheckBox crowdCB;
741		- JCheckBox smoothCB;
742		- JCheckBox fastCB;
743		- JCheckBox slowCB;
744		- JCheckBox boxCB;
745		- JCheckBox zoomBoxCB;
746		- JCheckBox trackCB;
747		- JCheckBox smoothfocusCB;
	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;
748	1050	// JCheckBox speakerMocapCB;
749		- JCheckBox speakerCameraCB;
750		- JCheckBox speakerFocusCB;
751		- JCheckBox debugCB;
752		- JCheckBox oeilCB;
753		- JCheckBox lookAtCB;
	1051	+ cCheckBox speakerCameraCB;
	1052	+ cCheckBox speakerFocusCB;
	1053	+ cCheckBox debugCB;
	1054	+
	1055	+ cCheckBox oeilCB;
	1056	+ cCheckBox shadowCB;
	1057	+ cCheckBox autokeepCB;
	1058	+ cCheckBox lookAtCB;
754	1059
755	1060	// static int COLOR = 1;
756	1061	// static int MATERIAL = 2;
..	..	@@ -758,9 +1063,9 @@
758	1063
759	1064	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
760	1065
761		- JCheckBox colorCB;
762		- JCheckBox materialCB;
763		- JCheckBox textureCB;
	1066	+ cCheckBox colorCB;
	1067	+ cCheckBox materialCB;
	1068	+ cCheckBox textureCB;
764	1069
765	1070	public void itemStateChanged(ItemEvent e)
766	1071	{
..	..	@@ -788,6 +1093,7 @@
788	1093	} else if(e.getSource() == liveCB)
789	1094	{
790	1095	cameraView.ToggleLive();
	1096	+ refreshContents(false);
791	1097	}
792	1098	else if(e.getSource() == supportCB)
793	1099	{
..	..	@@ -852,6 +1158,18 @@
852	1158	{
853	1159	cameraView.ToggleOeil();
854	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	+ }
855	1173	else if(e.getSource() == lookAtCB)
856	1174	{
857	1175	cameraView.ToggleLookAt();
..	..	@@ -868,7 +1186,8 @@
868	1186
869	1187	/**/
870	1188	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
871		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1189	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1190	+ TreePath path = objEditor.jTree.getSelectionPath();
872	1191	if ((path == null) \|\| (path.getPathCount() <= 1)) {
873	1192	// We can't move the root node or an empty selection
874	1193	return;
..	..	@@ -931,8 +1250,6 @@
931	1250	}
932	1251	}
933	1252
934		- String string = (String) object;
935		-
936	1253	System.out.println("Transfer = " + object + "; drop : " + target);
937	1254	// if( object instanceof java.io.File[])
938	1255	// {
..	..	@@ -940,7 +1257,11 @@
940	1257	// objEditor.DropFile((java.io.File[]) object, true);
941	1258	// return;
942	1259	// }
943		- 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) == ':')
944	1265	{
945	1266	// file(s)
946	1267	String[] names = string.split("\n");
..	..	@@ -967,7 +1288,7 @@
967	1288
968	1289	flashIt = false;
969	1290	CameraPane pane = (CameraPane) target;
970		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1291	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
971	1292	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
972	1293
973	1294	if (group.selection.size() == 1)
..	..	@@ -983,23 +1304,33 @@
983	1304
984	1305	assert target == objEditor.jTree;
985	1306	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1307	+ Object3D destinationLeaf;
986	1308	try {
987		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1309	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
988	1310	} catch (Exception e) {
989	1311	System.out.println("destinationPath : " + destinationPath);
990	1312	return;
991	1313	}
992	1314
993		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1315	+ for (int i=group.selection.size(); --i>=0;)
994	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	+// {
995	1326	loadClipboard(true);
996	1327	objEditor.jTree.setSelectionPath(destinationPath);
997	1328	pasteInto(false, false);
998		- } else {
999		- loadClipboard(false);
1000		- objEditor.jTree.setSelectionPath(destinationPath);
1001		- pasteInto(false, false); // true); // ???
1002		- }
	1329	+// } else {
	1330	+// loadClipboard(false);
	1331	+// objEditor.jTree.setSelectionPath(destinationPath);
	1332	+// pasteInto(false, false); // true); // ???
	1333	+// }
1003	1334	}
1004	1335	public void dropActionChanged(DropTargetDragEvent dtde)
1005	1336	// Called if the user has modified the current drop gesture
..	..	@@ -1104,22 +1435,30 @@
1104	1435	{
1105	1436	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1106	1437	//heightFieldItem.addActionListener(this);
1107		- gridItem = menu.add(new MenuItem("Grid"));
1108		- gridItem.addActionListener(this);
1109		- rectoidItem = menu.add(new MenuItem("Box"));
1110		- rectoidItem.addActionListener(this);
1111		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1112		- ellipsoidItem.addActionListener(this);
1113		- coneItem = menu.add(new MenuItem("Cone"));
1114		- coneItem.addActionListener(this);
1115		- torusItem = menu.add(new MenuItem("Torus"));
1116		- torusItem.addActionListener(this);
1117		- superItem = menu.add(new MenuItem("Superellipsoid"));
1118		- superItem.addActionListener(this);
	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	+ {
1119	1456	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1120	1457	kleinItem.addActionListener(this);
1121		- particleItem = menu.add(new MenuItem("Particle system"));
1122		- particleItem.addActionListener(this);
	1458	+ }
	1459	+
	1460	+// particleItem = menu.add(new MenuItem("Particle system"));
	1461	+// particleItem.addActionListener(this);
1123	1462	if (Globals.ADVANCED)
1124	1463	{
1125	1464	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1145,15 +1484,15 @@
1145	1484	}
1146	1485	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1147	1486	bezierItem.addActionListener(this);
1148		- overlayItem = menu.add(new MenuItem("Overlay"));
1149		- overlayItem.addActionListener(this);
1150		- lightItem = menu.add(new MenuItem("Light"));
1151		- lightItem.addActionListener(this);
	1487	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1488	+// overlayItem.addActionListener(this);
	1489	+// lightItem = menu.add(new MenuItem("Light"));
	1490	+// lightItem.addActionListener(this);
1152	1491	menu.add("-");
1153	1492	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1154	1493	//superLoopItem.addActionListener(this);
1155		- loopItem = menu.add(new MenuItem("Loop"));
1156		- loopItem.addActionListener(this);
	1494	+// loopItem = menu.add(new MenuItem("Loop"));
	1495	+// loopItem.addActionListener(this);
1157	1496	doubleItem = menu.add(new MenuItem("Fork"));
1158	1497	doubleItem.addActionListener(this);
1159	1498	if (Globals.ADVANCED)
..	..	@@ -1169,6 +1508,9 @@
1169	1508	animationItem.addItemListener(this);
1170	1509	animationItem.setState(Globals.ANIMATION);
1171	1510
	1511	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1512	+ archiveItem.addActionListener(this);
	1513	+
1172	1514	menu.add("-");
1173	1515	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1174	1516	parseverticesItem.addActionListener(this);
..	..	@@ -1181,6 +1523,8 @@
1181	1523	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1182	1524	reduce34MorphItem.addActionListener(this);
1183	1525	menu.add("-");
	1526	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1527	+ memoryItem.addActionListener(this);
1184	1528	menu.add(computeAOItem = new MenuItem("Compute AO"));
1185	1529	computeAOItem.addActionListener(this);
1186	1530
..	..	@@ -1189,11 +1533,9 @@
1189	1533	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1190	1534	mirrorItem.addActionListener(this);
1191	1535	menu.add("-");
1192		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1193		- memoryItem.addActionListener(this);
1194	1536	menu.add(analyzeItem = new MenuItem("Analyze"));
1195	1537	analyzeItem.addActionListener(this);
1196		- menu.add(dumpItem = new MenuItem("Dump"));
	1538	+ menu.add(dumpItem = new MenuItem("Print"));
1197	1539	dumpItem.addActionListener(this);
1198	1540	// menu.add(pathItem = new MenuItem("From-to path"));
1199	1541	// pathItem.addActionListener(this);
..	..	@@ -1334,9 +1676,34 @@
1334	1676	shadow.material = new cMaterial(obj.material);
1335	1677	shadow.material.diffuse = 0.0001f;
1336	1678	shadow.material.specular = 0.0001f;
	1679	+ //shadow.projectedVertices[1].x = 300;
1337	1680
1338	1681	makeSomething(shadow);
1339	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	+ }
1340	1707
1341	1708	/**
1342	1709	* applyExample
..	..	@@ -1540,9 +1907,9 @@
1540	1907
1541	1908	void Overwrite(int mask)
1542	1909	{
1543		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1910	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1544	1911	{
1545		- Object3D content = GrafreeD.clipboard.get(0);
	1912	+ Object3D content = Grafreed.clipboard.get(0);
1546	1913
1547	1914	if (content instanceof cGroup && ((cGroup)content).transientlink )
1548	1915	content = ((cGroup)content).get(0);
..	..	@@ -1581,7 +1948,7 @@
1581	1948	{
1582	1949	ScreenFit();
1583	1950	} else
1584		- if (source == switchItem)
	1951	+ if (source == switchViewItem)
1585	1952	{
1586	1953	cVector v1 = new cVector();
1587	1954	cVector v2 = new cVector();
..	..	@@ -1590,11 +1957,11 @@
1590	1957	objEditor.cameraView.renderCamera.setAim(v2, v1);
1591	1958	objEditor.cameraView.repaint();
1592	1959	} else
1593		- if (source == rectoidItem)
	1960	+ if (source == rectoidItem \|\| source == boxButton)
1594	1961	{
1595	1962	makeSomething(new Box());
1596	1963	} else
1597		- if (source == particleItem)
	1964	+ if (source == particleItem \|\| source == particlesButton)
1598	1965	{
1599	1966	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1600	1967	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1673,27 +2040,27 @@
1673	2040
1674	2041	makeSomething(obj);
1675	2042	} else
1676		- if (source == gridItem)
	2043	+ if (source == gridItem \|\| source == gridButton)
1677	2044	{
1678	2045	makeSomething(new Grid());
1679	2046	} else
1680		- if (source == ellipsoidItem)
	2047	+ if (source == ellipsoidItem \|\| source == sphereButton)
1681	2048	{
1682	2049	makeSomething(new Sphere());
1683	2050	} else
1684		- if (source == coneItem)
	2051	+ if (source == coneItem \|\| source == coneButton)
1685	2052	{
1686	2053	makeSomething(new Cone());
1687	2054	} else
1688		- if (source == torusItem)
	2055	+ if (source == torusItem \|\| source == torusButton)
1689	2056	{
1690	2057	makeSomething(new Torus());
1691	2058	} else
1692		- if (source == superItem)
	2059	+ if (source == superItem \|\| source == superButton)
1693	2060	{
1694	2061	makeSomething(new Superellipsoid());
1695	2062	} else
1696		- if (source == kleinItem)
	2063	+ if (source == kleinItem \|\| source == kleinButton)
1697	2064	{
1698	2065	makeSomething(new Klein());
1699	2066	} else
..	..	@@ -1713,7 +2080,7 @@
1713	2080	{
1714	2081	makeSomething(new BezierSurface());
1715	2082	} else
1716		- if (source == overlayItem)
	2083	+ if (source == overlayItem \|\| source == overlayButton)
1717	2084	{
1718	2085	/*
1719	2086	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1761,7 +2128,7 @@
1761	2128	s.setup();
1762	2129	makeSomething(s);
1763	2130	} else
1764		- if (source == lightItem)
	2131	+ if (source == lightItem \|\| source == lightButton)
1765	2132	{
1766	2133	makeSomething(new Light());
1767	2134	} else
..	..	@@ -1811,30 +2178,30 @@
1811	2178
1812	2179	group(g);
1813	2180	} else
1814		- if (source == loopItem)
	2181	+ if (source == loopItem \|\| source == loopButton)
1815	2182	{
1816	2183	Composite csg = new GroupLeaf();
1817	2184	csg.count = 5;
1818	2185	group(csg);
1819		- Composite child = new cGroup();
	2186	+ Composite child = new cGroup("Branch");
1820	2187	csg.addChild(child);
1821	2188	child.addChild(csg);
1822	2189	} else
1823	2190	if (source == doubleItem)
1824	2191	{
1825		- Composite csg = new GroupLeaf();
	2192	+ Composite csg = new GroupLeaf("Fork");
1826	2193	csg.count = 5;
1827	2194	group(csg);
1828		- Composite child = new cGroup();
	2195	+ Composite child = new cGroup("Branch A");
1829	2196	csg.addChild(child);
1830	2197	child.addChild(csg);
1831		- child = new cGroup();
	2198	+ child = new cGroup("Branch B");
1832	2199	csg.addChild(child);
1833	2200	child.addChild(csg);
1834	2201	} else
1835	2202	if (source == tripleItem)
1836	2203	{
1837		- Composite csg = new GroupLeaf();
	2204	+ Composite csg = new GroupLeaf("Trident");
1838	2205	csg.count = 4;
1839	2206	group(csg);
1840	2207	Composite child = new cGroup();
..	..	@@ -1846,31 +2213,6 @@
1846	2213	child = new cGroup();
1847	2214	csg.addChild(child);
1848	2215	child.addChild(csg);
1849		- } else
1850		-
1851		- if (source == importGFDItem)
1852		- {
1853		- ImportGFD();
1854		- } else
1855		- if (source == importVRMLX3DItem)
1856		- {
1857		- ImportVRMLX3D();
1858		- } else
1859		- if (source == import3DSItem)
1860		- {
1861		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1862		- } else
1863		- if (source == importOBJItem)
1864		- {
1865		- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1866		- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1867		- browser.setVisible(true);
1868		- String filename = browser.getFile();
1869		- if (filename != null && filename.length() > 0)
1870		- {
1871		- String fullname = browser.getDirectory() + filename;
1872		- makeSomething(ReadOBJ(fullname), true);
1873		- }
1874	2216	} else
1875	2217	if (source == computeAOItem)
1876	2218	{
..	..	@@ -1890,7 +2232,7 @@
1890	2232	if (source == invariantsItem)
1891	2233	{
1892	2234	System.out.println("Invariants:");
1893		- GrafreeD.grafreeD.universe.invariants();
	2235	+ Grafreed.grafreeD.universe.invariants();
1894	2236	} else
1895	2237	if (source == memoryItem)
1896	2238	{
..	..	@@ -1909,6 +2251,46 @@
1909	2251	{
1910	2252	DumpObject();
1911	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
1912	2294	if (source == oneStepButton)
1913	2295	{
1914	2296	Globals.ONESTEP = true;
..	..	@@ -1916,17 +2298,14 @@
1916	2298	} else
1917	2299	if (source == screenfitButton)
1918	2300	{
1919		- //Reload(lastConverter, lastFilename, true);
1920	2301	ScreenFit();
1921	2302	} else
1922	2303	if (source == screenfitpointButton)
1923	2304	{
1924		- //Reload(lastConverter, lastFilename, true);
1925	2305	ScreenFitPoint();
1926	2306	} else
1927	2307	if (source == snapobjectButton)
1928	2308	{
1929		- //Reload(lastConverter, lastFilename, true);
1930	2309	SnapObject();
1931	2310	} else
1932	2311	// if (event.getSource() == recompileButton)
..	..	@@ -1963,12 +2342,20 @@
1963	2342	{
1964	2343	loadClipboard(true);
1965	2344	} else
	2345	+ if (source == undoItem)
	2346	+ {
	2347	+ Undo();
	2348	+ } else
	2349	+ if (source == redoItem)
	2350	+ {
	2351	+ Redo();
	2352	+ } else
1966	2353	if (source == duplicateItem)
1967	2354	{
1968		- Object3D keep = GrafreeD.clipboard;
	2355	+ Object3D keep = Grafreed.clipboard;
1969	2356	loadClipboard(false);
1970	2357	paste(false);
1971		- GrafreeD.clipboard = keep;
	2358	+ Grafreed.clipboard = keep;
1972	2359	} else
1973	2360	if (source == cloneItem)
1974	2361	{
..	..	@@ -2188,9 +2575,9 @@
2188	2575	// group.selection.get(0).setMasterThis(content); // should be identity
2189	2576	// refreshContents();
2190	2577	// }
2191		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2578	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2192	2579	{
2193		- Object3D content = GrafreeD.clipboard.get(0);
	2580	+ Object3D content = Grafreed.clipboard.get(0);
2194	2581
2195	2582	if (content instanceof cGroup && ((cGroup)content).transientlink )
2196	2583	content = ((cGroup)content).get(0);
..	..	@@ -2240,9 +2627,9 @@
2240	2627	} else
2241	2628	if (source == setMasterItem)
2242	2629	{
2243		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2630	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2244	2631	{
2245		- Object3D content = GrafreeD.clipboard.get(0);
	2632	+ Object3D content = Grafreed.clipboard.get(0);
2246	2633
2247	2634	if (content instanceof cGroup && ((cGroup)content).transientlink )
2248	2635	content = ((cGroup)content).get(0);
..	..	@@ -2255,9 +2642,9 @@
2255	2642	{
2256	2643	if (group.selection.size() == 1)
2257	2644	{
2258		- if (GrafreeD.clipboard.size() == 1)
	2645	+ if (Grafreed.clipboard.size() == 1)
2259	2646	{
2260		- Object3D content = GrafreeD.clipboard.get(0);
	2647	+ Object3D content = Grafreed.clipboard.get(0);
2261	2648
2262	2649	if (content instanceof cGroup && ((cGroup)content).transientlink )
2263	2650	content = ((cGroup)content).get(0);
..	..	@@ -2274,7 +2661,7 @@
2274	2661	{
2275	2662	RevertMeshes();
2276	2663	} else
2277		- if (source == resetMeshItem)
	2664	+ if (source == resetAllItem)
2278	2665	{
2279	2666	ResetAll();
2280	2667	} else
..	..	@@ -2282,7 +2669,7 @@
2282	2669	{
2283	2670	StepAll();
2284	2671	} else
2285		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2672	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2286	2673	{
2287	2674	//int indices[] = jList.getSelectedIndices();
2288	2675	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2294,9 +2681,9 @@
2294	2681	{
2295	2682	ClearSelection(true);
2296	2683	} else
2297		- if (source == grabItem)
	2684	+ if (source == grabItem \|\| source == groupButton)
2298	2685	{
2299		- group(new cGroup(), true);
	2686	+ group(new cGroup(), false); // true);
2300	2687	} else
2301	2688	if (source == hideItem)
2302	2689	{
..	..	@@ -2314,11 +2701,11 @@
2314	2701	{
2315	2702	makeSomething(new Camera());
2316	2703	} else
2317		- if (source == compositeItem)
	2704	+ if (source == compositeItem \|\| source == compositeButton)
2318	2705	{
2319	2706	group(new Composite());
2320	2707	} else
2321		- if (source == randomItem)
	2708	+ if (source == switchItem \|\| source == switchButton)
2322	2709	{
2323	2710	RandomNode random = new RandomNode();
2324	2711	group(random);
..	..	@@ -2420,7 +2807,7 @@
2420	2807	{
2421	2808	group(new cLinker());
2422	2809	} else
2423		- if (source == textureItem)
	2810	+ if (source == textureItem \|\| source == textureButton)
2424	2811	{
2425	2812	group(new TextureNode());
2426	2813	} else
..	..	@@ -2440,17 +2827,30 @@
2440	2827	{
2441	2828	CastShadow(2);
2442	2829	} else
2443		- if (source == ungroupItem)
	2830	+ if (source == ungroupItem \|\| source == ungroupButton)
2444	2831	{
2445		- //ungroup();
	2832	+ boolean hasRoot = false;
	2833	+
2446	2834	for (int i=0; i<group.selection.size(); i++)
2447	2835	{
2448		- Ungroup(group.selection.get(i));
	2836	+ if (group.selection.get(i) == group)
	2837	+ {
	2838	+ hasRoot = true;
	2839	+ break;
	2840	+ }
2449	2841	}
2450	2842
2451		- ClearSelection(false);
2452		-
2453		- 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	+ }
2454	2854	} else
2455	2855	if (source == genUVItem)
2456	2856	{
..	..	@@ -2462,7 +2862,7 @@
2462	2862	} else
2463	2863	if (source == genNormalsMESHItem)
2464	2864	{
2465		- GenNormals(true); // TODO
	2865	+ GenNormalsMESH();
2466	2866	} else
2467	2867	if (source == genNormalsORGANItem)
2468	2868	{
..	..	@@ -2527,6 +2927,22 @@
2527	2927	if (source == unmarkleavesItem)
2528	2928	{
2529	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);
2530	2946	} else
2531	2947	if (source == flipVItem)
2532	2948	{
..	..	@@ -2612,9 +3028,13 @@
2612	3028	{
2613	3029	SmoothMesh();
2614	3030	} else
2615		- if (source == transformgeometryItem)
	3031	+ if (source == transformGeometryItem)
2616	3032	{
2617	3033	TransformGeometry();
	3034	+ } else
	3035	+ if (source == transformChildrenItem)
	3036	+ {
	3037	+ TransformChildren();
2618	3038	} else
2619	3039	if (source == resetTransformItem)
2620	3040	{
..	..	@@ -2622,7 +3042,11 @@
2622	3042	} else
2623	3043	if (source == resetCentroidItem)
2624	3044	{
2625		- ResetCentroid();
	3045	+ ResetCentroid(true);
	3046	+ } else
	3047	+ if (source == resetCentroidXZItem)
	3048	+ {
	3049	+ ResetCentroid(false);
2626	3050	} else
2627	3051	if (source == resetParentItem)
2628	3052	{
..	..	@@ -2754,6 +3178,10 @@
2754	3178	if (source == twoButton)
2755	3179	{
2756	3180	radio.layout = twoButton;
	3181	+
	3182	+ if (CameraPane.FULLSCREEN)
	3183	+ fullscreenLayout = radio.layout;
	3184	+
2757	3185	// bug
2758	3186	//gridPanel.setDividerLocation(1.0);
2759	3187	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2786,10 +3214,31 @@
2786	3214	bigThree.ClearUI();
2787	3215	bigThree.add(centralPanel);
2788	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	+
2789	3235	} else
2790	3236	if (source == threeButton)
2791	3237	{
2792	3238	radio.layout = threeButton;
	3239	+
	3240	+ if (CameraPane.FULLSCREEN)
	3241	+ fullscreenLayout = radio.layout;
2793	3242
2794	3243	// bigThree.remove(scenePanel);
2795	3244	// bigThree.remove(centralPanel);
..	..	@@ -2822,10 +3271,15 @@
2822	3271	bigThree.add(centralPanel);
2823	3272	bigThree.add(XYZPanel);
2824	3273	bigThree.FlushUI();
	3274	+
	3275	+ cameraView.requestFocusInWindow();
2825	3276	} else
2826	3277	if (source == fourButton)
2827	3278	{
2828	3279	radio.layout = fourButton;
	3280	+
	3281	+ if (CameraPane.FULLSCREEN)
	3282	+ fullscreenLayout = radio.layout;
2829	3283
2830	3284	// bigThree.remove(scenePanel);
2831	3285	// bigThree.remove(centralPanel);
..	..	@@ -2857,10 +3311,15 @@
2857	3311	bigThree.ClearUI();
2858	3312	bigThree.add(scenePanel);
2859	3313	bigThree.FlushUI();
	3314	+
	3315	+ cameraView.requestFocusInWindow();
2860	3316	} else
2861	3317	if (source == sixButton)
2862	3318	{
2863	3319	radio.layout = sixButton;
	3320	+
	3321	+ if (CameraPane.FULLSCREEN)
	3322	+ fullscreenLayout = radio.layout;
2864	3323
2865	3324	// bigThree.remove(scenePanel);
2866	3325	// bigThree.remove(centralPanel);
..	..	@@ -2893,10 +3352,15 @@
2893	3352	bigThree.add(scenePanel);
2894	3353	bigThree.add(centralPanel);
2895	3354	bigThree.FlushUI();
	3355	+
	3356	+ cameraView.requestFocusInWindow();
2896	3357	} else
2897	3358	if (source == sevenButton)
2898	3359	{
2899	3360	radio.layout = sevenButton;
	3361	+
	3362	+ if (CameraPane.FULLSCREEN)
	3363	+ fullscreenLayout = radio.layout;
2900	3364
2901	3365	// bigThree.remove(scenePanel);
2902	3366	// bigThree.remove(centralPanel);
..	..	@@ -2930,6 +3394,8 @@
2930	3394	bigThree.add(centralPanel);
2931	3395	bigThree.add(XYZPanel);
2932	3396	bigThree.FlushUI();
	3397	+
	3398	+ cameraView.requestFocusInWindow();
2933	3399	} else
2934	3400	if (source == rootButton)
2935	3401	{
..	..	@@ -2941,6 +3407,7 @@
2941	3407	EditObject(obj);
2942	3408	}
2943	3409
	3410	+ cameraView.requestFocusInWindow();
2944	3411	refreshContents(true);
2945	3412	} else
2946	3413	if (source == closeButton)
..	..	@@ -2950,22 +3417,37 @@
2950	3417	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2951	3418	{
2952	3419	ab = (cRadio)e.nextElement();
2953		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3420	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2954	3421	{
	3422	+ // Patch to avoid bug with transparency.
	3423	+ if (!ab.hadMaterial)
	3424	+ {
	3425	+ ab.object.material = null;
	3426	+ }
	3427	+
2955	3428	buttonGroup.remove(ab);
2956	3429	radioPanel.remove(ab);
2957	3430
2958		- ab.GetObject().editWindow = null;
	3431	+ //ab.GetObject().editWindow = null;
	3432	+ ab.GetObject().manipWindow = null;
2959	3433	// ab.GetObject().objectUI = null; // ?????????
2960	3434
2961	3435	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2962	3436	break;
2963	3437	}
2964	3438	}
	3439	+
	3440	+ cameraView.requestFocusInWindow();
2965	3441	refreshContents(true);
2966	3442	} else
2967	3443	if (source == editItem \|\| source == editButton)
2968	3444	{
	3445	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3446	+ {
	3447	+ Object3D child = (Object3D)e.nextElement();
	3448	+ child.pinned = true;
	3449	+ }
	3450	+
2969	3451	EditSelection(false);
2970	3452	} else
2971	3453	if (source == uneditButton)
..	..	@@ -2975,10 +3457,11 @@
2975	3457	Object3D child = (Object3D)e.nextElement();
2976	3458	if(child.editWindow != null)
2977	3459	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3460	+ child.pinned = false;
2978	3461	child.CloseUI();
2979	3462	listUI.remove(child);
2980	3463
2981		- child.editWindow = null; // ???????????
	3464	+ //child.editWindow = null; // ???????????
2982	3465	}
2983	3466	objEditor.ctrlPanel.FlushUI();
2984	3467	//objEditor.jTree.clearSelection();
..	..	@@ -2991,6 +3474,7 @@
2991	3474	//copy.ClearUI();
2992	3475	for (Object3D obj : listUI)
2993	3476	{
	3477	+ obj.pinned = false;
2994	3478	obj.CloseUI();
2995	3479	}
2996	3480	listUI.clear();
..	..	@@ -3000,7 +3484,7 @@
3000	3484	{
3001	3485	assert(copy == group);
3002	3486
3003		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3487	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3004	3488
3005	3489	for (Object3D obj : listUI)
3006	3490	{
..	..	@@ -3049,6 +3533,9 @@
3049	3533	}
3050	3534
3051	3535	copy = group;
	3536	+
	3537	+ SetUndoStates();
	3538	+
3052	3539	//Globals.theRenderer.object = group;
3053	3540	if(!useclient)
3054	3541	{
..	..	@@ -3064,20 +3551,46 @@
3064	3551	frontView.object = group;
3065	3552	sideView.object = group;
3066	3553	}
3067		- group.editWindow = this;
	3554	+
	3555	+// fix "+" issue
	3556	+ //group.editWindow = this;
	3557	+ group.manipWindow = this;
	3558	+
3068	3559	/*
3069	3560	currentLayout = radio.layout;
3070	3561	if (currentLayout == null)
3071	3562	currentLayout = sevenButton;
3072	3563	*/
3073	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);
3074	3572	keepparent = group.parent;
3075	3573	// PARENT = NULL or not???
3076	3574	//group.parent = null; // ROOT
3077	3575	//group.attributes = -1;
3078	3576	ResetModel();
	3577	+
	3578	+ cameraView.requestFocusInWindow();
3079	3579	refreshContents(true);
3080		- }
	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	+ }
3081	3594	else
3082	3595	{
3083	3596	//return super.action(event, arg);
..	..	@@ -3086,7 +3599,6 @@
3086	3599	}
3087	3600
3088	3601	boolean useclient = false;
3089		- cRadio radio;
3090	3602
3091	3603	void ToggleRoot()
3092	3604	{
..	..	@@ -3138,6 +3650,28 @@
3138	3650	refreshContents();
3139	3651	}
3140	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	+ }
3141	3675
3142	3676	void ResetTransform()
3143	3677	{
..	..	@@ -3250,7 +3784,7 @@
3250	3784	refreshContents();
3251	3785	}
3252	3786
3253		- void ResetCentroid()
	3787	+ void ResetCentroid(boolean full)
3254	3788	{
3255	3789	Object3D obj;
3256	3790	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3265,12 +3799,16 @@
3265	3799	LA.matIdentity(Object3D.mat);
3266	3800	obj.getBounds(minima, maxima, false);
3267	3801	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3268		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3802	+ if (full)
	3803	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3269	3804	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3270	3805	obj.TransformMesh(Object3D.mat);
	3806	+
3271	3807	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3272		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3808	+ if (full)
	3809	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3273	3810	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3811	+
3274	3812	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3275	3813	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3276	3814	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3299,7 +3837,8 @@
3299	3837
3300	3838	int size = obj.MemorySize();
3301	3839
3302		- 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)");
3303	3842	}
3304	3843	}
3305	3844	catch (Exception e)
..	..	@@ -3336,9 +3875,9 @@
3336	3875	obj = (Object3D)e.nextElement();
3337	3876
3338	3877	System.out.println("Object is: " + obj);
3339		- GrafreeD.AnalyzeObject(obj);
	3878	+ Grafreed.AnalyzeObject(obj);
3340	3879	System.out.println("Boundary rep: " + obj.bRep);
3341		- GrafreeD.AnalyzeObject(obj.bRep);
	3880	+ Grafreed.AnalyzeObject(obj.bRep);
3342	3881
3343	3882	// System.err.println((size/1024) + " KB is the size of " + obj);
3344	3883	}
..	..	@@ -3380,6 +3919,13 @@
3380	3919	void GenNormals(boolean crease)
3381	3920	{
3382	3921	group.GenNormalsS(crease);
	3922	+
	3923	+ refreshContents();
	3924	+ }
	3925	+
	3926	+ void GenNormalsMESH()
	3927	+ {
	3928	+ group.GenNormalsMeshS();
3383	3929
3384	3930	refreshContents();
3385	3931	}
..	..	@@ -3552,8 +4098,8 @@
3552	4098
3553	4099	void ParseVertices()
3554	4100	{
3555		- boolean epsequal = GrafreeD.epsequal;
3556		- GrafreeD.epsequal = true;
	4101	+ boolean epsequal = Grafreed.epsequal;
	4102	+ Grafreed.epsequal = true;
3557	4103
3558	4104	for (int i=0; i<group.selection.size(); i++)
3559	4105	{
..	..	@@ -3578,7 +4124,7 @@
3578	4124	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3579	4125	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3580	4126
3581		- g.add(GrafreeD.clipboard);
	4127	+ g.add(Grafreed.clipboard);
3582	4128
3583	4129	buffer.add(g);
3584	4130	}
..	..	@@ -3593,7 +4139,7 @@
3593	4139	makeSomething(buffer, i==group.selection.size()-1);
3594	4140	}
3595	4141
3596		- GrafreeD.epsequal = epsequal;
	4142	+ Grafreed.epsequal = epsequal;
3597	4143
3598	4144	refreshContents();
3599	4145	}
..	..	@@ -3611,7 +4157,16 @@
3611	4157	String pigment = Object3D.GetPigment(tex);
3612	4158	//String bump = Object3D.GetBump(tex);
3613	4159
3614		- 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	+ }
3615	4170
3616	4171	double s = v.s;
3617	4172
..	..	@@ -3743,7 +4298,7 @@
3743	4298	return;
3744	4299
3745	4300	Object3D poses = group.selection.get(0);
3746		- Object3D ref = GrafreeD.clipboard.get(0);
	4301	+ Object3D ref = Grafreed.clipboard.get(0);
3747	4302
3748	4303	Object3D newgroup = new Object3D("Po:" + poses.name);
3749	4304
..	..	@@ -3937,9 +4492,9 @@
3937	4492
3938	4493	void ClipMesh()
3939	4494	{
3940		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4495	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3941	4496	{
3942		- Object3D content = GrafreeD.clipboard.get(0);
	4497	+ Object3D content = Grafreed.clipboard.get(0);
3943	4498
3944	4499	if (content instanceof cGroup && ((cGroup)content).transientlink )
3945	4500	content = ((cGroup)content).get(0);
..	..	@@ -3948,7 +4503,7 @@
3948	4503	// {
3949	4504	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3950	4505	// }
3951		- group.selection.ClipMesh(GrafreeD.clipboard);
	4506	+ group.selection.ClipMesh(Grafreed.clipboard);
3952	4507	}
3953	4508	// group.selection.ClipMesh(GrafreeD.clipboard);
3954	4509	System.out.println("DONE.");
..	..	@@ -3995,6 +4550,18 @@
3995	4550	void MarkLeaves(boolean hide)
3996	4551	{
3997	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);
3998	4565	refreshContents();
3999	4566	}
4000	4567
..	..	@@ -4069,28 +4636,25 @@
4069	4636	// }
4070	4637	// }
4071	4638
4072		- static boolean allparams = true;
4073		-
4074		- static Vector<Object3D> listUI = new Vector<Object3D>();
4075		-
4076	4639	void EditSelection(boolean newWindow)
4077	4640	{
	4641	+ if (group.selection == null)
	4642	+ {
	4643	+ EditElement(group, newWindow); // ? new
	4644	+ return;
	4645	+ }
	4646	+
4078	4647	// aConstraints.gridy = 0;
4079	4648	for (int i=0; i<group.selection.size(); i++)
4080	4649	{
4081	4650	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4082	4651	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4083		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4652	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4084	4653
4085	4654	Object3D elem = (Object3D)group.selection.elementAt(i);
4086		- if(elem != group)
	4655	+ if(elem != group \|\| !newWindow)
4087	4656	{
4088		- // if (!(elem instanceof Composite))
4089		- // newWindow = false;
4090		- listUI.add(elem);
4091		- elem.openEditWindow(this, newWindow); //, false);
4092		- System.out.println("edit : " + elem);
4093		- elem.editWindow.refreshContents(true); // ? new
	4657	+ EditElement(elem, newWindow); // ? new
4094	4658	}
4095	4659	}
4096	4660	}
..	..	@@ -4165,7 +4729,8 @@
4165	4729	//new Exception().printStackTrace();
4166	4730
4167	4731	freezemodel = true;
4168		-
	4732	+ ClearUnpinned();
	4733	+
4169	4734	/**/
4170	4735	//switch (event.id)
4171	4736	{
..	..	@@ -4173,7 +4738,6 @@
4173	4738	//case 702: // Event.LIST_DESELECT
4174	4739	group.deselectAll();
4175	4740	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4176		- objEditor.ClearInfo(); // .GetMaterial());
4177	4741	if (tps != null)
4178	4742	{
4179	4743	for (int i=0; i < tps.length; i++)
..	..	@@ -4182,10 +4746,8 @@
4182	4746
4183	4747	//if (child.parent != null)
4184	4748	//child.parent.addSelectee(child);
	4749	+ objEditor.SetMaterial(child);
4185	4750	group.addSelectee(child);
4186		- objEditor.SetMaterial(child); // .GetMaterial());
4187		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4188		- System.err.println("info : " + child.GetPath());
4189	4751	}
4190	4752	}
4191	4753	// else
..	..	@@ -4195,20 +4757,28 @@
4195	4757	// System.err.println("info : " + group.GetPath());
4196	4758	// }
4197	4759
4198		- objEditor.SetText(); // jan 2014
4199		-
4200		- 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))
4201	4761	CameraPane.flash = true;
4202	4762
4203		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4763	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4204	4764	// a camera
4205	4765	{
4206		- CameraPane.camerachangeframe = 0; // don't refuse it
4207		- 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	+ }
4208	4771	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4209	4772	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4210	4773	}
4211	4774
	4775	+ if (tps != null && tps.length == 1)
	4776	+ {
	4777	+ EditSelection(false);
	4778	+ }
	4779	+
	4780	+ SetPinStates(tps != null && tps.length > 0);
	4781	+
4212	4782	refreshContents();
4213	4783	//return true;
4214	4784	}
..	..	@@ -4217,6 +4787,35 @@
4217	4787
4218	4788	freezemodel = false;
4219	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	+ }
4220	4819
4221	4820	void linkSomething(Object3D thing)
4222	4821	{
..	..	@@ -4288,16 +4887,19 @@
4288	4887	{
4289	4888	if (group.selection.isEmpty())
4290	4889	return;
4291		- GrafreeD.clipboardIsTempGroup = false;
	4890	+
	4891	+ Grafreed.clipboardIsTempGroup = false;
4292	4892	Composite tGroup = null;
4293	4893	if (group.selection.size() > 0) // 1)
4294	4894	{
4295	4895	tGroup = new cGroup();
4296		- GrafreeD.clipboardIsTempGroup = true;
	4896	+ Grafreed.clipboardIsTempGroup = true;
4297	4897	}
4298	4898
4299	4899	if (cut)
4300	4900	{
	4901	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4902	+// Save();
4301	4903	//int indices[] = jList.getSelectedIndices();
4302	4904	//for (int i = indices.length - 1; i >= 0; i--)
4303	4905	//jList.remove(indices[i]);
..	..	@@ -4333,16 +4935,16 @@
4333	4935	//System.out.println("cut " + child);
4334	4936	//System.out.println("parent = " + child.parent);
4335	4937	// tmp.addChild(child);
4336		- if (GrafreeD.clipboardIsTempGroup)
	4938	+ if (Grafreed.clipboardIsTempGroup)
4337	4939	tGroup.add/Child/(tmp);
4338	4940	else
4339		- GrafreeD.clipboard = tmp;
	4941	+ Grafreed.clipboard = tmp;
4340	4942	}
4341	4943	else
4342		- if (GrafreeD.clipboardIsTempGroup)
	4944	+ if (Grafreed.clipboardIsTempGroup)
4343	4945	tGroup.add/Child/(child);
4344	4946	else
4345		- GrafreeD.clipboard = child;
	4947	+ Grafreed.clipboard = child;
4346	4948	}
4347	4949
4348	4950	//ResetModel();
..	..	@@ -4374,21 +4976,23 @@
4374	4976	//System.out.println("cut " + elem);
4375	4977	//System.out.println("parent = " + elem.parent);
4376	4978	// tmp.addChild(elem);
4377		- if (GrafreeD.clipboardIsTempGroup)
	4979	+ if (Grafreed.clipboardIsTempGroup)
4378	4980	tGroup.add/Child/(tmp);
4379	4981	else
4380		- GrafreeD.clipboard = tmp;
	4982	+ Grafreed.clipboard = tmp;
4381	4983	}
4382	4984	else
4383		- if (GrafreeD.clipboardIsTempGroup)
	4985	+ if (Grafreed.clipboardIsTempGroup)
4384	4986	tGroup.add/Child/(child);
4385	4987	else
4386		- GrafreeD.clipboard = child;
	4988	+ Grafreed.clipboard = child;
4387	4989	}
4388	4990
4389	4991	}
4390		- if (GrafreeD.clipboardIsTempGroup)
4391		- GrafreeD.clipboard = tGroup;
	4992	+
	4993	+ if (Grafreed.clipboardIsTempGroup)
	4994	+ Grafreed.clipboard = tGroup;
	4995	+
4392	4996	if (cut)
4393	4997	{
4394	4998	ResetModel();
..	..	@@ -4398,11 +5002,15 @@
4398	5002
4399	5003	void paste(boolean expand)
4400	5004	{
	5005	+ if (Globals.REPLACEONMAKE)
	5006	+ Save();
	5007	+ boolean keep = Globals.REPLACEONMAKE;
	5008	+ Globals.REPLACEONMAKE = false;
4401	5009	// if (GrafreeD.clipboard == null)
4402	5010	// return;
4403	5011	boolean first = true;
4404	5012
4405		- if (GrafreeD.clipboardIsTempGroup)
	5013	+ if (Grafreed.clipboardIsTempGroup)
4406	5014	{
4407	5015	Composite temp;
4408	5016
..	..	@@ -4413,7 +5021,7 @@
4413	5021	temp = (Composite)Applet3D.clipboard.deepCopy();
4414	5022	*/
4415	5023	Object3D elem;
4416		- 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))
4417	5025	{
4418	5026	Object3D child = (Object3D)e.nextElement();
4419	5027
..	..	@@ -4447,16 +5055,17 @@
4447	5055	//Object3D cb = Applet3D.clipboard;
4448	5056	//temp.addChild(cb);
4449	5057	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4450		- assert(GrafreeD.clipboard.parent == null);
4451		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4452		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4453		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4454		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	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());
4455	5063	else
4456		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4457		- GrafreeD.clipboard.get(0).parent = keepparent;
	5064	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5065	+ Grafreed.clipboard.get(0).parent = keepparent;
4458	5066	}
4459	5067
	5068	+ Globals.REPLACEONMAKE = keep;
4460	5069	ResetModel();
4461	5070	refreshContents();
4462	5071	}
..	..	@@ -4503,9 +5112,9 @@
4503	5112	{
4504	5113	boolean first = true;
4505	5114
4506		- if (GrafreeD.clipboardIsTempGroup)
	5115	+ if (Grafreed.clipboardIsTempGroup)
4507	5116	{
4508		- Composite temp = (Composite)GrafreeD.clipboard;
	5117	+ Composite temp = (Composite)Grafreed.clipboard;
4509	5118	Object3D copy;
4510	5119	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4511	5120	{
..	..	@@ -4515,7 +5124,7 @@
4515	5124	}
4516	5125	} else
4517	5126	{
4518		- linkSomething(GrafreeD.clipboard); //.get(0));
	5127	+ linkSomething(Grafreed.clipboard); //.get(0));
4519	5128	}
4520	5129	}
4521	5130	}
..	..	@@ -4592,6 +5201,10 @@
4592	5201
4593	5202	void group(Object3D csg, boolean grab)
4594	5203	{
	5204	+ if (Globals.REPLACEONMAKE)
	5205	+ Save();
	5206	+ boolean keep = Globals.REPLACEONMAKE;
	5207	+ Globals.REPLACEONMAKE = false;
4595	5208	if (//false) // why??
4596	5209	!group.selection.isEmpty())
4597	5210	{
..	..	@@ -4705,10 +5318,15 @@
4705	5318	//node.add(csg);
4706	5319	//makeSomething(node);
4707	5320	makeSomething(csg);
	5321	+ Globals.REPLACEONMAKE = keep;
4708	5322	}
4709	5323
4710	5324	void Ungroup(Object3D g)
4711	5325	{
	5326	+ if (Globals.REPLACEONMAKE)
	5327	+ Save();
	5328	+ boolean keep = Globals.REPLACEONMAKE;
	5329	+ Globals.REPLACEONMAKE = false;
4712	5330	if (g instanceof HiddenObject)
4713	5331	{
4714	5332	HiddenObject h = (HiddenObject) g;
..	..	@@ -4725,6 +5343,7 @@
4725	5343	objEditor.makeSomething(g.get(i), false);
4726	5344	}
4727	5345	}
	5346	+ Globals.REPLACEONMAKE = keep;
4728	5347	}
4729	5348
4730	5349	void ungroup()
..	..	@@ -4920,21 +5539,6 @@
4920	5539	}
4921	5540	*/
4922	5541
4923		- void ImportGFD()
4924		- {
4925		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4926		- browser.show();
4927		- String filename = browser.getFile();
4928		- if (filename != null && filename.length() > 0)
4929		- {
4930		- String fullname = browser.getDirectory() + filename;
4931		-
4932		- //Object3D readobj =
4933		- objEditor.ReadGFD(fullname, objEditor);
4934		- //makeSomething(readobj);
4935		- }
4936		- }
4937		-
4938	5542	/*
4939	5543	public void Callback(Object obj)
4940	5544	{
..	..	@@ -4958,26 +5562,9 @@
4958	5562	}
4959	5563	*/
4960	5564
4961		- void ImportVRMLX3D()
4962		- {
4963		- if (GrafreeD.standAlone)
4964		- {
4965		- /**/
4966		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4967		- browser.show();
4968		- String filename = browser.getFile();
4969		- if (filename != null && filename.length() > 0)
4970		- {
4971		- String fullname = browser.getDirectory() + filename;
4972		- LoadVRMLX3D(fullname);
4973		- }
4974		- /**/
4975		- }
4976		- }
4977		-
4978	5565	String GetFile(String dialogName)
4979	5566	{
4980		- if (GrafreeD.standAlone)
	5567	+ if (Grafreed.standAlone)
4981	5568	{
4982	5569	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4983	5570	browser.show();
..	..	@@ -5045,7 +5632,28 @@
5045	5632	cButton clearpanelButton;
5046	5633	cButton unselectButton;
5047	5634
	5635	+ cButton restoreCameraButton;
	5636	+
	5637	+ cButton saveButton;
5048	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;
5049	5657
5050	5658	cButton screenfitButton;
5051	5659	cButton screenfitpointButton;
..	..	@@ -5058,14 +5666,6 @@
5058	5666
5059	5667	cButton setsupportButton;
5060	5668
5061		- cButton twoButton;
5062		- cButton sixButton;
5063		- cButton threeButton;
5064		- cButton sevenButton;
5065		- cButton fourButton; // full panel
5066		- cButton oneButton; // full XYZ
5067		- //cButton currentLayout;
5068		-
5069	5669	//
5070	5670	//Composite
5071	5671	Object3D // to do !!
..	..	@@ -5075,9 +5675,11 @@
5075	5675	//JTree jTree;
5076	5676	private MenuItem lookAtItem;
5077	5677	private MenuItem lookFromItem;
5078		- private MenuItem switchItem;
	5678	+ private MenuItem switchViewItem;
5079	5679	private MenuItem cutItem;
5080		- private MenuItem duplicateItem;
	5680	+ private MenuItem undoItem;
	5681	+ private MenuItem redoItem;
	5682	+ private JMenuItem duplicateItem;
5081	5683	private MenuItem cloneItem;
5082	5684	private MenuItem cloneSupportItem;
5083	5685	private MenuItem overwriteGeoItem;
..	..	@@ -5090,7 +5692,7 @@
5090	5692	private MenuItem linkverticesItem;
5091	5693	private MenuItem relinkverticesItem;
5092	5694	private MenuItem setMasterItem;
5093		- private MenuItem resetMeshItem;
	5695	+ private MenuItem resetAllItem;
5094	5696	private MenuItem stepAllItem;
5095	5697	private MenuItem revertMeshItem;
5096	5698	private MenuItem poseMeshItem;
..	..	@@ -5105,7 +5707,7 @@
5105	5707	private MenuItem pasteLinkItem;
5106	5708	private MenuItem pasteCloneItem;
5107	5709	private MenuItem pasteExpandItem;
5108		- private MenuItem clearItem;
	5710	+ private MenuItem deleteItem;
5109	5711	private MenuItem clearAllItem;
5110	5712	private MenuItem genUVItem;
5111	5713	private MenuItem genNormalsMESHItem;
..	..	@@ -5140,6 +5742,10 @@
5140	5742	private MenuItem showleavesItem;
5141	5743	private MenuItem markleavesItem;
5142	5744	private MenuItem unmarkleavesItem;
	5745	+ private MenuItem rewindleavesItem;
	5746	+ private MenuItem unrewindleavesItem;
	5747	+ private MenuItem randomleavesItem;
	5748	+ private MenuItem unrandomleavesItem;
5143	5749
5144	5750	private MenuItem flipVItem;
5145	5751	private MenuItem unflipVItem;
..	..	@@ -5151,15 +5757,17 @@
5151	5757	private MenuItem panoTexturesItem;
5152	5758
5153	5759	private MenuItem resetCentroidItem;
5154		- private MenuItem transformgeometryItem;
	5760	+ private MenuItem resetCentroidXZItem;
5155	5761	private MenuItem resetTransformItem;
	5762	+ private MenuItem transformGeometryItem;
	5763	+ private MenuItem transformChildrenItem;
5156	5764	private MenuItem hideItem;
5157	5765	private MenuItem grabItem;
5158	5766	private MenuItem backItem;
5159	5767	private MenuItem frontItem;
5160	5768	private MenuItem cameraItem;
5161	5769	private MenuItem compositeItem;
5162		- private MenuItem randomItem;
	5770	+ private MenuItem switchItem;
5163	5771	private MenuItem physicsItem;
5164	5772	private MenuItem frameselectorItem;
5165	5773	private MenuItem scriptNodeItem;
..	..	@@ -5221,11 +5829,6 @@
5221	5829	private MenuItem doubleItem;
5222	5830	private MenuItem tripleItem;
5223	5831
5224		- private MenuItem importGFDItem;
5225		- private MenuItem importVRMLX3DItem;
5226		- private MenuItem import3DSItem;
5227		- private MenuItem importOBJItem;
5228		-
5229	5832	private MenuItem computeAOItem;
5230	5833	private MenuItem recompileItem;
5231	5834	private MenuItem editScriptItem;
..	..	@@ -5235,4 +5838,8 @@
5235	5838	private MenuItem analyzeItem;
5236	5839	private MenuItem dumpItem;
5237	5840	//boolean freezemodel = false;
	5841	+
	5842	+ Menu cameraMenu;
	5843	+ MenuItem editCameraItem;
	5844	+ MenuItem restoreCameraItem;
5238	5845	}