~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,6 +12,7 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
..	..	@@ -59,6 +60,12 @@
59	60	this.copy = this.group = group;
60	61	//selectees = this.group.selectees;
61	62
	63	+ if (copy.versions == null)
	64	+ {
	65	+ copy.versions = new byte[100][];
	66	+ copy.versionindex = -1;
	67	+ }
	68	+
62	69	if(ui)
63	70	SetupUI(objEditor);
64	71	}
..	..	@@ -73,7 +80,13 @@
73	80	this.copy = this.group = copy;
74	81	//selectees = this.group.selectees;
75	82
76		- SetupMenu2(objEditor);
	83	+ if (copy.versions == null)
	84	+ {
	85	+ copy.versions = new byte[100][];
	86	+ copy.versionindex = -1;
	87	+ }
	88	+
	89	+ SetupMenu2(this); //objEditor);
77	90	SetupUI2(objEditor);
78	91	objEditor.SetupUI(true);
79	92	SetupViews(objEditor);
..	..	@@ -83,6 +96,10 @@
83	96
84	97	void CloneSelection(boolean supports)
85	98	{
	99	+ if (Globals.REPLACEONMAKE)
	100	+ Save();
	101	+ boolean keep = Globals.REPLACEONMAKE;
	102	+ Globals.REPLACEONMAKE = false;
86	103	// Object3D keep = GrafreeD.clipboard;
87	104	//Object3D obj;
88	105	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -93,18 +110,19 @@
93	110
94	111	makeSomething(clone, i==group.selection.size()-1);
95	112	}
	113	+ Globals.REPLACEONMAKE = keep;
96	114	}
97	115
98	116	void CloneClipboard(boolean supports)
99	117	{
100		- assert(GrafreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
102		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
104		- 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));
105	123	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	124	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	125	+ Grafreed.clipboard.get(0).parent = keepparent;
108	126	}
109	127
110	128	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +136,7 @@
118	136	// obj.support = null;
119	137	if (!supports)
120	138	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	139	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	140	obj.parent = parent;
123	141	// obj.support = support;
124	142	// clone.support = support; // aout 2013
..	..	@@ -147,30 +165,29 @@
147	165
148	166	//JTextField nameField;
149	167
150		- void SetupMenu2(ObjEditor oe)
	168	+ void SetupMenu2(GroupEditor oe)
151	169	{
152		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
155		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
156		- oe.cameraMenu.add("-");
157		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
158		- openWindowItem.addActionListener(this);
159		- editLeafItem.addActionListener(this);
160		- lookAtItem.addActionListener(this);
161		- //lookFromItem.addActinoListener(this);
162		- //switchItem.addActionListener(this);
	170	+ oe.jTree = new cTree();
	171	+
163	172	Menu menu;
164	173	oe.menuBar.add(menu = new Menu("Edit"));
165	174	//editItem = menu.add(new MenuItem("Edit"));
166	175	//editItem.addActionListener(this);
167		- 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"));
168	183	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	184	cloneItem = menu.add(new MenuItem("Clone"));
171	185	cloneItem.addActionListener(this);
	186	+ if (Globals.ADVANCED)
	187	+ {
172	188	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	189	cloneSupportItem.addActionListener(this);
	190	+ }
174	191	menu.add("-");
175	192	cutItem = menu.add(new MenuItem("Cut"));
176	193	cutItem.addActionListener(this);
..	..	@@ -178,27 +195,123 @@
178	195	copyItem.addActionListener(this);
179	196	pasteItem = menu.add(new MenuItem("Paste"));
180	197	pasteItem.addActionListener(this);
	198	+
	199	+ menu.add("-");
	200	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	201	+ pasteIntoItem.addActionListener(this);
181	202	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	203	pasteLinkItem.addActionListener(this);
183	204	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	205	pasteCloneItem.addActionListener(this);
185	206	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	207	// pasteExpandItem.addActionListener(this);
	208	+ menu.add("-");
187	209	clearItem = menu.add(new MenuItem("Clear"));
188	210	clearItem.addActionListener(this);
	211	+
	212	+ if (Globals.ADVANCED)
	213	+ {
	214	+ // Deletes the cameras...
189	215	clearAllItem = menu.add(new MenuItem("Clear All"));
190	216	clearAllItem.addActionListener(this);
	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());
191	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	+
192	306	oe.menuBar.add(menu = new Menu("Setting"));
193		- resetMeshItem = menu.add(new MenuItem("Reset All"));
194		- resetMeshItem.addActionListener(this);
195		- stepAllItem = menu.add(new MenuItem("Step All"));
196		- stepAllItem.addActionListener(this);
	307	+ if (Globals.ADVANCED)
	308	+ {
197	309	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	310	revertMeshItem.addActionListener(this);
199	311	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	312	resetreferencesItem.addActionListener(this);
201	313	menu.add("-");
	314	+ }
202	315	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	316	overwriteGeoItem.addActionListener(this);
204	317	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,79 +323,104 @@
210	323	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	324	overwriteUVItem.addActionListener(this);
212	325	menu.add("-");
	326	+ if (Globals.ADVANCED)
	327	+ {
213	328	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	329	generateMeshItem.addActionListener(this);
215	330	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	331	poseMeshItem.addActionListener(this);
217	332	menu.add("-");
	333	+ }
218	334	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	335	resetsupportItem.addActionListener(this);
220	336	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	337	linkverticesItem.addActionListener(this);
222	338	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	339	relinkverticesItem.addActionListener(this);
	340	+
	341	+ if (Globals.ADVANCED)
	342	+ {
224	343	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	344	setMasterItem.addActionListener(this);
	345	+ }
226	346
227	347	oe.menuBar.add(menu = new Menu("Group"));
228		- grabItem = menu.add(new MenuItem("Grab"));
229		- grabItem.addActionListener(this);
	348	+// grabItem = menu.add(new MenuItem("Grab"));
	349	+// grabItem.addActionListener(this);
230	350	backItem = menu.add(new MenuItem("Back"));
231	351	backItem.addActionListener(this);
232	352	frontItem = menu.add(new MenuItem("Front"));
233	353	frontItem.addActionListener(this);
234		- compositeItem = menu.add(new MenuItem("Composite"));
235		- compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	354	+// compositeItem = menu.add(new MenuItem("Composite"));
	355	+// compositeItem.addActionListener(this);
	356	+
	357	+ if (Globals.ADVANCED)
	358	+ {
	359	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	360	hideItem.addActionListener(this);
	361	+ }
238	362	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	363	ungroupItem.addActionListener(this);
240		- menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
242		- randomItem.addActionListener(this);
243		- physicsItem = menu.add(new MenuItem("Physics"));
244		- physicsItem.addActionListener(this);
245		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
246		- frameselectorItem.addActionListener(this);
	364	+
	365	+// menu.add("-");
	366	+//
	367	+// switchItem = menu.add(new MenuItem("Switch node"));
	368	+// switchItem.addActionListener(this);
	369	+ if (Globals.ADVANCED)
	370	+ {
247	371	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	372	switchGeoItem.addActionListener(this);
249	373	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	374	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	375	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	376	morphItem.addActionListener(this);
	377	+
	378	+ menu.add("-");
	379	+ physicsItem = menu.add(new MenuItem("Physics"));
	380	+ physicsItem.addActionListener(this);
	381	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	382	+ frameselectorItem.addActionListener(this);
253	383	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	384	scriptNodeItem.addActionListener(this);
255		- cameraItem = menu.add(new MenuItem("Camera"));
256		- cameraItem.addActionListener(this);
	385	+ }
257	386
258	387	oe.menuBar.add(menu = new Menu("Object"));
259		- textureItem = menu.add(new MenuItem("Texture"));
260		- textureItem.addActionListener(this);
	388	+// textureItem = menu.add(new MenuItem("Texture"));
	389	+// textureItem.addActionListener(this);
261	390	billboardItem = menu.add(new MenuItem("Billboard"));
262	391	billboardItem.addActionListener(this);
263	392	csgItem = menu.add(new MenuItem("CSG"));
264	393	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	394	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	395	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	396	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	397	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	398	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	399	shadowZItem.addActionListener(this);
	400	+ attributeItem = menu.add(new MenuItem("Attribute"));
	401	+ attributeItem.addActionListener(this);
	402	+
	403	+ if (Globals.ADVANCED)
	404	+ {
	405	+ menu.add("-");
271	406	linkerItem = menu.add(new MenuItem("Linker"));
272	407	linkerItem.addActionListener(this);
273	408	templateItem = menu.add(new MenuItem("Template"));
274	409	templateItem.addActionListener(this);
275		- attributeItem = menu.add(new MenuItem("Attribute"));
276		- attributeItem.addActionListener(this);
277	410	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	411	pointflowItem.addActionListener(this);
	412	+ }
279	413	menu.add("-");
280	414	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	415	resetTransformItem.addActionListener(this);
282	416	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	417	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- 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);
286	424
287	425	oe.menuBar.add(menu = new Menu("Geometry"));
288	426	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +431,11 @@
293	431	genNormalsCADItem.addActionListener(this);
294	432	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	433	genNormalsMESHItem.addActionListener(this);
	434	+ if (Globals.ADVANCED)
	435	+ {
296	436	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
297	437	genNormalsMINEItem.addActionListener(this);
	438	+ }
298	439	stripifyItem = menu.add(new MenuItem("Stripify"));
299	440	stripifyItem.addActionListener(this);
300	441	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +457,34 @@
316	457	reduce34MeshItem.addActionListener(this);
317	458	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	459	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	460	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	461	clipMeshItem.addActionListener(this);
	462	+
	463	+ if (Globals.ADVANCED)
	464	+ {
	465	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	466	+ smoothMeshItem.addActionListener(this);
	467	+ }
323	468
324	469	oe.menuBar.add(menu = new Menu("Attributes"));
325	470	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	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);
327	476	menu.add("-");
328	477	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	478	liveleavesItem.addActionListener(this);
330	479	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	480	unliveleavesItem.addActionListener(this);
	481	+ if (Globals.ADVANCED)
	482	+ {
332	483	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	484	supportleavesItem.addActionListener(this);
334	485	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	486	unsupportleavesItem.addActionListener(this);
	487	+ }
336	488	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	489	hideleavesItem.addActionListener(this);
338	490	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +493,14 @@
341	493	markleavesItem.addActionListener(this);
342	494	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	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);
344	504	menu.add("-");
345	505	flipVItem = menu.add(new MenuItem("Flip V"));
346	506	flipVItem.addActionListener(this);
..	..	@@ -376,35 +536,41 @@
376	536	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	537	sortbynameItem.addActionListener(this);
378	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);
	543	+ if (Globals.ADVANCED)
	544	+ {
	545	+ // Pretty much the same as duplicate and clone.
379	546	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	547	extractGeometriesItem.addActionListener(this);
381	548	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	549	cloneGeometriesItem.addActionListener(this);
383		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
384		- shareGeometriesItem.addActionListener(this);
385		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
386		- mergeGeometriesItem.addActionListener(this);
	550	+ }
387	551
388	552	oe.menuBar.add(menu = new Menu("Insert"));
389	553	buildCreateMenu(menu);
390	554
391		-
392		- oe.menuBar.add(menu = new Menu("Include"));
393		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
394		- importGFDItem.addActionListener(this);
395		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
396		- importVRMLX3DItem.addActionListener(this);
397		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
398		- importOBJItem.addActionListener(this);
399		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
400		- import3DSItem.addActionListener(this);
401		-
402	555	oe.menuBar.add(menu = new Menu("Tools"));
403	556	buildToolsMenu(menu);
404	557	}
405	558
	559	+
406	560	void SetupUI2(ObjEditor oe)
407	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	+
408	574	//new Exception().printStackTrace();
409	575
410	576	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -433,176 +599,230 @@
433	599	oe.radioPanel.add(dummyButton);
434	600	oe.buttonGroup.add(dummyButton);
435	601	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	602	+ cGridBag copyOptionsPanel = new cGridBag();
	603	+
	604	+ copyOptionsPanel.preferredHeight = 1;
439	605
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
441		- liveCB.setToolTipText("Enabled animation");
442		- liveCB.addItemListener(this);
443		-
444		- oe.aConstraints.gridx += 1;
445		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
446		- fastCB.setToolTipText("Fast mode");
447		- fastCB.addItemListener(this);
448		- oe.aConstraints.gridx += 1;
449		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
450		- supportCB.setToolTipText("Enabled rigging");
451		- supportCB.addItemListener(this);
452		-
453		- // oe.aConstraints.gridx += 1;
454		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
455		- // localCB.addItemListener(this);
456		-
457		- oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), oe.aConstraints);
459		- crowdCB.setToolTipText("Used for crowds");
460		- crowdCB.addItemListener(this);
461		-
462		- oe.aConstraints.gridx += 1;
463		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
464		- smoothCB.setToolTipText("Snapping delay");
465		- smoothCB.addItemListener(this);
466		-
467		- oe.aConstraints.gridx += 1;
468		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
469		- slowCB.setToolTipText("Smooth interpolation");
470		- slowCB.addItemListener(this);
471		- oe.aConstraints.gridx += 1;
472		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), oe.aConstraints);
473		- boxCB.setToolTipText("Display bounding boxes");
474		- boxCB.addItemListener(this);
475		- oe.aConstraints.gridx += 1;
476		- oe.toolbarPanel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), oe.aConstraints);
477		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
478		- zoomBoxCB.addItemListener(this);
479		-
480		-// oe.aConstraints.gridx += 1;
481		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
482		-// speakerMocapCB.addItemListener(this);
483		-
484		- if (false)
485		- {
486		- // handled in scripts
487		- oe.aConstraints.gridx += 1;
488		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
489		- speakerCameraCB.addItemListener(this);
490		-
491		- oe.aConstraints.gridx += 1;
492		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
493		- speakerFocusCB.addItemListener(this);
494		-
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
497		- smoothfocusCB.addItemListener(this);
498		- }
499		-
500		-//oe.aConstraints.gridx += 1;
501		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
502		-// debugCB.addItemListener(this);
503		-
504		- oe.aConstraints.gridx += 1;
505		- oe.toolbarPanel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), oe.aConstraints);
506		- oeilCB.addItemListener(this);
507		-
508		- oe.aConstraints.gridx += 1;
509		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), oe.aConstraints);
510		- lookAtCB.setToolTipText("Look-at target");
511		- lookAtCB.addItemListener(this);
512		-
513		- oe.aConstraints.gridx += 1;
514		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
515		- trackCB.setToolTipText("Enable tracking");
516		- trackCB.addItemListener(this);
517		-
518		- oe.aConstraints.gridx += 1;
519		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	606	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	607	+
	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);
520	624	screenfitButton.setToolTipText("Screen fit");
521	625	screenfitButton.addActionListener(this);
522		- oe.aConstraints.gridx += 1;
	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");
	660	+ liveCB.addItemListener(this);
	661	+
	662	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	663	+ oneStepButton.setToolTipText("Animate one step forward");
	664	+ oneStepButton.addActionListener(this);
	665	+
	666	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	667	+ fastCB.setToolTipText("Fast mode");
	668	+ fastCB.addItemListener(this);
	669	+
	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);
	675	+
523	676	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
524	677	// screenfitpointButton.addActionListener(this);
525		-// oe.aConstraints.gridx += 1;
526		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
527		- snapobjectButton.addActionListener(this);
528		- snapobjectButton.setToolTipText("Snap Object");
529		- oe.aConstraints.gridx += 1;
530	678
531		- //aConstraints.gridx = 0;
532		- //aConstraints.gridy += 1;
533		- oe.aConstraints.weighty = 0;
534		- oe.aConstraints.gridwidth = 1;
535		-
536		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
537		- flashSelectionButton.setToolTipText("Show selection");
538		- flashSelectionButton.addActionListener(this);
	679	+ if (Globals.ADVANCED)
	680	+ {
	681	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	682	+ snapobjectButton.addActionListener(this);
	683	+ snapobjectButton.setToolTipText("Snap Object");
	684	+ }
	685	+
	686	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
539	687
540		- oe.toolbarPanel.add(new cButton(" ", false));
541		-
542		- oe.aConstraints.gridx += 1;
543		- oe.aConstraints.weighty = 0;
544		- oe.aConstraints.gridwidth = 1;
545		-
546		- //
547		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	688	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
548	689	twoButton.setToolTipText("Show center view only");
549	690	twoButton.addActionListener(this);
550		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	691	+ this.fullscreenLayout = twoButton;
	692	+
	693	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
551	694	fourButton.addActionListener(this);
552	695	fourButton.setToolTipText("Show left panel only");
553		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	696	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
554	697	sixButton.setToolTipText("2-column layout left");
555	698	sixButton.addActionListener(this);
556		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	699	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
557	700	threeButton.setToolTipText("2-column layout right");
558	701	threeButton.addActionListener(this);
559		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	702	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
560	703	sevenButton.setToolTipText("3-column layout");
561	704	sevenButton.addActionListener(this);
562	705	//
563	706
564		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
565		- rootButton.setToolTipText("Edit object in new tab");
	707	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	708	+ rootButton.setToolTipText("Edit selection in new tab");
566	709	rootButton.addActionListener(this);
567		- oe.aConstraints.gridx += 1;
568		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	710	+
	711	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569	712	closeButton.setToolTipText("Close tab");
570	713	closeButton.addActionListener(this);
571	714	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
572	715	//clearButton.addActionListener(this);
573		- oe.aConstraints.gridx += 1;
574		-
575		- oe.aConstraints.gridx = 1; //
576		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
577		- editButton.addActionListener(this);
578		- oe.aConstraints.gridx += 1;
579		- oe.aConstraints.weighty = 0;
580		- oe.aConstraints.gridwidth = 1;
581	716
582		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	717	+ // INSERT
	718	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ gridButton.setToolTipText("Create grid");
	720	+ gridButton.addActionListener(this);
	721	+
	722	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	723	+ boxButton.setToolTipText("Create box");
	724	+ boxButton.addActionListener(this);
	725	+
	726	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	727	+ sphereButton.setToolTipText("Create sphere");
	728	+ sphereButton.addActionListener(this);
	729	+
	730	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	731	+ coneButton.setToolTipText("Create cone");
	732	+ coneButton.addActionListener(this);
	733	+
	734	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	735	+ torusButton.setToolTipText("Create torus");
	736	+ torusButton.addActionListener(this);
	737	+
	738	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	739	+ superButton.setToolTipText("Create superellipsoid");
	740	+ superButton.addActionListener(this);
	741	+
	742	+ if (Globals.ADVANCED)
	743	+ {
	744	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	745	+ kleinButton.setToolTipText("Create Klein bottle");
	746	+ kleinButton.addActionListener(this);
	747	+ }
	748	+
	749	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	750	+ particlesButton.setToolTipText("Create particle system");
	751	+ particlesButton.addActionListener(this);
	752	+
	753	+ oe.toolboxPanel.Return();
	754	+
	755	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	756	+ groupButton.setToolTipText("Create group");
	757	+ groupButton.addActionListener(this);
	758	+
	759	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	760	+ compositeButton.setToolTipText("Create composite");
	761	+ compositeButton.addActionListener(this);
	762	+
	763	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	764	+ switchButton.setToolTipText("Create item switcher");
	765	+ switchButton.addActionListener(this);
	766	+
	767	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	768	+ loopButton.setToolTipText("Create loop");
	769	+ loopButton.addActionListener(this);
	770	+
	771	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	772	+ textureButton.setToolTipText("Create texture");
	773	+ textureButton.addActionListener(this);
	774	+
	775	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	776	+ overlayButton.setToolTipText("Create overlay");
	777	+ overlayButton.addActionListener(this);
	778	+
	779	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	780	+ lightButton.setToolTipText("Create light");
	781	+ lightButton.addActionListener(this);
	782	+
	783	+ for (int i=6; --i>=0;)
	784	+ {
	785	+ oe.toolboxPanel.Return();
	786	+ oe.toolboxPanel.add(new cGridBag());
	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	+ }
	794	+
	795	+ // EDIT panel
	796	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	797	+ editButton.setToolTipText("Pin selection controls");
	798	+ editButton.addActionListener(this);
	799	+
	800	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	801	+ uneditButton.setToolTipText("Remove selection controls");
583	802	uneditButton.addActionListener(this);
584	803
585		- oe.aConstraints.gridx += 1;
586		- oe.aConstraints.weighty = 0;
587		- oe.aConstraints.gridwidth = 1;
588		-
589		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
590		- clearPanelButton.addActionListener(this);
591		-
592		- oe.aConstraints.gridx += 1;
593		- oe.aConstraints.weighty = 0;
594		- oe.aConstraints.gridwidth = 1;
595		-
596		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	804	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	805	+ allParamsButton.setToolTipText("Show all controle");
597	806	allParamsButton.addActionListener(this);
598	807
599		- oe.aConstraints.gridx += 1;
600		- oe.aConstraints.weighty = 0;
601		- oe.aConstraints.gridwidth = 1;
602		-
603		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	808	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	809	+ clearPanelButton.setToolTipText("Clear edit panel");
	810	+ clearPanelButton.addActionListener(this);
	811	+
	812	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	813	+ unselectButton.setToolTipText("Unselect");
604	814	unselectButton.addActionListener(this);
605	815
	816	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	817	+ flashSelectionButton.setToolTipText("Highlight selection");
	818	+ flashSelectionButton.addActionListener(this);
	819	+
	820	+ editCommandsPanel.preferredHeight = 1;
	821	+
	822	+ SetPinStates(false);
	823	+// oe.treePanel.add(commandsPanel);
	824	+// oe.treePanel.Return();
	825	+
606	826	// oe.aConstraints.gridx += 1;
607	827	// oe.aConstraints.weighty = 0;
608	828	// oe.aConstraints.gridwidth = 1;
..	..	@@ -614,40 +834,25 @@
614	834	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
615	835	// gcButton.addActionListener(this);
616	836
617		- oe.aConstraints.gridx = 0;
618		- oe.aConstraints.gridy += 1;
619		-
620		- //ctrlPanel.add(objList = new List(5, true));
621		- oe.aConstraints.gridwidth = 100;
622		- // oe.aConstraints.gridheight = 100;
623		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
624		- oe.aConstraints.gridheight = 1;
625		- oe.aConstraints.weighty = 0.5;
626		- oe.aConstraints.gridx = 0;
627		- JScrollPane jSP;
	837	+ cGridBag jSPPanel = new cGridBag();
	838	+
	839	+ JScrollPane jSP;
628	840	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
629		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	841	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
630	842	ResetModel();
631		- oe.aConstraints.weighty = 0.5;
632		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
633		- oe.aConstraints.gridy += 1;
634		- oe.aConstraints.gridwidth = 1;
635		-
636		- oe.aConstraints.weighty = 0;
637		- oe.aConstraints.gridwidth = 2;
638		-
639		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
640		- colorCB.addItemListener(this);
641		- oe.aConstraints.gridx += 2;
642		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
643		- materialCB.addItemListener(this);
644		- oe.aConstraints.gridx += 2;
645		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
646		- textureCB.addItemListener(this);
647		-
648		- oe.aConstraints.gridx = 0;
649		- oe.aConstraints.gridy += 1;
650	843
	844	+ oe.treePanel.add(jSPPanel);
	845	+ oe.treePanel.Return();
	846	+
	847	+ oe.treePanel.add(copyOptionsPanel);
	848	+ oe.treePanel.Return();
	849	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	850	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	851	+ sliderPane.preferredHeight = 1;
	852	+
	853	+// mainPanel.setDividerLocation(0.5); //1.0);
	854	+// mainPanel.setResizeWeight(0.5);
	855	+
651	856	//jList.addListSelectionListener(this);
652	857	oe.jTree.addTreeSelectionListener(this);
653	858	//jTree.setRootVisible(false);
..	..	@@ -669,10 +874,144 @@
669	874	radio.layout = sevenButton;
670	875	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
671	876	}
	877	+
	878	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	879	+ {
	880	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	881	+ colorCB.setToolTipText("Copy color when dropped");
	882	+ colorCB.addItemListener(this);
	883	+
	884	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	885	+ materialCB.setToolTipText("Copy material when dropped");
	886	+ materialCB.addItemListener(this);
	887	+
	888	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	889	+ textureCB.setToolTipText("Copy texture when dropped");
	890	+ textureCB.addItemListener(this);
	891	+
	892	+ panel.Return();
	893	+
	894	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	895	+ boxCB.setToolTipText("Display bounding boxes");
	896	+ boxCB.addItemListener(this);
	897	+
	898	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	899	+ zoomBoxCB.setToolTipText("Display only for wheel");
	900	+ zoomBoxCB.addItemListener(this);
	901	+
	902	+ if (true) // Globals.ADVANCED)
	903	+ {
	904	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	905	+// supportCB.setToolTipText("Enable rigging");
	906	+// supportCB.addItemListener(this);
	907	+
	908	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	909	+ freezeCB.setToolTipText("Fast moving camera");
	910	+ freezeCB.addItemListener(this);
	911	+
	912	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	913	+ // localCB.addItemListener(this);
	914	+
	915	+ panel.Return();
	916	+
	917	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	918	+ crowdCB.setToolTipText("Used for crowds");
	919	+ crowdCB.addItemListener(this);
	920	+
	921	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	922	+ smoothCB.setToolTipText("Snapping delay");
	923	+ smoothCB.addItemListener(this);
	924	+
	925	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	926	+ slowCB.setToolTipText("Smooth interpolation");
	927	+ slowCB.addItemListener(this);
	928	+
	929	+// constraints.gridy += 1;
	930	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	931	+// speakerMocapCB.addItemListener(this);
	932	+
	933	+ panel.Return();
	934	+
	935	+ if (false)
	936	+ {
	937	+ // handled in scripts
	938	+ //constraints.gridy += 1;
	939	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	940	+ speakerCameraCB.addItemListener(this);
	941	+
	942	+ //constraints.gridy += 1;
	943	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	944	+ speakerFocusCB.addItemListener(this);
	945	+
	946	+ //constraints.gridy += 1;
	947	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	948	+ smoothfocusCB.addItemListener(this);
	949	+ panel.Return();
	950	+ }
	951	+
	952	+//constraints.gridx += 1;
	953	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	954	+// debugCB.addItemListener(this);
	955	+
	956	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	957	+ trackCB.setToolTipText("Enable tracking target");
	958	+ trackCB.addItemListener(this);
	959	+
	960	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	961	+ oeilCB.setToolTipText("Move camera when tracking");
	962	+ oeilCB.addItemListener(this);
	963	+
	964	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	965	+ shadowCB.setToolTipText("When live compute shadows");
	966	+ shadowCB.addItemListener(this);
	967	+
	968	+ panel.Return();
	969	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	970	+ toggleTextureCB.setToolTipText("Load textures");
	971	+ toggleTextureCB.addItemListener(this);
	972	+
	973	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	974	+ toggleSwitchCB.setToolTipText("Choose a single item");
	975	+ toggleSwitchCB.addItemListener(this);
	976	+
	977	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	978	+ autokeepCB.setToolTipText("On structure change");
	979	+ autokeepCB.addItemListener(this);
	980	+
	981	+ panel.Return();
	982	+ if (Globals.ADVANCED)
	983	+ {
	984	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	985	+ lookAtCB.setToolTipText("Look-at target");
	986	+ lookAtCB.addItemListener(this);
	987	+ }
	988	+
	989	+ }
	990	+
	991	+ cGridBag fill = new cGridBag();
	992	+ fill.preferredHeight = 200;
	993	+ cGridBag fill2 = new cGridBag();
	994	+ fill2.preferredHeight = 200;
	995	+ cGridBag fill3 = new cGridBag();
	996	+ fill3.preferredHeight = 200;
	997	+
	998	+ panel.add(fill);
	999	+ panel.add(fill2);
	1000	+ panel.add(fill3);
	1001	+
	1002	+ }
672	1003
673	1004	void EditObject(Object3D obj)
674	1005	{
675	1006	cRadio radioButton = new cRadio(obj.name);
	1007	+
	1008	+ // June 2019. Patch to avoid bug with transparency.
	1009	+ radioButton.hadMaterial = obj.material != null;
	1010	+ if (!radioButton.hadMaterial)
	1011	+ {
	1012	+ obj.material = new cMaterial();
	1013	+ }
	1014	+
676	1015	radioButton.SetObject(obj);
677	1016	radioButton.layout = sevenButton;
678	1017	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -681,8 +1020,11 @@
681	1020	buttonGroup.add(radioButton);
682	1021	radioButton.doClick();
683	1022	}
	1023	+
684	1024	void SetupViews(ObjEditor oe)
685	1025	{
	1026	+ theFrame = this;
	1027	+
686	1028	oe.SetupViews();
687	1029
688	1030	System.out.println("SetupViews");
..	..	@@ -691,23 +1033,28 @@
691	1033	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
692	1034	}
693	1035
694		- JCheckBox liveCB;
695		- JCheckBox supportCB;
696		- JCheckBox localCB;
697		- JCheckBox crowdCB;
698		- JCheckBox smoothCB;
699		- JCheckBox fastCB;
700		- JCheckBox slowCB;
701		- JCheckBox boxCB;
702		- JCheckBox zoomBoxCB;
703		- JCheckBox trackCB;
704		- JCheckBox smoothfocusCB;
	1036	+ cToggleButton liveCB;
	1037	+ cCheckBox supportCB;
	1038	+ cCheckBox localCB;
	1039	+ cCheckBox crowdCB;
	1040	+ cCheckBox smoothCB;
	1041	+ cToggleButton fastCB;
	1042	+ cCheckBox slowCB;
	1043	+ cCheckBox boxCB;
	1044	+ cCheckBox zoomBoxCB;
	1045	+ cCheckBox freezeCB;
	1046	+ //cToggleButton trackCB;
	1047	+ cCheckBox trackCB;
	1048	+ cCheckBox smoothfocusCB;
705	1049	// JCheckBox speakerMocapCB;
706		- JCheckBox speakerCameraCB;
707		- JCheckBox speakerFocusCB;
708		- JCheckBox debugCB;
709		- JCheckBox oeilCB;
710		- JCheckBox lookAtCB;
	1050	+ cCheckBox speakerCameraCB;
	1051	+ cCheckBox speakerFocusCB;
	1052	+ cCheckBox debugCB;
	1053	+
	1054	+ cCheckBox oeilCB;
	1055	+ cCheckBox shadowCB;
	1056	+ cCheckBox autokeepCB;
	1057	+ cCheckBox lookAtCB;
711	1058
712	1059	// static int COLOR = 1;
713	1060	// static int MATERIAL = 2;
..	..	@@ -715,9 +1062,9 @@
715	1062
716	1063	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
717	1064
718		- JCheckBox colorCB;
719		- JCheckBox materialCB;
720		- JCheckBox textureCB;
	1065	+ cCheckBox colorCB;
	1066	+ cCheckBox materialCB;
	1067	+ cCheckBox textureCB;
721	1068
722	1069	public void itemStateChanged(ItemEvent e)
723	1070	{
..	..	@@ -745,6 +1092,7 @@
745	1092	} else if(e.getSource() == liveCB)
746	1093	{
747	1094	cameraView.ToggleLive();
	1095	+ refreshContents(false);
748	1096	}
749	1097	else if(e.getSource() == supportCB)
750	1098	{
..	..	@@ -809,6 +1157,18 @@
809	1157	{
810	1158	cameraView.ToggleOeil();
811	1159	}
	1160	+ else if(e.getSource() == shadowCB)
	1161	+ {
	1162	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1163	+ }
	1164	+ else if(e.getSource() == freezeCB)
	1165	+ {
	1166	+ Globals.FREEZEONMOVE ^= true;
	1167	+ }
	1168	+ else if(e.getSource() == autokeepCB)
	1169	+ {
	1170	+ Globals.REPLACEONMAKE ^= true;
	1171	+ }
812	1172	else if(e.getSource() == lookAtCB)
813	1173	{
814	1174	cameraView.ToggleLookAt();
..	..	@@ -825,7 +1185,8 @@
825	1185
826	1186	/**/
827	1187	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
828		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1188	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1189	+ TreePath path = objEditor.jTree.getSelectionPath();
829	1190	if ((path == null) \|\| (path.getPathCount() <= 1)) {
830	1191	// We can't move the root node or an empty selection
831	1192	return;
..	..	@@ -888,8 +1249,6 @@
888	1249	}
889	1250	}
890	1251
891		- String string = (String) object;
892		-
893	1252	System.out.println("Transfer = " + object + "; drop : " + target);
894	1253	// if( object instanceof java.io.File[])
895	1254	// {
..	..	@@ -897,7 +1256,11 @@
897	1256	// objEditor.DropFile((java.io.File[]) object, true);
898	1257	// return;
899	1258	// }
900		- if (string.charAt(0) == '/')
	1259	+
	1260	+ String string = object.toString();
	1261	+
	1262	+ // File path for Mac and Windows
	1263	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
901	1264	{
902	1265	// file(s)
903	1266	String[] names = string.split("\n");
..	..	@@ -924,7 +1287,7 @@
924	1287
925	1288	flashIt = false;
926	1289	CameraPane pane = (CameraPane) target;
927		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1290	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
928	1291	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
929	1292
930	1293	if (group.selection.size() == 1)
..	..	@@ -940,23 +1303,33 @@
940	1303
941	1304	assert target == objEditor.jTree;
942	1305	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1306	+ Object3D destinationLeaf;
943	1307	try {
944		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1308	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
945	1309	} catch (Exception e) {
946	1310	System.out.println("destinationPath : " + destinationPath);
947	1311	return;
948	1312	}
949	1313
950		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1314	+ for (int i=group.selection.size(); --i>=0;)
951	1315	{
	1316	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1317	+
	1318	+ // Cannot move into itself
	1319	+ if (child == destinationLeaf)
	1320	+ return;
	1321	+ }
	1322	+
	1323	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1324	+// {
952	1325	loadClipboard(true);
953	1326	objEditor.jTree.setSelectionPath(destinationPath);
954		- pasteInto(false);
955		- } else {
956		- loadClipboard(false);
957		- objEditor.jTree.setSelectionPath(destinationPath);
958		- pasteInto(false); // true); // ???
959		- }
	1327	+ pasteInto(false, false);
	1328	+// } else {
	1329	+// loadClipboard(false);
	1330	+// objEditor.jTree.setSelectionPath(destinationPath);
	1331	+// pasteInto(false, false); // true); // ???
	1332	+// }
960	1333	}
961	1334	public void dropActionChanged(DropTargetDragEvent dtde)
962	1335	// Called if the user has modified the current drop gesture
..	..	@@ -1061,85 +1434,107 @@
1061	1434	{
1062	1435	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1063	1436	//heightFieldItem.addActionListener(this);
1064		- gridItem = menu.add(new MenuItem("Grid"));
1065		- gridItem.addActionListener(this);
1066		- rectoidItem = menu.add(new MenuItem("Box"));
1067		- rectoidItem.addActionListener(this);
1068		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1069		- ellipsoidItem.addActionListener(this);
1070		- coneItem = menu.add(new MenuItem("Cone"));
1071		- coneItem.addActionListener(this);
1072		- torusItem = menu.add(new MenuItem("Torus"));
1073		- torusItem.addActionListener(this);
1074		- superItem = menu.add(new MenuItem("Superellipsoid"));
1075		- superItem.addActionListener(this);
	1437	+// gridItem = menu.add(new MenuItem("Grid"));
	1438	+// gridItem.addActionListener(this);
	1439	+// rectoidItem = menu.add(new MenuItem("Box"));
	1440	+// rectoidItem.addActionListener(this);
	1441	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1442	+// ellipsoidItem.addActionListener(this);
	1443	+// coneItem = menu.add(new MenuItem("Cone"));
	1444	+// coneItem.addActionListener(this);
	1445	+// torusItem = menu.add(new MenuItem("Torus"));
	1446	+// torusItem.addActionListener(this);
	1447	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1448	+// superItem.addActionListener(this);
	1449	+
	1450	+ cameraItem = menu.add(new MenuItem("Camera"));
	1451	+ cameraItem.addActionListener(this);
	1452	+
	1453	+ if (!Globals.ADVANCED)
	1454	+ {
1076	1455	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1077	1456	kleinItem.addActionListener(this);
1078		- particleItem = menu.add(new MenuItem("Particle system"));
1079		- particleItem.addActionListener(this);
	1457	+ }
	1458	+
	1459	+// particleItem = menu.add(new MenuItem("Particle system"));
	1460	+// particleItem.addActionListener(this);
	1461	+ if (Globals.ADVANCED)
	1462	+ {
1080	1463	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1081	1464	ragdollItem.addActionListener(this);
1082	1465	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1083	1466	ragdoll2Item.addActionListener(this);
	1467	+ }
1084	1468	menu.add("-");
1085		- meshItem = menu.add(new MenuItem("Mesh"));
	1469	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1086	1470	meshItem.addActionListener(this);
1087	1471	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1088	1472	// meshGroupItem.addActionListener(this);
	1473	+ if (Globals.ADVANCED)
	1474	+ {
1089	1475	springItem = menu.add(new MenuItem("Spring"));
1090	1476	springItem.addActionListener(this);
1091	1477	flagItem = menu.add(new MenuItem("Flag"));
1092	1478	flagItem.addActionListener(this);
1093		- bezierItem = menu.add(new MenuItem("Patch"));
1094		- bezierItem.addActionListener(this);
1095		- checkerItem = menu.add(new MenuItem("Checker"));
1096		- checkerItem.addActionListener(this);
1097	1479	blobItem = menu.add(new MenuItem("Blob"));
1098	1480	blobItem.addActionListener(this);
1099	1481	latheItem = menu.add(new MenuItem("Lathe"));
1100	1482	latheItem.addActionListener(this);
1101		- lightItem = menu.add(new MenuItem("Light"));
1102		- lightItem.addActionListener(this);
	1483	+ }
	1484	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1485	+ bezierItem.addActionListener(this);
	1486	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1487	+// overlayItem.addActionListener(this);
	1488	+// lightItem = menu.add(new MenuItem("Light"));
	1489	+// lightItem.addActionListener(this);
1103	1490	menu.add("-");
1104	1491	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1105	1492	//superLoopItem.addActionListener(this);
1106		- loopItem = menu.add(new MenuItem("Loop"));
1107		- loopItem.addActionListener(this);
	1493	+// loopItem = menu.add(new MenuItem("Loop"));
	1494	+// loopItem.addActionListener(this);
1108	1495	doubleItem = menu.add(new MenuItem("Fork"));
1109	1496	doubleItem.addActionListener(this);
	1497	+ if (Globals.ADVANCED)
	1498	+ {
1110	1499	tripleItem = menu.add(new MenuItem("Trident"));
1111	1500	tripleItem.addActionListener(this);
	1501	+ }
1112	1502	}
1113	1503
1114	1504	void buildToolsMenu(Menu menu)
1115	1505	{
1116	1506	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1117	1507	animationItem.addItemListener(this);
1118		- animationItem.setState(CameraPane.ANIMATION);
	1508	+ animationItem.setState(Globals.ANIMATION);
	1509	+
	1510	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1511	+ archiveItem.addActionListener(this);
1119	1512
1120	1513	menu.add("-");
1121	1514	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1122	1515	parseverticesItem.addActionListener(this);
1123	1516	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1124	1517	textureFieldItem.addActionListener(this);
1125		- alignItem = menu.add(new MenuItem("Align"));
	1518	+ alignItem = menu.add(new MenuItem("Align Objects"));
1126	1519	alignItem.addActionListener(this);
1127		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1128		- mirrorItem.addActionListener(this);
1129	1520	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1130	1521	reduceMorphItem.addActionListener(this);
1131	1522	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1132	1523	reduce34MorphItem.addActionListener(this);
1133		-
1134		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1135		- computeAOItem.addActionListener(this);
1136	1524	menu.add("-");
1137		-
1138	1525	menu.add(memoryItem = new MenuItem("Memory Usage"));
1139	1526	memoryItem.addActionListener(this);
	1527	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1528	+ computeAOItem.addActionListener(this);
	1529	+
	1530	+ if (Globals.ADVANCED)
	1531	+ {
	1532	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1533	+ mirrorItem.addActionListener(this);
	1534	+ menu.add("-");
1140	1535	menu.add(analyzeItem = new MenuItem("Analyze"));
1141	1536	analyzeItem.addActionListener(this);
1142		- menu.add(dumpItem = new MenuItem("Dump"));
	1537	+ menu.add(dumpItem = new MenuItem("Print"));
1143	1538	dumpItem.addActionListener(this);
1144	1539	// menu.add(pathItem = new MenuItem("From-to path"));
1145	1540	// pathItem.addActionListener(this);
..	..	@@ -1157,6 +1552,7 @@
1157	1552	menu.add("-");
1158	1553	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1159	1554	editScriptItem.addActionListener(this);
	1555	+ }
1160	1556	}
1161	1557
1162	1558	void ScreenFit()
..	..	@@ -1279,9 +1675,24 @@
1279	1675	shadow.material = new cMaterial(obj.material);
1280	1676	shadow.material.diffuse = 0.0001f;
1281	1677	shadow.material.specular = 0.0001f;
	1678	+ //shadow.projectedVertices[1].x = 300;
1282	1679
1283	1680	makeSomething(shadow);
1284	1681	}
	1682	+
	1683	+ private void ClearUnpinned()
	1684	+ {
	1685	+ //for (Object3D obj : listUI)
	1686	+ for (int i=listUI.size(); --i>=0;)
	1687	+ {
	1688	+ Object3D obj = listUI.elementAt(i);
	1689	+ if (!obj.pinned)
	1690	+ {
	1691	+ obj.CloseUI();
	1692	+ listUI.remove(i);
	1693	+ }
	1694	+ }
	1695	+ }
1285	1696
1286	1697	/**
1287	1698	* applyExample
..	..	@@ -1485,9 +1896,9 @@
1485	1896
1486	1897	void Overwrite(int mask)
1487	1898	{
1488		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1899	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1489	1900	{
1490		- Object3D content = GrafreeD.clipboard.get(0);
	1901	+ Object3D content = Grafreed.clipboard.get(0);
1491	1902
1492	1903	if (content instanceof cGroup && ((cGroup)content).transientlink )
1493	1904	content = ((cGroup)content).get(0);
..	..	@@ -1510,6 +1921,7 @@
1510	1921	//
1511	1922	public void actionPerformed(ActionEvent event) // , Object arg)
1512	1923	{
	1924	+ Object source = event.getSource();
1513	1925	/*
1514	1926	if (event.getSource() == nameField)
1515	1927	{
..	..	@@ -1521,11 +1933,11 @@
1521	1933	}
1522	1934	else
1523	1935	*/
1524		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1936	+ if (source == lookAtItem \|\| source == lookFromItem)
1525	1937	{
1526	1938	ScreenFit();
1527	1939	} else
1528		- if (event.getSource() == switchItem)
	1940	+ if (source == switchViewItem)
1529	1941	{
1530	1942	cVector v1 = new cVector();
1531	1943	cVector v2 = new cVector();
..	..	@@ -1534,11 +1946,11 @@
1534	1946	objEditor.cameraView.renderCamera.setAim(v2, v1);
1535	1947	objEditor.cameraView.repaint();
1536	1948	} else
1537		- if (event.getSource() == rectoidItem)
	1949	+ if (source == rectoidItem \|\| source == boxButton)
1538	1950	{
1539	1951	makeSomething(new Box());
1540	1952	} else
1541		- if (event.getSource() == particleItem)
	1953	+ if (source == particleItem \|\| source == particlesButton)
1542	1954	{
1543	1955	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1544	1956	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1559,9 +1971,9 @@
1559	1971	applyExample(particleGeom, "SMOKE");
1560	1972	makeSomething(particleGeom);
1561	1973	} else
1562		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1974	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1563	1975	{
1564		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1976	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1565	1977
1566	1978	ragdoll.toParent = LA.newMatrix();
1567	1979	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1579,7 +1991,7 @@
1579	1991	} else
1580	1992	/*
1581	1993	*/
1582		- if (event.getSource() == heightFieldItem)
	1994	+ if (source == heightFieldItem)
1583	1995	{
1584	1996	Object3D obj = new Object3D();
1585	1997
..	..	@@ -1617,31 +2029,31 @@
1617	2029
1618	2030	makeSomething(obj);
1619	2031	} else
1620		- if (event.getSource() == gridItem)
	2032	+ if (source == gridItem \|\| source == gridButton)
1621	2033	{
1622	2034	makeSomething(new Grid());
1623	2035	} else
1624		- if (event.getSource() == ellipsoidItem)
	2036	+ if (source == ellipsoidItem \|\| source == sphereButton)
1625	2037	{
1626	2038	makeSomething(new Sphere());
1627	2039	} else
1628		- if (event.getSource() == coneItem)
	2040	+ if (source == coneItem \|\| source == coneButton)
1629	2041	{
1630	2042	makeSomething(new Cone());
1631	2043	} else
1632		- if (event.getSource() == torusItem)
	2044	+ if (source == torusItem \|\| source == torusButton)
1633	2045	{
1634	2046	makeSomething(new Torus());
1635	2047	} else
1636		- if (event.getSource() == superItem)
	2048	+ if (source == superItem \|\| source == superButton)
1637	2049	{
1638	2050	makeSomething(new Superellipsoid());
1639	2051	} else
1640		- if (event.getSource() == kleinItem)
	2052	+ if (source == kleinItem \|\| source == kleinButton)
1641	2053	{
1642	2054	makeSomething(new Klein());
1643	2055	} else
1644		- if (event.getSource() == blobItem)
	2056	+ if (source == blobItem)
1645	2057	{
1646	2058	Blob blob = new Blob();
1647	2059	BlobComponent comp = new BlobComponent();
..	..	@@ -1649,15 +2061,15 @@
1649	2061	//blob.retile();
1650	2062	makeSomething(blob);
1651	2063	} else
1652		- if (event.getSource() == latheItem)
	2064	+ if (source == latheItem)
1653	2065	{
1654	2066	makeSomething(new Lathe());
1655	2067	} else
1656		- if (event.getSource() == bezierItem)
	2068	+ if (source == bezierItem)
1657	2069	{
1658	2070	makeSomething(new BezierSurface());
1659	2071	} else
1660		- if (event.getSource() == checkerItem)
	2072	+ if (source == overlayItem \|\| source == overlayButton)
1661	2073	{
1662	2074	/*
1663	2075	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1672,7 +2084,7 @@
1672	2084	*/
1673	2085	makeSomething(new Checker());
1674	2086	} else
1675		- if (event.getSource() == meshItem)
	2087	+ if (source == meshItem)
1676	2088	{
1677	2089	Object3D itemtomake = new Object3D();
1678	2090	Object3D child;
..	..	@@ -1693,35 +2105,35 @@
1693	2105	makeSomething(child);
1694	2106	}
1695	2107	} else
1696		- if (event.getSource() == springItem)
	2108	+ if (source == springItem)
1697	2109	{
1698	2110	cSpring s = new cSpring();
1699	2111	s.setup();
1700	2112	makeSomething(s);
1701	2113	} else
1702		- if (event.getSource() == flagItem)
	2114	+ if (source == flagItem)
1703	2115	{
1704	2116	cSpring s = new cFlag();
1705	2117	s.setup();
1706	2118	makeSomething(s);
1707	2119	} else
1708		- if (event.getSource() == lightItem)
	2120	+ if (source == lightItem \|\| source == lightButton)
1709	2121	{
1710	2122	makeSomething(new Light());
1711	2123	} else
1712		- if (event.getSource() == csgItem)
	2124	+ if (source == csgItem)
1713	2125	{
1714	2126	group(new CSG());
1715	2127	} else
1716		- if (event.getSource() == templateItem)
	2128	+ if (source == templateItem)
1717	2129	{
1718	2130	group(new cTemplate());
1719	2131	} else
1720		- if (event.getSource() == attributeItem)
	2132	+ if (source == attributeItem)
1721	2133	{
1722	2134	makeSomething(new Attribute());
1723	2135	} else
1724		- if (event.getSource() == pointflowItem)
	2136	+ if (source == pointflowItem)
1725	2137	{
1726	2138	makeSomething(new PointFlow());
1727	2139	} else
..	..	@@ -1733,7 +2145,7 @@
1733	2145	} else
1734	2146	*/
1735	2147
1736		- if (event.getSource() == superLoopItem)
	2148	+ if (source == superLoopItem)
1737	2149	{
1738	2150	Composite g = new cGroup();
1739	2151	for (int i=0; i<15; i++)
..	..	@@ -1755,30 +2167,30 @@
1755	2167
1756	2168	group(g);
1757	2169	} else
1758		- if (event.getSource() == loopItem)
	2170	+ if (source == loopItem \|\| source == loopButton)
1759	2171	{
1760	2172	Composite csg = new GroupLeaf();
1761	2173	csg.count = 5;
1762	2174	group(csg);
1763		- Composite child = new cGroup();
	2175	+ Composite child = new cGroup("Branch");
1764	2176	csg.addChild(child);
1765	2177	child.addChild(csg);
1766	2178	} else
1767		- if (event.getSource() == doubleItem)
	2179	+ if (source == doubleItem)
1768	2180	{
1769		- Composite csg = new GroupLeaf();
	2181	+ Composite csg = new GroupLeaf("Fork");
1770	2182	csg.count = 5;
1771	2183	group(csg);
1772		- Composite child = new cGroup();
	2184	+ Composite child = new cGroup("Branch A");
1773	2185	csg.addChild(child);
1774	2186	child.addChild(csg);
1775		- child = new cGroup();
	2187	+ child = new cGroup("Branch B");
1776	2188	csg.addChild(child);
1777	2189	child.addChild(csg);
1778	2190	} else
1779		- if (event.getSource() == tripleItem)
	2191	+ if (source == tripleItem)
1780	2192	{
1781		- Composite csg = new GroupLeaf();
	2193	+ Composite csg = new GroupLeaf("Trident");
1782	2194	csg.count = 4;
1783	2195	group(csg);
1784	2196	Composite child = new cGroup();
..	..	@@ -1791,73 +2203,98 @@
1791	2203	csg.addChild(child);
1792	2204	child.addChild(csg);
1793	2205	} else
1794		-
1795		- if (event.getSource() == importGFDItem)
1796		- {
1797		- ImportGFD();
1798		- } else
1799		- if (event.getSource() == importVRMLX3DItem)
1800		- {
1801		- ImportVRMLX3D();
1802		- } else
1803		- if (event.getSource() == import3DSItem)
1804		- {
1805		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1806		- } else
1807		- if (event.getSource() == importOBJItem)
1808		- {
1809		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1810		- } else
1811		- if (event.getSource() == computeAOItem)
	2206	+ if (source == computeAOItem)
1812	2207	{
1813	2208	Globals.drawMode = CameraPane.OCCLUSION;
1814	2209	Globals.theRenderer.repaint();
1815	2210	} else
1816		- if (event.getSource() == recompileItem)
	2211	+ if (source == recompileItem)
1817	2212	{
1818	2213	Recompile();
1819	2214	refreshContents();
1820	2215	} else
1821		- if (event.getSource() == editScriptItem)
	2216	+ if (source == editScriptItem)
1822	2217	{
1823	2218	OpenDialog();
1824	2219	refreshContents();
1825	2220	} else
1826		- if (event.getSource() == invariantsItem)
	2221	+ if (source == invariantsItem)
1827	2222	{
1828	2223	System.out.println("Invariants:");
1829		- GrafreeD.grafreeD.universe.invariants();
	2224	+ Grafreed.grafreeD.universe.invariants();
1830	2225	} else
1831		- if (event.getSource() == memoryItem)
	2226	+ if (source == memoryItem)
1832	2227	{
1833	2228	//System.out.println("Invariants:");
1834	2229	PrintMemory();
1835	2230	} else
1836		- if (event.getSource() == pathItem)
	2231	+ if (source == pathItem)
1837	2232	{
1838	2233	PrintPath();
1839	2234	} else
1840		- if (event.getSource() == analyzeItem)
	2235	+ if (source == analyzeItem)
1841	2236	{
1842	2237	AnalyzeObject();
1843	2238	} else
1844		- if (event.getSource() == dumpItem)
	2239	+ if (source == dumpItem)
1845	2240	{
1846	2241	DumpObject();
1847	2242	} else
1848		- if (event.getSource() == screenfitButton)
	2243	+ if (source == minButton)
1849	2244	{
1850		- //Reload(lastConverter, lastFilename, true);
	2245	+ Minimize();
	2246	+ } else
	2247	+ if (source == maxButton)
	2248	+ {
	2249	+ Maximize();
	2250	+ } else
	2251	+ if (source == fullButton)
	2252	+ {
	2253	+ ToggleFullScreen();
	2254	+ } else
	2255	+ if (source == undoButton)
	2256	+ {
	2257	+ // Go to previous version
	2258	+ //if (!Undo())
	2259	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2260	+ Undo();
	2261	+ } else
	2262	+ if (source == restoreButton)
	2263	+ {
	2264	+ // Restore current version
	2265	+ Restore();
	2266	+ } else
	2267	+ if (source == replaceButton)
	2268	+ {
	2269	+ // Overwrite current version
	2270	+ Replace();
	2271	+ } else
	2272	+ if (source == redoButton)
	2273	+ {
	2274	+ // Go to next version
	2275	+ Redo();
	2276	+ } else
	2277	+ if (source == saveButton)
	2278	+ {
	2279	+ // Save a new version
	2280	+ if (!Save(true))
	2281	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2282	+ } else
	2283	+ if (source == oneStepButton)
	2284	+ {
	2285	+ Globals.ONESTEP = true;
	2286	+ cameraView.repaint();
	2287	+ } else
	2288	+ if (source == screenfitButton)
	2289	+ {
1851	2290	ScreenFit();
1852	2291	} else
1853		- if (event.getSource() == screenfitpointButton)
	2292	+ if (source == screenfitpointButton)
1854	2293	{
1855		- //Reload(lastConverter, lastFilename, true);
1856	2294	ScreenFitPoint();
1857	2295	} else
1858		- if (event.getSource() == snapobjectButton)
	2296	+ if (source == snapobjectButton)
1859	2297	{
1860		- //Reload(lastConverter, lastFilename, true);
1861	2298	SnapObject();
1862	2299	} else
1863	2300	// if (event.getSource() == recompileButton)
..	..	@@ -1866,13 +2303,13 @@
1866	2303	// Recompile();
1867	2304	// refreshContents();
1868	2305	// } else
1869		- if (event.getSource() == gcButton)
	2306	+ if (source == gcButton)
1870	2307	{
1871	2308	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1872	2309	System.gc();
1873	2310	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1874	2311	} else
1875		- if (event.getSource() == editLeafItem)
	2312	+ if (source == editLeafItem)
1876	2313	{
1877	2314	Object3D obj;
1878	2315	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1886,62 +2323,74 @@
1886	2323	}
1887	2324	refreshContents(true);
1888	2325	} else
1889		- if (event.getSource() == openWindowItem)
	2326	+ if (source == openWindowItem)
1890	2327	{
1891	2328	EditSelection(true);
1892	2329	} else
1893		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2330	+ if (source == cutItem \|\| source == clearButton)
1894	2331	{
1895	2332	loadClipboard(true);
1896	2333	} else
1897		- if (event.getSource() == duplicateItem)
	2334	+ if (source == undoItem)
1898	2335	{
1899		- Object3D keep = GrafreeD.clipboard;
	2336	+ Undo();
	2337	+ } else
	2338	+ if (source == redoItem)
	2339	+ {
	2340	+ Redo();
	2341	+ } else
	2342	+ if (source == duplicateItem)
	2343	+ {
	2344	+ Object3D keep = Grafreed.clipboard;
1900	2345	loadClipboard(false);
1901	2346	paste(false);
1902		- GrafreeD.clipboard = keep;
	2347	+ Grafreed.clipboard = keep;
1903	2348	} else
1904		- if (event.getSource() == cloneItem)
	2349	+ if (source == cloneItem)
1905	2350	{
1906	2351	CloneSelection(false);
1907	2352	} else
1908		- if (event.getSource() == cloneSupportItem)
	2353	+ if (source == cloneSupportItem)
1909	2354	{
1910	2355	CloneSelection(true);
1911	2356	} else
1912		- if (event.getSource() == copyItem)
	2357	+ if (source == copyItem)
1913	2358	{
1914	2359	loadClipboard(false);
1915	2360	} else
1916		- if (event.getSource() == pasteItem)
	2361	+ if (source == pasteItem)
1917	2362	{
1918	2363	paste(false);
1919	2364	} else
1920		- if (event.getSource() == pasteLinkItem)
	2365	+ if (source == pasteIntoItem)
1921	2366	{
1922		- pasteInto(false);
	2367	+ pasteInto(true, false);
1923	2368	} else
1924		- if (event.getSource() == pasteCloneItem)
	2369	+ if (source == pasteLinkItem)
1925	2370	{
1926		- pasteInto(true);
	2371	+ pasteInto(false, false);
1927	2372	} else
1928		- if (event.getSource() == pasteExpandItem)
	2373	+ if (source == pasteCloneItem)
	2374	+ {
	2375	+ pasteInto(true, true);
	2376	+ } else
	2377	+ if (source == pasteExpandItem)
1929	2378	{
1930	2379	paste(true);
1931	2380	} else
1932		- if (event.getSource() == synchronizeItem)
	2381	+ if (source == synchronizeItem)
1933	2382	{
1934	2383	Overwrite(Object3D.TRANSFORM);
1935	2384	} else
1936		- if (event.getSource() == overwriteNameItem)
	2385	+ if (source == overwriteNameItem)
1937	2386	{
1938	2387	Overwrite(Object3D.NAME);
1939	2388	} else
1940		- if (event.getSource() == overwriteUVItem)
	2389	+ if (source == overwriteUVItem)
1941	2390	{
1942	2391	Overwrite(Object3D.UV);
1943	2392	} else
1944		- if (event.getSource() == overwriteMatItem)
	2393	+ if (source == overwriteMatItem)
1945	2394	{
1946	2395	/* july 2015
1947	2396	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1961,7 +2410,7 @@
1961	2410
1962	2411	Overwrite(dropAttributes);
1963	2412	}
1964		- if (event.getSource() == overwriteGeoItem)
	2413	+ if (source == overwriteGeoItem)
1965	2414	{
1966	2415	Overwrite(Object3D.GEOMETRY);
1967	2416	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1978,7 +2427,7 @@
1978	2427	// refreshContents();
1979	2428	// }
1980	2429	} else
1981		- if (event.getSource() == generateMeshItem)
	2430	+ if (source == generateMeshItem)
1982	2431	{
1983	2432	//if (group.selection.size() == 1)
1984	2433	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1989,7 +2438,7 @@
1989	2438	ResetModel();
1990	2439	refreshContents();
1991	2440	} else
1992		- if (event.getSource() == extractGeometriesItem)
	2441	+ if (source == extractGeometriesItem)
1993	2442	{
1994	2443	boolean one = false;
1995	2444
..	..	@@ -2016,7 +2465,7 @@
2016	2465	ResetModel();
2017	2466	refreshContents();
2018	2467	} else
2019		- if (event.getSource() == cloneGeometriesItem)
	2468	+ if (source == cloneGeometriesItem)
2020	2469	{
2021	2470	boolean one = false;
2022	2471
..	..	@@ -2042,7 +2491,7 @@
2042	2491	ResetModel();
2043	2492	refreshContents();
2044	2493	} else
2045		- if (event.getSource() == shareGeometriesItem)
	2494	+ if (source == shareGeometriesItem)
2046	2495	{
2047	2496	boolean one = false;
2048	2497
..	..	@@ -2072,7 +2521,7 @@
2072	2521	refreshContents();
2073	2522	}
2074	2523	} else
2075		- if (event.getSource() == mergeGeometriesItem)
	2524	+ if (source == mergeGeometriesItem)
2076	2525	{
2077	2526	boolean one = false;
2078	2527
..	..	@@ -2102,7 +2551,7 @@
2102	2551	ResetModel();
2103	2552	refreshContents();
2104	2553	} else
2105		- if (event.getSource() == linkverticesItem)
	2554	+ if (source == linkverticesItem)
2106	2555	{
2107	2556	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2108	2557	// {
..	..	@@ -2115,9 +2564,9 @@
2115	2564	// group.selection.get(0).setMasterThis(content); // should be identity
2116	2565	// refreshContents();
2117	2566	// }
2118		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2567	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2119	2568	{
2120		- Object3D content = GrafreeD.clipboard.get(0);
	2569	+ Object3D content = Grafreed.clipboard.get(0);
2121	2570
2122	2571	if (content instanceof cGroup && ((cGroup)content).transientlink )
2123	2572	content = ((cGroup)content).get(0);
..	..	@@ -2125,38 +2574,38 @@
2125	2574	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2126	2575	for (int i=0; i<group.selection.size(); i++)
2127	2576	{
2128		- boolean random = CameraPane.RANDOM;
2129		- CameraPane.RANDOM = false; // parse all random nodes
	2577	+ boolean random = CameraPane.SWITCH;
	2578	+ CameraPane.SWITCH = false; // parse all random nodes
2130	2579	group.selection.get(i).linkVerticesThis(content);
2131	2580	// group.selection.get(i).setMasterThis(content); // should be identity
2132		- CameraPane.RANDOM = random;
	2581	+ CameraPane.SWITCH = random;
2133	2582	}
2134	2583	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2135	2584	refreshContents();
2136	2585	}
2137	2586	} else
2138		- if (event.getSource() == resetsupportItem)
	2587	+ if (source == resetsupportItem)
2139	2588	{
2140	2589	for (int i=0; i<group.selection.size(); i++)
2141	2590	{
2142		- boolean random = CameraPane.RANDOM;
2143		- CameraPane.RANDOM = false; // parse all random nodes
	2591	+ boolean random = CameraPane.SWITCH;
	2592	+ CameraPane.SWITCH = false; // parse all random nodes
2144	2593	group.selection.get(i).linkVerticesThis(null);
2145		- CameraPane.RANDOM = random;
	2594	+ CameraPane.SWITCH = random;
2146	2595	}
2147	2596
2148	2597	refreshContents();
2149	2598	} else
2150		- if (event.getSource() == relinkverticesItem)
	2599	+ if (source == relinkverticesItem)
2151	2600	{
2152		- boolean random = CameraPane.RANDOM;
2153		- CameraPane.RANDOM = false; // parse all random nodes
	2601	+ boolean random = CameraPane.SWITCH;
	2602	+ CameraPane.SWITCH = false; // parse all random nodes
2154	2603	group.selection.RelinkToSupport();
2155		- CameraPane.RANDOM = random;
	2604	+ CameraPane.SWITCH = random;
2156	2605
2157	2606	refreshContents();
2158	2607	} else
2159		- if (event.getSource() == resetreferencesItem)
	2608	+ if (source == resetreferencesItem)
2160	2609	{
2161	2610	for (int i=0; i<group.selection.size(); i++)
2162	2611	{
..	..	@@ -2165,11 +2614,11 @@
2165	2614
2166	2615	refreshContents();
2167	2616	} else
2168		- if (event.getSource() == setMasterItem)
	2617	+ if (source == setMasterItem)
2169	2618	{
2170		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2619	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2171	2620	{
2172		- Object3D content = GrafreeD.clipboard.get(0);
	2621	+ Object3D content = Grafreed.clipboard.get(0);
2173	2622
2174	2623	if (content instanceof cGroup && ((cGroup)content).transientlink )
2175	2624	content = ((cGroup)content).get(0);
..	..	@@ -2178,13 +2627,13 @@
2178	2627	refreshContents();
2179	2628	}
2180	2629	} else
2181		- if (event.getSource() == poseMeshItem)
	2630	+ if (source == poseMeshItem)
2182	2631	{
2183	2632	if (group.selection.size() == 1)
2184	2633	{
2185		- if (GrafreeD.clipboard.size() == 1)
	2634	+ if (Grafreed.clipboard.size() == 1)
2186	2635	{
2187		- Object3D content = GrafreeD.clipboard.get(0);
	2636	+ Object3D content = Grafreed.clipboard.get(0);
2188	2637
2189	2638	if (content instanceof cGroup && ((cGroup)content).transientlink )
2190	2639	content = ((cGroup)content).get(0);
..	..	@@ -2197,19 +2646,19 @@
2197	2646	}
2198	2647
2199	2648	} else
2200		- if (event.getSource() == revertMeshItem)
	2649	+ if (source == revertMeshItem)
2201	2650	{
2202	2651	RevertMeshes();
2203	2652	} else
2204		- if (event.getSource() == resetMeshItem)
	2653	+ if (source == resetAllItem)
2205	2654	{
2206	2655	ResetAll();
2207	2656	} else
2208		- if (event.getSource() == stepAllItem)
	2657	+ if (source == stepAllItem)
2209	2658	{
2210	2659	StepAll();
2211	2660	} else
2212		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2661	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2213	2662	{
2214	2663	//int indices[] = jList.getSelectedIndices();
2215	2664	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2217,46 +2666,46 @@
2217	2666
2218	2667	ClearSelection(false);
2219	2668	} else
2220		- if (event.getSource() == clearAllItem)
	2669	+ if (source == clearAllItem)
2221	2670	{
2222	2671	ClearSelection(true);
2223	2672	} else
2224		- if (event.getSource() == grabItem)
	2673	+ if (source == grabItem \|\| source == groupButton)
2225	2674	{
2226		- group(new cGroup(), true);
	2675	+ group(new cGroup(), false); // true);
2227	2676	} else
2228		- if (event.getSource() == hideItem)
	2677	+ if (source == hideItem)
2229	2678	{
2230	2679	group(new HiddenObject());
2231	2680	} else
2232		- if (event.getSource() == frontItem)
	2681	+ if (source == frontItem)
2233	2682	{
2234	2683	front();
2235	2684	} else
2236		- if (event.getSource() == backItem)
	2685	+ if (source == backItem)
2237	2686	{
2238	2687	back();
2239	2688	} else
2240		- if (event.getSource() == cameraItem)
	2689	+ if (source == cameraItem)
2241	2690	{
2242	2691	makeSomething(new Camera());
2243	2692	} else
2244		- if (event.getSource() == compositeItem)
	2693	+ if (source == compositeItem \|\| source == compositeButton)
2245	2694	{
2246	2695	group(new Composite());
2247	2696	} else
2248		- if (event.getSource() == randomItem)
	2697	+ if (source == switchItem \|\| source == switchButton)
2249	2698	{
2250	2699	RandomNode random = new RandomNode();
2251	2700	group(random);
2252	2701	if (random.size() > 0)
2253		- random.name = random.get(0).name + "Rnd";
	2702	+ random.name = random.get(0).name + "Switch";
2254	2703	} else
2255		- if (event.getSource() == physicsItem)
	2704	+ if (source == physicsItem)
2256	2705	{
2257	2706	group(new PhysicsNode());
2258	2707	} else
2259		- if (event.getSource() == frameselectorItem)
	2708	+ if (source == frameselectorItem)
2260	2709	{
2261	2710	for (int i=0; i<group.selection.size(); i++)
2262	2711	{
..	..	@@ -2268,7 +2717,7 @@
2268	2717	ResetModel();
2269	2718	refreshContents();
2270	2719	} else
2271		- if (event.getSource() == switchGeoItem)
	2720	+ if (source == switchGeoItem)
2272	2721	{
2273	2722	for (int i=0; i<group.selection.size(); i++)
2274	2723	{
..	..	@@ -2280,7 +2729,7 @@
2280	2729	ResetModel();
2281	2730	refreshContents();
2282	2731	} else
2283		- if (event.getSource() == switchTransfoItem)
	2732	+ if (source == switchTransfoItem)
2284	2733	{
2285	2734	for (int i=0; i<group.selection.size(); i++)
2286	2735	{
..	..	@@ -2292,7 +2741,7 @@
2292	2741	ResetModel();
2293	2742	refreshContents();
2294	2743	} else
2295		- if (event.getSource() == morphItem)
	2744	+ if (source == morphItem)
2296	2745	{
2297	2746	for (int i=0; i<group.selection.size(); i++)
2298	2747	{
..	..	@@ -2304,7 +2753,7 @@
2304	2753	ResetModel();
2305	2754	refreshContents();
2306	2755	} else
2307		- if (event.getSource() == scriptNodeItem)
	2756	+ if (source == scriptNodeItem)
2308	2757	{
2309	2758	boolean atleastone = false;
2310	2759
..	..	@@ -2343,215 +2792,252 @@
2343	2792	}
2344	2793	}
2345	2794	} else
2346		- if (event.getSource() == linkerItem)
	2795	+ if (source == linkerItem)
2347	2796	{
2348	2797	group(new cLinker());
2349	2798	} else
2350		- if (event.getSource() == textureItem)
	2799	+ if (source == textureItem \|\| source == textureButton)
2351	2800	{
2352	2801	group(new TextureNode());
2353	2802	} else
2354		- if (event.getSource() == billboardItem)
	2803	+ if (source == billboardItem)
2355	2804	{
2356	2805	group(new BillboardNode());
2357	2806	} else
2358		- if (event.getSource() == shadowXItem)
	2807	+ if (source == shadowXItem)
2359	2808	{
2360	2809	CastShadow(0);
2361	2810	} else
2362		- if (event.getSource() == shadowYItem)
	2811	+ if (source == shadowYItem)
2363	2812	{
2364	2813	CastShadow(1);
2365	2814	} else
2366		- if (event.getSource() == shadowZItem)
	2815	+ if (source == shadowZItem)
2367	2816	{
2368	2817	CastShadow(2);
2369	2818	} else
2370		- if (event.getSource() == ungroupItem)
	2819	+ if (source == ungroupItem \|\| source == ungroupButton)
2371	2820	{
2372		- //ungroup();
	2821	+ boolean hasRoot = false;
	2822	+
2373	2823	for (int i=0; i<group.selection.size(); i++)
2374	2824	{
2375		- Ungroup(group.selection.get(i));
	2825	+ if (group.selection.get(i) == group)
	2826	+ {
	2827	+ hasRoot = true;
	2828	+ break;
	2829	+ }
2376	2830	}
2377	2831
2378		- ClearSelection(false);
2379		-
2380		- refreshContents();
	2832	+ if (!hasRoot)
	2833	+ {
	2834	+ for (int i=0; i<group.selection.size(); i++)
	2835	+ {
	2836	+ Ungroup(group.selection.get(i));
	2837	+ }
	2838	+
	2839	+ ClearSelection(false);
	2840	+
	2841	+ refreshContents();
	2842	+ }
2381	2843	} else
2382		- if (event.getSource() == genUVItem)
	2844	+ if (source == genUVItem)
2383	2845	{
2384	2846	GenUV();
2385	2847	} else
2386		- if (event.getSource() == genNormalsCADItem)
	2848	+ if (source == genNormalsCADItem)
2387	2849	{
2388	2850	GenNormals(true);
2389	2851	} else
2390		- if (event.getSource() == genNormalsMESHItem)
	2852	+ if (source == genNormalsMESHItem)
2391	2853	{
2392		- GenNormals(true); // TODO
	2854	+ GenNormalsMESH();
2393	2855	} else
2394		- if (event.getSource() == genNormalsORGANItem)
	2856	+ if (source == genNormalsORGANItem)
2395	2857	{
2396	2858	GenNormals(false);
2397	2859	} else
2398		- if (event.getSource() == genNormalsMINEItem)
	2860	+ if (source == genNormalsMINEItem)
2399	2861	{
2400	2862	GenNormalsMINE();
2401	2863	} else
2402		- if (event.getSource() == stripifyItem)
	2864	+ if (source == stripifyItem)
2403	2865	{
2404	2866	Stripify();
2405	2867	} else
2406		- if (event.getSource() == unstripifyItem)
	2868	+ if (source == unstripifyItem)
2407	2869	{
2408	2870	Unstripify();
2409	2871	} else
2410		- if (event.getSource() == trimItem)
	2872	+ if (source == trimItem)
2411	2873	{
2412	2874	Trim();
2413	2875	} else
2414		- if (event.getSource() == untrimItem)
	2876	+ if (source == untrimItem)
2415	2877	{
2416	2878	Untrim();
2417	2879	} else
2418		- if (event.getSource() == clearColorsItem)
	2880	+ if (source == clearColorsItem)
2419	2881	{
2420	2882	ClearColors();
2421	2883	} else
2422		- if (event.getSource() == clearMaterialsItem)
	2884	+ if (source == clearMaterialsItem)
2423	2885	{
2424	2886	ClearMaterials();
2425	2887	} else
2426		- if (event.getSource() == liveleavesItem)
	2888	+ if (source == liveleavesItem)
2427	2889	{
2428	2890	LiveLeaves(true);
2429	2891	} else
2430		- if (event.getSource() == unliveleavesItem)
	2892	+ if (source == unliveleavesItem)
2431	2893	{
2432	2894	LiveLeaves(false);
2433	2895	} else
2434		- if (event.getSource() == supportleavesItem)
	2896	+ if (source == supportleavesItem)
2435	2897	{
2436	2898	SupportLeaves(true);
2437	2899	} else
2438		- if (event.getSource() == unsupportleavesItem)
	2900	+ if (source == unsupportleavesItem)
2439	2901	{
2440	2902	SupportLeaves(false);
2441	2903	} else
2442		- if (event.getSource() == hideleavesItem)
	2904	+ if (source == hideleavesItem)
2443	2905	{
2444	2906	HideLeaves(true);
2445	2907	} else
2446		- if (event.getSource() == showleavesItem)
	2908	+ if (source == showleavesItem)
2447	2909	{
2448	2910	HideLeaves(false);
2449	2911	} else
2450		- if (event.getSource() == markleavesItem)
	2912	+ if (source == markleavesItem)
2451	2913	{
2452	2914	MarkLeaves(true);
2453	2915	} else
2454		- if (event.getSource() == unmarkleavesItem)
	2916	+ if (source == unmarkleavesItem)
2455	2917	{
2456	2918	MarkLeaves(false);
2457	2919	} else
2458		- if (event.getSource() == flipVItem)
	2920	+ if (source == rewindleavesItem)
	2921	+ {
	2922	+ RewindLeaves(true);
	2923	+ } else
	2924	+ if (source == unrewindleavesItem)
	2925	+ {
	2926	+ RewindLeaves(false);
	2927	+ } else
	2928	+ if (source == randomleavesItem)
	2929	+ {
	2930	+ RandomLeaves(true);
	2931	+ } else
	2932	+ if (source == unrandomleavesItem)
	2933	+ {
	2934	+ RandomLeaves(false);
	2935	+ } else
	2936	+ if (source == flipVItem)
2459	2937	{
2460	2938	FlipV(true);
2461	2939	} else
2462		- if (event.getSource() == unflipVItem)
	2940	+ if (source == unflipVItem)
2463	2941	{
2464	2942	FlipV(false);
2465	2943	} else
2466		- if (event.getSource() == lowTexturesItem)
	2944	+ if (source == lowTexturesItem)
2467	2945	{
2468	2946	SetTexRes(0);
2469	2947	} else
2470		- if (event.getSource() == normalTexturesItem)
	2948	+ if (source == normalTexturesItem)
2471	2949	{
2472	2950	SetTexRes(1);
2473	2951	} else
2474		- if (event.getSource() == highTexturesItem)
	2952	+ if (source == highTexturesItem)
2475	2953	{
2476	2954	SetTexRes(2);
2477	2955	} else
2478		- if (event.getSource() == veryhighTexturesItem)
	2956	+ if (source == veryhighTexturesItem)
2479	2957	{
2480	2958	SetTexRes(3);
2481	2959	} else
2482		- if (event.getSource() == maxTexturesItem)
	2960	+ if (source == maxTexturesItem)
2483	2961	{
2484	2962	SetTexRes(4);
2485	2963	} else
2486		- if (event.getSource() == panoTexturesItem)
	2964	+ if (source == panoTexturesItem)
2487	2965	{
2488	2966	SetTexRes(5);
2489	2967	} else
2490		- if (event.getSource() == reverseNormalsItem)
	2968	+ if (source == reverseNormalsItem)
2491	2969	{
2492	2970	ReverseNormals();
2493	2971	} else
2494		- if (event.getSource() == parseverticesItem)
	2972	+ if (source == parseverticesItem)
2495	2973	{
2496	2974	ParseVertices();
2497	2975	} else
2498		- if (event.getSource() == textureFieldItem)
	2976	+ if (source == textureFieldItem)
2499	2977	{
2500	2978	TextureVertices();
2501	2979	} else
2502		- if (event.getSource() == alignItem)
	2980	+ if (source == alignItem)
2503	2981	{
2504	2982	Align();
2505	2983	} else
2506		- if (event.getSource() == mirrorItem)
	2984	+ if (source == mirrorItem)
2507	2985	{
2508	2986	MirrorPoses();
2509	2987	} else
2510		- if (event.getSource() == reduceMorphItem)
	2988	+ if (source == reduceMorphItem)
2511	2989	{
2512	2990	MeshReduction(false);
2513	2991	} else
2514		- if (event.getSource() == reduce34MorphItem)
	2992	+ if (source == reduce34MorphItem)
2515	2993	{
2516	2994	MeshReduction(true);
2517	2995	} else
2518		- if (event.getSource() == reverseTrianglesItem)
	2996	+ if (source == reverseTrianglesItem)
2519	2997	{
2520	2998	ReverseTriangles();
2521	2999	} else
2522		- if (event.getSource() == reduceMeshItem)
	3000	+ if (source == reduceMeshItem)
2523	3001	{
2524	3002	ReduceMesh(false);
2525	3003	} else
2526		- if (event.getSource() == reduce34MeshItem)
	3004	+ if (source == reduce34MeshItem)
2527	3005	{
2528	3006	ReduceMesh(true);
2529	3007	} else
2530		- if (event.getSource() == increaseMeshItem)
	3008	+ if (source == increaseMeshItem)
2531	3009	{
2532	3010	IncreaseMesh();
2533	3011	} else
2534		- if (event.getSource() == clipMeshItem)
	3012	+ if (source == clipMeshItem)
2535	3013	{
2536	3014	ClipMesh();
2537	3015	} else
2538		- if (event.getSource() == smoothMeshItem)
	3016	+ if (source == smoothMeshItem)
2539	3017	{
2540	3018	SmoothMesh();
2541	3019	} else
2542		- if (event.getSource() == transformgeometryItem)
	3020	+ if (source == transformGeometryItem)
2543	3021	{
2544	3022	TransformGeometry();
2545	3023	} else
2546		- if (event.getSource() == resetTransformItem)
	3024	+ if (source == transformChildrenItem)
	3025	+ {
	3026	+ TransformChildren();
	3027	+ } else
	3028	+ if (source == resetTransformItem)
2547	3029	{
2548	3030	ResetTransform();
2549	3031	} else
2550		- if (event.getSource() == resetCentroidItem)
	3032	+ if (source == resetCentroidItem)
2551	3033	{
2552		- ResetCentroid();
	3034	+ ResetCentroid(true);
2553	3035	} else
2554		- if (event.getSource() == resetParentItem)
	3036	+ if (source == resetCentroidXZItem)
	3037	+ {
	3038	+ ResetCentroid(false);
	3039	+ } else
	3040	+ if (source == resetParentItem)
2555	3041	{
2556	3042	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2557	3043	{
..	..	@@ -2561,7 +3047,7 @@
2561	3047
2562	3048	refreshContents();
2563	3049	} else
2564		- if (event.getSource() == repairParentItem)
	3050	+ if (source == repairParentItem)
2565	3051	{
2566	3052	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2567	3053	{
..	..	@@ -2575,7 +3061,7 @@
2575	3061
2576	3062	refreshContents();
2577	3063	} else
2578		- if (event.getSource() == repairShadowItem)
	3064	+ if (source == repairShadowItem)
2579	3065	{
2580	3066	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2581	3067	{
..	..	@@ -2589,7 +3075,7 @@
2589	3075
2590	3076	refreshContents();
2591	3077	} else
2592		- if (event.getSource() == sortbysizeItem)
	3078	+ if (source == sortbysizeItem)
2593	3079	{
2594	3080	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2595	3081	{
..	..	@@ -2601,7 +3087,7 @@
2601	3087	ResetModel();
2602	3088	refreshContents();
2603	3089	} else
2604		- if (event.getSource() == sortbynameItem)
	3090	+ if (source == sortbynameItem)
2605	3091	{
2606	3092	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2607	3093	{
..	..	@@ -2613,7 +3099,7 @@
2613	3099	ResetModel();
2614	3100	refreshContents();
2615	3101	} else
2616		- if (event.getSource() == attachPigmentItem)
	3102	+ if (source == attachPigmentItem)
2617	3103	{
2618	3104	String texture = GetFile("Attach pigment");
2619	3105	Object3D obj;
..	..	@@ -2625,7 +3111,7 @@
2625	3111
2626	3112	refreshContents();
2627	3113	} else
2628		- if (event.getSource() == detachPigmentItem)
	3114	+ if (source == detachPigmentItem)
2629	3115	{
2630	3116	Object3D obj;
2631	3117	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2636,7 +3122,7 @@
2636	3122
2637	3123	refreshContents();
2638	3124	} else
2639		- if (event.getSource() == attachBumpItem)
	3125	+ if (source == attachBumpItem)
2640	3126	{
2641	3127	String texture = GetFile("Attach bump");
2642	3128	Object3D obj;
..	..	@@ -2648,7 +3134,7 @@
2648	3134
2649	3135	refreshContents();
2650	3136	} else
2651		- if (event.getSource() == detachBumpItem)
	3137	+ if (source == detachBumpItem)
2652	3138	{
2653	3139	Object3D obj;
2654	3140	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2659,7 +3145,7 @@
2659	3145
2660	3146	refreshContents();
2661	3147	} else
2662		- if (event.getSource() == pigmentBumpItem)
	3148	+ if (source == pigmentBumpItem)
2663	3149	{
2664	3150	Object3D obj;
2665	3151	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2670,158 +3156,237 @@
2670	3156
2671	3157	refreshContents();
2672	3158	} else
2673		- if (event.getSource() == flashSelectionButton)
	3159	+ if (source == flashSelectionButton)
2674	3160	{
2675	3161	CameraPane.flash = true;
2676	3162	refreshContents();
2677	3163	} else
2678		- if (event.getSource() == oneButton)
	3164	+ if (source == oneButton)
2679	3165	{
2680	3166	} else
2681		- if (event.getSource() == twoButton)
	3167	+ if (source == twoButton)
2682	3168	{
2683	3169	radio.layout = twoButton;
	3170	+
	3171	+ if (CameraPane.FULLSCREEN)
	3172	+ fullscreenLayout = radio.layout;
	3173	+
2684	3174	// bug
2685	3175	//gridPanel.setDividerLocation(1.0);
2686	3176	//bigPanel.setDividerLocation(0.0);
2687		- bigThree.remove(scenePanel);
2688		- bigThree.remove(centralPanel);
2689		- bigThree.remove(XYZPanel);
2690		- aWindowConstraints.gridx = 0;
2691		- aWindowConstraints.gridy = 0;
2692		- aWindowConstraints.gridwidth = 1;
2693		- // aConstraints.gridheight = 3;
2694		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2695		- aWindowConstraints.weightx = 0;
2696		- aWindowConstraints.weighty = 1;
2697		- //bigThree.add(jtp, aWindowConstraints);
2698		- aWindowConstraints.weightx = 1;
2699		- aWindowConstraints.gridwidth = 3;
2700		- // aConstraints.gridheight = 3;
2701		- aWindowConstraints.gridx = 1;
2702		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2703		- bigThree.add(centralPanel, aWindowConstraints);
2704		- aWindowConstraints.weightx = 0;
2705		- aWindowConstraints.gridx = 4;
2706		- aWindowConstraints.gridwidth = 1;
2707		- // aConstraints.gridheight = 3;
2708		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2709		- //bigThree.add(XYZPanel, aWindowConstraints);
2710		- bigThree.revalidate();
	3177	+// bigThree.remove(scenePanel);
	3178	+// bigThree.remove(centralPanel);
	3179	+// bigThree.remove(XYZPanel);
	3180	+// aWindowConstraints.gridx = 0;
	3181	+// aWindowConstraints.gridy = 0;
	3182	+// aWindowConstraints.gridwidth = 1;
	3183	+// // aConstraints.gridheight = 3;
	3184	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3185	+// aWindowConstraints.weightx = 0;
	3186	+// aWindowConstraints.weighty = 1;
	3187	+// //bigThree.add(jtp, aWindowConstraints);
	3188	+// aWindowConstraints.weightx = 1;
	3189	+// aWindowConstraints.gridwidth = 3;
	3190	+// // aConstraints.gridheight = 3;
	3191	+// aWindowConstraints.gridx = 1;
	3192	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3193	+// bigThree.add(centralPanel, aWindowConstraints);
	3194	+// aWindowConstraints.weightx = 0;
	3195	+// aWindowConstraints.gridx = 4;
	3196	+// aWindowConstraints.gridwidth = 1;
	3197	+// // aConstraints.gridheight = 3;
	3198	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3199	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3200	+// scenePanel.setVisible(false);
	3201	+// centralPanel.setVisible(true);
	3202	+// XYZPanel.setVisible(false);
	3203	+ bigThree.ClearUI();
	3204	+ bigThree.add(centralPanel);
	3205	+ bigThree.FlushUI();
	3206	+
	3207	+ cameraView.requestFocusInWindow();
	3208	+
	3209	+// refreshContents(true);
	3210	+//
	3211	+// try
	3212	+// {
	3213	+// java.awt.Robot bot = new java.awt.Robot();
	3214	+// int mask = InputEvent.BUTTON1_MASK;
	3215	+// bot.mouseMove(100, 100);
	3216	+// bot.mousePress(mask);
	3217	+// bot.mouseRelease(mask);
	3218	+// }
	3219	+// catch (Exception e)
	3220	+// {
	3221	+//
	3222	+// }
	3223	+
2711	3224	} else
2712		- if (event.getSource() == threeButton)
	3225	+ if (source == threeButton)
2713	3226	{
2714	3227	radio.layout = threeButton;
2715		- bigThree.remove(scenePanel);
2716		- bigThree.remove(centralPanel);
2717		- bigThree.remove(XYZPanel);
2718		- aWindowConstraints.gridx = 0;
2719		- aWindowConstraints.gridy = 0;
2720		- aWindowConstraints.gridwidth = 1;
2721		- // aConstraints.gridheight = 3;
2722		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2723		- aWindowConstraints.weightx = 0;
2724		- aWindowConstraints.weighty = 1;
2725		- //bigThree.add(jtp, aWindowConstraints);
2726		- aWindowConstraints.weightx = 1;
2727		- aWindowConstraints.gridwidth = 3;
2728		- // aConstraints.gridheight = 3;
2729		- aWindowConstraints.gridx = 1;
2730		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2731		- bigThree.add(centralPanel, aWindowConstraints);
2732		- aWindowConstraints.weightx = 0;
2733		- aWindowConstraints.gridx = 4;
2734		- aWindowConstraints.gridwidth = 1;
2735		- // aConstraints.gridheight = 3;
2736		- aConstraints.fill = GridBagConstraints.VERTICAL;
2737		- bigThree.add(XYZPanel, aWindowConstraints);
2738		- bigThree.revalidate();
	3228	+
	3229	+ if (CameraPane.FULLSCREEN)
	3230	+ fullscreenLayout = radio.layout;
	3231	+
	3232	+// bigThree.remove(scenePanel);
	3233	+// bigThree.remove(centralPanel);
	3234	+// bigThree.remove(XYZPanel);
	3235	+// aWindowConstraints.gridx = 0;
	3236	+// aWindowConstraints.gridy = 0;
	3237	+// aWindowConstraints.gridwidth = 1;
	3238	+// // aConstraints.gridheight = 3;
	3239	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3240	+// aWindowConstraints.weightx = 0;
	3241	+// aWindowConstraints.weighty = 1;
	3242	+// //bigThree.add(jtp, aWindowConstraints);
	3243	+// aWindowConstraints.weightx = 1;
	3244	+// aWindowConstraints.gridwidth = 3;
	3245	+// // aConstraints.gridheight = 3;
	3246	+// aWindowConstraints.gridx = 1;
	3247	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3248	+// bigThree.add(centralPanel, aWindowConstraints);
	3249	+// aWindowConstraints.weightx = 0;
	3250	+// aWindowConstraints.gridx = 4;
	3251	+// aWindowConstraints.gridwidth = 1;
	3252	+// // aConstraints.gridheight = 3;
	3253	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3254	+// bigThree.add(XYZPanel, aWindowConstraints);
	3255	+// bigThree.validate();
	3256	+// scenePanel.setVisible(false);
	3257	+// centralPanel.setVisible(true);
	3258	+// XYZPanel.setVisible(true);
	3259	+ bigThree.ClearUI();
	3260	+ bigThree.add(centralPanel);
	3261	+ bigThree.add(XYZPanel);
	3262	+ bigThree.FlushUI();
	3263	+
	3264	+ cameraView.requestFocusInWindow();
2739	3265	} else
2740		- if (event.getSource() == fourButton)
	3266	+ if (source == fourButton)
2741	3267	{
2742	3268	radio.layout = fourButton;
2743		- bigThree.remove(scenePanel);
2744		- bigThree.remove(centralPanel);
2745		- bigThree.remove(XYZPanel);
2746		- aWindowConstraints.gridx = 0;
2747		- aWindowConstraints.gridy = 0;
2748		- aWindowConstraints.gridwidth = 1;
2749		- // aWindowConstraints.gridheight = 3;
2750		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2751		- aWindowConstraints.weightx = 1;
2752		- aWindowConstraints.weighty = 1;
2753		- bigThree.add(scenePanel, aWindowConstraints);
2754		- aWindowConstraints.weightx = 1;
2755		- aWindowConstraints.gridwidth = 3;
2756		- // aConstraints.gridheight = 3;
2757		- aWindowConstraints.gridx = 1;
2758		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2759		- //bigThree.add(cameraPanel, aWindowConstraints);
2760		- aWindowConstraints.weightx = 0;
2761		- aWindowConstraints.gridx = 4;
2762		- aWindowConstraints.gridwidth = 1;
2763		- // aWindowConstraints.gridheight = 3;
2764		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2765		- //bigThree.add(XYZPanel, aWindowConstraints);
2766		- bigThree.revalidate();
	3269	+
	3270	+ if (CameraPane.FULLSCREEN)
	3271	+ fullscreenLayout = radio.layout;
	3272	+
	3273	+// bigThree.remove(scenePanel);
	3274	+// bigThree.remove(centralPanel);
	3275	+// bigThree.remove(XYZPanel);
	3276	+// aWindowConstraints.gridx = 0;
	3277	+// aWindowConstraints.gridy = 0;
	3278	+// aWindowConstraints.gridwidth = 1;
	3279	+// // aWindowConstraints.gridheight = 3;
	3280	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3281	+// aWindowConstraints.weightx = 1;
	3282	+// aWindowConstraints.weighty = 1;
	3283	+// bigThree.add(scenePanel, aWindowConstraints);
	3284	+// aWindowConstraints.weightx = 1;
	3285	+// aWindowConstraints.gridwidth = 3;
	3286	+// // aConstraints.gridheight = 3;
	3287	+// aWindowConstraints.gridx = 1;
	3288	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3289	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3290	+// aWindowConstraints.weightx = 0;
	3291	+// aWindowConstraints.gridx = 4;
	3292	+// aWindowConstraints.gridwidth = 1;
	3293	+// // aWindowConstraints.gridheight = 3;
	3294	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3295	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3296	+// bigThree.validate();
	3297	+// scenePanel.setVisible(true);
	3298	+// centralPanel.setVisible(false);
	3299	+// XYZPanel.setVisible(false);
	3300	+ bigThree.ClearUI();
	3301	+ bigThree.add(scenePanel);
	3302	+ bigThree.FlushUI();
	3303	+
	3304	+ cameraView.requestFocusInWindow();
2767	3305	} else
2768		- if (event.getSource() == sixButton)
	3306	+ if (source == sixButton)
2769	3307	{
2770	3308	radio.layout = sixButton;
2771		- bigThree.remove(scenePanel);
2772		- bigThree.remove(centralPanel);
2773		- bigThree.remove(XYZPanel);
2774		- aWindowConstraints.gridx = 0;
2775		- aWindowConstraints.gridy = 0;
2776		- aWindowConstraints.gridwidth = 1;
2777		- // aConstraints.gridheight = 3;
2778		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2779		- aWindowConstraints.weightx = 0;
2780		- aWindowConstraints.weighty = 1;
2781		- bigThree.add(scenePanel, aWindowConstraints);
2782		- aWindowConstraints.weightx = 1;
2783		- aWindowConstraints.gridwidth = 3;
2784		- // aWindowConstraints.gridheight = 3;
2785		- aWindowConstraints.gridx = 1;
2786		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2787		- bigThree.add(centralPanel, aWindowConstraints);
2788		- aWindowConstraints.weightx = 0;
2789		- aWindowConstraints.gridx = 4;
2790		- aWindowConstraints.gridwidth = 1;
2791		- // aWindowConstraints.gridheight = 3;
2792		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2793		- //bigThree.add(XYZPanel, aConstraints);
2794		- bigThree.revalidate();
	3309	+
	3310	+ if (CameraPane.FULLSCREEN)
	3311	+ fullscreenLayout = radio.layout;
	3312	+
	3313	+// bigThree.remove(scenePanel);
	3314	+// bigThree.remove(centralPanel);
	3315	+// bigThree.remove(XYZPanel);
	3316	+// aWindowConstraints.gridx = 0;
	3317	+// aWindowConstraints.gridy = 0;
	3318	+// aWindowConstraints.gridwidth = 1;
	3319	+// // aConstraints.gridheight = 3;
	3320	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3321	+// aWindowConstraints.weightx = 0;
	3322	+// aWindowConstraints.weighty = 1;
	3323	+// bigThree.add(scenePanel, aWindowConstraints);
	3324	+// aWindowConstraints.weightx = 1;
	3325	+// aWindowConstraints.gridwidth = 3;
	3326	+// // aWindowConstraints.gridheight = 3;
	3327	+// aWindowConstraints.gridx = 1;
	3328	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3329	+// bigThree.add(centralPanel, aWindowConstraints);
	3330	+// aWindowConstraints.weightx = 0;
	3331	+// aWindowConstraints.gridx = 4;
	3332	+// aWindowConstraints.gridwidth = 1;
	3333	+// // aWindowConstraints.gridheight = 3;
	3334	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3335	+// //bigThree.add(XYZPanel, aConstraints);
	3336	+// bigThree.validate();
	3337	+// scenePanel.setVisible(true);
	3338	+// centralPanel.setVisible(true);
	3339	+// XYZPanel.setVisible(false);
	3340	+ bigThree.ClearUI();
	3341	+ bigThree.add(scenePanel);
	3342	+ bigThree.add(centralPanel);
	3343	+ bigThree.FlushUI();
	3344	+
	3345	+ cameraView.requestFocusInWindow();
2795	3346	} else
2796		- if (event.getSource() == sevenButton)
	3347	+ if (source == sevenButton)
2797	3348	{
2798	3349	radio.layout = sevenButton;
2799		- bigThree.remove(scenePanel);
2800		- bigThree.remove(centralPanel);
2801		- bigThree.remove(XYZPanel);
2802		- aWindowConstraints.gridx = 0;
2803		- aWindowConstraints.gridy = 0;
2804		- aWindowConstraints.gridwidth = 1;
2805		- // aWindowConstraints.gridheight = 3;
2806		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2807		- aWindowConstraints.weightx = 0;
2808		- aWindowConstraints.weighty = 1;
2809		- bigThree.add(scenePanel, aWindowConstraints);
2810		- aWindowConstraints.weightx = 1;
2811		- aWindowConstraints.gridwidth = 3;
2812		- // aWindowConstraints.gridheight = 3;
2813		- aWindowConstraints.gridx = 1;
2814		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2815		- bigThree.add(centralPanel, aWindowConstraints);
2816		- aWindowConstraints.weightx = 0;
2817		- aWindowConstraints.gridx = 4;
2818		- aWindowConstraints.gridwidth = 1;
2819		- // aConstraints.gridheight = 3;
2820		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2821		- bigThree.add(XYZPanel, aWindowConstraints);
2822		- bigThree.revalidate();
	3350	+
	3351	+ if (CameraPane.FULLSCREEN)
	3352	+ fullscreenLayout = radio.layout;
	3353	+
	3354	+// bigThree.remove(scenePanel);
	3355	+// bigThree.remove(centralPanel);
	3356	+// bigThree.remove(XYZPanel);
	3357	+// aWindowConstraints.gridx = 0;
	3358	+// aWindowConstraints.gridy = 0;
	3359	+// aWindowConstraints.gridwidth = 1;
	3360	+// // aWindowConstraints.gridheight = 3;
	3361	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3362	+// aWindowConstraints.weightx = 0;
	3363	+// aWindowConstraints.weighty = 1;
	3364	+// bigThree.add(scenePanel, aWindowConstraints);
	3365	+// aWindowConstraints.weightx = 1;
	3366	+// aWindowConstraints.gridwidth = 3;
	3367	+// // aWindowConstraints.gridheight = 3;
	3368	+// aWindowConstraints.gridx = 1;
	3369	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3370	+// bigThree.add(centralPanel, aWindowConstraints);
	3371	+// aWindowConstraints.weightx = 0;
	3372	+// aWindowConstraints.gridx = 4;
	3373	+// aWindowConstraints.gridwidth = 1;
	3374	+// // aConstraints.gridheight = 3;
	3375	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3376	+// bigThree.add(XYZPanel, aWindowConstraints);
	3377	+// bigThree.validate();
	3378	+// scenePanel.setVisible(true);
	3379	+// centralPanel.setVisible(true);
	3380	+// XYZPanel.setVisible(true);
	3381	+ bigThree.ClearUI();
	3382	+ bigThree.add(scenePanel);
	3383	+ bigThree.add(centralPanel);
	3384	+ bigThree.add(XYZPanel);
	3385	+ bigThree.FlushUI();
	3386	+
	3387	+ cameraView.requestFocusInWindow();
2823	3388	} else
2824		- if (event.getSource() == rootButton)
	3389	+ if (source == rootButton)
2825	3390	{
2826	3391	Object3D obj;
2827	3392	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2831,66 +3396,84 @@
2831	3396	EditObject(obj);
2832	3397	}
2833	3398
	3399	+ cameraView.requestFocusInWindow();
2834	3400	refreshContents(true);
2835	3401	} else
2836		- if (event.getSource() == closeButton)
	3402	+ if (source == closeButton)
2837	3403	{
2838	3404	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2839	3405	cRadio ab;
2840	3406	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2841	3407	{
2842	3408	ab = (cRadio)e.nextElement();
2843		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3409	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2844	3410	{
	3411	+ // Patch to avoid bug with transparency.
	3412	+ if (!ab.hadMaterial)
	3413	+ {
	3414	+ ab.object.material = null;
	3415	+ }
	3416	+
2845	3417	buttonGroup.remove(ab);
2846	3418	radioPanel.remove(ab);
2847	3419
2848		- ab.GetObject().editWindow = null;
	3420	+ //ab.GetObject().editWindow = null;
	3421	+ ab.GetObject().manipWindow = null;
2849	3422	// ab.GetObject().objectUI = null; // ?????????
2850	3423
2851	3424	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2852	3425	break;
2853	3426	}
2854	3427	}
	3428	+
	3429	+ cameraView.requestFocusInWindow();
2855	3430	refreshContents(true);
2856	3431	} else
2857		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3432	+ if (source == editItem \|\| source == editButton)
2858	3433	{
	3434	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3435	+ {
	3436	+ Object3D child = (Object3D)e.nextElement();
	3437	+ child.pinned = true;
	3438	+ }
	3439	+
2859	3440	EditSelection(false);
2860	3441	} else
2861		- if (event.getSource() == uneditButton)
	3442	+ if (source == uneditButton)
2862	3443	{
2863	3444	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2864	3445	{
2865	3446	Object3D child = (Object3D)e.nextElement();
2866	3447	if(child.editWindow != null)
2867	3448	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3449	+ child.pinned = false;
2868	3450	child.CloseUI();
2869	3451	listUI.remove(child);
2870	3452
2871		- child.editWindow = null; // ???????????
	3453	+ //child.editWindow = null; // ???????????
2872	3454	}
2873		- objEditor.ctrlPanel.revalidate();
	3455	+ objEditor.ctrlPanel.FlushUI();
2874	3456	//objEditor.jTree.clearSelection();
2875	3457	//objEditor.ResetSliders();
2876	3458	refreshContents(true);
2877	3459	} else
2878		- if (event.getSource() == clearPanelButton)
	3460	+ if (source == clearPanelButton)
2879	3461	{
2880	3462	assert(copy == group);
2881	3463	//copy.ClearUI();
2882	3464	for (Object3D obj : listUI)
2883	3465	{
	3466	+ obj.pinned = false;
2884	3467	obj.CloseUI();
2885	3468	}
2886	3469	listUI.clear();
2887	3470	refreshContents(true);
2888	3471	} else
2889		- if (event.getSource() == allParamsButton)
	3472	+ if (source == allParamsButton)
2890	3473	{
2891	3474	assert(copy == group);
2892	3475
2893		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3476	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2894	3477
2895	3478	for (Object3D obj : listUI)
2896	3479	{
..	..	@@ -2907,19 +3490,19 @@
2907	3490
2908	3491	refreshContents(true);
2909	3492	} else
2910		- if (event.getSource() == unselectButton)
	3493	+ if (source == unselectButton)
2911	3494	{
2912	3495	objEditor.jTree.clearSelection();
2913	3496	// ?? oct 2012 GrafreeD.clipboard.clear();
2914	3497	objEditor.ResetSliders();
2915	3498	refreshContents(true);
2916	3499	} else
2917		- if(event.getSource() instanceof cRadio)
	3500	+ if(source instanceof cRadio)
2918	3501	{
2919	3502	group.parent = keepparent;
2920	3503	group.attributes = 0;
2921	3504	//group.editWindow = null;
2922		- /cRadio/ radio = (cRadio)event.getSource();
	3505	+ /cRadio/ radio = (cRadio)source;
2923	3506	Object3D obj = radio.GetObject();
2924	3507	System.out.println("Edit " + obj);
2925	3508	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2939,6 +3522,9 @@
2939	3522	}
2940	3523
2941	3524	copy = group;
	3525	+
	3526	+ SetUndoStates();
	3527	+
2942	3528	//Globals.theRenderer.object = group;
2943	3529	if(!useclient)
2944	3530	{
..	..	@@ -2954,20 +3540,46 @@
2954	3540	frontView.object = group;
2955	3541	sideView.object = group;
2956	3542	}
2957		- group.editWindow = this;
	3543	+
	3544	+// fix "+" issue
	3545	+ //group.editWindow = this;
	3546	+ group.manipWindow = this;
	3547	+
2958	3548	/*
2959	3549	currentLayout = radio.layout;
2960	3550	if (currentLayout == null)
2961	3551	currentLayout = sevenButton;
2962	3552	*/
2963	3553	radio.layout.doClick();
	3554	+
	3555	+ ClearUnpinned();
	3556	+ Grafreed.Assert(group != null);
	3557	+ Grafreed.Assert(group.selection != null);
	3558	+ SetPinStates(group.selection.size() > 0);
	3559	+ if (group.selection.size() == 1)
	3560	+ EditSelection(false);
2964	3561	keepparent = group.parent;
2965	3562	// PARENT = NULL or not???
2966	3563	//group.parent = null; // ROOT
2967	3564	//group.attributes = -1;
2968	3565	ResetModel();
	3566	+
	3567	+ cameraView.requestFocusInWindow();
2969	3568	refreshContents(true);
2970		- }
	3569	+ } else if (event.getSource() == editCameraItem)
	3570	+ {
	3571	+ cameraView.ProtectCamera();
	3572	+ cameraView.repaint();
	3573	+ return;
	3574	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3575	+ {
	3576	+ cameraView.RevertCamera();
	3577	+ cameraView.repaint();
	3578	+ return;
	3579	+ // } else if (event.getSource() == textureButton)
	3580	+ // {
	3581	+ // return; // true;
	3582	+ }
2971	3583	else
2972	3584	{
2973	3585	//return super.action(event, arg);
..	..	@@ -2976,7 +3588,6 @@
2976	3588	}
2977	3589
2978	3590	boolean useclient = false;
2979		- cRadio radio;
2980	3591
2981	3592	void ToggleRoot()
2982	3593	{
..	..	@@ -3028,6 +3639,28 @@
3028	3639	refreshContents();
3029	3640	}
3030	3641
	3642	+ void TransformChildren()
	3643	+ {
	3644	+ Object3D obj;
	3645	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3646	+ {
	3647	+ obj = (Object3D)e.nextElement();
	3648	+ obj.KeepTextureMatrices();
	3649	+ obj.TransformChildren();
	3650	+ obj.RestoreTextureMatrices();
	3651	+
	3652	+// if (obj.parent == null)
	3653	+// {
	3654	+// System.out.println("NULL PARENT!");
	3655	+// new Exception().printStackTrace();
	3656	+// }
	3657	+// else
	3658	+// TouchTransform(obj);
	3659	+// //obj.parent.Touch();
	3660	+ }
	3661	+
	3662	+ refreshContents();
	3663	+ }
3031	3664
3032	3665	void ResetTransform()
3033	3666	{
..	..	@@ -3140,7 +3773,7 @@
3140	3773	refreshContents();
3141	3774	}
3142	3775
3143		- void ResetCentroid()
	3776	+ void ResetCentroid(boolean full)
3144	3777	{
3145	3778	Object3D obj;
3146	3779	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3155,12 +3788,16 @@
3155	3788	LA.matIdentity(Object3D.mat);
3156	3789	obj.getBounds(minima, maxima, false);
3157	3790	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3158		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3791	+ if (full)
	3792	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3159	3793	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3160	3794	obj.TransformMesh(Object3D.mat);
	3795	+
3161	3796	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3162		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3797	+ if (full)
	3798	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3163	3799	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3800	+
3164	3801	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3165	3802	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3166	3803	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3189,7 +3826,8 @@
3189	3826
3190	3827	int size = obj.MemorySize();
3191	3828
3192		- System.err.println((size/1024) + " KB is the size of " + obj);
	3829	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3830	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3193	3831	}
3194	3832	}
3195	3833	catch (Exception e)
..	..	@@ -3226,9 +3864,9 @@
3226	3864	obj = (Object3D)e.nextElement();
3227	3865
3228	3866	System.out.println("Object is: " + obj);
3229		- GrafreeD.AnalyzeObject(obj);
	3867	+ Grafreed.AnalyzeObject(obj);
3230	3868	System.out.println("Boundary rep: " + obj.bRep);
3231		- GrafreeD.AnalyzeObject(obj.bRep);
	3869	+ Grafreed.AnalyzeObject(obj.bRep);
3232	3870
3233	3871	// System.err.println((size/1024) + " KB is the size of " + obj);
3234	3872	}
..	..	@@ -3270,6 +3908,13 @@
3270	3908	void GenNormals(boolean crease)
3271	3909	{
3272	3910	group.GenNormalsS(crease);
	3911	+
	3912	+ refreshContents();
	3913	+ }
	3914	+
	3915	+ void GenNormalsMESH()
	3916	+ {
	3917	+ group.GenNormalsMeshS();
3273	3918
3274	3919	refreshContents();
3275	3920	}
..	..	@@ -3442,8 +4087,8 @@
3442	4087
3443	4088	void ParseVertices()
3444	4089	{
3445		- boolean epsequal = GrafreeD.epsequal;
3446		- GrafreeD.epsequal = true;
	4090	+ boolean epsequal = Grafreed.epsequal;
	4091	+ Grafreed.epsequal = true;
3447	4092
3448	4093	for (int i=0; i<group.selection.size(); i++)
3449	4094	{
..	..	@@ -3468,7 +4113,7 @@
3468	4113	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3469	4114	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3470	4115
3471		- g.add(GrafreeD.clipboard);
	4116	+ g.add(Grafreed.clipboard);
3472	4117
3473	4118	buffer.add(g);
3474	4119	}
..	..	@@ -3483,7 +4128,7 @@
3483	4128	makeSomething(buffer, i==group.selection.size()-1);
3484	4129	}
3485	4130
3486		- GrafreeD.epsequal = epsequal;
	4131	+ Grafreed.epsequal = epsequal;
3487	4132
3488	4133	refreshContents();
3489	4134	}
..	..	@@ -3501,7 +4146,16 @@
3501	4146	String pigment = Object3D.GetPigment(tex);
3502	4147	//String bump = Object3D.GetBump(tex);
3503	4148
3504		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4149	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4150	+
	4151	+ try
	4152	+ {
	4153	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4154	+ }
	4155	+ catch (Exception e)
	4156	+ {
	4157	+ System.err.println("FAIL: " + node);
	4158	+ }
3505	4159
3506	4160	double s = v.s;
3507	4161
..	..	@@ -3589,11 +4243,11 @@
3589	4243
3590	4244	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3591	4245
3592		- boolean random = CameraPane.RANDOM;
3593		- CameraPane.RANDOM = false; // parse all random nodes
	4246	+ boolean random = CameraPane.SWITCH;
	4247	+ CameraPane.SWITCH = false; // parse all random nodes
3594	4248	lowres.linkVerticesThis(null);
3595	4249	lowres.linkVerticesThis(sn);
3596		- CameraPane.RANDOM = random;
	4250	+ CameraPane.SWITCH = random;
3597	4251
3598	4252	System.err.flush();
3599	4253
..	..	@@ -3633,7 +4287,7 @@
3633	4287	return;
3634	4288
3635	4289	Object3D poses = group.selection.get(0);
3636		- Object3D ref = GrafreeD.clipboard.get(0);
	4290	+ Object3D ref = Grafreed.clipboard.get(0);
3637	4291
3638	4292	Object3D newgroup = new Object3D("Po:" + poses.name);
3639	4293
..	..	@@ -3827,9 +4481,9 @@
3827	4481
3828	4482	void ClipMesh()
3829	4483	{
3830		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4484	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3831	4485	{
3832		- Object3D content = GrafreeD.clipboard.get(0);
	4486	+ Object3D content = Grafreed.clipboard.get(0);
3833	4487
3834	4488	if (content instanceof cGroup && ((cGroup)content).transientlink )
3835	4489	content = ((cGroup)content).get(0);
..	..	@@ -3838,7 +4492,7 @@
3838	4492	// {
3839	4493	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3840	4494	// }
3841		- group.selection.ClipMesh(GrafreeD.clipboard);
	4495	+ group.selection.ClipMesh(Grafreed.clipboard);
3842	4496	}
3843	4497	// group.selection.ClipMesh(GrafreeD.clipboard);
3844	4498	System.out.println("DONE.");
..	..	@@ -3885,6 +4539,18 @@
3885	4539	void MarkLeaves(boolean hide)
3886	4540	{
3887	4541	group.selection.MarkLeaves(hide);
	4542	+ refreshContents();
	4543	+ }
	4544	+
	4545	+ void RewindLeaves(boolean hide)
	4546	+ {
	4547	+ group.selection.RewindLeaves(hide);
	4548	+ refreshContents();
	4549	+ }
	4550	+
	4551	+ void RandomLeaves(boolean hide)
	4552	+ {
	4553	+ group.selection.RandomLeaves(hide);
3888	4554	refreshContents();
3889	4555	}
3890	4556
..	..	@@ -3959,10 +4625,6 @@
3959	4625	// }
3960	4626	// }
3961	4627
3962		- static boolean allparams = true;
3963		-
3964		- static Vector<Object3D> listUI = new Vector<Object3D>();
3965		-
3966	4628	void EditSelection(boolean newWindow)
3967	4629	{
3968	4630	// aConstraints.gridy = 0;
..	..	@@ -3970,10 +4632,10 @@
3970	4632	{
3971	4633	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3972	4634	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3973		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4635	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3974	4636
3975	4637	Object3D elem = (Object3D)group.selection.elementAt(i);
3976		- if(elem != group)
	4638	+ if(elem != group \|\| !newWindow)
3977	4639	{
3978	4640	// if (!(elem instanceof Composite))
3979	4641	// newWindow = false;
..	..	@@ -4055,7 +4717,8 @@
4055	4717	//new Exception().printStackTrace();
4056	4718
4057	4719	freezemodel = true;
4058		-
	4720	+ ClearUnpinned();
	4721	+
4059	4722	/**/
4060	4723	//switch (event.id)
4061	4724	{
..	..	@@ -4063,7 +4726,6 @@
4063	4726	//case 702: // Event.LIST_DESELECT
4064	4727	group.deselectAll();
4065	4728	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4066		- objEditor.ClearInfo(); // .GetMaterial());
4067	4729	if (tps != null)
4068	4730	{
4069	4731	for (int i=0; i < tps.length; i++)
..	..	@@ -4072,33 +4734,39 @@
4072	4734
4073	4735	//if (child.parent != null)
4074	4736	//child.parent.addSelectee(child);
	4737	+ objEditor.SetMaterial(child);
4075	4738	group.addSelectee(child);
4076		- objEditor.SetMaterial(child); // .GetMaterial());
4077		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4078		- System.err.println("info : " + child.GetPath());
4079	4739	}
4080	4740	}
4081		- else
4082		- {
4083		- objEditor.SetMaterial(group); // .GetMaterial());
4084		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4085		- System.err.println("info : " + group.GetPath());
4086		- }
	4741	+// else
	4742	+// {
	4743	+// objEditor.SetMaterial(group); // .GetMaterial());
	4744	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4745	+// System.err.println("info : " + group.GetPath());
	4746	+// }
4087	4747
4088		- objEditor.SetText(); // jan 2014
4089		-
4090		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4748	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4091	4749	CameraPane.flash = true;
4092	4750
4093		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4751	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4094	4752	// a camera
4095	4753	{
4096		- CameraPane.camerachangeframe = 0; // don't refuse it
4097		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4754	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4755	+ {
	4756	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4757	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4758	+ }
4098	4759	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4099	4760	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4100	4761	}
4101	4762
	4763	+ if (tps != null && tps.length == 1)
	4764	+ {
	4765	+ EditSelection(false);
	4766	+ }
	4767	+
	4768	+ SetPinStates(tps != null && tps.length > 0);
	4769	+
4102	4770	refreshContents();
4103	4771	//return true;
4104	4772	}
..	..	@@ -4107,6 +4775,35 @@
4107	4775
4108	4776	freezemodel = false;
4109	4777	}
	4778	+
	4779	+ void SetPinStates(boolean enabled)
	4780	+ {
	4781	+ editButton.setEnabled(enabled);
	4782	+ uneditButton.setEnabled(enabled);
	4783	+ unselectButton.setEnabled(enabled);
	4784	+ flashSelectionButton.setEnabled(enabled);
	4785	+ }
	4786	+
	4787	+ void refreshContents(boolean cp)
	4788	+ {
	4789	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4790	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4791	+ {
	4792	+ objEditor.ClearInfo(); // .GetMaterial());
	4793	+
	4794	+ for (int i=0; i < group.selection.Size(); i++)
	4795	+ {
	4796	+ Object3D child = (Object3D) group.selection.get(i);
	4797	+
	4798	+ objEditor.AddInfo(child, this, true);
	4799	+ System.err.println("info : " + child.GetPath());
	4800	+ }
	4801	+
	4802	+ objEditor.SetText(); // jan 2014
	4803	+ }
	4804	+
	4805	+ super.refreshContents(cp);
	4806	+ }
4110	4807
4111	4808	void linkSomething(Object3D thing)
4112	4809	{
..	..	@@ -4178,16 +4875,19 @@
4178	4875	{
4179	4876	if (group.selection.isEmpty())
4180	4877	return;
4181		- GrafreeD.clipboardIsTempGroup = false;
	4878	+
	4879	+ Grafreed.clipboardIsTempGroup = false;
4182	4880	Composite tGroup = null;
4183	4881	if (group.selection.size() > 0) // 1)
4184	4882	{
4185	4883	tGroup = new cGroup();
4186		- GrafreeD.clipboardIsTempGroup = true;
	4884	+ Grafreed.clipboardIsTempGroup = true;
4187	4885	}
4188	4886
4189	4887	if (cut)
4190	4888	{
	4889	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4890	+// Save();
4191	4891	//int indices[] = jList.getSelectedIndices();
4192	4892	//for (int i = indices.length - 1; i >= 0; i--)
4193	4893	//jList.remove(indices[i]);
..	..	@@ -4223,16 +4923,16 @@
4223	4923	//System.out.println("cut " + child);
4224	4924	//System.out.println("parent = " + child.parent);
4225	4925	// tmp.addChild(child);
4226		- if (GrafreeD.clipboardIsTempGroup)
	4926	+ if (Grafreed.clipboardIsTempGroup)
4227	4927	tGroup.add/Child/(tmp);
4228	4928	else
4229		- GrafreeD.clipboard = tmp;
	4929	+ Grafreed.clipboard = tmp;
4230	4930	}
4231	4931	else
4232		- if (GrafreeD.clipboardIsTempGroup)
	4932	+ if (Grafreed.clipboardIsTempGroup)
4233	4933	tGroup.add/Child/(child);
4234	4934	else
4235		- GrafreeD.clipboard = child;
	4935	+ Grafreed.clipboard = child;
4236	4936	}
4237	4937
4238	4938	//ResetModel();
..	..	@@ -4264,21 +4964,23 @@
4264	4964	//System.out.println("cut " + elem);
4265	4965	//System.out.println("parent = " + elem.parent);
4266	4966	// tmp.addChild(elem);
4267		- if (GrafreeD.clipboardIsTempGroup)
	4967	+ if (Grafreed.clipboardIsTempGroup)
4268	4968	tGroup.add/Child/(tmp);
4269	4969	else
4270		- GrafreeD.clipboard = tmp;
	4970	+ Grafreed.clipboard = tmp;
4271	4971	}
4272	4972	else
4273		- if (GrafreeD.clipboardIsTempGroup)
	4973	+ if (Grafreed.clipboardIsTempGroup)
4274	4974	tGroup.add/Child/(child);
4275	4975	else
4276		- GrafreeD.clipboard = child;
	4976	+ Grafreed.clipboard = child;
4277	4977	}
4278	4978
4279	4979	}
4280		- if (GrafreeD.clipboardIsTempGroup)
4281		- GrafreeD.clipboard = tGroup;
	4980	+
	4981	+ if (Grafreed.clipboardIsTempGroup)
	4982	+ Grafreed.clipboard = tGroup;
	4983	+
4282	4984	if (cut)
4283	4985	{
4284	4986	ResetModel();
..	..	@@ -4288,11 +4990,15 @@
4288	4990
4289	4991	void paste(boolean expand)
4290	4992	{
	4993	+ if (Globals.REPLACEONMAKE)
	4994	+ Save();
	4995	+ boolean keep = Globals.REPLACEONMAKE;
	4996	+ Globals.REPLACEONMAKE = false;
4291	4997	// if (GrafreeD.clipboard == null)
4292	4998	// return;
4293	4999	boolean first = true;
4294	5000
4295		- if (GrafreeD.clipboardIsTempGroup)
	5001	+ if (Grafreed.clipboardIsTempGroup)
4296	5002	{
4297	5003	Composite temp;
4298	5004
..	..	@@ -4303,7 +5009,7 @@
4303	5009	temp = (Composite)Applet3D.clipboard.deepCopy();
4304	5010	*/
4305	5011	Object3D elem;
4306		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5012	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4307	5013	{
4308	5014	Object3D child = (Object3D)e.nextElement();
4309	5015
..	..	@@ -4337,21 +5043,22 @@
4337	5043	//Object3D cb = Applet3D.clipboard;
4338	5044	//temp.addChild(cb);
4339	5045	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4340		- assert(GrafreeD.clipboard.parent == null);
4341		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4342		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4343		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4344		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5046	+ assert(Grafreed.clipboard.parent == null);
	5047	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5048	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5049	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5050	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4345	5051	else
4346		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4347		- GrafreeD.clipboard.get(0).parent = keepparent;
	5052	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5053	+ Grafreed.clipboard.get(0).parent = keepparent;
4348	5054	}
4349	5055
	5056	+ Globals.REPLACEONMAKE = keep;
4350	5057	ResetModel();
4351	5058	refreshContents();
4352	5059	}
4353	5060
4354		- void pasteInto(boolean copyit)
	5061	+ void pasteInto(boolean copyit, boolean clone)
4355	5062	{
4356	5063	// if (GrafreeD.clipboard == null)
4357	5064	// return;
..	..	@@ -4380,15 +5087,22 @@
4380	5087	if (copyit)
4381	5088	{
4382	5089	// paste(false);
4383		- CloneClipboard(false); // sept 2014
	5090	+ if (clone)
	5091	+ {
	5092	+ CloneClipboard(false); // sept 2014
	5093	+ }
	5094	+ else
	5095	+ {
	5096	+ paste(false);
	5097	+ }
4384	5098	}
4385	5099	else
4386	5100	{
4387	5101	boolean first = true;
4388	5102
4389		- if (GrafreeD.clipboardIsTempGroup)
	5103	+ if (Grafreed.clipboardIsTempGroup)
4390	5104	{
4391		- Composite temp = (Composite)GrafreeD.clipboard;
	5105	+ Composite temp = (Composite)Grafreed.clipboard;
4392	5106	Object3D copy;
4393	5107	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4394	5108	{
..	..	@@ -4398,7 +5112,7 @@
4398	5112	}
4399	5113	} else
4400	5114	{
4401		- linkSomething(GrafreeD.clipboard); //.get(0));
	5115	+ linkSomething(Grafreed.clipboard); //.get(0));
4402	5116	}
4403	5117	}
4404	5118	}
..	..	@@ -4475,6 +5189,10 @@
4475	5189
4476	5190	void group(Object3D csg, boolean grab)
4477	5191	{
	5192	+ if (Globals.REPLACEONMAKE)
	5193	+ Save();
	5194	+ boolean keep = Globals.REPLACEONMAKE;
	5195	+ Globals.REPLACEONMAKE = false;
4478	5196	if (//false) // why??
4479	5197	!group.selection.isEmpty())
4480	5198	{
..	..	@@ -4588,10 +5306,15 @@
4588	5306	//node.add(csg);
4589	5307	//makeSomething(node);
4590	5308	makeSomething(csg);
	5309	+ Globals.REPLACEONMAKE = keep;
4591	5310	}
4592	5311
4593	5312	void Ungroup(Object3D g)
4594	5313	{
	5314	+ if (Globals.REPLACEONMAKE)
	5315	+ Save();
	5316	+ boolean keep = Globals.REPLACEONMAKE;
	5317	+ Globals.REPLACEONMAKE = false;
4595	5318	if (g instanceof HiddenObject)
4596	5319	{
4597	5320	HiddenObject h = (HiddenObject) g;
..	..	@@ -4608,6 +5331,7 @@
4608	5331	objEditor.makeSomething(g.get(i), false);
4609	5332	}
4610	5333	}
	5334	+ Globals.REPLACEONMAKE = keep;
4611	5335	}
4612	5336
4613	5337	void ungroup()
..	..	@@ -4803,21 +5527,6 @@
4803	5527	}
4804	5528	*/
4805	5529
4806		- void ImportGFD()
4807		- {
4808		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4809		- browser.show();
4810		- String filename = browser.getFile();
4811		- if (filename != null && filename.length() > 0)
4812		- {
4813		- String fullname = browser.getDirectory() + filename;
4814		-
4815		- //Object3D readobj =
4816		- objEditor.ReadGFD(fullname, objEditor);
4817		- //makeSomething(readobj);
4818		- }
4819		- }
4820		-
4821	5530	/*
4822	5531	public void Callback(Object obj)
4823	5532	{
..	..	@@ -4841,26 +5550,9 @@
4841	5550	}
4842	5551	*/
4843	5552
4844		- void ImportVRMLX3D()
4845		- {
4846		- if (GrafreeD.standAlone)
4847		- {
4848		- /**/
4849		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4850		- browser.show();
4851		- String filename = browser.getFile();
4852		- if (filename != null && filename.length() > 0)
4853		- {
4854		- String fullname = browser.getDirectory() + filename;
4855		- LoadVRMLX3D(fullname);
4856		- }
4857		- /**/
4858		- }
4859		- }
4860		-
4861	5553	String GetFile(String dialogName)
4862	5554	{
4863		- if (GrafreeD.standAlone)
	5555	+ if (Grafreed.standAlone)
4864	5556	{
4865	5557	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4866	5558	browser.show();
..	..	@@ -4924,10 +5616,33 @@
4924	5616	cButton flashSelectionButton;
4925	5617	cButton editButton;
4926	5618	cButton uneditButton;
	5619	+ JCheckBox allParamsButton;
4927	5620	cButton clearpanelButton;
4928		- cButton allParamsButton;
4929	5621	cButton unselectButton;
4930	5622
	5623	+ cButton restoreCameraButton;
	5624	+
	5625	+ cButton saveButton;
	5626	+ cButton oneStepButton;
	5627	+
	5628	+ cButton groupButton;
	5629	+ cButton ungroupButton;
	5630	+ cButton compositeButton;
	5631	+ cButton switchButton;
	5632	+ cButton loopButton;
	5633	+ cButton textureButton;
	5634	+
	5635	+ cButton gridButton;
	5636	+ cButton boxButton;
	5637	+ cButton sphereButton;
	5638	+ cButton coneButton;
	5639	+ cButton torusButton;
	5640	+ cButton superButton;
	5641	+ cButton kleinButton;
	5642	+ cButton particlesButton;
	5643	+ cButton overlayButton;
	5644	+ cButton lightButton;
	5645	+
4931	5646	cButton screenfitButton;
4932	5647	cButton screenfitpointButton;
4933	5648	cButton snapobjectButton;
..	..	@@ -4939,14 +5654,6 @@
4939	5654
4940	5655	cButton setsupportButton;
4941	5656
4942		- cButton twoButton;
4943		- cButton sixButton;
4944		- cButton threeButton;
4945		- cButton sevenButton;
4946		- cButton fourButton; // full panel
4947		- cButton oneButton; // full XYZ
4948		- //cButton currentLayout;
4949		-
4950	5657	//
4951	5658	//Composite
4952	5659	Object3D // to do !!
..	..	@@ -4956,9 +5663,11 @@
4956	5663	//JTree jTree;
4957	5664	private MenuItem lookAtItem;
4958	5665	private MenuItem lookFromItem;
4959		- private MenuItem switchItem;
	5666	+ private MenuItem switchViewItem;
4960	5667	private MenuItem cutItem;
4961		- private MenuItem duplicateItem;
	5668	+ private MenuItem undoItem;
	5669	+ private MenuItem redoItem;
	5670	+ private JMenuItem duplicateItem;
4962	5671	private MenuItem cloneItem;
4963	5672	private MenuItem cloneSupportItem;
4964	5673	private MenuItem overwriteGeoItem;
..	..	@@ -4971,7 +5680,7 @@
4971	5680	private MenuItem linkverticesItem;
4972	5681	private MenuItem relinkverticesItem;
4973	5682	private MenuItem setMasterItem;
4974		- private MenuItem resetMeshItem;
	5683	+ private MenuItem resetAllItem;
4975	5684	private MenuItem stepAllItem;
4976	5685	private MenuItem revertMeshItem;
4977	5686	private MenuItem poseMeshItem;
..	..	@@ -4982,6 +5691,7 @@
4982	5691	private MenuItem mergeGeometriesItem;
4983	5692	private MenuItem copyItem;
4984	5693	private MenuItem pasteItem;
	5694	+ private MenuItem pasteIntoItem;
4985	5695	private MenuItem pasteLinkItem;
4986	5696	private MenuItem pasteCloneItem;
4987	5697	private MenuItem pasteExpandItem;
..	..	@@ -5020,6 +5730,10 @@
5020	5730	private MenuItem showleavesItem;
5021	5731	private MenuItem markleavesItem;
5022	5732	private MenuItem unmarkleavesItem;
	5733	+ private MenuItem rewindleavesItem;
	5734	+ private MenuItem unrewindleavesItem;
	5735	+ private MenuItem randomleavesItem;
	5736	+ private MenuItem unrandomleavesItem;
5023	5737
5024	5738	private MenuItem flipVItem;
5025	5739	private MenuItem unflipVItem;
..	..	@@ -5031,15 +5745,17 @@
5031	5745	private MenuItem panoTexturesItem;
5032	5746
5033	5747	private MenuItem resetCentroidItem;
5034		- private MenuItem transformgeometryItem;
	5748	+ private MenuItem resetCentroidXZItem;
5035	5749	private MenuItem resetTransformItem;
	5750	+ private MenuItem transformGeometryItem;
	5751	+ private MenuItem transformChildrenItem;
5036	5752	private MenuItem hideItem;
5037	5753	private MenuItem grabItem;
5038	5754	private MenuItem backItem;
5039	5755	private MenuItem frontItem;
5040	5756	private MenuItem cameraItem;
5041	5757	private MenuItem compositeItem;
5042		- private MenuItem randomItem;
	5758	+ private MenuItem switchItem;
5043	5759	private MenuItem physicsItem;
5044	5760	private MenuItem frameselectorItem;
5045	5761	private MenuItem scriptNodeItem;
..	..	@@ -5079,7 +5795,7 @@
5079	5795	private MenuItem blobItem;
5080	5796	private MenuItem latheItem;
5081	5797	private MenuItem bezierItem;
5082		- private MenuItem checkerItem;
	5798	+ private MenuItem overlayItem;
5083	5799	private MenuItem meshItem;
5084	5800	// private MenuItem meshGroupItem;
5085	5801	private MenuItem springItem;
..	..	@@ -5101,11 +5817,6 @@
5101	5817	private MenuItem doubleItem;
5102	5818	private MenuItem tripleItem;
5103	5819
5104		- private MenuItem importGFDItem;
5105		- private MenuItem importVRMLX3DItem;
5106		- private MenuItem import3DSItem;
5107		- private MenuItem importOBJItem;
5108		-
5109	5820	private MenuItem computeAOItem;
5110	5821	private MenuItem recompileItem;
5111	5822	private MenuItem editScriptItem;
..	..	@@ -5115,4 +5826,8 @@
5115	5826	private MenuItem analyzeItem;
5116	5827	private MenuItem dumpItem;
5117	5828	//boolean freezemodel = false;
	5829	+
	5830	+ Menu cameraMenu;
	5831	+ MenuItem editCameraItem;
	5832	+ MenuItem restoreCameraItem;
5118	5833	}