~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,
..	..	@@ -73,7 +74,7 @@
73	74	this.copy = this.group = copy;
74	75	//selectees = this.group.selectees;
75	76
76		- SetupMenu2(objEditor);
	77	+ SetupMenu2(this); //objEditor);
77	78	SetupUI2(objEditor);
78	79	objEditor.SetupUI(true);
79	80	SetupViews(objEditor);
..	..	@@ -83,6 +84,10 @@
83	84
84	85	void CloneSelection(boolean supports)
85	86	{
	87	+ if (Globals.REPLACEONMAKE)
	88	+ Save();
	89	+ boolean keep = Globals.REPLACEONMAKE;
	90	+ Globals.REPLACEONMAKE = false;
86	91	// Object3D keep = GrafreeD.clipboard;
87	92	//Object3D obj;
88	93	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -93,18 +98,19 @@
93	98
94	99	makeSomething(clone, i==group.selection.size()-1);
95	100	}
	101	+ Globals.REPLACEONMAKE = keep;
96	102	}
97	103
98	104	void CloneClipboard(boolean supports)
99	105	{
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));
	106	+ assert(Grafreed.clipboard.parent == null);
	107	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	108	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	109	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	110	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	111	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	112	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	113	+ Grafreed.clipboard.get(0).parent = keepparent;
108	114	}
109	115
110	116	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +124,7 @@
118	124	// obj.support = null;
119	125	if (!supports)
120	126	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	127	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	128	obj.parent = parent;
123	129	// obj.support = support;
124	130	// clone.support = support; // aout 2013
..	..	@@ -147,30 +153,29 @@
147	153
148	154	//JTextField nameField;
149	155
150		- void SetupMenu2(ObjEditor oe)
	156	+ void SetupMenu2(GroupEditor oe)
151	157	{
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);
	158	+ oe.jTree = new cTree();
	159	+
163	160	Menu menu;
164	161	oe.menuBar.add(menu = new Menu("Edit"));
165	162	//editItem = menu.add(new MenuItem("Edit"));
166	163	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	164	+
	165	+// undoItem = menu.add(new MenuItem("Undo"));
	166	+// undoItem.addActionListener(this);
	167	+// redoItem = menu.add(new MenuItem("Redo"));
	168	+// redoItem.addActionListener(this);
	169	+// menu.add("-");
	170	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	171	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	172	cloneItem = menu.add(new MenuItem("Clone"));
171	173	cloneItem.addActionListener(this);
	174	+ if (Globals.ADVANCED)
	175	+ {
172	176	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	177	cloneSupportItem.addActionListener(this);
	178	+ }
174	179	menu.add("-");
175	180	cutItem = menu.add(new MenuItem("Cut"));
176	181	cutItem.addActionListener(this);
..	..	@@ -178,27 +183,123 @@
178	183	copyItem.addActionListener(this);
179	184	pasteItem = menu.add(new MenuItem("Paste"));
180	185	pasteItem.addActionListener(this);
	186	+
	187	+ menu.add("-");
	188	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	189	+ pasteIntoItem.addActionListener(this);
181	190	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	191	pasteLinkItem.addActionListener(this);
183	192	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	193	pasteCloneItem.addActionListener(this);
185	194	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	195	// pasteExpandItem.addActionListener(this);
	196	+ menu.add("-");
187	197	clearItem = menu.add(new MenuItem("Clear"));
188	198	clearItem.addActionListener(this);
	199	+
	200	+ if (Globals.ADVANCED)
	201	+ {
	202	+ // Deletes the cameras...
189	203	clearAllItem = menu.add(new MenuItem("Clear All"));
190	204	clearAllItem.addActionListener(this);
	205	+ }
	206	+
	207	+ menuBar.add(cameraMenu = new Menu("View"));
	208	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	209	+ //zBufferItem.addActionListener(this);
	210	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	211	+ //normalLensItem.addActionListener(this);
	212	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	213	+ restoreCameraItem.addActionListener(this);
	214	+
	215	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	216	+// toggleFullScreenItem.addItemListener(this);
	217	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	218	+// cameraMenu.add("-");
	219	+//
	220	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	221	+// toggleTextureItem.addItemListener(this);
	222	+// toggleTextureItem.setState(CameraPane.textureon);
	223	+//
	224	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	225	+// toggleSwitchItem.addItemListener(this);
	226	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	227	+
	228	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	229	+ toggleHandleItem.addItemListener(this);
	230	+ toggleHandleItem.setState(CameraPane.HANDLES);
	231	+
	232	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	233	+ togglePaintItem.addItemListener(this);
	234	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	235	+
	236	+ if (Globals.ADVANCED)
	237	+ {
	238	+ cameraMenu.add("-");
	239	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	240	+ toggleLiveItem.addItemListener(this);
	241	+ toggleLiveItem.setState(Globals.isLIVE());
191	242
	243	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	244	+ stepItem.addActionListener(this);
	245	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	246	+ // toggleDLItem.addItemListener(this);
	247	+ // toggleDLItem.setState(false);
	248	+
	249	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	250	+ toggleRenderItem.addItemListener(this);
	251	+ toggleRenderItem.setState(!CameraPane.frozen);
	252	+
	253	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	254	+ toggleDebugItem.addItemListener(this);
	255	+ toggleDebugItem.setState(Globals.DEBUG);
	256	+
	257	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	258	+ toggleFrustumItem.addItemListener(this);
	259	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	260	+
	261	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	262	+ toggleFootContactItem.addItemListener(this);
	263	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	264	+
	265	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	266	+ toggleTimelineItem.addItemListener(this);
	267	+ }
	268	+
	269	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	270	+// toggleRootItem.addItemListener(this);
	271	+// toggleRootItem.setState(false);
	272	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	273	+// animationItem.addItemListener(this);
	274	+// animationItem.setState(CameraPane.ANIMATION);
	275	+ cameraMenu.add("-");
	276	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	277	+ editCameraItem.addActionListener(this);
	278	+
	279	+ if (Globals.ADVANCED)
	280	+ {
	281	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	282	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	283	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	284	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	285	+ oe.cameraMenu.add("-");
	286	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	287	+ openWindowItem.addActionListener(this);
	288	+ editLeafItem.addActionListener(this);
	289	+ lookAtItem.addActionListener(this);
	290	+ //lookFromItem.addActinoListener(this);
	291	+ //switchViewItem.addActionListener(this);
	292	+ }
	293	+
192	294	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);
	295	+ if (Globals.ADVANCED)
	296	+ {
197	297	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	298	revertMeshItem.addActionListener(this);
199	299	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	300	resetreferencesItem.addActionListener(this);
201	301	menu.add("-");
	302	+ }
202	303	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	304	overwriteGeoItem.addActionListener(this);
204	305	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,79 +311,104 @@
210	311	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	312	overwriteUVItem.addActionListener(this);
212	313	menu.add("-");
	314	+ if (Globals.ADVANCED)
	315	+ {
213	316	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	317	generateMeshItem.addActionListener(this);
215	318	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	319	poseMeshItem.addActionListener(this);
217	320	menu.add("-");
	321	+ }
218	322	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	323	resetsupportItem.addActionListener(this);
220	324	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	325	linkverticesItem.addActionListener(this);
222	326	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	327	relinkverticesItem.addActionListener(this);
	328	+
	329	+ if (Globals.ADVANCED)
	330	+ {
224	331	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	332	setMasterItem.addActionListener(this);
	333	+ }
226	334
227	335	oe.menuBar.add(menu = new Menu("Group"));
228		- grabItem = menu.add(new MenuItem("Grab"));
229		- grabItem.addActionListener(this);
	336	+// grabItem = menu.add(new MenuItem("Grab"));
	337	+// grabItem.addActionListener(this);
230	338	backItem = menu.add(new MenuItem("Back"));
231	339	backItem.addActionListener(this);
232	340	frontItem = menu.add(new MenuItem("Front"));
233	341	frontItem.addActionListener(this);
234		- compositeItem = menu.add(new MenuItem("Composite"));
235		- compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	342	+// compositeItem = menu.add(new MenuItem("Composite"));
	343	+// compositeItem.addActionListener(this);
	344	+
	345	+ if (Globals.ADVANCED)
	346	+ {
	347	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	348	hideItem.addActionListener(this);
	349	+ }
238	350	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	351	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);
	352	+
	353	+// menu.add("-");
	354	+//
	355	+// switchItem = menu.add(new MenuItem("Switch node"));
	356	+// switchItem.addActionListener(this);
	357	+ if (Globals.ADVANCED)
	358	+ {
247	359	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	360	switchGeoItem.addActionListener(this);
249	361	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	362	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	363	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	364	morphItem.addActionListener(this);
	365	+
	366	+ menu.add("-");
	367	+ physicsItem = menu.add(new MenuItem("Physics"));
	368	+ physicsItem.addActionListener(this);
	369	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	370	+ frameselectorItem.addActionListener(this);
253	371	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	372	scriptNodeItem.addActionListener(this);
255		- cameraItem = menu.add(new MenuItem("Camera"));
256		- cameraItem.addActionListener(this);
	373	+ }
257	374
258	375	oe.menuBar.add(menu = new Menu("Object"));
259		- textureItem = menu.add(new MenuItem("Texture"));
260		- textureItem.addActionListener(this);
	376	+// textureItem = menu.add(new MenuItem("Texture"));
	377	+// textureItem.addActionListener(this);
261	378	billboardItem = menu.add(new MenuItem("Billboard"));
262	379	billboardItem.addActionListener(this);
263	380	csgItem = menu.add(new MenuItem("CSG"));
264	381	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	382	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	383	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	384	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	385	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	386	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	387	shadowZItem.addActionListener(this);
	388	+ attributeItem = menu.add(new MenuItem("Attribute"));
	389	+ attributeItem.addActionListener(this);
	390	+
	391	+ if (Globals.ADVANCED)
	392	+ {
	393	+ menu.add("-");
271	394	linkerItem = menu.add(new MenuItem("Linker"));
272	395	linkerItem.addActionListener(this);
273	396	templateItem = menu.add(new MenuItem("Template"));
274	397	templateItem.addActionListener(this);
275		- attributeItem = menu.add(new MenuItem("Attribute"));
276		- attributeItem.addActionListener(this);
277	398	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	399	pointflowItem.addActionListener(this);
	400	+ }
279	401	menu.add("-");
280	402	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	403	resetTransformItem.addActionListener(this);
282	404	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	405	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	406	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	407	+ resetCentroidXZItem.addActionListener(this);
	408	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	409	+ transformGeometryItem.addActionListener(this);
	410	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	411	+ transformChildrenItem.addActionListener(this);
286	412
287	413	oe.menuBar.add(menu = new Menu("Geometry"));
288	414	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +419,11 @@
293	419	genNormalsCADItem.addActionListener(this);
294	420	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	421	genNormalsMESHItem.addActionListener(this);
	422	+ if (Globals.ADVANCED)
	423	+ {
296	424	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
297	425	genNormalsMINEItem.addActionListener(this);
	426	+ }
298	427	stripifyItem = menu.add(new MenuItem("Stripify"));
299	428	stripifyItem.addActionListener(this);
300	429	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +445,34 @@
316	445	reduce34MeshItem.addActionListener(this);
317	446	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	447	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	448	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	449	clipMeshItem.addActionListener(this);
	450	+
	451	+ if (Globals.ADVANCED)
	452	+ {
	453	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	454	+ smoothMeshItem.addActionListener(this);
	455	+ }
323	456
324	457	oe.menuBar.add(menu = new Menu("Attributes"));
325	458	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	459	clearMaterialsItem.addActionListener(this);
	460	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	461	+ resetAllItem.addActionListener(this);
	462	+ stepAllItem = menu.add(new MenuItem("Step All"));
	463	+ stepAllItem.addActionListener(this);
327	464	menu.add("-");
328	465	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	466	liveleavesItem.addActionListener(this);
330	467	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	468	unliveleavesItem.addActionListener(this);
	469	+ if (Globals.ADVANCED)
	470	+ {
332	471	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	472	supportleavesItem.addActionListener(this);
334	473	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	474	unsupportleavesItem.addActionListener(this);
	475	+ }
336	476	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	477	hideleavesItem.addActionListener(this);
338	478	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +481,14 @@
341	481	markleavesItem.addActionListener(this);
342	482	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	483	unmarkleavesItem.addActionListener(this);
	484	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	485	+ rewindleavesItem.addActionListener(this);
	486	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	487	+ unrewindleavesItem.addActionListener(this);
	488	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	489	+ randomleavesItem.addActionListener(this);
	490	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	491	+ unrandomleavesItem.addActionListener(this);
344	492	menu.add("-");
345	493	flipVItem = menu.add(new MenuItem("Flip V"));
346	494	flipVItem.addActionListener(this);
..	..	@@ -376,35 +524,41 @@
376	524	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	525	sortbynameItem.addActionListener(this);
378	526	menu.add("-");
	527	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	528	+ shareGeometriesItem.addActionListener(this);
	529	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	530	+ mergeGeometriesItem.addActionListener(this);
	531	+ if (Globals.ADVANCED)
	532	+ {
	533	+ // Pretty much the same as duplicate and clone.
379	534	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	535	extractGeometriesItem.addActionListener(this);
381	536	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	537	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);
	538	+ }
387	539
388	540	oe.menuBar.add(menu = new Menu("Insert"));
389	541	buildCreateMenu(menu);
390	542
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	543	oe.menuBar.add(menu = new Menu("Tools"));
403	544	buildToolsMenu(menu);
404	545	}
405	546
	547	+
406	548	void SetupUI2(ObjEditor oe)
407	549	{
	550	+ // June 2019
	551	+ if (oe == null)
	552	+ {
	553	+ //super.SetupUI2(this);
	554	+ //return;
	555	+ }
	556	+
	557	+ if (copy != group)
	558	+ {
	559	+ //super.SetupUI2(this);
	560	+ }
	561	+
408	562	//new Exception().printStackTrace();
409	563
410	564	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -433,176 +587,230 @@
433	587	oe.radioPanel.add(dummyButton);
434	588	oe.buttonGroup.add(dummyButton);
435	589	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	590	+ cGridBag copyOptionsPanel = new cGridBag();
	591	+
	592	+ copyOptionsPanel.preferredHeight = 1;
439	593
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);
	594	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	595	+
	596	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	597	+ //minButton.setToolTipText("Minimize window");
	598	+ //minButton.addActionListener(this);
	599	+
	600	+ if (Globals.ADVANCED)
	601	+ {
	602	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	603	+ maxButton.setToolTipText("Maximize window");
	604	+ maxButton.addActionListener(this);
	605	+ }
	606	+
	607	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	608	+ fullButton.setToolTipText("Full-screen window");
	609	+ fullButton.addActionListener(this);
	610	+
	611	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
520	612	screenfitButton.setToolTipText("Screen fit");
521	613	screenfitButton.addActionListener(this);
522		- oe.aConstraints.gridx += 1;
	614	+
	615	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	616	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	617	+ restoreCameraButton.addActionListener(this);
	618	+
	619	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	620	+ saveButton.setToolTipText("New version");
	621	+ saveButton.addActionListener(this);
	622	+
	623	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ undoButton.setToolTipText("Previous version");
	625	+ undoButton.addActionListener(this);
	626	+ undoButton.setEnabled(false);
	627	+
	628	+ cGridBag updown = new cGridBag().setVertical(true);
	629	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	630	+ restoreButton.setToolTipText("Restore current");
	631	+ restoreButton.addActionListener(this);
	632	+ restoreButton.setEnabled(false);
	633	+
	634	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	635	+ replaceButton.setToolTipText("Replace current");
	636	+ replaceButton.addActionListener(this);
	637	+ replaceButton.setEnabled(false);
	638	+
	639	+ copyOptionsPanel.add(updown);
	640	+
	641	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	642	+ redoButton.setToolTipText("Next version");
	643	+ redoButton.addActionListener(this);
	644	+ redoButton.setEnabled(false);
	645	+
	646	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	647	+ liveCB.setToolTipText("Enable animation");
	648	+ liveCB.addItemListener(this);
	649	+
	650	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	651	+ oneStepButton.setToolTipText("Animate one step forward");
	652	+ oneStepButton.addActionListener(this);
	653	+
	654	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	655	+ fastCB.setToolTipText("Fast mode");
	656	+ fastCB.addItemListener(this);
	657	+
	658	+ //oe.toolboxPanel.Return();
	659	+
	660	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	661	+// trackCB.setToolTipText("Enable tracking");
	662	+// trackCB.addItemListener(this);
	663	+
523	664	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
524	665	// 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	666
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);
	667	+ if (Globals.ADVANCED)
	668	+ {
	669	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	670	+ snapobjectButton.addActionListener(this);
	671	+ snapobjectButton.setToolTipText("Snap Object");
	672	+ }
	673	+
	674	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
539	675
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);
	676	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
548	677	twoButton.setToolTipText("Show center view only");
549	678	twoButton.addActionListener(this);
550		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	679	+ this.fullscreenLayout = twoButton;
	680	+
	681	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
551	682	fourButton.addActionListener(this);
552	683	fourButton.setToolTipText("Show left panel only");
553		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	684	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
554	685	sixButton.setToolTipText("2-column layout left");
555	686	sixButton.addActionListener(this);
556		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	687	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
557	688	threeButton.setToolTipText("2-column layout right");
558	689	threeButton.addActionListener(this);
559		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	690	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
560	691	sevenButton.setToolTipText("3-column layout");
561	692	sevenButton.addActionListener(this);
562	693	//
563	694
564		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
565		- rootButton.setToolTipText("Edit object in new tab");
	695	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	696	+ rootButton.setToolTipText("Edit selection in new tab");
566	697	rootButton.addActionListener(this);
567		- oe.aConstraints.gridx += 1;
568		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	698	+
	699	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569	700	closeButton.setToolTipText("Close tab");
570	701	closeButton.addActionListener(this);
571	702	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
572	703	//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	704
582		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	705	+ // INSERT
	706	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	707	+ gridButton.setToolTipText("Create grid");
	708	+ gridButton.addActionListener(this);
	709	+
	710	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	711	+ boxButton.setToolTipText("Create box");
	712	+ boxButton.addActionListener(this);
	713	+
	714	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	715	+ sphereButton.setToolTipText("Create sphere");
	716	+ sphereButton.addActionListener(this);
	717	+
	718	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ coneButton.setToolTipText("Create cone");
	720	+ coneButton.addActionListener(this);
	721	+
	722	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	723	+ torusButton.setToolTipText("Create torus");
	724	+ torusButton.addActionListener(this);
	725	+
	726	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	727	+ superButton.setToolTipText("Create superellipsoid");
	728	+ superButton.addActionListener(this);
	729	+
	730	+ if (Globals.ADVANCED)
	731	+ {
	732	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	733	+ kleinButton.setToolTipText("Create Klein bottle");
	734	+ kleinButton.addActionListener(this);
	735	+ }
	736	+
	737	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	738	+ particlesButton.setToolTipText("Create particle system");
	739	+ particlesButton.addActionListener(this);
	740	+
	741	+ oe.toolboxPanel.Return();
	742	+
	743	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	744	+ groupButton.setToolTipText("Create group");
	745	+ groupButton.addActionListener(this);
	746	+
	747	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	748	+ compositeButton.setToolTipText("Create composite");
	749	+ compositeButton.addActionListener(this);
	750	+
	751	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	752	+ switchButton.setToolTipText("Create item switcher");
	753	+ switchButton.addActionListener(this);
	754	+
	755	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	756	+ loopButton.setToolTipText("Create loop");
	757	+ loopButton.addActionListener(this);
	758	+
	759	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	760	+ textureButton.setToolTipText("Create texture");
	761	+ textureButton.addActionListener(this);
	762	+
	763	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	764	+ overlayButton.setToolTipText("Create overlay");
	765	+ overlayButton.addActionListener(this);
	766	+
	767	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	768	+ lightButton.setToolTipText("Create light");
	769	+ lightButton.addActionListener(this);
	770	+
	771	+ for (int i=6; --i>=0;)
	772	+ {
	773	+ oe.toolboxPanel.Return();
	774	+ oe.toolboxPanel.add(new cGridBag());
	775	+ oe.toolboxPanel.add(new cGridBag());
	776	+ oe.toolboxPanel.add(new cGridBag());
	777	+ oe.toolboxPanel.add(new cGridBag());
	778	+ oe.toolboxPanel.add(new cGridBag());
	779	+ oe.toolboxPanel.add(new cGridBag());
	780	+ oe.toolboxPanel.add(new cGridBag());
	781	+ }
	782	+
	783	+ // EDIT panel
	784	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	785	+ editButton.setToolTipText("Pin selection controls");
	786	+ editButton.addActionListener(this);
	787	+
	788	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	789	+ uneditButton.setToolTipText("Remove selection controls");
583	790	uneditButton.addActionListener(this);
584	791
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);
	792	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	793	+ allParamsButton.setToolTipText("Show all controle");
597	794	allParamsButton.addActionListener(this);
598	795
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);
	796	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	797	+ clearPanelButton.setToolTipText("Clear edit panel");
	798	+ clearPanelButton.addActionListener(this);
	799	+
	800	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	801	+ unselectButton.setToolTipText("Unselect");
604	802	unselectButton.addActionListener(this);
605	803
	804	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	805	+ flashSelectionButton.setToolTipText("Highlight selection");
	806	+ flashSelectionButton.addActionListener(this);
	807	+
	808	+ editCommandsPanel.preferredHeight = 1;
	809	+
	810	+ SetPinStates(false);
	811	+// oe.treePanel.add(commandsPanel);
	812	+// oe.treePanel.Return();
	813	+
606	814	// oe.aConstraints.gridx += 1;
607	815	// oe.aConstraints.weighty = 0;
608	816	// oe.aConstraints.gridwidth = 1;
..	..	@@ -614,40 +822,25 @@
614	822	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
615	823	// gcButton.addActionListener(this);
616	824
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;
	825	+ cGridBag jSPPanel = new cGridBag();
	826	+
	827	+ JScrollPane jSP;
628	828	//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);
	829	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
630	830	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	831
	832	+ oe.treePanel.add(jSPPanel);
	833	+ oe.treePanel.Return();
	834	+
	835	+ oe.treePanel.add(copyOptionsPanel);
	836	+ oe.treePanel.Return();
	837	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 10, 0);
	838	+ versionField = (cNumberSlider)sliderPane.getComponent(1);
	839	+ sliderPane.preferredHeight = 1;
	840	+
	841	+// mainPanel.setDividerLocation(0.5); //1.0);
	842	+// mainPanel.setResizeWeight(0.5);
	843	+
651	844	//jList.addListSelectionListener(this);
652	845	oe.jTree.addTreeSelectionListener(this);
653	846	//jTree.setRootVisible(false);
..	..	@@ -669,10 +862,144 @@
669	862	radio.layout = sevenButton;
670	863	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
671	864	}
	865	+
	866	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	867	+ {
	868	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	869	+ colorCB.setToolTipText("Copy color when dropped");
	870	+ colorCB.addItemListener(this);
	871	+
	872	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	873	+ materialCB.setToolTipText("Copy material when dropped");
	874	+ materialCB.addItemListener(this);
	875	+
	876	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	877	+ textureCB.setToolTipText("Copy texture when dropped");
	878	+ textureCB.addItemListener(this);
	879	+
	880	+ panel.Return();
	881	+
	882	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	883	+ boxCB.setToolTipText("Display bounding boxes");
	884	+ boxCB.addItemListener(this);
	885	+
	886	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	887	+ zoomBoxCB.setToolTipText("Display only for wheel");
	888	+ zoomBoxCB.addItemListener(this);
	889	+
	890	+ if (true) // Globals.ADVANCED)
	891	+ {
	892	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	893	+// supportCB.setToolTipText("Enable rigging");
	894	+// supportCB.addItemListener(this);
	895	+
	896	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	897	+ freezeCB.setToolTipText("Fast moving camera");
	898	+ freezeCB.addItemListener(this);
	899	+
	900	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	901	+ // localCB.addItemListener(this);
	902	+
	903	+ panel.Return();
	904	+
	905	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	906	+ crowdCB.setToolTipText("Used for crowds");
	907	+ crowdCB.addItemListener(this);
	908	+
	909	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	910	+ smoothCB.setToolTipText("Snapping delay");
	911	+ smoothCB.addItemListener(this);
	912	+
	913	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	914	+ slowCB.setToolTipText("Smooth interpolation");
	915	+ slowCB.addItemListener(this);
	916	+
	917	+// constraints.gridy += 1;
	918	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	919	+// speakerMocapCB.addItemListener(this);
	920	+
	921	+ panel.Return();
	922	+
	923	+ if (false)
	924	+ {
	925	+ // handled in scripts
	926	+ //constraints.gridy += 1;
	927	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	928	+ speakerCameraCB.addItemListener(this);
	929	+
	930	+ //constraints.gridy += 1;
	931	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	932	+ speakerFocusCB.addItemListener(this);
	933	+
	934	+ //constraints.gridy += 1;
	935	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	936	+ smoothfocusCB.addItemListener(this);
	937	+ panel.Return();
	938	+ }
	939	+
	940	+//constraints.gridx += 1;
	941	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	942	+// debugCB.addItemListener(this);
	943	+
	944	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	945	+ trackCB.setToolTipText("Enable tracking target");
	946	+ trackCB.addItemListener(this);
	947	+
	948	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	949	+ oeilCB.setToolTipText("Move camera when tracking");
	950	+ oeilCB.addItemListener(this);
	951	+
	952	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	953	+ shadowCB.setToolTipText("When live compute shadows");
	954	+ shadowCB.addItemListener(this);
	955	+
	956	+ panel.Return();
	957	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	958	+ toggleTextureCB.setToolTipText("Load textures");
	959	+ toggleTextureCB.addItemListener(this);
	960	+
	961	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	962	+ toggleSwitchCB.setToolTipText("Choose a single item");
	963	+ toggleSwitchCB.addItemListener(this);
	964	+
	965	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	966	+ autokeepCB.setToolTipText("On structure change");
	967	+ autokeepCB.addItemListener(this);
	968	+
	969	+ panel.Return();
	970	+ if (Globals.ADVANCED)
	971	+ {
	972	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	973	+ lookAtCB.setToolTipText("Look-at target");
	974	+ lookAtCB.addItemListener(this);
	975	+ }
	976	+
	977	+ }
	978	+
	979	+ cGridBag fill = new cGridBag();
	980	+ fill.preferredHeight = 200;
	981	+ cGridBag fill2 = new cGridBag();
	982	+ fill2.preferredHeight = 200;
	983	+ cGridBag fill3 = new cGridBag();
	984	+ fill3.preferredHeight = 200;
	985	+
	986	+ panel.add(fill);
	987	+ panel.add(fill2);
	988	+ panel.add(fill3);
	989	+
	990	+ }
672	991
673	992	void EditObject(Object3D obj)
674	993	{
675	994	cRadio radioButton = new cRadio(obj.name);
	995	+
	996	+ // June 2019. Patch to avoid bug with transparency.
	997	+ radioButton.hadMaterial = obj.material != null;
	998	+ if (!radioButton.hadMaterial)
	999	+ {
	1000	+ obj.material = new cMaterial();
	1001	+ }
	1002	+
676	1003	radioButton.SetObject(obj);
677	1004	radioButton.layout = sevenButton;
678	1005	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -681,8 +1008,11 @@
681	1008	buttonGroup.add(radioButton);
682	1009	radioButton.doClick();
683	1010	}
	1011	+
684	1012	void SetupViews(ObjEditor oe)
685	1013	{
	1014	+ theFrame = this;
	1015	+
686	1016	oe.SetupViews();
687	1017
688	1018	System.out.println("SetupViews");
..	..	@@ -691,23 +1021,28 @@
691	1021	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
692	1022	}
693	1023
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;
	1024	+ cToggleButton liveCB;
	1025	+ cCheckBox supportCB;
	1026	+ cCheckBox localCB;
	1027	+ cCheckBox crowdCB;
	1028	+ cCheckBox smoothCB;
	1029	+ cToggleButton fastCB;
	1030	+ cCheckBox slowCB;
	1031	+ cCheckBox boxCB;
	1032	+ cCheckBox zoomBoxCB;
	1033	+ cCheckBox freezeCB;
	1034	+ //cToggleButton trackCB;
	1035	+ cCheckBox trackCB;
	1036	+ cCheckBox smoothfocusCB;
705	1037	// JCheckBox speakerMocapCB;
706		- JCheckBox speakerCameraCB;
707		- JCheckBox speakerFocusCB;
708		- JCheckBox debugCB;
709		- JCheckBox oeilCB;
710		- JCheckBox lookAtCB;
	1038	+ cCheckBox speakerCameraCB;
	1039	+ cCheckBox speakerFocusCB;
	1040	+ cCheckBox debugCB;
	1041	+
	1042	+ cCheckBox oeilCB;
	1043	+ cCheckBox shadowCB;
	1044	+ cCheckBox autokeepCB;
	1045	+ cCheckBox lookAtCB;
711	1046
712	1047	// static int COLOR = 1;
713	1048	// static int MATERIAL = 2;
..	..	@@ -715,9 +1050,9 @@
715	1050
716	1051	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
717	1052
718		- JCheckBox colorCB;
719		- JCheckBox materialCB;
720		- JCheckBox textureCB;
	1053	+ cCheckBox colorCB;
	1054	+ cCheckBox materialCB;
	1055	+ cCheckBox textureCB;
721	1056
722	1057	public void itemStateChanged(ItemEvent e)
723	1058	{
..	..	@@ -745,6 +1080,7 @@
745	1080	} else if(e.getSource() == liveCB)
746	1081	{
747	1082	cameraView.ToggleLive();
	1083	+ refreshContents(false);
748	1084	}
749	1085	else if(e.getSource() == supportCB)
750	1086	{
..	..	@@ -809,6 +1145,18 @@
809	1145	{
810	1146	cameraView.ToggleOeil();
811	1147	}
	1148	+ else if(e.getSource() == shadowCB)
	1149	+ {
	1150	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1151	+ }
	1152	+ else if(e.getSource() == freezeCB)
	1153	+ {
	1154	+ Globals.FREEZEONMOVE ^= true;
	1155	+ }
	1156	+ else if(e.getSource() == autokeepCB)
	1157	+ {
	1158	+ Globals.REPLACEONMAKE ^= true;
	1159	+ }
812	1160	else if(e.getSource() == lookAtCB)
813	1161	{
814	1162	cameraView.ToggleLookAt();
..	..	@@ -825,7 +1173,8 @@
825	1173
826	1174	/**/
827	1175	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
828		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1176	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1177	+ TreePath path = objEditor.jTree.getSelectionPath();
829	1178	if ((path == null) \|\| (path.getPathCount() <= 1)) {
830	1179	// We can't move the root node or an empty selection
831	1180	return;
..	..	@@ -888,8 +1237,6 @@
888	1237	}
889	1238	}
890	1239
891		- String string = (String) object;
892		-
893	1240	System.out.println("Transfer = " + object + "; drop : " + target);
894	1241	// if( object instanceof java.io.File[])
895	1242	// {
..	..	@@ -897,7 +1244,11 @@
897	1244	// objEditor.DropFile((java.io.File[]) object, true);
898	1245	// return;
899	1246	// }
900		- if (string.charAt(0) == '/')
	1247	+
	1248	+ String string = object.toString();
	1249	+
	1250	+ // File path for Mac and Windows
	1251	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
901	1252	{
902	1253	// file(s)
903	1254	String[] names = string.split("\n");
..	..	@@ -924,7 +1275,7 @@
924	1275
925	1276	flashIt = false;
926	1277	CameraPane pane = (CameraPane) target;
927		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1278	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
928	1279	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
929	1280
930	1281	if (group.selection.size() == 1)
..	..	@@ -940,23 +1291,33 @@
940	1291
941	1292	assert target == objEditor.jTree;
942	1293	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1294	+ Object3D destinationLeaf;
943	1295	try {
944		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1296	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
945	1297	} catch (Exception e) {
946	1298	System.out.println("destinationPath : " + destinationPath);
947	1299	return;
948	1300	}
949	1301
950		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1302	+ for (int i=group.selection.size(); --i>=0;)
951	1303	{
	1304	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1305	+
	1306	+ // Cannot move into itself
	1307	+ if (child == destinationLeaf)
	1308	+ return;
	1309	+ }
	1310	+
	1311	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1312	+// {
952	1313	loadClipboard(true);
953	1314	objEditor.jTree.setSelectionPath(destinationPath);
954		- pasteInto(false);
955		- } else {
956		- loadClipboard(false);
957		- objEditor.jTree.setSelectionPath(destinationPath);
958		- pasteInto(false); // true); // ???
959		- }
	1315	+ pasteInto(false, false);
	1316	+// } else {
	1317	+// loadClipboard(false);
	1318	+// objEditor.jTree.setSelectionPath(destinationPath);
	1319	+// pasteInto(false, false); // true); // ???
	1320	+// }
960	1321	}
961	1322	public void dropActionChanged(DropTargetDragEvent dtde)
962	1323	// Called if the user has modified the current drop gesture
..	..	@@ -1061,85 +1422,107 @@
1061	1422	{
1062	1423	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1063	1424	//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);
	1425	+// gridItem = menu.add(new MenuItem("Grid"));
	1426	+// gridItem.addActionListener(this);
	1427	+// rectoidItem = menu.add(new MenuItem("Box"));
	1428	+// rectoidItem.addActionListener(this);
	1429	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1430	+// ellipsoidItem.addActionListener(this);
	1431	+// coneItem = menu.add(new MenuItem("Cone"));
	1432	+// coneItem.addActionListener(this);
	1433	+// torusItem = menu.add(new MenuItem("Torus"));
	1434	+// torusItem.addActionListener(this);
	1435	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1436	+// superItem.addActionListener(this);
	1437	+
	1438	+ cameraItem = menu.add(new MenuItem("Camera"));
	1439	+ cameraItem.addActionListener(this);
	1440	+
	1441	+ if (!Globals.ADVANCED)
	1442	+ {
1076	1443	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1077	1444	kleinItem.addActionListener(this);
1078		- particleItem = menu.add(new MenuItem("Particle system"));
1079		- particleItem.addActionListener(this);
	1445	+ }
	1446	+
	1447	+// particleItem = menu.add(new MenuItem("Particle system"));
	1448	+// particleItem.addActionListener(this);
	1449	+ if (Globals.ADVANCED)
	1450	+ {
1080	1451	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1081	1452	ragdollItem.addActionListener(this);
1082	1453	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1083	1454	ragdoll2Item.addActionListener(this);
	1455	+ }
1084	1456	menu.add("-");
1085		- meshItem = menu.add(new MenuItem("Mesh"));
	1457	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1086	1458	meshItem.addActionListener(this);
1087	1459	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1088	1460	// meshGroupItem.addActionListener(this);
	1461	+ if (Globals.ADVANCED)
	1462	+ {
1089	1463	springItem = menu.add(new MenuItem("Spring"));
1090	1464	springItem.addActionListener(this);
1091	1465	flagItem = menu.add(new MenuItem("Flag"));
1092	1466	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	1467	blobItem = menu.add(new MenuItem("Blob"));
1098	1468	blobItem.addActionListener(this);
1099	1469	latheItem = menu.add(new MenuItem("Lathe"));
1100	1470	latheItem.addActionListener(this);
1101		- lightItem = menu.add(new MenuItem("Light"));
1102		- lightItem.addActionListener(this);
	1471	+ }
	1472	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1473	+ bezierItem.addActionListener(this);
	1474	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1475	+// overlayItem.addActionListener(this);
	1476	+// lightItem = menu.add(new MenuItem("Light"));
	1477	+// lightItem.addActionListener(this);
1103	1478	menu.add("-");
1104	1479	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1105	1480	//superLoopItem.addActionListener(this);
1106		- loopItem = menu.add(new MenuItem("Loop"));
1107		- loopItem.addActionListener(this);
	1481	+// loopItem = menu.add(new MenuItem("Loop"));
	1482	+// loopItem.addActionListener(this);
1108	1483	doubleItem = menu.add(new MenuItem("Fork"));
1109	1484	doubleItem.addActionListener(this);
	1485	+ if (Globals.ADVANCED)
	1486	+ {
1110	1487	tripleItem = menu.add(new MenuItem("Trident"));
1111	1488	tripleItem.addActionListener(this);
	1489	+ }
1112	1490	}
1113	1491
1114	1492	void buildToolsMenu(Menu menu)
1115	1493	{
1116	1494	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1117	1495	animationItem.addItemListener(this);
1118		- animationItem.setState(CameraPane.ANIMATION);
	1496	+ animationItem.setState(Globals.ANIMATION);
	1497	+
	1498	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1499	+ archiveItem.addActionListener(this);
1119	1500
1120	1501	menu.add("-");
1121	1502	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1122	1503	parseverticesItem.addActionListener(this);
1123	1504	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1124	1505	textureFieldItem.addActionListener(this);
1125		- alignItem = menu.add(new MenuItem("Align"));
	1506	+ alignItem = menu.add(new MenuItem("Align Objects"));
1126	1507	alignItem.addActionListener(this);
1127		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1128		- mirrorItem.addActionListener(this);
1129	1508	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1130	1509	reduceMorphItem.addActionListener(this);
1131	1510	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1132	1511	reduce34MorphItem.addActionListener(this);
1133		-
1134		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1135		- computeAOItem.addActionListener(this);
1136	1512	menu.add("-");
1137		-
1138	1513	menu.add(memoryItem = new MenuItem("Memory Usage"));
1139	1514	memoryItem.addActionListener(this);
	1515	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1516	+ computeAOItem.addActionListener(this);
	1517	+
	1518	+ if (Globals.ADVANCED)
	1519	+ {
	1520	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1521	+ mirrorItem.addActionListener(this);
	1522	+ menu.add("-");
1140	1523	menu.add(analyzeItem = new MenuItem("Analyze"));
1141	1524	analyzeItem.addActionListener(this);
1142		- menu.add(dumpItem = new MenuItem("Dump"));
	1525	+ menu.add(dumpItem = new MenuItem("Print"));
1143	1526	dumpItem.addActionListener(this);
1144	1527	// menu.add(pathItem = new MenuItem("From-to path"));
1145	1528	// pathItem.addActionListener(this);
..	..	@@ -1157,6 +1540,7 @@
1157	1540	menu.add("-");
1158	1541	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1159	1542	editScriptItem.addActionListener(this);
	1543	+ }
1160	1544	}
1161	1545
1162	1546	void ScreenFit()
..	..	@@ -1279,9 +1663,24 @@
1279	1663	shadow.material = new cMaterial(obj.material);
1280	1664	shadow.material.diffuse = 0.0001f;
1281	1665	shadow.material.specular = 0.0001f;
	1666	+ //shadow.projectedVertices[1].x = 300;
1282	1667
1283	1668	makeSomething(shadow);
1284	1669	}
	1670	+
	1671	+ private void ClearUnpinned()
	1672	+ {
	1673	+ //for (Object3D obj : listUI)
	1674	+ for (int i=listUI.size(); --i>=0;)
	1675	+ {
	1676	+ Object3D obj = listUI.elementAt(i);
	1677	+ if (!obj.pinned)
	1678	+ {
	1679	+ obj.CloseUI();
	1680	+ listUI.remove(i);
	1681	+ }
	1682	+ }
	1683	+ }
1285	1684
1286	1685	/**
1287	1686	* applyExample
..	..	@@ -1485,9 +1884,9 @@
1485	1884
1486	1885	void Overwrite(int mask)
1487	1886	{
1488		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1887	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1489	1888	{
1490		- Object3D content = GrafreeD.clipboard.get(0);
	1889	+ Object3D content = Grafreed.clipboard.get(0);
1491	1890
1492	1891	if (content instanceof cGroup && ((cGroup)content).transientlink )
1493	1892	content = ((cGroup)content).get(0);
..	..	@@ -1510,6 +1909,7 @@
1510	1909	//
1511	1910	public void actionPerformed(ActionEvent event) // , Object arg)
1512	1911	{
	1912	+ Object source = event.getSource();
1513	1913	/*
1514	1914	if (event.getSource() == nameField)
1515	1915	{
..	..	@@ -1521,11 +1921,11 @@
1521	1921	}
1522	1922	else
1523	1923	*/
1524		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1924	+ if (source == lookAtItem \|\| source == lookFromItem)
1525	1925	{
1526	1926	ScreenFit();
1527	1927	} else
1528		- if (event.getSource() == switchItem)
	1928	+ if (source == switchViewItem)
1529	1929	{
1530	1930	cVector v1 = new cVector();
1531	1931	cVector v2 = new cVector();
..	..	@@ -1534,11 +1934,11 @@
1534	1934	objEditor.cameraView.renderCamera.setAim(v2, v1);
1535	1935	objEditor.cameraView.repaint();
1536	1936	} else
1537		- if (event.getSource() == rectoidItem)
	1937	+ if (source == rectoidItem \|\| source == boxButton)
1538	1938	{
1539	1939	makeSomething(new Box());
1540	1940	} else
1541		- if (event.getSource() == particleItem)
	1941	+ if (source == particleItem \|\| source == particlesButton)
1542	1942	{
1543	1943	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1544	1944	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1559,9 +1959,9 @@
1559	1959	applyExample(particleGeom, "SMOKE");
1560	1960	makeSomething(particleGeom);
1561	1961	} else
1562		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1962	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1563	1963	{
1564		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1964	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1565	1965
1566	1966	ragdoll.toParent = LA.newMatrix();
1567	1967	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1579,7 +1979,7 @@
1579	1979	} else
1580	1980	/*
1581	1981	*/
1582		- if (event.getSource() == heightFieldItem)
	1982	+ if (source == heightFieldItem)
1583	1983	{
1584	1984	Object3D obj = new Object3D();
1585	1985
..	..	@@ -1617,31 +2017,31 @@
1617	2017
1618	2018	makeSomething(obj);
1619	2019	} else
1620		- if (event.getSource() == gridItem)
	2020	+ if (source == gridItem \|\| source == gridButton)
1621	2021	{
1622	2022	makeSomething(new Grid());
1623	2023	} else
1624		- if (event.getSource() == ellipsoidItem)
	2024	+ if (source == ellipsoidItem \|\| source == sphereButton)
1625	2025	{
1626	2026	makeSomething(new Sphere());
1627	2027	} else
1628		- if (event.getSource() == coneItem)
	2028	+ if (source == coneItem \|\| source == coneButton)
1629	2029	{
1630	2030	makeSomething(new Cone());
1631	2031	} else
1632		- if (event.getSource() == torusItem)
	2032	+ if (source == torusItem \|\| source == torusButton)
1633	2033	{
1634	2034	makeSomething(new Torus());
1635	2035	} else
1636		- if (event.getSource() == superItem)
	2036	+ if (source == superItem \|\| source == superButton)
1637	2037	{
1638	2038	makeSomething(new Superellipsoid());
1639	2039	} else
1640		- if (event.getSource() == kleinItem)
	2040	+ if (source == kleinItem \|\| source == kleinButton)
1641	2041	{
1642	2042	makeSomething(new Klein());
1643	2043	} else
1644		- if (event.getSource() == blobItem)
	2044	+ if (source == blobItem)
1645	2045	{
1646	2046	Blob blob = new Blob();
1647	2047	BlobComponent comp = new BlobComponent();
..	..	@@ -1649,15 +2049,15 @@
1649	2049	//blob.retile();
1650	2050	makeSomething(blob);
1651	2051	} else
1652		- if (event.getSource() == latheItem)
	2052	+ if (source == latheItem)
1653	2053	{
1654	2054	makeSomething(new Lathe());
1655	2055	} else
1656		- if (event.getSource() == bezierItem)
	2056	+ if (source == bezierItem)
1657	2057	{
1658	2058	makeSomething(new BezierSurface());
1659	2059	} else
1660		- if (event.getSource() == checkerItem)
	2060	+ if (source == overlayItem \|\| source == overlayButton)
1661	2061	{
1662	2062	/*
1663	2063	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1672,7 +2072,7 @@
1672	2072	*/
1673	2073	makeSomething(new Checker());
1674	2074	} else
1675		- if (event.getSource() == meshItem)
	2075	+ if (source == meshItem)
1676	2076	{
1677	2077	Object3D itemtomake = new Object3D();
1678	2078	Object3D child;
..	..	@@ -1693,35 +2093,35 @@
1693	2093	makeSomething(child);
1694	2094	}
1695	2095	} else
1696		- if (event.getSource() == springItem)
	2096	+ if (source == springItem)
1697	2097	{
1698	2098	cSpring s = new cSpring();
1699	2099	s.setup();
1700	2100	makeSomething(s);
1701	2101	} else
1702		- if (event.getSource() == flagItem)
	2102	+ if (source == flagItem)
1703	2103	{
1704	2104	cSpring s = new cFlag();
1705	2105	s.setup();
1706	2106	makeSomething(s);
1707	2107	} else
1708		- if (event.getSource() == lightItem)
	2108	+ if (source == lightItem \|\| source == lightButton)
1709	2109	{
1710	2110	makeSomething(new Light());
1711	2111	} else
1712		- if (event.getSource() == csgItem)
	2112	+ if (source == csgItem)
1713	2113	{
1714	2114	group(new CSG());
1715	2115	} else
1716		- if (event.getSource() == templateItem)
	2116	+ if (source == templateItem)
1717	2117	{
1718	2118	group(new cTemplate());
1719	2119	} else
1720		- if (event.getSource() == attributeItem)
	2120	+ if (source == attributeItem)
1721	2121	{
1722	2122	makeSomething(new Attribute());
1723	2123	} else
1724		- if (event.getSource() == pointflowItem)
	2124	+ if (source == pointflowItem)
1725	2125	{
1726	2126	makeSomething(new PointFlow());
1727	2127	} else
..	..	@@ -1733,7 +2133,7 @@
1733	2133	} else
1734	2134	*/
1735	2135
1736		- if (event.getSource() == superLoopItem)
	2136	+ if (source == superLoopItem)
1737	2137	{
1738	2138	Composite g = new cGroup();
1739	2139	for (int i=0; i<15; i++)
..	..	@@ -1755,30 +2155,30 @@
1755	2155
1756	2156	group(g);
1757	2157	} else
1758		- if (event.getSource() == loopItem)
	2158	+ if (source == loopItem \|\| source == loopButton)
1759	2159	{
1760	2160	Composite csg = new GroupLeaf();
1761	2161	csg.count = 5;
1762	2162	group(csg);
1763		- Composite child = new cGroup();
	2163	+ Composite child = new cGroup("Branch");
1764	2164	csg.addChild(child);
1765	2165	child.addChild(csg);
1766	2166	} else
1767		- if (event.getSource() == doubleItem)
	2167	+ if (source == doubleItem)
1768	2168	{
1769		- Composite csg = new GroupLeaf();
	2169	+ Composite csg = new GroupLeaf("Fork");
1770	2170	csg.count = 5;
1771	2171	group(csg);
1772		- Composite child = new cGroup();
	2172	+ Composite child = new cGroup("Branch A");
1773	2173	csg.addChild(child);
1774	2174	child.addChild(csg);
1775		- child = new cGroup();
	2175	+ child = new cGroup("Branch B");
1776	2176	csg.addChild(child);
1777	2177	child.addChild(csg);
1778	2178	} else
1779		- if (event.getSource() == tripleItem)
	2179	+ if (source == tripleItem)
1780	2180	{
1781		- Composite csg = new GroupLeaf();
	2181	+ Composite csg = new GroupLeaf("Trident");
1782	2182	csg.count = 4;
1783	2183	group(csg);
1784	2184	Composite child = new cGroup();
..	..	@@ -1791,73 +2191,98 @@
1791	2191	csg.addChild(child);
1792	2192	child.addChild(csg);
1793	2193	} 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)
	2194	+ if (source == computeAOItem)
1812	2195	{
1813	2196	Globals.drawMode = CameraPane.OCCLUSION;
1814	2197	Globals.theRenderer.repaint();
1815	2198	} else
1816		- if (event.getSource() == recompileItem)
	2199	+ if (source == recompileItem)
1817	2200	{
1818	2201	Recompile();
1819	2202	refreshContents();
1820	2203	} else
1821		- if (event.getSource() == editScriptItem)
	2204	+ if (source == editScriptItem)
1822	2205	{
1823	2206	OpenDialog();
1824	2207	refreshContents();
1825	2208	} else
1826		- if (event.getSource() == invariantsItem)
	2209	+ if (source == invariantsItem)
1827	2210	{
1828	2211	System.out.println("Invariants:");
1829		- GrafreeD.grafreeD.universe.invariants();
	2212	+ Grafreed.grafreeD.universe.invariants();
1830	2213	} else
1831		- if (event.getSource() == memoryItem)
	2214	+ if (source == memoryItem)
1832	2215	{
1833	2216	//System.out.println("Invariants:");
1834	2217	PrintMemory();
1835	2218	} else
1836		- if (event.getSource() == pathItem)
	2219	+ if (source == pathItem)
1837	2220	{
1838	2221	PrintPath();
1839	2222	} else
1840		- if (event.getSource() == analyzeItem)
	2223	+ if (source == analyzeItem)
1841	2224	{
1842	2225	AnalyzeObject();
1843	2226	} else
1844		- if (event.getSource() == dumpItem)
	2227	+ if (source == dumpItem)
1845	2228	{
1846	2229	DumpObject();
1847	2230	} else
1848		- if (event.getSource() == screenfitButton)
	2231	+ if (source == minButton)
1849	2232	{
1850		- //Reload(lastConverter, lastFilename, true);
	2233	+ Minimize();
	2234	+ } else
	2235	+ if (source == maxButton)
	2236	+ {
	2237	+ Maximize();
	2238	+ } else
	2239	+ if (source == fullButton)
	2240	+ {
	2241	+ ToggleFullScreen();
	2242	+ } else
	2243	+ if (source == undoButton)
	2244	+ {
	2245	+ // Go to previous version
	2246	+ //if (!Undo())
	2247	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2248	+ Undo();
	2249	+ } else
	2250	+ if (source == restoreButton)
	2251	+ {
	2252	+ // Restore current version
	2253	+ Restore();
	2254	+ } else
	2255	+ if (source == replaceButton)
	2256	+ {
	2257	+ // Overwrite current version
	2258	+ Replace();
	2259	+ } else
	2260	+ if (source == redoButton)
	2261	+ {
	2262	+ // Go to next version
	2263	+ Redo();
	2264	+ } else
	2265	+ if (source == saveButton)
	2266	+ {
	2267	+ // Save a new version
	2268	+ if (!Save(true))
	2269	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2270	+ } else
	2271	+ if (source == oneStepButton)
	2272	+ {
	2273	+ Globals.ONESTEP = true;
	2274	+ cameraView.repaint();
	2275	+ } else
	2276	+ if (source == screenfitButton)
	2277	+ {
1851	2278	ScreenFit();
1852	2279	} else
1853		- if (event.getSource() == screenfitpointButton)
	2280	+ if (source == screenfitpointButton)
1854	2281	{
1855		- //Reload(lastConverter, lastFilename, true);
1856	2282	ScreenFitPoint();
1857	2283	} else
1858		- if (event.getSource() == snapobjectButton)
	2284	+ if (source == snapobjectButton)
1859	2285	{
1860		- //Reload(lastConverter, lastFilename, true);
1861	2286	SnapObject();
1862	2287	} else
1863	2288	// if (event.getSource() == recompileButton)
..	..	@@ -1866,13 +2291,13 @@
1866	2291	// Recompile();
1867	2292	// refreshContents();
1868	2293	// } else
1869		- if (event.getSource() == gcButton)
	2294	+ if (source == gcButton)
1870	2295	{
1871	2296	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1872	2297	System.gc();
1873	2298	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1874	2299	} else
1875		- if (event.getSource() == editLeafItem)
	2300	+ if (source == editLeafItem)
1876	2301	{
1877	2302	Object3D obj;
1878	2303	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1886,62 +2311,74 @@
1886	2311	}
1887	2312	refreshContents(true);
1888	2313	} else
1889		- if (event.getSource() == openWindowItem)
	2314	+ if (source == openWindowItem)
1890	2315	{
1891	2316	EditSelection(true);
1892	2317	} else
1893		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2318	+ if (source == cutItem \|\| source == clearButton)
1894	2319	{
1895	2320	loadClipboard(true);
1896	2321	} else
1897		- if (event.getSource() == duplicateItem)
	2322	+ if (source == undoItem)
1898	2323	{
1899		- Object3D keep = GrafreeD.clipboard;
	2324	+ Undo();
	2325	+ } else
	2326	+ if (source == redoItem)
	2327	+ {
	2328	+ Redo();
	2329	+ } else
	2330	+ if (source == duplicateItem)
	2331	+ {
	2332	+ Object3D keep = Grafreed.clipboard;
1900	2333	loadClipboard(false);
1901	2334	paste(false);
1902		- GrafreeD.clipboard = keep;
	2335	+ Grafreed.clipboard = keep;
1903	2336	} else
1904		- if (event.getSource() == cloneItem)
	2337	+ if (source == cloneItem)
1905	2338	{
1906	2339	CloneSelection(false);
1907	2340	} else
1908		- if (event.getSource() == cloneSupportItem)
	2341	+ if (source == cloneSupportItem)
1909	2342	{
1910	2343	CloneSelection(true);
1911	2344	} else
1912		- if (event.getSource() == copyItem)
	2345	+ if (source == copyItem)
1913	2346	{
1914	2347	loadClipboard(false);
1915	2348	} else
1916		- if (event.getSource() == pasteItem)
	2349	+ if (source == pasteItem)
1917	2350	{
1918	2351	paste(false);
1919	2352	} else
1920		- if (event.getSource() == pasteLinkItem)
	2353	+ if (source == pasteIntoItem)
1921	2354	{
1922		- pasteInto(false);
	2355	+ pasteInto(true, false);
1923	2356	} else
1924		- if (event.getSource() == pasteCloneItem)
	2357	+ if (source == pasteLinkItem)
1925	2358	{
1926		- pasteInto(true);
	2359	+ pasteInto(false, false);
1927	2360	} else
1928		- if (event.getSource() == pasteExpandItem)
	2361	+ if (source == pasteCloneItem)
	2362	+ {
	2363	+ pasteInto(true, true);
	2364	+ } else
	2365	+ if (source == pasteExpandItem)
1929	2366	{
1930	2367	paste(true);
1931	2368	} else
1932		- if (event.getSource() == synchronizeItem)
	2369	+ if (source == synchronizeItem)
1933	2370	{
1934	2371	Overwrite(Object3D.TRANSFORM);
1935	2372	} else
1936		- if (event.getSource() == overwriteNameItem)
	2373	+ if (source == overwriteNameItem)
1937	2374	{
1938	2375	Overwrite(Object3D.NAME);
1939	2376	} else
1940		- if (event.getSource() == overwriteUVItem)
	2377	+ if (source == overwriteUVItem)
1941	2378	{
1942	2379	Overwrite(Object3D.UV);
1943	2380	} else
1944		- if (event.getSource() == overwriteMatItem)
	2381	+ if (source == overwriteMatItem)
1945	2382	{
1946	2383	/* july 2015
1947	2384	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1961,7 +2398,7 @@
1961	2398
1962	2399	Overwrite(dropAttributes);
1963	2400	}
1964		- if (event.getSource() == overwriteGeoItem)
	2401	+ if (source == overwriteGeoItem)
1965	2402	{
1966	2403	Overwrite(Object3D.GEOMETRY);
1967	2404	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1978,7 +2415,7 @@
1978	2415	// refreshContents();
1979	2416	// }
1980	2417	} else
1981		- if (event.getSource() == generateMeshItem)
	2418	+ if (source == generateMeshItem)
1982	2419	{
1983	2420	//if (group.selection.size() == 1)
1984	2421	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1989,7 +2426,7 @@
1989	2426	ResetModel();
1990	2427	refreshContents();
1991	2428	} else
1992		- if (event.getSource() == extractGeometriesItem)
	2429	+ if (source == extractGeometriesItem)
1993	2430	{
1994	2431	boolean one = false;
1995	2432
..	..	@@ -2016,7 +2453,7 @@
2016	2453	ResetModel();
2017	2454	refreshContents();
2018	2455	} else
2019		- if (event.getSource() == cloneGeometriesItem)
	2456	+ if (source == cloneGeometriesItem)
2020	2457	{
2021	2458	boolean one = false;
2022	2459
..	..	@@ -2042,7 +2479,7 @@
2042	2479	ResetModel();
2043	2480	refreshContents();
2044	2481	} else
2045		- if (event.getSource() == shareGeometriesItem)
	2482	+ if (source == shareGeometriesItem)
2046	2483	{
2047	2484	boolean one = false;
2048	2485
..	..	@@ -2072,7 +2509,7 @@
2072	2509	refreshContents();
2073	2510	}
2074	2511	} else
2075		- if (event.getSource() == mergeGeometriesItem)
	2512	+ if (source == mergeGeometriesItem)
2076	2513	{
2077	2514	boolean one = false;
2078	2515
..	..	@@ -2102,7 +2539,7 @@
2102	2539	ResetModel();
2103	2540	refreshContents();
2104	2541	} else
2105		- if (event.getSource() == linkverticesItem)
	2542	+ if (source == linkverticesItem)
2106	2543	{
2107	2544	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2108	2545	// {
..	..	@@ -2115,9 +2552,9 @@
2115	2552	// group.selection.get(0).setMasterThis(content); // should be identity
2116	2553	// refreshContents();
2117	2554	// }
2118		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2555	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2119	2556	{
2120		- Object3D content = GrafreeD.clipboard.get(0);
	2557	+ Object3D content = Grafreed.clipboard.get(0);
2121	2558
2122	2559	if (content instanceof cGroup && ((cGroup)content).transientlink )
2123	2560	content = ((cGroup)content).get(0);
..	..	@@ -2125,38 +2562,38 @@
2125	2562	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2126	2563	for (int i=0; i<group.selection.size(); i++)
2127	2564	{
2128		- boolean random = CameraPane.RANDOM;
2129		- CameraPane.RANDOM = false; // parse all random nodes
	2565	+ boolean random = CameraPane.SWITCH;
	2566	+ CameraPane.SWITCH = false; // parse all random nodes
2130	2567	group.selection.get(i).linkVerticesThis(content);
2131	2568	// group.selection.get(i).setMasterThis(content); // should be identity
2132		- CameraPane.RANDOM = random;
	2569	+ CameraPane.SWITCH = random;
2133	2570	}
2134	2571	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2135	2572	refreshContents();
2136	2573	}
2137	2574	} else
2138		- if (event.getSource() == resetsupportItem)
	2575	+ if (source == resetsupportItem)
2139	2576	{
2140	2577	for (int i=0; i<group.selection.size(); i++)
2141	2578	{
2142		- boolean random = CameraPane.RANDOM;
2143		- CameraPane.RANDOM = false; // parse all random nodes
	2579	+ boolean random = CameraPane.SWITCH;
	2580	+ CameraPane.SWITCH = false; // parse all random nodes
2144	2581	group.selection.get(i).linkVerticesThis(null);
2145		- CameraPane.RANDOM = random;
	2582	+ CameraPane.SWITCH = random;
2146	2583	}
2147	2584
2148	2585	refreshContents();
2149	2586	} else
2150		- if (event.getSource() == relinkverticesItem)
	2587	+ if (source == relinkverticesItem)
2151	2588	{
2152		- boolean random = CameraPane.RANDOM;
2153		- CameraPane.RANDOM = false; // parse all random nodes
	2589	+ boolean random = CameraPane.SWITCH;
	2590	+ CameraPane.SWITCH = false; // parse all random nodes
2154	2591	group.selection.RelinkToSupport();
2155		- CameraPane.RANDOM = random;
	2592	+ CameraPane.SWITCH = random;
2156	2593
2157	2594	refreshContents();
2158	2595	} else
2159		- if (event.getSource() == resetreferencesItem)
	2596	+ if (source == resetreferencesItem)
2160	2597	{
2161	2598	for (int i=0; i<group.selection.size(); i++)
2162	2599	{
..	..	@@ -2165,11 +2602,11 @@
2165	2602
2166	2603	refreshContents();
2167	2604	} else
2168		- if (event.getSource() == setMasterItem)
	2605	+ if (source == setMasterItem)
2169	2606	{
2170		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2607	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2171	2608	{
2172		- Object3D content = GrafreeD.clipboard.get(0);
	2609	+ Object3D content = Grafreed.clipboard.get(0);
2173	2610
2174	2611	if (content instanceof cGroup && ((cGroup)content).transientlink )
2175	2612	content = ((cGroup)content).get(0);
..	..	@@ -2178,13 +2615,13 @@
2178	2615	refreshContents();
2179	2616	}
2180	2617	} else
2181		- if (event.getSource() == poseMeshItem)
	2618	+ if (source == poseMeshItem)
2182	2619	{
2183	2620	if (group.selection.size() == 1)
2184	2621	{
2185		- if (GrafreeD.clipboard.size() == 1)
	2622	+ if (Grafreed.clipboard.size() == 1)
2186	2623	{
2187		- Object3D content = GrafreeD.clipboard.get(0);
	2624	+ Object3D content = Grafreed.clipboard.get(0);
2188	2625
2189	2626	if (content instanceof cGroup && ((cGroup)content).transientlink )
2190	2627	content = ((cGroup)content).get(0);
..	..	@@ -2197,19 +2634,19 @@
2197	2634	}
2198	2635
2199	2636	} else
2200		- if (event.getSource() == revertMeshItem)
	2637	+ if (source == revertMeshItem)
2201	2638	{
2202	2639	RevertMeshes();
2203	2640	} else
2204		- if (event.getSource() == resetMeshItem)
	2641	+ if (source == resetAllItem)
2205	2642	{
2206	2643	ResetAll();
2207	2644	} else
2208		- if (event.getSource() == stepAllItem)
	2645	+ if (source == stepAllItem)
2209	2646	{
2210	2647	StepAll();
2211	2648	} else
2212		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2649	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2213	2650	{
2214	2651	//int indices[] = jList.getSelectedIndices();
2215	2652	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2217,46 +2654,46 @@
2217	2654
2218	2655	ClearSelection(false);
2219	2656	} else
2220		- if (event.getSource() == clearAllItem)
	2657	+ if (source == clearAllItem)
2221	2658	{
2222	2659	ClearSelection(true);
2223	2660	} else
2224		- if (event.getSource() == grabItem)
	2661	+ if (source == grabItem \|\| source == groupButton)
2225	2662	{
2226		- group(new cGroup(), true);
	2663	+ group(new cGroup(), false); // true);
2227	2664	} else
2228		- if (event.getSource() == hideItem)
	2665	+ if (source == hideItem)
2229	2666	{
2230	2667	group(new HiddenObject());
2231	2668	} else
2232		- if (event.getSource() == frontItem)
	2669	+ if (source == frontItem)
2233	2670	{
2234	2671	front();
2235	2672	} else
2236		- if (event.getSource() == backItem)
	2673	+ if (source == backItem)
2237	2674	{
2238	2675	back();
2239	2676	} else
2240		- if (event.getSource() == cameraItem)
	2677	+ if (source == cameraItem)
2241	2678	{
2242	2679	makeSomething(new Camera());
2243	2680	} else
2244		- if (event.getSource() == compositeItem)
	2681	+ if (source == compositeItem \|\| source == compositeButton)
2245	2682	{
2246	2683	group(new Composite());
2247	2684	} else
2248		- if (event.getSource() == randomItem)
	2685	+ if (source == switchItem \|\| source == switchButton)
2249	2686	{
2250	2687	RandomNode random = new RandomNode();
2251	2688	group(random);
2252	2689	if (random.size() > 0)
2253		- random.name = random.get(0).name + "Rnd";
	2690	+ random.name = random.get(0).name + "Switch";
2254	2691	} else
2255		- if (event.getSource() == physicsItem)
	2692	+ if (source == physicsItem)
2256	2693	{
2257	2694	group(new PhysicsNode());
2258	2695	} else
2259		- if (event.getSource() == frameselectorItem)
	2696	+ if (source == frameselectorItem)
2260	2697	{
2261	2698	for (int i=0; i<group.selection.size(); i++)
2262	2699	{
..	..	@@ -2268,7 +2705,7 @@
2268	2705	ResetModel();
2269	2706	refreshContents();
2270	2707	} else
2271		- if (event.getSource() == switchGeoItem)
	2708	+ if (source == switchGeoItem)
2272	2709	{
2273	2710	for (int i=0; i<group.selection.size(); i++)
2274	2711	{
..	..	@@ -2280,7 +2717,7 @@
2280	2717	ResetModel();
2281	2718	refreshContents();
2282	2719	} else
2283		- if (event.getSource() == switchTransfoItem)
	2720	+ if (source == switchTransfoItem)
2284	2721	{
2285	2722	for (int i=0; i<group.selection.size(); i++)
2286	2723	{
..	..	@@ -2292,7 +2729,7 @@
2292	2729	ResetModel();
2293	2730	refreshContents();
2294	2731	} else
2295		- if (event.getSource() == morphItem)
	2732	+ if (source == morphItem)
2296	2733	{
2297	2734	for (int i=0; i<group.selection.size(); i++)
2298	2735	{
..	..	@@ -2304,7 +2741,7 @@
2304	2741	ResetModel();
2305	2742	refreshContents();
2306	2743	} else
2307		- if (event.getSource() == scriptNodeItem)
	2744	+ if (source == scriptNodeItem)
2308	2745	{
2309	2746	boolean atleastone = false;
2310	2747
..	..	@@ -2343,215 +2780,252 @@
2343	2780	}
2344	2781	}
2345	2782	} else
2346		- if (event.getSource() == linkerItem)
	2783	+ if (source == linkerItem)
2347	2784	{
2348	2785	group(new cLinker());
2349	2786	} else
2350		- if (event.getSource() == textureItem)
	2787	+ if (source == textureItem \|\| source == textureButton)
2351	2788	{
2352	2789	group(new TextureNode());
2353	2790	} else
2354		- if (event.getSource() == billboardItem)
	2791	+ if (source == billboardItem)
2355	2792	{
2356	2793	group(new BillboardNode());
2357	2794	} else
2358		- if (event.getSource() == shadowXItem)
	2795	+ if (source == shadowXItem)
2359	2796	{
2360	2797	CastShadow(0);
2361	2798	} else
2362		- if (event.getSource() == shadowYItem)
	2799	+ if (source == shadowYItem)
2363	2800	{
2364	2801	CastShadow(1);
2365	2802	} else
2366		- if (event.getSource() == shadowZItem)
	2803	+ if (source == shadowZItem)
2367	2804	{
2368	2805	CastShadow(2);
2369	2806	} else
2370		- if (event.getSource() == ungroupItem)
	2807	+ if (source == ungroupItem \|\| source == ungroupButton)
2371	2808	{
2372		- //ungroup();
	2809	+ boolean hasRoot = false;
	2810	+
2373	2811	for (int i=0; i<group.selection.size(); i++)
2374	2812	{
2375		- Ungroup(group.selection.get(i));
	2813	+ if (group.selection.get(i) == group)
	2814	+ {
	2815	+ hasRoot = true;
	2816	+ break;
	2817	+ }
2376	2818	}
2377	2819
2378		- ClearSelection(false);
2379		-
2380		- refreshContents();
	2820	+ if (!hasRoot)
	2821	+ {
	2822	+ for (int i=0; i<group.selection.size(); i++)
	2823	+ {
	2824	+ Ungroup(group.selection.get(i));
	2825	+ }
	2826	+
	2827	+ ClearSelection(false);
	2828	+
	2829	+ refreshContents();
	2830	+ }
2381	2831	} else
2382		- if (event.getSource() == genUVItem)
	2832	+ if (source == genUVItem)
2383	2833	{
2384	2834	GenUV();
2385	2835	} else
2386		- if (event.getSource() == genNormalsCADItem)
	2836	+ if (source == genNormalsCADItem)
2387	2837	{
2388	2838	GenNormals(true);
2389	2839	} else
2390		- if (event.getSource() == genNormalsMESHItem)
	2840	+ if (source == genNormalsMESHItem)
2391	2841	{
2392		- GenNormals(true); // TODO
	2842	+ GenNormalsMESH();
2393	2843	} else
2394		- if (event.getSource() == genNormalsORGANItem)
	2844	+ if (source == genNormalsORGANItem)
2395	2845	{
2396	2846	GenNormals(false);
2397	2847	} else
2398		- if (event.getSource() == genNormalsMINEItem)
	2848	+ if (source == genNormalsMINEItem)
2399	2849	{
2400	2850	GenNormalsMINE();
2401	2851	} else
2402		- if (event.getSource() == stripifyItem)
	2852	+ if (source == stripifyItem)
2403	2853	{
2404	2854	Stripify();
2405	2855	} else
2406		- if (event.getSource() == unstripifyItem)
	2856	+ if (source == unstripifyItem)
2407	2857	{
2408	2858	Unstripify();
2409	2859	} else
2410		- if (event.getSource() == trimItem)
	2860	+ if (source == trimItem)
2411	2861	{
2412	2862	Trim();
2413	2863	} else
2414		- if (event.getSource() == untrimItem)
	2864	+ if (source == untrimItem)
2415	2865	{
2416	2866	Untrim();
2417	2867	} else
2418		- if (event.getSource() == clearColorsItem)
	2868	+ if (source == clearColorsItem)
2419	2869	{
2420	2870	ClearColors();
2421	2871	} else
2422		- if (event.getSource() == clearMaterialsItem)
	2872	+ if (source == clearMaterialsItem)
2423	2873	{
2424	2874	ClearMaterials();
2425	2875	} else
2426		- if (event.getSource() == liveleavesItem)
	2876	+ if (source == liveleavesItem)
2427	2877	{
2428	2878	LiveLeaves(true);
2429	2879	} else
2430		- if (event.getSource() == unliveleavesItem)
	2880	+ if (source == unliveleavesItem)
2431	2881	{
2432	2882	LiveLeaves(false);
2433	2883	} else
2434		- if (event.getSource() == supportleavesItem)
	2884	+ if (source == supportleavesItem)
2435	2885	{
2436	2886	SupportLeaves(true);
2437	2887	} else
2438		- if (event.getSource() == unsupportleavesItem)
	2888	+ if (source == unsupportleavesItem)
2439	2889	{
2440	2890	SupportLeaves(false);
2441	2891	} else
2442		- if (event.getSource() == hideleavesItem)
	2892	+ if (source == hideleavesItem)
2443	2893	{
2444	2894	HideLeaves(true);
2445	2895	} else
2446		- if (event.getSource() == showleavesItem)
	2896	+ if (source == showleavesItem)
2447	2897	{
2448	2898	HideLeaves(false);
2449	2899	} else
2450		- if (event.getSource() == markleavesItem)
	2900	+ if (source == markleavesItem)
2451	2901	{
2452	2902	MarkLeaves(true);
2453	2903	} else
2454		- if (event.getSource() == unmarkleavesItem)
	2904	+ if (source == unmarkleavesItem)
2455	2905	{
2456	2906	MarkLeaves(false);
2457	2907	} else
2458		- if (event.getSource() == flipVItem)
	2908	+ if (source == rewindleavesItem)
	2909	+ {
	2910	+ RewindLeaves(true);
	2911	+ } else
	2912	+ if (source == unrewindleavesItem)
	2913	+ {
	2914	+ RewindLeaves(false);
	2915	+ } else
	2916	+ if (source == randomleavesItem)
	2917	+ {
	2918	+ RandomLeaves(true);
	2919	+ } else
	2920	+ if (source == unrandomleavesItem)
	2921	+ {
	2922	+ RandomLeaves(false);
	2923	+ } else
	2924	+ if (source == flipVItem)
2459	2925	{
2460	2926	FlipV(true);
2461	2927	} else
2462		- if (event.getSource() == unflipVItem)
	2928	+ if (source == unflipVItem)
2463	2929	{
2464	2930	FlipV(false);
2465	2931	} else
2466		- if (event.getSource() == lowTexturesItem)
	2932	+ if (source == lowTexturesItem)
2467	2933	{
2468	2934	SetTexRes(0);
2469	2935	} else
2470		- if (event.getSource() == normalTexturesItem)
	2936	+ if (source == normalTexturesItem)
2471	2937	{
2472	2938	SetTexRes(1);
2473	2939	} else
2474		- if (event.getSource() == highTexturesItem)
	2940	+ if (source == highTexturesItem)
2475	2941	{
2476	2942	SetTexRes(2);
2477	2943	} else
2478		- if (event.getSource() == veryhighTexturesItem)
	2944	+ if (source == veryhighTexturesItem)
2479	2945	{
2480	2946	SetTexRes(3);
2481	2947	} else
2482		- if (event.getSource() == maxTexturesItem)
	2948	+ if (source == maxTexturesItem)
2483	2949	{
2484	2950	SetTexRes(4);
2485	2951	} else
2486		- if (event.getSource() == panoTexturesItem)
	2952	+ if (source == panoTexturesItem)
2487	2953	{
2488	2954	SetTexRes(5);
2489	2955	} else
2490		- if (event.getSource() == reverseNormalsItem)
	2956	+ if (source == reverseNormalsItem)
2491	2957	{
2492	2958	ReverseNormals();
2493	2959	} else
2494		- if (event.getSource() == parseverticesItem)
	2960	+ if (source == parseverticesItem)
2495	2961	{
2496	2962	ParseVertices();
2497	2963	} else
2498		- if (event.getSource() == textureFieldItem)
	2964	+ if (source == textureFieldItem)
2499	2965	{
2500	2966	TextureVertices();
2501	2967	} else
2502		- if (event.getSource() == alignItem)
	2968	+ if (source == alignItem)
2503	2969	{
2504	2970	Align();
2505	2971	} else
2506		- if (event.getSource() == mirrorItem)
	2972	+ if (source == mirrorItem)
2507	2973	{
2508	2974	MirrorPoses();
2509	2975	} else
2510		- if (event.getSource() == reduceMorphItem)
	2976	+ if (source == reduceMorphItem)
2511	2977	{
2512	2978	MeshReduction(false);
2513	2979	} else
2514		- if (event.getSource() == reduce34MorphItem)
	2980	+ if (source == reduce34MorphItem)
2515	2981	{
2516	2982	MeshReduction(true);
2517	2983	} else
2518		- if (event.getSource() == reverseTrianglesItem)
	2984	+ if (source == reverseTrianglesItem)
2519	2985	{
2520	2986	ReverseTriangles();
2521	2987	} else
2522		- if (event.getSource() == reduceMeshItem)
	2988	+ if (source == reduceMeshItem)
2523	2989	{
2524	2990	ReduceMesh(false);
2525	2991	} else
2526		- if (event.getSource() == reduce34MeshItem)
	2992	+ if (source == reduce34MeshItem)
2527	2993	{
2528	2994	ReduceMesh(true);
2529	2995	} else
2530		- if (event.getSource() == increaseMeshItem)
	2996	+ if (source == increaseMeshItem)
2531	2997	{
2532	2998	IncreaseMesh();
2533	2999	} else
2534		- if (event.getSource() == clipMeshItem)
	3000	+ if (source == clipMeshItem)
2535	3001	{
2536	3002	ClipMesh();
2537	3003	} else
2538		- if (event.getSource() == smoothMeshItem)
	3004	+ if (source == smoothMeshItem)
2539	3005	{
2540	3006	SmoothMesh();
2541	3007	} else
2542		- if (event.getSource() == transformgeometryItem)
	3008	+ if (source == transformGeometryItem)
2543	3009	{
2544	3010	TransformGeometry();
2545	3011	} else
2546		- if (event.getSource() == resetTransformItem)
	3012	+ if (source == transformChildrenItem)
	3013	+ {
	3014	+ TransformChildren();
	3015	+ } else
	3016	+ if (source == resetTransformItem)
2547	3017	{
2548	3018	ResetTransform();
2549	3019	} else
2550		- if (event.getSource() == resetCentroidItem)
	3020	+ if (source == resetCentroidItem)
2551	3021	{
2552		- ResetCentroid();
	3022	+ ResetCentroid(true);
2553	3023	} else
2554		- if (event.getSource() == resetParentItem)
	3024	+ if (source == resetCentroidXZItem)
	3025	+ {
	3026	+ ResetCentroid(false);
	3027	+ } else
	3028	+ if (source == resetParentItem)
2555	3029	{
2556	3030	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2557	3031	{
..	..	@@ -2561,7 +3035,7 @@
2561	3035
2562	3036	refreshContents();
2563	3037	} else
2564		- if (event.getSource() == repairParentItem)
	3038	+ if (source == repairParentItem)
2565	3039	{
2566	3040	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2567	3041	{
..	..	@@ -2575,7 +3049,7 @@
2575	3049
2576	3050	refreshContents();
2577	3051	} else
2578		- if (event.getSource() == repairShadowItem)
	3052	+ if (source == repairShadowItem)
2579	3053	{
2580	3054	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2581	3055	{
..	..	@@ -2589,7 +3063,7 @@
2589	3063
2590	3064	refreshContents();
2591	3065	} else
2592		- if (event.getSource() == sortbysizeItem)
	3066	+ if (source == sortbysizeItem)
2593	3067	{
2594	3068	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2595	3069	{
..	..	@@ -2601,7 +3075,7 @@
2601	3075	ResetModel();
2602	3076	refreshContents();
2603	3077	} else
2604		- if (event.getSource() == sortbynameItem)
	3078	+ if (source == sortbynameItem)
2605	3079	{
2606	3080	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2607	3081	{
..	..	@@ -2613,7 +3087,7 @@
2613	3087	ResetModel();
2614	3088	refreshContents();
2615	3089	} else
2616		- if (event.getSource() == attachPigmentItem)
	3090	+ if (source == attachPigmentItem)
2617	3091	{
2618	3092	String texture = GetFile("Attach pigment");
2619	3093	Object3D obj;
..	..	@@ -2625,7 +3099,7 @@
2625	3099
2626	3100	refreshContents();
2627	3101	} else
2628		- if (event.getSource() == detachPigmentItem)
	3102	+ if (source == detachPigmentItem)
2629	3103	{
2630	3104	Object3D obj;
2631	3105	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2636,7 +3110,7 @@
2636	3110
2637	3111	refreshContents();
2638	3112	} else
2639		- if (event.getSource() == attachBumpItem)
	3113	+ if (source == attachBumpItem)
2640	3114	{
2641	3115	String texture = GetFile("Attach bump");
2642	3116	Object3D obj;
..	..	@@ -2648,7 +3122,7 @@
2648	3122
2649	3123	refreshContents();
2650	3124	} else
2651		- if (event.getSource() == detachBumpItem)
	3125	+ if (source == detachBumpItem)
2652	3126	{
2653	3127	Object3D obj;
2654	3128	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2659,7 +3133,7 @@
2659	3133
2660	3134	refreshContents();
2661	3135	} else
2662		- if (event.getSource() == pigmentBumpItem)
	3136	+ if (source == pigmentBumpItem)
2663	3137	{
2664	3138	Object3D obj;
2665	3139	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2670,158 +3144,237 @@
2670	3144
2671	3145	refreshContents();
2672	3146	} else
2673		- if (event.getSource() == flashSelectionButton)
	3147	+ if (source == flashSelectionButton)
2674	3148	{
2675	3149	CameraPane.flash = true;
2676	3150	refreshContents();
2677	3151	} else
2678		- if (event.getSource() == oneButton)
	3152	+ if (source == oneButton)
2679	3153	{
2680	3154	} else
2681		- if (event.getSource() == twoButton)
	3155	+ if (source == twoButton)
2682	3156	{
2683	3157	radio.layout = twoButton;
	3158	+
	3159	+ if (CameraPane.FULLSCREEN)
	3160	+ fullscreenLayout = radio.layout;
	3161	+
2684	3162	// bug
2685	3163	//gridPanel.setDividerLocation(1.0);
2686	3164	//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();
	3165	+// bigThree.remove(scenePanel);
	3166	+// bigThree.remove(centralPanel);
	3167	+// bigThree.remove(XYZPanel);
	3168	+// aWindowConstraints.gridx = 0;
	3169	+// aWindowConstraints.gridy = 0;
	3170	+// aWindowConstraints.gridwidth = 1;
	3171	+// // aConstraints.gridheight = 3;
	3172	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3173	+// aWindowConstraints.weightx = 0;
	3174	+// aWindowConstraints.weighty = 1;
	3175	+// //bigThree.add(jtp, aWindowConstraints);
	3176	+// aWindowConstraints.weightx = 1;
	3177	+// aWindowConstraints.gridwidth = 3;
	3178	+// // aConstraints.gridheight = 3;
	3179	+// aWindowConstraints.gridx = 1;
	3180	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3181	+// bigThree.add(centralPanel, aWindowConstraints);
	3182	+// aWindowConstraints.weightx = 0;
	3183	+// aWindowConstraints.gridx = 4;
	3184	+// aWindowConstraints.gridwidth = 1;
	3185	+// // aConstraints.gridheight = 3;
	3186	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3187	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3188	+// scenePanel.setVisible(false);
	3189	+// centralPanel.setVisible(true);
	3190	+// XYZPanel.setVisible(false);
	3191	+ bigThree.ClearUI();
	3192	+ bigThree.add(centralPanel);
	3193	+ bigThree.FlushUI();
	3194	+
	3195	+ cameraView.requestFocusInWindow();
	3196	+
	3197	+// refreshContents(true);
	3198	+//
	3199	+// try
	3200	+// {
	3201	+// java.awt.Robot bot = new java.awt.Robot();
	3202	+// int mask = InputEvent.BUTTON1_MASK;
	3203	+// bot.mouseMove(100, 100);
	3204	+// bot.mousePress(mask);
	3205	+// bot.mouseRelease(mask);
	3206	+// }
	3207	+// catch (Exception e)
	3208	+// {
	3209	+//
	3210	+// }
	3211	+
2711	3212	} else
2712		- if (event.getSource() == threeButton)
	3213	+ if (source == threeButton)
2713	3214	{
2714	3215	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();
	3216	+
	3217	+ if (CameraPane.FULLSCREEN)
	3218	+ fullscreenLayout = radio.layout;
	3219	+
	3220	+// bigThree.remove(scenePanel);
	3221	+// bigThree.remove(centralPanel);
	3222	+// bigThree.remove(XYZPanel);
	3223	+// aWindowConstraints.gridx = 0;
	3224	+// aWindowConstraints.gridy = 0;
	3225	+// aWindowConstraints.gridwidth = 1;
	3226	+// // aConstraints.gridheight = 3;
	3227	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3228	+// aWindowConstraints.weightx = 0;
	3229	+// aWindowConstraints.weighty = 1;
	3230	+// //bigThree.add(jtp, aWindowConstraints);
	3231	+// aWindowConstraints.weightx = 1;
	3232	+// aWindowConstraints.gridwidth = 3;
	3233	+// // aConstraints.gridheight = 3;
	3234	+// aWindowConstraints.gridx = 1;
	3235	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3236	+// bigThree.add(centralPanel, aWindowConstraints);
	3237	+// aWindowConstraints.weightx = 0;
	3238	+// aWindowConstraints.gridx = 4;
	3239	+// aWindowConstraints.gridwidth = 1;
	3240	+// // aConstraints.gridheight = 3;
	3241	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3242	+// bigThree.add(XYZPanel, aWindowConstraints);
	3243	+// bigThree.validate();
	3244	+// scenePanel.setVisible(false);
	3245	+// centralPanel.setVisible(true);
	3246	+// XYZPanel.setVisible(true);
	3247	+ bigThree.ClearUI();
	3248	+ bigThree.add(centralPanel);
	3249	+ bigThree.add(XYZPanel);
	3250	+ bigThree.FlushUI();
	3251	+
	3252	+ cameraView.requestFocusInWindow();
2739	3253	} else
2740		- if (event.getSource() == fourButton)
	3254	+ if (source == fourButton)
2741	3255	{
2742	3256	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();
	3257	+
	3258	+ if (CameraPane.FULLSCREEN)
	3259	+ fullscreenLayout = radio.layout;
	3260	+
	3261	+// bigThree.remove(scenePanel);
	3262	+// bigThree.remove(centralPanel);
	3263	+// bigThree.remove(XYZPanel);
	3264	+// aWindowConstraints.gridx = 0;
	3265	+// aWindowConstraints.gridy = 0;
	3266	+// aWindowConstraints.gridwidth = 1;
	3267	+// // aWindowConstraints.gridheight = 3;
	3268	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3269	+// aWindowConstraints.weightx = 1;
	3270	+// aWindowConstraints.weighty = 1;
	3271	+// bigThree.add(scenePanel, aWindowConstraints);
	3272	+// aWindowConstraints.weightx = 1;
	3273	+// aWindowConstraints.gridwidth = 3;
	3274	+// // aConstraints.gridheight = 3;
	3275	+// aWindowConstraints.gridx = 1;
	3276	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3277	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3278	+// aWindowConstraints.weightx = 0;
	3279	+// aWindowConstraints.gridx = 4;
	3280	+// aWindowConstraints.gridwidth = 1;
	3281	+// // aWindowConstraints.gridheight = 3;
	3282	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3283	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3284	+// bigThree.validate();
	3285	+// scenePanel.setVisible(true);
	3286	+// centralPanel.setVisible(false);
	3287	+// XYZPanel.setVisible(false);
	3288	+ bigThree.ClearUI();
	3289	+ bigThree.add(scenePanel);
	3290	+ bigThree.FlushUI();
	3291	+
	3292	+ cameraView.requestFocusInWindow();
2767	3293	} else
2768		- if (event.getSource() == sixButton)
	3294	+ if (source == sixButton)
2769	3295	{
2770	3296	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();
	3297	+
	3298	+ if (CameraPane.FULLSCREEN)
	3299	+ fullscreenLayout = radio.layout;
	3300	+
	3301	+// bigThree.remove(scenePanel);
	3302	+// bigThree.remove(centralPanel);
	3303	+// bigThree.remove(XYZPanel);
	3304	+// aWindowConstraints.gridx = 0;
	3305	+// aWindowConstraints.gridy = 0;
	3306	+// aWindowConstraints.gridwidth = 1;
	3307	+// // aConstraints.gridheight = 3;
	3308	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3309	+// aWindowConstraints.weightx = 0;
	3310	+// aWindowConstraints.weighty = 1;
	3311	+// bigThree.add(scenePanel, aWindowConstraints);
	3312	+// aWindowConstraints.weightx = 1;
	3313	+// aWindowConstraints.gridwidth = 3;
	3314	+// // aWindowConstraints.gridheight = 3;
	3315	+// aWindowConstraints.gridx = 1;
	3316	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3317	+// bigThree.add(centralPanel, aWindowConstraints);
	3318	+// aWindowConstraints.weightx = 0;
	3319	+// aWindowConstraints.gridx = 4;
	3320	+// aWindowConstraints.gridwidth = 1;
	3321	+// // aWindowConstraints.gridheight = 3;
	3322	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3323	+// //bigThree.add(XYZPanel, aConstraints);
	3324	+// bigThree.validate();
	3325	+// scenePanel.setVisible(true);
	3326	+// centralPanel.setVisible(true);
	3327	+// XYZPanel.setVisible(false);
	3328	+ bigThree.ClearUI();
	3329	+ bigThree.add(scenePanel);
	3330	+ bigThree.add(centralPanel);
	3331	+ bigThree.FlushUI();
	3332	+
	3333	+ cameraView.requestFocusInWindow();
2795	3334	} else
2796		- if (event.getSource() == sevenButton)
	3335	+ if (source == sevenButton)
2797	3336	{
2798	3337	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();
	3338	+
	3339	+ if (CameraPane.FULLSCREEN)
	3340	+ fullscreenLayout = radio.layout;
	3341	+
	3342	+// bigThree.remove(scenePanel);
	3343	+// bigThree.remove(centralPanel);
	3344	+// bigThree.remove(XYZPanel);
	3345	+// aWindowConstraints.gridx = 0;
	3346	+// aWindowConstraints.gridy = 0;
	3347	+// aWindowConstraints.gridwidth = 1;
	3348	+// // aWindowConstraints.gridheight = 3;
	3349	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3350	+// aWindowConstraints.weightx = 0;
	3351	+// aWindowConstraints.weighty = 1;
	3352	+// bigThree.add(scenePanel, aWindowConstraints);
	3353	+// aWindowConstraints.weightx = 1;
	3354	+// aWindowConstraints.gridwidth = 3;
	3355	+// // aWindowConstraints.gridheight = 3;
	3356	+// aWindowConstraints.gridx = 1;
	3357	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3358	+// bigThree.add(centralPanel, aWindowConstraints);
	3359	+// aWindowConstraints.weightx = 0;
	3360	+// aWindowConstraints.gridx = 4;
	3361	+// aWindowConstraints.gridwidth = 1;
	3362	+// // aConstraints.gridheight = 3;
	3363	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3364	+// bigThree.add(XYZPanel, aWindowConstraints);
	3365	+// bigThree.validate();
	3366	+// scenePanel.setVisible(true);
	3367	+// centralPanel.setVisible(true);
	3368	+// XYZPanel.setVisible(true);
	3369	+ bigThree.ClearUI();
	3370	+ bigThree.add(scenePanel);
	3371	+ bigThree.add(centralPanel);
	3372	+ bigThree.add(XYZPanel);
	3373	+ bigThree.FlushUI();
	3374	+
	3375	+ cameraView.requestFocusInWindow();
2823	3376	} else
2824		- if (event.getSource() == rootButton)
	3377	+ if (source == rootButton)
2825	3378	{
2826	3379	Object3D obj;
2827	3380	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2831,66 +3384,84 @@
2831	3384	EditObject(obj);
2832	3385	}
2833	3386
	3387	+ cameraView.requestFocusInWindow();
2834	3388	refreshContents(true);
2835	3389	} else
2836		- if (event.getSource() == closeButton)
	3390	+ if (source == closeButton)
2837	3391	{
2838	3392	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2839	3393	cRadio ab;
2840	3394	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2841	3395	{
2842	3396	ab = (cRadio)e.nextElement();
2843		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3397	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2844	3398	{
	3399	+ // Patch to avoid bug with transparency.
	3400	+ if (!ab.hadMaterial)
	3401	+ {
	3402	+ ab.object.material = null;
	3403	+ }
	3404	+
2845	3405	buttonGroup.remove(ab);
2846	3406	radioPanel.remove(ab);
2847	3407
2848		- ab.GetObject().editWindow = null;
	3408	+ //ab.GetObject().editWindow = null;
	3409	+ ab.GetObject().manipWindow = null;
2849	3410	// ab.GetObject().objectUI = null; // ?????????
2850	3411
2851	3412	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2852	3413	break;
2853	3414	}
2854	3415	}
	3416	+
	3417	+ cameraView.requestFocusInWindow();
2855	3418	refreshContents(true);
2856	3419	} else
2857		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3420	+ if (source == editItem \|\| source == editButton)
2858	3421	{
	3422	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3423	+ {
	3424	+ Object3D child = (Object3D)e.nextElement();
	3425	+ child.pinned = true;
	3426	+ }
	3427	+
2859	3428	EditSelection(false);
2860	3429	} else
2861		- if (event.getSource() == uneditButton)
	3430	+ if (source == uneditButton)
2862	3431	{
2863	3432	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2864	3433	{
2865	3434	Object3D child = (Object3D)e.nextElement();
2866	3435	if(child.editWindow != null)
2867	3436	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3437	+ child.pinned = false;
2868	3438	child.CloseUI();
2869	3439	listUI.remove(child);
2870	3440
2871		- child.editWindow = null; // ???????????
	3441	+ //child.editWindow = null; // ???????????
2872	3442	}
2873		- objEditor.ctrlPanel.revalidate();
	3443	+ objEditor.ctrlPanel.FlushUI();
2874	3444	//objEditor.jTree.clearSelection();
2875	3445	//objEditor.ResetSliders();
2876	3446	refreshContents(true);
2877	3447	} else
2878		- if (event.getSource() == clearPanelButton)
	3448	+ if (source == clearPanelButton)
2879	3449	{
2880	3450	assert(copy == group);
2881	3451	//copy.ClearUI();
2882	3452	for (Object3D obj : listUI)
2883	3453	{
	3454	+ obj.pinned = false;
2884	3455	obj.CloseUI();
2885	3456	}
2886	3457	listUI.clear();
2887	3458	refreshContents(true);
2888	3459	} else
2889		- if (event.getSource() == allParamsButton)
	3460	+ if (source == allParamsButton)
2890	3461	{
2891	3462	assert(copy == group);
2892	3463
2893		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3464	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2894	3465
2895	3466	for (Object3D obj : listUI)
2896	3467	{
..	..	@@ -2907,19 +3478,19 @@
2907	3478
2908	3479	refreshContents(true);
2909	3480	} else
2910		- if (event.getSource() == unselectButton)
	3481	+ if (source == unselectButton)
2911	3482	{
2912	3483	objEditor.jTree.clearSelection();
2913	3484	// ?? oct 2012 GrafreeD.clipboard.clear();
2914	3485	objEditor.ResetSliders();
2915	3486	refreshContents(true);
2916	3487	} else
2917		- if(event.getSource() instanceof cRadio)
	3488	+ if(source instanceof cRadio)
2918	3489	{
2919	3490	group.parent = keepparent;
2920	3491	group.attributes = 0;
2921	3492	//group.editWindow = null;
2922		- /cRadio/ radio = (cRadio)event.getSource();
	3493	+ /cRadio/ radio = (cRadio)source;
2923	3494	Object3D obj = radio.GetObject();
2924	3495	System.out.println("Edit " + obj);
2925	3496	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2939,6 +3510,9 @@
2939	3510	}
2940	3511
2941	3512	copy = group;
	3513	+
	3514	+ SetUndoStates();
	3515	+
2942	3516	//Globals.theRenderer.object = group;
2943	3517	if(!useclient)
2944	3518	{
..	..	@@ -2954,20 +3528,44 @@
2954	3528	frontView.object = group;
2955	3529	sideView.object = group;
2956	3530	}
2957		- group.editWindow = this;
	3531	+
	3532	+// fix "+" issue
	3533	+ //group.editWindow = this;
	3534	+ group.manipWindow = this;
	3535	+
2958	3536	/*
2959	3537	currentLayout = radio.layout;
2960	3538	if (currentLayout == null)
2961	3539	currentLayout = sevenButton;
2962	3540	*/
2963	3541	radio.layout.doClick();
	3542	+
	3543	+ ClearUnpinned();
	3544	+ SetPinStates(group.selection.size() > 0);
	3545	+ if (group.selection.size() == 1)
	3546	+ EditSelection(false);
2964	3547	keepparent = group.parent;
2965	3548	// PARENT = NULL or not???
2966	3549	//group.parent = null; // ROOT
2967	3550	//group.attributes = -1;
2968	3551	ResetModel();
	3552	+
	3553	+ cameraView.requestFocusInWindow();
2969	3554	refreshContents(true);
2970		- }
	3555	+ } else if (event.getSource() == editCameraItem)
	3556	+ {
	3557	+ cameraView.ProtectCamera();
	3558	+ cameraView.repaint();
	3559	+ return;
	3560	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3561	+ {
	3562	+ cameraView.RevertCamera();
	3563	+ cameraView.repaint();
	3564	+ return;
	3565	+ // } else if (event.getSource() == textureButton)
	3566	+ // {
	3567	+ // return; // true;
	3568	+ }
2971	3569	else
2972	3570	{
2973	3571	//return super.action(event, arg);
..	..	@@ -2976,7 +3574,6 @@
2976	3574	}
2977	3575
2978	3576	boolean useclient = false;
2979		- cRadio radio;
2980	3577
2981	3578	void ToggleRoot()
2982	3579	{
..	..	@@ -3028,6 +3625,28 @@
3028	3625	refreshContents();
3029	3626	}
3030	3627
	3628	+ void TransformChildren()
	3629	+ {
	3630	+ Object3D obj;
	3631	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3632	+ {
	3633	+ obj = (Object3D)e.nextElement();
	3634	+ obj.KeepTextureMatrices();
	3635	+ obj.TransformChildren();
	3636	+ obj.RestoreTextureMatrices();
	3637	+
	3638	+// if (obj.parent == null)
	3639	+// {
	3640	+// System.out.println("NULL PARENT!");
	3641	+// new Exception().printStackTrace();
	3642	+// }
	3643	+// else
	3644	+// TouchTransform(obj);
	3645	+// //obj.parent.Touch();
	3646	+ }
	3647	+
	3648	+ refreshContents();
	3649	+ }
3031	3650
3032	3651	void ResetTransform()
3033	3652	{
..	..	@@ -3140,7 +3759,7 @@
3140	3759	refreshContents();
3141	3760	}
3142	3761
3143		- void ResetCentroid()
	3762	+ void ResetCentroid(boolean full)
3144	3763	{
3145	3764	Object3D obj;
3146	3765	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3155,12 +3774,16 @@
3155	3774	LA.matIdentity(Object3D.mat);
3156	3775	obj.getBounds(minima, maxima, false);
3157	3776	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3158		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3777	+ if (full)
	3778	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3159	3779	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3160	3780	obj.TransformMesh(Object3D.mat);
	3781	+
3161	3782	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3162		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3783	+ if (full)
	3784	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3163	3785	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3786	+
3164	3787	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3165	3788	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3166	3789	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3189,7 +3812,8 @@
3189	3812
3190	3813	int size = obj.MemorySize();
3191	3814
3192		- System.err.println((size/1024) + " KB is the size of " + obj);
	3815	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3816	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3193	3817	}
3194	3818	}
3195	3819	catch (Exception e)
..	..	@@ -3226,9 +3850,9 @@
3226	3850	obj = (Object3D)e.nextElement();
3227	3851
3228	3852	System.out.println("Object is: " + obj);
3229		- GrafreeD.AnalyzeObject(obj);
	3853	+ Grafreed.AnalyzeObject(obj);
3230	3854	System.out.println("Boundary rep: " + obj.bRep);
3231		- GrafreeD.AnalyzeObject(obj.bRep);
	3855	+ Grafreed.AnalyzeObject(obj.bRep);
3232	3856
3233	3857	// System.err.println((size/1024) + " KB is the size of " + obj);
3234	3858	}
..	..	@@ -3270,6 +3894,13 @@
3270	3894	void GenNormals(boolean crease)
3271	3895	{
3272	3896	group.GenNormalsS(crease);
	3897	+
	3898	+ refreshContents();
	3899	+ }
	3900	+
	3901	+ void GenNormalsMESH()
	3902	+ {
	3903	+ group.GenNormalsMeshS();
3273	3904
3274	3905	refreshContents();
3275	3906	}
..	..	@@ -3442,8 +4073,8 @@
3442	4073
3443	4074	void ParseVertices()
3444	4075	{
3445		- boolean epsequal = GrafreeD.epsequal;
3446		- GrafreeD.epsequal = true;
	4076	+ boolean epsequal = Grafreed.epsequal;
	4077	+ Grafreed.epsequal = true;
3447	4078
3448	4079	for (int i=0; i<group.selection.size(); i++)
3449	4080	{
..	..	@@ -3468,7 +4099,7 @@
3468	4099	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3469	4100	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3470	4101
3471		- g.add(GrafreeD.clipboard);
	4102	+ g.add(Grafreed.clipboard);
3472	4103
3473	4104	buffer.add(g);
3474	4105	}
..	..	@@ -3483,7 +4114,7 @@
3483	4114	makeSomething(buffer, i==group.selection.size()-1);
3484	4115	}
3485	4116
3486		- GrafreeD.epsequal = epsequal;
	4117	+ Grafreed.epsequal = epsequal;
3487	4118
3488	4119	refreshContents();
3489	4120	}
..	..	@@ -3501,7 +4132,16 @@
3501	4132	String pigment = Object3D.GetPigment(tex);
3502	4133	//String bump = Object3D.GetBump(tex);
3503	4134
3504		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4135	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4136	+
	4137	+ try
	4138	+ {
	4139	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4140	+ }
	4141	+ catch (Exception e)
	4142	+ {
	4143	+ System.err.println("FAIL: " + node);
	4144	+ }
3505	4145
3506	4146	double s = v.s;
3507	4147
..	..	@@ -3589,11 +4229,11 @@
3589	4229
3590	4230	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3591	4231
3592		- boolean random = CameraPane.RANDOM;
3593		- CameraPane.RANDOM = false; // parse all random nodes
	4232	+ boolean random = CameraPane.SWITCH;
	4233	+ CameraPane.SWITCH = false; // parse all random nodes
3594	4234	lowres.linkVerticesThis(null);
3595	4235	lowres.linkVerticesThis(sn);
3596		- CameraPane.RANDOM = random;
	4236	+ CameraPane.SWITCH = random;
3597	4237
3598	4238	System.err.flush();
3599	4239
..	..	@@ -3633,7 +4273,7 @@
3633	4273	return;
3634	4274
3635	4275	Object3D poses = group.selection.get(0);
3636		- Object3D ref = GrafreeD.clipboard.get(0);
	4276	+ Object3D ref = Grafreed.clipboard.get(0);
3637	4277
3638	4278	Object3D newgroup = new Object3D("Po:" + poses.name);
3639	4279
..	..	@@ -3827,9 +4467,9 @@
3827	4467
3828	4468	void ClipMesh()
3829	4469	{
3830		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4470	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3831	4471	{
3832		- Object3D content = GrafreeD.clipboard.get(0);
	4472	+ Object3D content = Grafreed.clipboard.get(0);
3833	4473
3834	4474	if (content instanceof cGroup && ((cGroup)content).transientlink )
3835	4475	content = ((cGroup)content).get(0);
..	..	@@ -3838,7 +4478,7 @@
3838	4478	// {
3839	4479	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3840	4480	// }
3841		- group.selection.ClipMesh(GrafreeD.clipboard);
	4481	+ group.selection.ClipMesh(Grafreed.clipboard);
3842	4482	}
3843	4483	// group.selection.ClipMesh(GrafreeD.clipboard);
3844	4484	System.out.println("DONE.");
..	..	@@ -3885,6 +4525,18 @@
3885	4525	void MarkLeaves(boolean hide)
3886	4526	{
3887	4527	group.selection.MarkLeaves(hide);
	4528	+ refreshContents();
	4529	+ }
	4530	+
	4531	+ void RewindLeaves(boolean hide)
	4532	+ {
	4533	+ group.selection.RewindLeaves(hide);
	4534	+ refreshContents();
	4535	+ }
	4536	+
	4537	+ void RandomLeaves(boolean hide)
	4538	+ {
	4539	+ group.selection.RandomLeaves(hide);
3888	4540	refreshContents();
3889	4541	}
3890	4542
..	..	@@ -3959,10 +4611,6 @@
3959	4611	// }
3960	4612	// }
3961	4613
3962		- static boolean allparams = true;
3963		-
3964		- static Vector<Object3D> listUI = new Vector<Object3D>();
3965		-
3966	4614	void EditSelection(boolean newWindow)
3967	4615	{
3968	4616	// aConstraints.gridy = 0;
..	..	@@ -3970,10 +4618,10 @@
3970	4618	{
3971	4619	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3972	4620	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3973		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4621	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3974	4622
3975	4623	Object3D elem = (Object3D)group.selection.elementAt(i);
3976		- if(elem != group)
	4624	+ if(elem != group \|\| !newWindow)
3977	4625	{
3978	4626	// if (!(elem instanceof Composite))
3979	4627	// newWindow = false;
..	..	@@ -4055,7 +4703,8 @@
4055	4703	//new Exception().printStackTrace();
4056	4704
4057	4705	freezemodel = true;
4058		-
	4706	+ ClearUnpinned();
	4707	+
4059	4708	/**/
4060	4709	//switch (event.id)
4061	4710	{
..	..	@@ -4063,7 +4712,6 @@
4063	4712	//case 702: // Event.LIST_DESELECT
4064	4713	group.deselectAll();
4065	4714	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4066		- objEditor.ClearInfo(); // .GetMaterial());
4067	4715	if (tps != null)
4068	4716	{
4069	4717	for (int i=0; i < tps.length; i++)
..	..	@@ -4072,33 +4720,39 @@
4072	4720
4073	4721	//if (child.parent != null)
4074	4722	//child.parent.addSelectee(child);
	4723	+ objEditor.SetMaterial(child);
4075	4724	group.addSelectee(child);
4076		- objEditor.SetMaterial(child); // .GetMaterial());
4077		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4078		- System.err.println("info : " + child.GetPath());
4079	4725	}
4080	4726	}
4081		- else
4082		- {
4083		- objEditor.SetMaterial(group); // .GetMaterial());
4084		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4085		- System.err.println("info : " + group.GetPath());
4086		- }
	4727	+// else
	4728	+// {
	4729	+// objEditor.SetMaterial(group); // .GetMaterial());
	4730	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4731	+// System.err.println("info : " + group.GetPath());
	4732	+// }
4087	4733
4088		- objEditor.SetText(); // jan 2014
4089		-
4090		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4734	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4091	4735	CameraPane.flash = true;
4092	4736
4093		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4737	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4094	4738	// a camera
4095	4739	{
4096		- CameraPane.camerachangeframe = 0; // don't refuse it
4097		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4740	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4741	+ {
	4742	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4743	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4744	+ }
4098	4745	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4099	4746	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4100	4747	}
4101	4748
	4749	+ if (tps != null && tps.length == 1)
	4750	+ {
	4751	+ EditSelection(false);
	4752	+ }
	4753	+
	4754	+ SetPinStates(tps != null && tps.length > 0);
	4755	+
4102	4756	refreshContents();
4103	4757	//return true;
4104	4758	}
..	..	@@ -4107,6 +4761,35 @@
4107	4761
4108	4762	freezemodel = false;
4109	4763	}
	4764	+
	4765	+ void SetPinStates(boolean enabled)
	4766	+ {
	4767	+ editButton.setEnabled(enabled);
	4768	+ uneditButton.setEnabled(enabled);
	4769	+ unselectButton.setEnabled(enabled);
	4770	+ flashSelectionButton.setEnabled(enabled);
	4771	+ }
	4772	+
	4773	+ void refreshContents(boolean cp)
	4774	+ {
	4775	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4776	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4777	+ {
	4778	+ objEditor.ClearInfo(); // .GetMaterial());
	4779	+
	4780	+ for (int i=0; i < group.selection.Size(); i++)
	4781	+ {
	4782	+ Object3D child = (Object3D) group.selection.get(i);
	4783	+
	4784	+ objEditor.AddInfo(child, this, true);
	4785	+ System.err.println("info : " + child.GetPath());
	4786	+ }
	4787	+
	4788	+ objEditor.SetText(); // jan 2014
	4789	+ }
	4790	+
	4791	+ super.refreshContents(cp);
	4792	+ }
4110	4793
4111	4794	void linkSomething(Object3D thing)
4112	4795	{
..	..	@@ -4178,16 +4861,19 @@
4178	4861	{
4179	4862	if (group.selection.isEmpty())
4180	4863	return;
4181		- GrafreeD.clipboardIsTempGroup = false;
	4864	+
	4865	+ Grafreed.clipboardIsTempGroup = false;
4182	4866	Composite tGroup = null;
4183	4867	if (group.selection.size() > 0) // 1)
4184	4868	{
4185	4869	tGroup = new cGroup();
4186		- GrafreeD.clipboardIsTempGroup = true;
	4870	+ Grafreed.clipboardIsTempGroup = true;
4187	4871	}
4188	4872
4189	4873	if (cut)
4190	4874	{
	4875	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4876	+// Save();
4191	4877	//int indices[] = jList.getSelectedIndices();
4192	4878	//for (int i = indices.length - 1; i >= 0; i--)
4193	4879	//jList.remove(indices[i]);
..	..	@@ -4223,16 +4909,16 @@
4223	4909	//System.out.println("cut " + child);
4224	4910	//System.out.println("parent = " + child.parent);
4225	4911	// tmp.addChild(child);
4226		- if (GrafreeD.clipboardIsTempGroup)
	4912	+ if (Grafreed.clipboardIsTempGroup)
4227	4913	tGroup.add/Child/(tmp);
4228	4914	else
4229		- GrafreeD.clipboard = tmp;
	4915	+ Grafreed.clipboard = tmp;
4230	4916	}
4231	4917	else
4232		- if (GrafreeD.clipboardIsTempGroup)
	4918	+ if (Grafreed.clipboardIsTempGroup)
4233	4919	tGroup.add/Child/(child);
4234	4920	else
4235		- GrafreeD.clipboard = child;
	4921	+ Grafreed.clipboard = child;
4236	4922	}
4237	4923
4238	4924	//ResetModel();
..	..	@@ -4264,21 +4950,23 @@
4264	4950	//System.out.println("cut " + elem);
4265	4951	//System.out.println("parent = " + elem.parent);
4266	4952	// tmp.addChild(elem);
4267		- if (GrafreeD.clipboardIsTempGroup)
	4953	+ if (Grafreed.clipboardIsTempGroup)
4268	4954	tGroup.add/Child/(tmp);
4269	4955	else
4270		- GrafreeD.clipboard = tmp;
	4956	+ Grafreed.clipboard = tmp;
4271	4957	}
4272	4958	else
4273		- if (GrafreeD.clipboardIsTempGroup)
	4959	+ if (Grafreed.clipboardIsTempGroup)
4274	4960	tGroup.add/Child/(child);
4275	4961	else
4276		- GrafreeD.clipboard = child;
	4962	+ Grafreed.clipboard = child;
4277	4963	}
4278	4964
4279	4965	}
4280		- if (GrafreeD.clipboardIsTempGroup)
4281		- GrafreeD.clipboard = tGroup;
	4966	+
	4967	+ if (Grafreed.clipboardIsTempGroup)
	4968	+ Grafreed.clipboard = tGroup;
	4969	+
4282	4970	if (cut)
4283	4971	{
4284	4972	ResetModel();
..	..	@@ -4288,11 +4976,15 @@
4288	4976
4289	4977	void paste(boolean expand)
4290	4978	{
	4979	+ if (Globals.REPLACEONMAKE)
	4980	+ Save();
	4981	+ boolean keep = Globals.REPLACEONMAKE;
	4982	+ Globals.REPLACEONMAKE = false;
4291	4983	// if (GrafreeD.clipboard == null)
4292	4984	// return;
4293	4985	boolean first = true;
4294	4986
4295		- if (GrafreeD.clipboardIsTempGroup)
	4987	+ if (Grafreed.clipboardIsTempGroup)
4296	4988	{
4297	4989	Composite temp;
4298	4990
..	..	@@ -4303,7 +4995,7 @@
4303	4995	temp = (Composite)Applet3D.clipboard.deepCopy();
4304	4996	*/
4305	4997	Object3D elem;
4306		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4998	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4307	4999	{
4308	5000	Object3D child = (Object3D)e.nextElement();
4309	5001
..	..	@@ -4337,21 +5029,22 @@
4337	5029	//Object3D cb = Applet3D.clipboard;
4338	5030	//temp.addChild(cb);
4339	5031	//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());
	5032	+ assert(Grafreed.clipboard.parent == null);
	5033	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5034	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5035	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5036	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4345	5037	else
4346		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4347		- GrafreeD.clipboard.get(0).parent = keepparent;
	5038	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5039	+ Grafreed.clipboard.get(0).parent = keepparent;
4348	5040	}
4349	5041
	5042	+ Globals.REPLACEONMAKE = keep;
4350	5043	ResetModel();
4351	5044	refreshContents();
4352	5045	}
4353	5046
4354		- void pasteInto(boolean copyit)
	5047	+ void pasteInto(boolean copyit, boolean clone)
4355	5048	{
4356	5049	// if (GrafreeD.clipboard == null)
4357	5050	// return;
..	..	@@ -4380,15 +5073,22 @@
4380	5073	if (copyit)
4381	5074	{
4382	5075	// paste(false);
4383		- CloneClipboard(false); // sept 2014
	5076	+ if (clone)
	5077	+ {
	5078	+ CloneClipboard(false); // sept 2014
	5079	+ }
	5080	+ else
	5081	+ {
	5082	+ paste(false);
	5083	+ }
4384	5084	}
4385	5085	else
4386	5086	{
4387	5087	boolean first = true;
4388	5088
4389		- if (GrafreeD.clipboardIsTempGroup)
	5089	+ if (Grafreed.clipboardIsTempGroup)
4390	5090	{
4391		- Composite temp = (Composite)GrafreeD.clipboard;
	5091	+ Composite temp = (Composite)Grafreed.clipboard;
4392	5092	Object3D copy;
4393	5093	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4394	5094	{
..	..	@@ -4398,7 +5098,7 @@
4398	5098	}
4399	5099	} else
4400	5100	{
4401		- linkSomething(GrafreeD.clipboard); //.get(0));
	5101	+ linkSomething(Grafreed.clipboard); //.get(0));
4402	5102	}
4403	5103	}
4404	5104	}
..	..	@@ -4475,6 +5175,10 @@
4475	5175
4476	5176	void group(Object3D csg, boolean grab)
4477	5177	{
	5178	+ if (Globals.REPLACEONMAKE)
	5179	+ Save();
	5180	+ boolean keep = Globals.REPLACEONMAKE;
	5181	+ Globals.REPLACEONMAKE = false;
4478	5182	if (//false) // why??
4479	5183	!group.selection.isEmpty())
4480	5184	{
..	..	@@ -4588,10 +5292,15 @@
4588	5292	//node.add(csg);
4589	5293	//makeSomething(node);
4590	5294	makeSomething(csg);
	5295	+ Globals.REPLACEONMAKE = keep;
4591	5296	}
4592	5297
4593	5298	void Ungroup(Object3D g)
4594	5299	{
	5300	+ if (Globals.REPLACEONMAKE)
	5301	+ Save();
	5302	+ boolean keep = Globals.REPLACEONMAKE;
	5303	+ Globals.REPLACEONMAKE = false;
4595	5304	if (g instanceof HiddenObject)
4596	5305	{
4597	5306	HiddenObject h = (HiddenObject) g;
..	..	@@ -4608,6 +5317,7 @@
4608	5317	objEditor.makeSomething(g.get(i), false);
4609	5318	}
4610	5319	}
	5320	+ Globals.REPLACEONMAKE = keep;
4611	5321	}
4612	5322
4613	5323	void ungroup()
..	..	@@ -4803,21 +5513,6 @@
4803	5513	}
4804	5514	*/
4805	5515
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	5516	/*
4822	5517	public void Callback(Object obj)
4823	5518	{
..	..	@@ -4841,26 +5536,9 @@
4841	5536	}
4842	5537	*/
4843	5538
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	5539	String GetFile(String dialogName)
4862	5540	{
4863		- if (GrafreeD.standAlone)
	5541	+ if (Grafreed.standAlone)
4864	5542	{
4865	5543	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4866	5544	browser.show();
..	..	@@ -4924,10 +5602,33 @@
4924	5602	cButton flashSelectionButton;
4925	5603	cButton editButton;
4926	5604	cButton uneditButton;
	5605	+ JCheckBox allParamsButton;
4927	5606	cButton clearpanelButton;
4928		- cButton allParamsButton;
4929	5607	cButton unselectButton;
4930	5608
	5609	+ cButton restoreCameraButton;
	5610	+
	5611	+ cButton saveButton;
	5612	+ cButton oneStepButton;
	5613	+
	5614	+ cButton groupButton;
	5615	+ cButton ungroupButton;
	5616	+ cButton compositeButton;
	5617	+ cButton switchButton;
	5618	+ cButton loopButton;
	5619	+ cButton textureButton;
	5620	+
	5621	+ cButton gridButton;
	5622	+ cButton boxButton;
	5623	+ cButton sphereButton;
	5624	+ cButton coneButton;
	5625	+ cButton torusButton;
	5626	+ cButton superButton;
	5627	+ cButton kleinButton;
	5628	+ cButton particlesButton;
	5629	+ cButton overlayButton;
	5630	+ cButton lightButton;
	5631	+
4931	5632	cButton screenfitButton;
4932	5633	cButton screenfitpointButton;
4933	5634	cButton snapobjectButton;
..	..	@@ -4939,14 +5640,6 @@
4939	5640
4940	5641	cButton setsupportButton;
4941	5642
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	5643	//
4951	5644	//Composite
4952	5645	Object3D // to do !!
..	..	@@ -4956,9 +5649,11 @@
4956	5649	//JTree jTree;
4957	5650	private MenuItem lookAtItem;
4958	5651	private MenuItem lookFromItem;
4959		- private MenuItem switchItem;
	5652	+ private MenuItem switchViewItem;
4960	5653	private MenuItem cutItem;
4961		- private MenuItem duplicateItem;
	5654	+ private MenuItem undoItem;
	5655	+ private MenuItem redoItem;
	5656	+ private JMenuItem duplicateItem;
4962	5657	private MenuItem cloneItem;
4963	5658	private MenuItem cloneSupportItem;
4964	5659	private MenuItem overwriteGeoItem;
..	..	@@ -4971,7 +5666,7 @@
4971	5666	private MenuItem linkverticesItem;
4972	5667	private MenuItem relinkverticesItem;
4973	5668	private MenuItem setMasterItem;
4974		- private MenuItem resetMeshItem;
	5669	+ private MenuItem resetAllItem;
4975	5670	private MenuItem stepAllItem;
4976	5671	private MenuItem revertMeshItem;
4977	5672	private MenuItem poseMeshItem;
..	..	@@ -4982,6 +5677,7 @@
4982	5677	private MenuItem mergeGeometriesItem;
4983	5678	private MenuItem copyItem;
4984	5679	private MenuItem pasteItem;
	5680	+ private MenuItem pasteIntoItem;
4985	5681	private MenuItem pasteLinkItem;
4986	5682	private MenuItem pasteCloneItem;
4987	5683	private MenuItem pasteExpandItem;
..	..	@@ -5020,6 +5716,10 @@
5020	5716	private MenuItem showleavesItem;
5021	5717	private MenuItem markleavesItem;
5022	5718	private MenuItem unmarkleavesItem;
	5719	+ private MenuItem rewindleavesItem;
	5720	+ private MenuItem unrewindleavesItem;
	5721	+ private MenuItem randomleavesItem;
	5722	+ private MenuItem unrandomleavesItem;
5023	5723
5024	5724	private MenuItem flipVItem;
5025	5725	private MenuItem unflipVItem;
..	..	@@ -5031,15 +5731,17 @@
5031	5731	private MenuItem panoTexturesItem;
5032	5732
5033	5733	private MenuItem resetCentroidItem;
5034		- private MenuItem transformgeometryItem;
	5734	+ private MenuItem resetCentroidXZItem;
5035	5735	private MenuItem resetTransformItem;
	5736	+ private MenuItem transformGeometryItem;
	5737	+ private MenuItem transformChildrenItem;
5036	5738	private MenuItem hideItem;
5037	5739	private MenuItem grabItem;
5038	5740	private MenuItem backItem;
5039	5741	private MenuItem frontItem;
5040	5742	private MenuItem cameraItem;
5041	5743	private MenuItem compositeItem;
5042		- private MenuItem randomItem;
	5744	+ private MenuItem switchItem;
5043	5745	private MenuItem physicsItem;
5044	5746	private MenuItem frameselectorItem;
5045	5747	private MenuItem scriptNodeItem;
..	..	@@ -5079,7 +5781,7 @@
5079	5781	private MenuItem blobItem;
5080	5782	private MenuItem latheItem;
5081	5783	private MenuItem bezierItem;
5082		- private MenuItem checkerItem;
	5784	+ private MenuItem overlayItem;
5083	5785	private MenuItem meshItem;
5084	5786	// private MenuItem meshGroupItem;
5085	5787	private MenuItem springItem;
..	..	@@ -5101,11 +5803,6 @@
5101	5803	private MenuItem doubleItem;
5102	5804	private MenuItem tripleItem;
5103	5805
5104		- private MenuItem importGFDItem;
5105		- private MenuItem importVRMLX3DItem;
5106		- private MenuItem import3DSItem;
5107		- private MenuItem importOBJItem;
5108		-
5109	5806	private MenuItem computeAOItem;
5110	5807	private MenuItem recompileItem;
5111	5808	private MenuItem editScriptItem;
..	..	@@ -5115,4 +5812,8 @@
5115	5812	private MenuItem analyzeItem;
5116	5813	private MenuItem dumpItem;
5117	5814	//boolean freezemodel = false;
	5815	+
	5816	+ Menu cameraMenu;
	5817	+ MenuItem editCameraItem;
	5818	+ MenuItem restoreCameraItem;
5118	5819	}