~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,150 +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", CameraPane.isLIVE()), 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);
	612	+ screenfitButton.setToolTipText("Screen fit");
	613	+ screenfitButton.addActionListener(this);
	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");
441	648	liveCB.addItemListener(this);
442	649
443		- oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
445		- supportCB.addItemListener(this);
446		-
447		- // oe.aConstraints.gridx += 1;
448		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
449		- // localCB.addItemListener(this);
450		-
451		- oe.aConstraints.gridx += 1;
452		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
453		- crowdCB.addItemListener(this);
454		-
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
457		- smoothCB.addItemListener(this);
458		-
459		- oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	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");
461	656	fastCB.addItemListener(this);
462		- oe.aConstraints.gridx += 1;
463		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
464		- slowCB.addItemListener(this);
465		- oe.aConstraints.gridx += 1;
466		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
467		- boxCB.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);
468	663
469		-// oe.aConstraints.gridx += 1;
470		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
471		-// speakerMocapCB.addItemListener(this);
472		-
473		- if (false)
474		- {
475		- // handled in scripts
476		- oe.aConstraints.gridx += 1;
477		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
478		- speakerCameraCB.addItemListener(this);
479		-
480		- oe.aConstraints.gridx += 1;
481		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
482		- speakerFocusCB.addItemListener(this);
483		-
484		- oe.aConstraints.gridx += 1;
485		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
486		- smoothfocusCB.addItemListener(this);
487		- }
488		-
489		-//oe.aConstraints.gridx += 1;
490		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
491		-// debugCB.addItemListener(this);
492		-
493		- oe.aConstraints.gridx += 1;
494		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
495		- oeilCB.addItemListener(this);
496		-
497		- oe.aConstraints.gridx += 1;
498		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
499		- lookAtCB.addItemListener(this);
500		-
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
503		- trackCB.addItemListener(this);
504		-
505		- oe.aConstraints.gridx += 1;
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
507		- screenfitButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
509	664	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
510	665	// screenfitpointButton.addActionListener(this);
511		-// oe.aConstraints.gridx += 1;
512		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
513		- snapobjectButton.addActionListener(this);
514		- oe.aConstraints.gridx += 1;
515	666
516		- //aConstraints.gridx = 0;
517		- //aConstraints.gridy += 1;
518		- oe.aConstraints.weighty = 0;
519		- oe.aConstraints.gridwidth = 1;
520		-
521		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
522		- flashSelectionButton.addActionListener(this);
523		- oe.aConstraints.gridx += 1;
524		- oe.aConstraints.weighty = 0;
525		- oe.aConstraints.gridwidth = 1;
	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));
526	675
527		- //
528		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	676	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	677	+ twoButton.setToolTipText("Show center view only");
529	678	twoButton.addActionListener(this);
530		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	679	+ this.fullscreenLayout = twoButton;
	680	+
	681	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
531	682	fourButton.addActionListener(this);
532		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	683	+ fourButton.setToolTipText("Show left panel only");
	684	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	685	+ sixButton.setToolTipText("2-column layout left");
533	686	sixButton.addActionListener(this);
534		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	687	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	688	+ threeButton.setToolTipText("2-column layout right");
535	689	threeButton.addActionListener(this);
536		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	690	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	691	+ sevenButton.setToolTipText("3-column layout");
537	692	sevenButton.addActionListener(this);
538	693	//
539	694
540		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	695	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	696	+ rootButton.setToolTipText("Edit selection in new tab");
541	697	rootButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	698	+
	699	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ closeButton.setToolTipText("Close tab");
544	701	closeButton.addActionListener(this);
545	702	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
546	703	//clearButton.addActionListener(this);
547		- oe.aConstraints.gridx += 1;
548		-
549		- oe.aConstraints.gridx = 1; //
550		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
551		- editButton.addActionListener(this);
552		- oe.aConstraints.gridx += 1;
553		- oe.aConstraints.weighty = 0;
554		- oe.aConstraints.gridwidth = 1;
555	704
556		- 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");
557	790	uneditButton.addActionListener(this);
558	791
559		- oe.aConstraints.gridx += 1;
560		- oe.aConstraints.weighty = 0;
561		- oe.aConstraints.gridwidth = 1;
562		-
563		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
564		- clearPanelButton.addActionListener(this);
565		-
566		- oe.aConstraints.gridx += 1;
567		- oe.aConstraints.weighty = 0;
568		- oe.aConstraints.gridwidth = 1;
569		-
570		- 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");
571	794	allParamsButton.addActionListener(this);
572	795
573		- oe.aConstraints.gridx += 1;
574		- oe.aConstraints.weighty = 0;
575		- oe.aConstraints.gridwidth = 1;
576		-
577		- 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");
578	802	unselectButton.addActionListener(this);
579	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	+
580	814	// oe.aConstraints.gridx += 1;
581	815	// oe.aConstraints.weighty = 0;
582	816	// oe.aConstraints.gridwidth = 1;
..	..	@@ -588,40 +822,25 @@
588	822	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
589	823	// gcButton.addActionListener(this);
590	824
591		- oe.aConstraints.gridx = 0;
592		- oe.aConstraints.gridy += 1;
593		-
594		- //ctrlPanel.add(objList = new List(5, true));
595		- oe.aConstraints.gridwidth = 100;
596		- // oe.aConstraints.gridheight = 100;
597		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
598		- oe.aConstraints.gridheight = 1;
599		- oe.aConstraints.weighty = 0.5;
600		- oe.aConstraints.gridx = 0;
601		- JScrollPane jSP;
	825	+ cGridBag jSPPanel = new cGridBag();
	826	+
	827	+ JScrollPane jSP;
602	828	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
603		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	829	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
604	830	ResetModel();
605		- oe.aConstraints.weighty = 0.5;
606		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
607		- oe.aConstraints.gridy += 1;
608		- oe.aConstraints.gridwidth = 1;
609		-
610		- oe.aConstraints.weighty = 0;
611		- oe.aConstraints.gridwidth = 2;
612		-
613		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
614		- colorCB.addItemListener(this);
615		- oe.aConstraints.gridx += 2;
616		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
617		- materialCB.addItemListener(this);
618		- oe.aConstraints.gridx += 2;
619		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
620		- textureCB.addItemListener(this);
621		-
622		- oe.aConstraints.gridx = 0;
623		- oe.aConstraints.gridy += 1;
624	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	+
625	844	//jList.addListSelectionListener(this);
626	845	oe.jTree.addTreeSelectionListener(this);
627	846	//jTree.setRootVisible(false);
..	..	@@ -643,20 +862,157 @@
643	862	radio.layout = sevenButton;
644	863	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
645	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	+ }
646	991
647	992	void EditObject(Object3D obj)
648	993	{
649		- cRadio dummyButton = new cRadio(obj.name);
650		- dummyButton.SetObject(obj);
651		- dummyButton.layout = sevenButton;
652		- dummyButton.SetCamera(cameraView.renderCamera, false);
653		- dummyButton.addActionListener(this);
654		- radioPanel.add(dummyButton);
655		- buttonGroup.add(dummyButton);
656		- dummyButton.doClick();
	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	+
	1003	+ radioButton.SetObject(obj);
	1004	+ radioButton.layout = sevenButton;
	1005	+ radioButton.SetCamera(cameraView.renderCamera, false);
	1006	+ radioButton.addActionListener(this);
	1007	+ radioPanel.add(radioButton);
	1008	+ buttonGroup.add(radioButton);
	1009	+ radioButton.doClick();
657	1010	}
	1011	+
658	1012	void SetupViews(ObjEditor oe)
659	1013	{
	1014	+ theFrame = this;
	1015	+
660	1016	oe.SetupViews();
661	1017
662	1018	System.out.println("SetupViews");
..	..	@@ -665,22 +1021,28 @@
665	1021	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
666	1022	}
667	1023
668		- JCheckBox liveCB;
669		- JCheckBox supportCB;
670		- JCheckBox localCB;
671		- JCheckBox crowdCB;
672		- JCheckBox smoothCB;
673		- JCheckBox fastCB;
674		- JCheckBox slowCB;
675		- JCheckBox boxCB;
676		- JCheckBox trackCB;
677		- 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;
678	1037	// JCheckBox speakerMocapCB;
679		- JCheckBox speakerCameraCB;
680		- JCheckBox speakerFocusCB;
681		- JCheckBox debugCB;
682		- JCheckBox oeilCB;
683		- JCheckBox lookAtCB;
	1038	+ cCheckBox speakerCameraCB;
	1039	+ cCheckBox speakerFocusCB;
	1040	+ cCheckBox debugCB;
	1041	+
	1042	+ cCheckBox oeilCB;
	1043	+ cCheckBox shadowCB;
	1044	+ cCheckBox autokeepCB;
	1045	+ cCheckBox lookAtCB;
684	1046
685	1047	// static int COLOR = 1;
686	1048	// static int MATERIAL = 2;
..	..	@@ -688,9 +1050,9 @@
688	1050
689	1051	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
690	1052
691		- JCheckBox colorCB;
692		- JCheckBox materialCB;
693		- JCheckBox textureCB;
	1053	+ cCheckBox colorCB;
	1054	+ cCheckBox materialCB;
	1055	+ cCheckBox textureCB;
694	1056
695	1057	public void itemStateChanged(ItemEvent e)
696	1058	{
..	..	@@ -715,10 +1077,10 @@
715	1077	dropAttributes \|= Object3D.TEXTURE;
716	1078	else
717	1079	dropAttributes &= ~Object3D.TEXTURE;
718		- }
719		- else if(e.getSource() == liveCB)
	1080	+ } else if(e.getSource() == liveCB)
720	1081	{
721	1082	cameraView.ToggleLive();
	1083	+ refreshContents(false);
722	1084	}
723	1085	else if(e.getSource() == supportCB)
724	1086	{
..	..	@@ -754,6 +1116,10 @@
754	1116	cameraView.repaint();
755	1117	// refreshContents();
756	1118	}
	1119	+ else if(e.getSource() == zoomBoxCB)
	1120	+ {
	1121	+ cameraView.ToggleZoomBoxMode();
	1122	+ }
757	1123	else if(e.getSource() == smoothfocusCB)
758	1124	{
759	1125	cameraView.ToggleSmoothFocus();
..	..	@@ -779,6 +1145,18 @@
779	1145	{
780	1146	cameraView.ToggleOeil();
781	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	+ }
782	1160	else if(e.getSource() == lookAtCB)
783	1161	{
784	1162	cameraView.ToggleLookAt();
..	..	@@ -795,7 +1173,8 @@
795	1173
796	1174	/**/
797	1175	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
798		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1176	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1177	+ TreePath path = objEditor.jTree.getSelectionPath();
799	1178	if ((path == null) \|\| (path.getPathCount() <= 1)) {
800	1179	// We can't move the root node or an empty selection
801	1180	return;
..	..	@@ -858,8 +1237,6 @@
858	1237	}
859	1238	}
860	1239
861		- String string = (String) object;
862		-
863	1240	System.out.println("Transfer = " + object + "; drop : " + target);
864	1241	// if( object instanceof java.io.File[])
865	1242	// {
..	..	@@ -867,7 +1244,11 @@
867	1244	// objEditor.DropFile((java.io.File[]) object, true);
868	1245	// return;
869	1246	// }
870		- 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) == ':')
871	1252	{
872	1253	// file(s)
873	1254	String[] names = string.split("\n");
..	..	@@ -894,7 +1275,7 @@
894	1275
895	1276	flashIt = false;
896	1277	CameraPane pane = (CameraPane) target;
897		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1278	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
898	1279	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
899	1280
900	1281	if (group.selection.size() == 1)
..	..	@@ -910,23 +1291,33 @@
910	1291
911	1292	assert target == objEditor.jTree;
912	1293	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1294	+ Object3D destinationLeaf;
913	1295	try {
914		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1296	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
915	1297	} catch (Exception e) {
916	1298	System.out.println("destinationPath : " + destinationPath);
917	1299	return;
918	1300	}
919	1301
920		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1302	+ for (int i=group.selection.size(); --i>=0;)
921	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	+// {
922	1313	loadClipboard(true);
923	1314	objEditor.jTree.setSelectionPath(destinationPath);
924		- pasteInto(false);
925		- } else {
926		- loadClipboard(false);
927		- objEditor.jTree.setSelectionPath(destinationPath);
928		- pasteInto(false); // true); // ???
929		- }
	1315	+ pasteInto(false, false);
	1316	+// } else {
	1317	+// loadClipboard(false);
	1318	+// objEditor.jTree.setSelectionPath(destinationPath);
	1319	+// pasteInto(false, false); // true); // ???
	1320	+// }
930	1321	}
931	1322	public void dropActionChanged(DropTargetDragEvent dtde)
932	1323	// Called if the user has modified the current drop gesture
..	..	@@ -1031,85 +1422,107 @@
1031	1422	{
1032	1423	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1033	1424	//heightFieldItem.addActionListener(this);
1034		- gridItem = menu.add(new MenuItem("Grid"));
1035		- gridItem.addActionListener(this);
1036		- rectoidItem = menu.add(new MenuItem("Box"));
1037		- rectoidItem.addActionListener(this);
1038		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1039		- ellipsoidItem.addActionListener(this);
1040		- coneItem = menu.add(new MenuItem("Cone"));
1041		- coneItem.addActionListener(this);
1042		- torusItem = menu.add(new MenuItem("Torus"));
1043		- torusItem.addActionListener(this);
1044		- superItem = menu.add(new MenuItem("Superellipsoid"));
1045		- 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	+ {
1046	1443	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1047	1444	kleinItem.addActionListener(this);
1048		- particleItem = menu.add(new MenuItem("Particle system"));
1049		- particleItem.addActionListener(this);
	1445	+ }
	1446	+
	1447	+// particleItem = menu.add(new MenuItem("Particle system"));
	1448	+// particleItem.addActionListener(this);
	1449	+ if (Globals.ADVANCED)
	1450	+ {
1050	1451	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1051	1452	ragdollItem.addActionListener(this);
1052	1453	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1053	1454	ragdoll2Item.addActionListener(this);
	1455	+ }
1054	1456	menu.add("-");
1055		- meshItem = menu.add(new MenuItem("Mesh"));
	1457	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1056	1458	meshItem.addActionListener(this);
1057	1459	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1058	1460	// meshGroupItem.addActionListener(this);
	1461	+ if (Globals.ADVANCED)
	1462	+ {
1059	1463	springItem = menu.add(new MenuItem("Spring"));
1060	1464	springItem.addActionListener(this);
1061	1465	flagItem = menu.add(new MenuItem("Flag"));
1062	1466	flagItem.addActionListener(this);
1063		- bezierItem = menu.add(new MenuItem("Patch"));
1064		- bezierItem.addActionListener(this);
1065		- checkerItem = menu.add(new MenuItem("Checker"));
1066		- checkerItem.addActionListener(this);
1067	1467	blobItem = menu.add(new MenuItem("Blob"));
1068	1468	blobItem.addActionListener(this);
1069	1469	latheItem = menu.add(new MenuItem("Lathe"));
1070	1470	latheItem.addActionListener(this);
1071		- lightItem = menu.add(new MenuItem("Light"));
1072		- 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);
1073	1478	menu.add("-");
1074	1479	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1075	1480	//superLoopItem.addActionListener(this);
1076		- loopItem = menu.add(new MenuItem("Loop"));
1077		- loopItem.addActionListener(this);
	1481	+// loopItem = menu.add(new MenuItem("Loop"));
	1482	+// loopItem.addActionListener(this);
1078	1483	doubleItem = menu.add(new MenuItem("Fork"));
1079	1484	doubleItem.addActionListener(this);
	1485	+ if (Globals.ADVANCED)
	1486	+ {
1080	1487	tripleItem = menu.add(new MenuItem("Trident"));
1081	1488	tripleItem.addActionListener(this);
	1489	+ }
1082	1490	}
1083	1491
1084	1492	void buildToolsMenu(Menu menu)
1085	1493	{
1086	1494	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1087	1495	animationItem.addItemListener(this);
1088		- animationItem.setState(CameraPane.ANIMATION);
	1496	+ animationItem.setState(Globals.ANIMATION);
	1497	+
	1498	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1499	+ archiveItem.addActionListener(this);
1089	1500
1090	1501	menu.add("-");
1091	1502	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1092	1503	parseverticesItem.addActionListener(this);
1093	1504	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1094	1505	textureFieldItem.addActionListener(this);
1095		- alignItem = menu.add(new MenuItem("Align"));
	1506	+ alignItem = menu.add(new MenuItem("Align Objects"));
1096	1507	alignItem.addActionListener(this);
1097		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1098		- mirrorItem.addActionListener(this);
1099	1508	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1100	1509	reduceMorphItem.addActionListener(this);
1101	1510	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1102	1511	reduce34MorphItem.addActionListener(this);
1103		-
1104		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1105		- computeAOItem.addActionListener(this);
1106	1512	menu.add("-");
1107		-
1108	1513	menu.add(memoryItem = new MenuItem("Memory Usage"));
1109	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("-");
1110	1523	menu.add(analyzeItem = new MenuItem("Analyze"));
1111	1524	analyzeItem.addActionListener(this);
1112		- menu.add(dumpItem = new MenuItem("Dump"));
	1525	+ menu.add(dumpItem = new MenuItem("Print"));
1113	1526	dumpItem.addActionListener(this);
1114	1527	// menu.add(pathItem = new MenuItem("From-to path"));
1115	1528	// pathItem.addActionListener(this);
..	..	@@ -1118,6 +1531,8 @@
1118	1531	resetParentItem.addActionListener(this);
1119	1532	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1120	1533	repairParentItem.addActionListener(this);
	1534	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1535	+ repairShadowItem.addActionListener(this);
1121	1536	menu.add(invariantsItem = new MenuItem("Invariants"));
1122	1537	invariantsItem.addActionListener(this);
1123	1538	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1125,6 +1540,7 @@
1125	1540	menu.add("-");
1126	1541	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1127	1542	editScriptItem.addActionListener(this);
	1543	+ }
1128	1544	}
1129	1545
1130	1546	void ScreenFit()
..	..	@@ -1247,9 +1663,24 @@
1247	1663	shadow.material = new cMaterial(obj.material);
1248	1664	shadow.material.diffuse = 0.0001f;
1249	1665	shadow.material.specular = 0.0001f;
	1666	+ //shadow.projectedVertices[1].x = 300;
1250	1667
1251	1668	makeSomething(shadow);
1252	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	+ }
1253	1684
1254	1685	/**
1255	1686	* applyExample
..	..	@@ -1453,9 +1884,9 @@
1453	1884
1454	1885	void Overwrite(int mask)
1455	1886	{
1456		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1887	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1457	1888	{
1458		- Object3D content = GrafreeD.clipboard.get(0);
	1889	+ Object3D content = Grafreed.clipboard.get(0);
1459	1890
1460	1891	if (content instanceof cGroup && ((cGroup)content).transientlink )
1461	1892	content = ((cGroup)content).get(0);
..	..	@@ -1478,6 +1909,7 @@
1478	1909	//
1479	1910	public void actionPerformed(ActionEvent event) // , Object arg)
1480	1911	{
	1912	+ Object source = event.getSource();
1481	1913	/*
1482	1914	if (event.getSource() == nameField)
1483	1915	{
..	..	@@ -1489,11 +1921,11 @@
1489	1921	}
1490	1922	else
1491	1923	*/
1492		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1924	+ if (source == lookAtItem \|\| source == lookFromItem)
1493	1925	{
1494	1926	ScreenFit();
1495	1927	} else
1496		- if (event.getSource() == switchItem)
	1928	+ if (source == switchViewItem)
1497	1929	{
1498	1930	cVector v1 = new cVector();
1499	1931	cVector v2 = new cVector();
..	..	@@ -1502,11 +1934,11 @@
1502	1934	objEditor.cameraView.renderCamera.setAim(v2, v1);
1503	1935	objEditor.cameraView.repaint();
1504	1936	} else
1505		- if (event.getSource() == rectoidItem)
	1937	+ if (source == rectoidItem \|\| source == boxButton)
1506	1938	{
1507	1939	makeSomething(new Box());
1508	1940	} else
1509		- if (event.getSource() == particleItem)
	1941	+ if (source == particleItem \|\| source == particlesButton)
1510	1942	{
1511	1943	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1512	1944	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1527,9 +1959,9 @@
1527	1959	applyExample(particleGeom, "SMOKE");
1528	1960	makeSomething(particleGeom);
1529	1961	} else
1530		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1962	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1531	1963	{
1532		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1964	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1533	1965
1534	1966	ragdoll.toParent = LA.newMatrix();
1535	1967	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1547,7 +1979,7 @@
1547	1979	} else
1548	1980	/*
1549	1981	*/
1550		- if (event.getSource() == heightFieldItem)
	1982	+ if (source == heightFieldItem)
1551	1983	{
1552	1984	Object3D obj = new Object3D();
1553	1985
..	..	@@ -1585,31 +2017,31 @@
1585	2017
1586	2018	makeSomething(obj);
1587	2019	} else
1588		- if (event.getSource() == gridItem)
	2020	+ if (source == gridItem \|\| source == gridButton)
1589	2021	{
1590	2022	makeSomething(new Grid());
1591	2023	} else
1592		- if (event.getSource() == ellipsoidItem)
	2024	+ if (source == ellipsoidItem \|\| source == sphereButton)
1593	2025	{
1594	2026	makeSomething(new Sphere());
1595	2027	} else
1596		- if (event.getSource() == coneItem)
	2028	+ if (source == coneItem \|\| source == coneButton)
1597	2029	{
1598	2030	makeSomething(new Cone());
1599	2031	} else
1600		- if (event.getSource() == torusItem)
	2032	+ if (source == torusItem \|\| source == torusButton)
1601	2033	{
1602	2034	makeSomething(new Torus());
1603	2035	} else
1604		- if (event.getSource() == superItem)
	2036	+ if (source == superItem \|\| source == superButton)
1605	2037	{
1606	2038	makeSomething(new Superellipsoid());
1607	2039	} else
1608		- if (event.getSource() == kleinItem)
	2040	+ if (source == kleinItem \|\| source == kleinButton)
1609	2041	{
1610	2042	makeSomething(new Klein());
1611	2043	} else
1612		- if (event.getSource() == blobItem)
	2044	+ if (source == blobItem)
1613	2045	{
1614	2046	Blob blob = new Blob();
1615	2047	BlobComponent comp = new BlobComponent();
..	..	@@ -1617,15 +2049,15 @@
1617	2049	//blob.retile();
1618	2050	makeSomething(blob);
1619	2051	} else
1620		- if (event.getSource() == latheItem)
	2052	+ if (source == latheItem)
1621	2053	{
1622	2054	makeSomething(new Lathe());
1623	2055	} else
1624		- if (event.getSource() == bezierItem)
	2056	+ if (source == bezierItem)
1625	2057	{
1626	2058	makeSomething(new BezierSurface());
1627	2059	} else
1628		- if (event.getSource() == checkerItem)
	2060	+ if (source == overlayItem \|\| source == overlayButton)
1629	2061	{
1630	2062	/*
1631	2063	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1640,7 +2072,7 @@
1640	2072	*/
1641	2073	makeSomething(new Checker());
1642	2074	} else
1643		- if (event.getSource() == meshItem)
	2075	+ if (source == meshItem)
1644	2076	{
1645	2077	Object3D itemtomake = new Object3D();
1646	2078	Object3D child;
..	..	@@ -1661,35 +2093,35 @@
1661	2093	makeSomething(child);
1662	2094	}
1663	2095	} else
1664		- if (event.getSource() == springItem)
	2096	+ if (source == springItem)
1665	2097	{
1666	2098	cSpring s = new cSpring();
1667	2099	s.setup();
1668	2100	makeSomething(s);
1669	2101	} else
1670		- if (event.getSource() == flagItem)
	2102	+ if (source == flagItem)
1671	2103	{
1672	2104	cSpring s = new cFlag();
1673	2105	s.setup();
1674	2106	makeSomething(s);
1675	2107	} else
1676		- if (event.getSource() == lightItem)
	2108	+ if (source == lightItem \|\| source == lightButton)
1677	2109	{
1678	2110	makeSomething(new Light());
1679	2111	} else
1680		- if (event.getSource() == csgItem)
	2112	+ if (source == csgItem)
1681	2113	{
1682	2114	group(new CSG());
1683	2115	} else
1684		- if (event.getSource() == templateItem)
	2116	+ if (source == templateItem)
1685	2117	{
1686	2118	group(new cTemplate());
1687	2119	} else
1688		- if (event.getSource() == attributeItem)
	2120	+ if (source == attributeItem)
1689	2121	{
1690	2122	makeSomething(new Attribute());
1691	2123	} else
1692		- if (event.getSource() == pointflowItem)
	2124	+ if (source == pointflowItem)
1693	2125	{
1694	2126	makeSomething(new PointFlow());
1695	2127	} else
..	..	@@ -1701,7 +2133,7 @@
1701	2133	} else
1702	2134	*/
1703	2135
1704		- if (event.getSource() == superLoopItem)
	2136	+ if (source == superLoopItem)
1705	2137	{
1706	2138	Composite g = new cGroup();
1707	2139	for (int i=0; i<15; i++)
..	..	@@ -1723,30 +2155,30 @@
1723	2155
1724	2156	group(g);
1725	2157	} else
1726		- if (event.getSource() == loopItem)
	2158	+ if (source == loopItem \|\| source == loopButton)
1727	2159	{
1728	2160	Composite csg = new GroupLeaf();
1729	2161	csg.count = 5;
1730	2162	group(csg);
1731		- Composite child = new cGroup();
	2163	+ Composite child = new cGroup("Branch");
1732	2164	csg.addChild(child);
1733	2165	child.addChild(csg);
1734	2166	} else
1735		- if (event.getSource() == doubleItem)
	2167	+ if (source == doubleItem)
1736	2168	{
1737		- Composite csg = new GroupLeaf();
	2169	+ Composite csg = new GroupLeaf("Fork");
1738	2170	csg.count = 5;
1739	2171	group(csg);
1740		- Composite child = new cGroup();
	2172	+ Composite child = new cGroup("Branch A");
1741	2173	csg.addChild(child);
1742	2174	child.addChild(csg);
1743		- child = new cGroup();
	2175	+ child = new cGroup("Branch B");
1744	2176	csg.addChild(child);
1745	2177	child.addChild(csg);
1746	2178	} else
1747		- if (event.getSource() == tripleItem)
	2179	+ if (source == tripleItem)
1748	2180	{
1749		- Composite csg = new GroupLeaf();
	2181	+ Composite csg = new GroupLeaf("Trident");
1750	2182	csg.count = 4;
1751	2183	group(csg);
1752	2184	Composite child = new cGroup();
..	..	@@ -1759,73 +2191,98 @@
1759	2191	csg.addChild(child);
1760	2192	child.addChild(csg);
1761	2193	} else
1762		-
1763		- if (event.getSource() == importGFDItem)
	2194	+ if (source == computeAOItem)
1764	2195	{
1765		- ImportGFD();
	2196	+ Globals.drawMode = CameraPane.OCCLUSION;
	2197	+ Globals.theRenderer.repaint();
1766	2198	} else
1767		- if (event.getSource() == importVRMLX3DItem)
1768		- {
1769		- ImportVRMLX3D();
1770		- } else
1771		- if (event.getSource() == import3DSItem)
1772		- {
1773		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1774		- } else
1775		- if (event.getSource() == importOBJItem)
1776		- {
1777		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1778		- } else
1779		- if (event.getSource() == computeAOItem)
1780		- {
1781		- CameraPane.drawMode = CameraPane.OCCLUSION;
1782		- CameraPane.theRenderer.repaint();
1783		- } else
1784		- if (event.getSource() == recompileItem)
	2199	+ if (source == recompileItem)
1785	2200	{
1786	2201	Recompile();
1787	2202	refreshContents();
1788	2203	} else
1789		- if (event.getSource() == editScriptItem)
	2204	+ if (source == editScriptItem)
1790	2205	{
1791	2206	OpenDialog();
1792	2207	refreshContents();
1793	2208	} else
1794		- if (event.getSource() == invariantsItem)
	2209	+ if (source == invariantsItem)
1795	2210	{
1796	2211	System.out.println("Invariants:");
1797		- GrafreeD.grafreeD.universe.invariants();
	2212	+ Grafreed.grafreeD.universe.invariants();
1798	2213	} else
1799		- if (event.getSource() == memoryItem)
	2214	+ if (source == memoryItem)
1800	2215	{
1801	2216	//System.out.println("Invariants:");
1802	2217	PrintMemory();
1803	2218	} else
1804		- if (event.getSource() == pathItem)
	2219	+ if (source == pathItem)
1805	2220	{
1806	2221	PrintPath();
1807	2222	} else
1808		- if (event.getSource() == analyzeItem)
	2223	+ if (source == analyzeItem)
1809	2224	{
1810	2225	AnalyzeObject();
1811	2226	} else
1812		- if (event.getSource() == dumpItem)
	2227	+ if (source == dumpItem)
1813	2228	{
1814	2229	DumpObject();
1815	2230	} else
1816		- if (event.getSource() == screenfitButton)
	2231	+ if (source == minButton)
1817	2232	{
1818		- //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	+ {
1819	2278	ScreenFit();
1820	2279	} else
1821		- if (event.getSource() == screenfitpointButton)
	2280	+ if (source == screenfitpointButton)
1822	2281	{
1823		- //Reload(lastConverter, lastFilename, true);
1824	2282	ScreenFitPoint();
1825	2283	} else
1826		- if (event.getSource() == snapobjectButton)
	2284	+ if (source == snapobjectButton)
1827	2285	{
1828		- //Reload(lastConverter, lastFilename, true);
1829	2286	SnapObject();
1830	2287	} else
1831	2288	// if (event.getSource() == recompileButton)
..	..	@@ -1834,13 +2291,13 @@
1834	2291	// Recompile();
1835	2292	// refreshContents();
1836	2293	// } else
1837		- if (event.getSource() == gcButton)
	2294	+ if (source == gcButton)
1838	2295	{
1839	2296	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1840	2297	System.gc();
1841	2298	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1842	2299	} else
1843		- if (event.getSource() == editLeafItem)
	2300	+ if (source == editLeafItem)
1844	2301	{
1845	2302	Object3D obj;
1846	2303	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1854,62 +2311,74 @@
1854	2311	}
1855	2312	refreshContents(true);
1856	2313	} else
1857		- if (event.getSource() == openWindowItem)
	2314	+ if (source == openWindowItem)
1858	2315	{
1859	2316	EditSelection(true);
1860	2317	} else
1861		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2318	+ if (source == cutItem \|\| source == clearButton)
1862	2319	{
1863	2320	loadClipboard(true);
1864	2321	} else
1865		- if (event.getSource() == duplicateItem)
	2322	+ if (source == undoItem)
1866	2323	{
1867		- 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;
1868	2333	loadClipboard(false);
1869	2334	paste(false);
1870		- GrafreeD.clipboard = keep;
	2335	+ Grafreed.clipboard = keep;
1871	2336	} else
1872		- if (event.getSource() == cloneItem)
	2337	+ if (source == cloneItem)
1873	2338	{
1874	2339	CloneSelection(false);
1875	2340	} else
1876		- if (event.getSource() == cloneSupportItem)
	2341	+ if (source == cloneSupportItem)
1877	2342	{
1878	2343	CloneSelection(true);
1879	2344	} else
1880		- if (event.getSource() == copyItem)
	2345	+ if (source == copyItem)
1881	2346	{
1882	2347	loadClipboard(false);
1883	2348	} else
1884		- if (event.getSource() == pasteItem)
	2349	+ if (source == pasteItem)
1885	2350	{
1886	2351	paste(false);
1887	2352	} else
1888		- if (event.getSource() == pasteLinkItem)
	2353	+ if (source == pasteIntoItem)
1889	2354	{
1890		- pasteInto(false);
	2355	+ pasteInto(true, false);
1891	2356	} else
1892		- if (event.getSource() == pasteCloneItem)
	2357	+ if (source == pasteLinkItem)
1893	2358	{
1894		- pasteInto(true);
	2359	+ pasteInto(false, false);
1895	2360	} else
1896		- if (event.getSource() == pasteExpandItem)
	2361	+ if (source == pasteCloneItem)
	2362	+ {
	2363	+ pasteInto(true, true);
	2364	+ } else
	2365	+ if (source == pasteExpandItem)
1897	2366	{
1898	2367	paste(true);
1899	2368	} else
1900		- if (event.getSource() == synchronizeItem)
	2369	+ if (source == synchronizeItem)
1901	2370	{
1902	2371	Overwrite(Object3D.TRANSFORM);
1903	2372	} else
1904		- if (event.getSource() == overwriteNameItem)
	2373	+ if (source == overwriteNameItem)
1905	2374	{
1906	2375	Overwrite(Object3D.NAME);
1907	2376	} else
1908		- if (event.getSource() == overwriteUVItem)
	2377	+ if (source == overwriteUVItem)
1909	2378	{
1910	2379	Overwrite(Object3D.UV);
1911	2380	} else
1912		- if (event.getSource() == overwriteMatItem)
	2381	+ if (source == overwriteMatItem)
1913	2382	{
1914	2383	/* july 2015
1915	2384	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1929,7 +2398,7 @@
1929	2398
1930	2399	Overwrite(dropAttributes);
1931	2400	}
1932		- if (event.getSource() == overwriteGeoItem)
	2401	+ if (source == overwriteGeoItem)
1933	2402	{
1934	2403	Overwrite(Object3D.GEOMETRY);
1935	2404	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1946,7 +2415,7 @@
1946	2415	// refreshContents();
1947	2416	// }
1948	2417	} else
1949		- if (event.getSource() == generateMeshItem)
	2418	+ if (source == generateMeshItem)
1950	2419	{
1951	2420	//if (group.selection.size() == 1)
1952	2421	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1957,7 +2426,7 @@
1957	2426	ResetModel();
1958	2427	refreshContents();
1959	2428	} else
1960		- if (event.getSource() == extractGeometriesItem)
	2429	+ if (source == extractGeometriesItem)
1961	2430	{
1962	2431	boolean one = false;
1963	2432
..	..	@@ -1984,7 +2453,7 @@
1984	2453	ResetModel();
1985	2454	refreshContents();
1986	2455	} else
1987		- if (event.getSource() == cloneGeometriesItem)
	2456	+ if (source == cloneGeometriesItem)
1988	2457	{
1989	2458	boolean one = false;
1990	2459
..	..	@@ -2010,7 +2479,7 @@
2010	2479	ResetModel();
2011	2480	refreshContents();
2012	2481	} else
2013		- if (event.getSource() == shareGeometriesItem)
	2482	+ if (source == shareGeometriesItem)
2014	2483	{
2015	2484	boolean one = false;
2016	2485
..	..	@@ -2040,7 +2509,7 @@
2040	2509	refreshContents();
2041	2510	}
2042	2511	} else
2043		- if (event.getSource() == mergeGeometriesItem)
	2512	+ if (source == mergeGeometriesItem)
2044	2513	{
2045	2514	boolean one = false;
2046	2515
..	..	@@ -2070,7 +2539,7 @@
2070	2539	ResetModel();
2071	2540	refreshContents();
2072	2541	} else
2073		- if (event.getSource() == linkverticesItem)
	2542	+ if (source == linkverticesItem)
2074	2543	{
2075	2544	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2076	2545	// {
..	..	@@ -2083,48 +2552,48 @@
2083	2552	// group.selection.get(0).setMasterThis(content); // should be identity
2084	2553	// refreshContents();
2085	2554	// }
2086		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2555	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2087	2556	{
2088		- Object3D content = GrafreeD.clipboard.get(0);
	2557	+ Object3D content = Grafreed.clipboard.get(0);
2089	2558
2090	2559	if (content instanceof cGroup && ((cGroup)content).transientlink )
2091	2560	content = ((cGroup)content).get(0);
2092	2561
2093		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2562	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2094	2563	for (int i=0; i<group.selection.size(); i++)
2095	2564	{
2096		- boolean random = CameraPane.RANDOM;
2097		- CameraPane.RANDOM = false; // parse all random nodes
	2565	+ boolean random = CameraPane.SWITCH;
	2566	+ CameraPane.SWITCH = false; // parse all random nodes
2098	2567	group.selection.get(i).linkVerticesThis(content);
2099	2568	// group.selection.get(i).setMasterThis(content); // should be identity
2100		- CameraPane.RANDOM = random;
	2569	+ CameraPane.SWITCH = random;
2101	2570	}
2102		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2571	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2103	2572	refreshContents();
2104	2573	}
2105	2574	} else
2106		- if (event.getSource() == resetsupportItem)
	2575	+ if (source == resetsupportItem)
2107	2576	{
2108	2577	for (int i=0; i<group.selection.size(); i++)
2109	2578	{
2110		- boolean random = CameraPane.RANDOM;
2111		- CameraPane.RANDOM = false; // parse all random nodes
	2579	+ boolean random = CameraPane.SWITCH;
	2580	+ CameraPane.SWITCH = false; // parse all random nodes
2112	2581	group.selection.get(i).linkVerticesThis(null);
2113		- CameraPane.RANDOM = random;
	2582	+ CameraPane.SWITCH = random;
2114	2583	}
2115	2584
2116	2585	refreshContents();
2117	2586	} else
2118		- if (event.getSource() == relinkverticesItem)
	2587	+ if (source == relinkverticesItem)
2119	2588	{
2120		- boolean random = CameraPane.RANDOM;
2121		- CameraPane.RANDOM = false; // parse all random nodes
	2589	+ boolean random = CameraPane.SWITCH;
	2590	+ CameraPane.SWITCH = false; // parse all random nodes
2122	2591	group.selection.RelinkToSupport();
2123		- CameraPane.RANDOM = random;
	2592	+ CameraPane.SWITCH = random;
2124	2593
2125	2594	refreshContents();
2126	2595	} else
2127		- if (event.getSource() == resetreferencesItem)
	2596	+ if (source == resetreferencesItem)
2128	2597	{
2129	2598	for (int i=0; i<group.selection.size(); i++)
2130	2599	{
..	..	@@ -2133,11 +2602,11 @@
2133	2602
2134	2603	refreshContents();
2135	2604	} else
2136		- if (event.getSource() == setMasterItem)
	2605	+ if (source == setMasterItem)
2137	2606	{
2138		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2607	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2139	2608	{
2140		- Object3D content = GrafreeD.clipboard.get(0);
	2609	+ Object3D content = Grafreed.clipboard.get(0);
2141	2610
2142	2611	if (content instanceof cGroup && ((cGroup)content).transientlink )
2143	2612	content = ((cGroup)content).get(0);
..	..	@@ -2146,13 +2615,13 @@
2146	2615	refreshContents();
2147	2616	}
2148	2617	} else
2149		- if (event.getSource() == poseMeshItem)
	2618	+ if (source == poseMeshItem)
2150	2619	{
2151	2620	if (group.selection.size() == 1)
2152	2621	{
2153		- if (GrafreeD.clipboard.size() == 1)
	2622	+ if (Grafreed.clipboard.size() == 1)
2154	2623	{
2155		- Object3D content = GrafreeD.clipboard.get(0);
	2624	+ Object3D content = Grafreed.clipboard.get(0);
2156	2625
2157	2626	if (content instanceof cGroup && ((cGroup)content).transientlink )
2158	2627	content = ((cGroup)content).get(0);
..	..	@@ -2165,19 +2634,19 @@
2165	2634	}
2166	2635
2167	2636	} else
2168		- if (event.getSource() == revertMeshItem)
	2637	+ if (source == revertMeshItem)
2169	2638	{
2170	2639	RevertMeshes();
2171	2640	} else
2172		- if (event.getSource() == resetMeshItem)
	2641	+ if (source == resetAllItem)
2173	2642	{
2174	2643	ResetAll();
2175	2644	} else
2176		- if (event.getSource() == stepAllItem)
	2645	+ if (source == stepAllItem)
2177	2646	{
2178	2647	StepAll();
2179	2648	} else
2180		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2649	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2181	2650	{
2182	2651	//int indices[] = jList.getSelectedIndices();
2183	2652	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2185,46 +2654,46 @@
2185	2654
2186	2655	ClearSelection(false);
2187	2656	} else
2188		- if (event.getSource() == clearAllItem)
	2657	+ if (source == clearAllItem)
2189	2658	{
2190	2659	ClearSelection(true);
2191	2660	} else
2192		- if (event.getSource() == grabItem)
	2661	+ if (source == grabItem \|\| source == groupButton)
2193	2662	{
2194		- group(new cGroup(), true);
	2663	+ group(new cGroup(), false); // true);
2195	2664	} else
2196		- if (event.getSource() == hideItem)
	2665	+ if (source == hideItem)
2197	2666	{
2198	2667	group(new HiddenObject());
2199	2668	} else
2200		- if (event.getSource() == frontItem)
	2669	+ if (source == frontItem)
2201	2670	{
2202	2671	front();
2203	2672	} else
2204		- if (event.getSource() == backItem)
	2673	+ if (source == backItem)
2205	2674	{
2206	2675	back();
2207	2676	} else
2208		- if (event.getSource() == cameraItem)
	2677	+ if (source == cameraItem)
2209	2678	{
2210	2679	makeSomething(new Camera());
2211	2680	} else
2212		- if (event.getSource() == compositeItem)
	2681	+ if (source == compositeItem \|\| source == compositeButton)
2213	2682	{
2214	2683	group(new Composite());
2215	2684	} else
2216		- if (event.getSource() == randomItem)
	2685	+ if (source == switchItem \|\| source == switchButton)
2217	2686	{
2218	2687	RandomNode random = new RandomNode();
2219	2688	group(random);
2220	2689	if (random.size() > 0)
2221		- random.name = random.get(0).name + "Rnd";
	2690	+ random.name = random.get(0).name + "Switch";
2222	2691	} else
2223		- if (event.getSource() == physicsItem)
	2692	+ if (source == physicsItem)
2224	2693	{
2225	2694	group(new PhysicsNode());
2226	2695	} else
2227		- if (event.getSource() == frameselectorItem)
	2696	+ if (source == frameselectorItem)
2228	2697	{
2229	2698	for (int i=0; i<group.selection.size(); i++)
2230	2699	{
..	..	@@ -2236,7 +2705,7 @@
2236	2705	ResetModel();
2237	2706	refreshContents();
2238	2707	} else
2239		- if (event.getSource() == switchGeoItem)
	2708	+ if (source == switchGeoItem)
2240	2709	{
2241	2710	for (int i=0; i<group.selection.size(); i++)
2242	2711	{
..	..	@@ -2248,7 +2717,7 @@
2248	2717	ResetModel();
2249	2718	refreshContents();
2250	2719	} else
2251		- if (event.getSource() == switchTransfoItem)
	2720	+ if (source == switchTransfoItem)
2252	2721	{
2253	2722	for (int i=0; i<group.selection.size(); i++)
2254	2723	{
..	..	@@ -2260,7 +2729,7 @@
2260	2729	ResetModel();
2261	2730	refreshContents();
2262	2731	} else
2263		- if (event.getSource() == morphItem)
	2732	+ if (source == morphItem)
2264	2733	{
2265	2734	for (int i=0; i<group.selection.size(); i++)
2266	2735	{
..	..	@@ -2272,7 +2741,7 @@
2272	2741	ResetModel();
2273	2742	refreshContents();
2274	2743	} else
2275		- if (event.getSource() == scriptNodeItem)
	2744	+ if (source == scriptNodeItem)
2276	2745	{
2277	2746	boolean atleastone = false;
2278	2747
..	..	@@ -2311,215 +2780,252 @@
2311	2780	}
2312	2781	}
2313	2782	} else
2314		- if (event.getSource() == linkerItem)
	2783	+ if (source == linkerItem)
2315	2784	{
2316	2785	group(new cLinker());
2317	2786	} else
2318		- if (event.getSource() == textureItem)
	2787	+ if (source == textureItem \|\| source == textureButton)
2319	2788	{
2320	2789	group(new TextureNode());
2321	2790	} else
2322		- if (event.getSource() == billboardItem)
	2791	+ if (source == billboardItem)
2323	2792	{
2324	2793	group(new BillboardNode());
2325	2794	} else
2326		- if (event.getSource() == shadowXItem)
	2795	+ if (source == shadowXItem)
2327	2796	{
2328	2797	CastShadow(0);
2329	2798	} else
2330		- if (event.getSource() == shadowYItem)
	2799	+ if (source == shadowYItem)
2331	2800	{
2332	2801	CastShadow(1);
2333	2802	} else
2334		- if (event.getSource() == shadowZItem)
	2803	+ if (source == shadowZItem)
2335	2804	{
2336	2805	CastShadow(2);
2337	2806	} else
2338		- if (event.getSource() == ungroupItem)
	2807	+ if (source == ungroupItem \|\| source == ungroupButton)
2339	2808	{
2340		- //ungroup();
	2809	+ boolean hasRoot = false;
	2810	+
2341	2811	for (int i=0; i<group.selection.size(); i++)
2342	2812	{
2343		- Ungroup(group.selection.get(i));
	2813	+ if (group.selection.get(i) == group)
	2814	+ {
	2815	+ hasRoot = true;
	2816	+ break;
	2817	+ }
2344	2818	}
2345	2819
2346		- ClearSelection(false);
2347		-
2348		- 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	+ }
2349	2831	} else
2350		- if (event.getSource() == genUVItem)
	2832	+ if (source == genUVItem)
2351	2833	{
2352	2834	GenUV();
2353	2835	} else
2354		- if (event.getSource() == genNormalsCADItem)
	2836	+ if (source == genNormalsCADItem)
2355	2837	{
2356	2838	GenNormals(true);
2357	2839	} else
2358		- if (event.getSource() == genNormalsMESHItem)
	2840	+ if (source == genNormalsMESHItem)
2359	2841	{
2360		- GenNormals(true); // TODO
	2842	+ GenNormalsMESH();
2361	2843	} else
2362		- if (event.getSource() == genNormalsORGANItem)
	2844	+ if (source == genNormalsORGANItem)
2363	2845	{
2364	2846	GenNormals(false);
2365	2847	} else
2366		- if (event.getSource() == genNormalsMINEItem)
	2848	+ if (source == genNormalsMINEItem)
2367	2849	{
2368	2850	GenNormalsMINE();
2369	2851	} else
2370		- if (event.getSource() == stripifyItem)
	2852	+ if (source == stripifyItem)
2371	2853	{
2372	2854	Stripify();
2373	2855	} else
2374		- if (event.getSource() == unstripifyItem)
	2856	+ if (source == unstripifyItem)
2375	2857	{
2376	2858	Unstripify();
2377	2859	} else
2378		- if (event.getSource() == trimItem)
	2860	+ if (source == trimItem)
2379	2861	{
2380	2862	Trim();
2381	2863	} else
2382		- if (event.getSource() == untrimItem)
	2864	+ if (source == untrimItem)
2383	2865	{
2384	2866	Untrim();
2385	2867	} else
2386		- if (event.getSource() == clearColorsItem)
	2868	+ if (source == clearColorsItem)
2387	2869	{
2388	2870	ClearColors();
2389	2871	} else
2390		- if (event.getSource() == clearMaterialsItem)
	2872	+ if (source == clearMaterialsItem)
2391	2873	{
2392	2874	ClearMaterials();
2393	2875	} else
2394		- if (event.getSource() == liveleavesItem)
	2876	+ if (source == liveleavesItem)
2395	2877	{
2396	2878	LiveLeaves(true);
2397	2879	} else
2398		- if (event.getSource() == unliveleavesItem)
	2880	+ if (source == unliveleavesItem)
2399	2881	{
2400	2882	LiveLeaves(false);
2401	2883	} else
2402		- if (event.getSource() == supportleavesItem)
	2884	+ if (source == supportleavesItem)
2403	2885	{
2404	2886	SupportLeaves(true);
2405	2887	} else
2406		- if (event.getSource() == unsupportleavesItem)
	2888	+ if (source == unsupportleavesItem)
2407	2889	{
2408	2890	SupportLeaves(false);
2409	2891	} else
2410		- if (event.getSource() == hideleavesItem)
	2892	+ if (source == hideleavesItem)
2411	2893	{
2412	2894	HideLeaves(true);
2413	2895	} else
2414		- if (event.getSource() == showleavesItem)
	2896	+ if (source == showleavesItem)
2415	2897	{
2416	2898	HideLeaves(false);
2417	2899	} else
2418		- if (event.getSource() == markleavesItem)
	2900	+ if (source == markleavesItem)
2419	2901	{
2420	2902	MarkLeaves(true);
2421	2903	} else
2422		- if (event.getSource() == unmarkleavesItem)
	2904	+ if (source == unmarkleavesItem)
2423	2905	{
2424	2906	MarkLeaves(false);
2425	2907	} else
2426		- 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)
2427	2925	{
2428	2926	FlipV(true);
2429	2927	} else
2430		- if (event.getSource() == unflipVItem)
	2928	+ if (source == unflipVItem)
2431	2929	{
2432	2930	FlipV(false);
2433	2931	} else
2434		- if (event.getSource() == lowTexturesItem)
	2932	+ if (source == lowTexturesItem)
2435	2933	{
2436	2934	SetTexRes(0);
2437	2935	} else
2438		- if (event.getSource() == normalTexturesItem)
	2936	+ if (source == normalTexturesItem)
2439	2937	{
2440	2938	SetTexRes(1);
2441	2939	} else
2442		- if (event.getSource() == highTexturesItem)
	2940	+ if (source == highTexturesItem)
2443	2941	{
2444	2942	SetTexRes(2);
2445	2943	} else
2446		- if (event.getSource() == veryhighTexturesItem)
	2944	+ if (source == veryhighTexturesItem)
2447	2945	{
2448	2946	SetTexRes(3);
2449	2947	} else
2450		- if (event.getSource() == maxTexturesItem)
	2948	+ if (source == maxTexturesItem)
2451	2949	{
2452	2950	SetTexRes(4);
2453	2951	} else
2454		- if (event.getSource() == panoTexturesItem)
	2952	+ if (source == panoTexturesItem)
2455	2953	{
2456	2954	SetTexRes(5);
2457	2955	} else
2458		- if (event.getSource() == reverseNormalsItem)
	2956	+ if (source == reverseNormalsItem)
2459	2957	{
2460	2958	ReverseNormals();
2461	2959	} else
2462		- if (event.getSource() == parseverticesItem)
	2960	+ if (source == parseverticesItem)
2463	2961	{
2464	2962	ParseVertices();
2465	2963	} else
2466		- if (event.getSource() == textureFieldItem)
	2964	+ if (source == textureFieldItem)
2467	2965	{
2468	2966	TextureVertices();
2469	2967	} else
2470		- if (event.getSource() == alignItem)
	2968	+ if (source == alignItem)
2471	2969	{
2472	2970	Align();
2473	2971	} else
2474		- if (event.getSource() == mirrorItem)
	2972	+ if (source == mirrorItem)
2475	2973	{
2476	2974	MirrorPoses();
2477	2975	} else
2478		- if (event.getSource() == reduceMorphItem)
	2976	+ if (source == reduceMorphItem)
2479	2977	{
2480	2978	MeshReduction(false);
2481	2979	} else
2482		- if (event.getSource() == reduce34MorphItem)
	2980	+ if (source == reduce34MorphItem)
2483	2981	{
2484	2982	MeshReduction(true);
2485	2983	} else
2486		- if (event.getSource() == reverseTrianglesItem)
	2984	+ if (source == reverseTrianglesItem)
2487	2985	{
2488	2986	ReverseTriangles();
2489	2987	} else
2490		- if (event.getSource() == reduceMeshItem)
	2988	+ if (source == reduceMeshItem)
2491	2989	{
2492	2990	ReduceMesh(false);
2493	2991	} else
2494		- if (event.getSource() == reduce34MeshItem)
	2992	+ if (source == reduce34MeshItem)
2495	2993	{
2496	2994	ReduceMesh(true);
2497	2995	} else
2498		- if (event.getSource() == increaseMeshItem)
	2996	+ if (source == increaseMeshItem)
2499	2997	{
2500	2998	IncreaseMesh();
2501	2999	} else
2502		- if (event.getSource() == clipMeshItem)
	3000	+ if (source == clipMeshItem)
2503	3001	{
2504	3002	ClipMesh();
2505	3003	} else
2506		- if (event.getSource() == smoothMeshItem)
	3004	+ if (source == smoothMeshItem)
2507	3005	{
2508	3006	SmoothMesh();
2509	3007	} else
2510		- if (event.getSource() == transformgeometryItem)
	3008	+ if (source == transformGeometryItem)
2511	3009	{
2512	3010	TransformGeometry();
2513	3011	} else
2514		- if (event.getSource() == resetTransformItem)
	3012	+ if (source == transformChildrenItem)
	3013	+ {
	3014	+ TransformChildren();
	3015	+ } else
	3016	+ if (source == resetTransformItem)
2515	3017	{
2516	3018	ResetTransform();
2517	3019	} else
2518		- if (event.getSource() == resetCentroidItem)
	3020	+ if (source == resetCentroidItem)
2519	3021	{
2520		- ResetCentroid();
	3022	+ ResetCentroid(true);
2521	3023	} else
2522		- if (event.getSource() == resetParentItem)
	3024	+ if (source == resetCentroidXZItem)
	3025	+ {
	3026	+ ResetCentroid(false);
	3027	+ } else
	3028	+ if (source == resetParentItem)
2523	3029	{
2524	3030	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2525	3031	{
..	..	@@ -2529,7 +3035,7 @@
2529	3035
2530	3036	refreshContents();
2531	3037	} else
2532		- if (event.getSource() == repairParentItem)
	3038	+ if (source == repairParentItem)
2533	3039	{
2534	3040	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2535	3041	{
..	..	@@ -2543,7 +3049,21 @@
2543	3049
2544	3050	refreshContents();
2545	3051	} else
2546		- if (event.getSource() == sortbysizeItem)
	3052	+ if (source == repairShadowItem)
	3053	+ {
	3054	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3055	+ {
	3056	+ Object3D obj = (Object3D)e.nextElement();
	3057	+ obj.RepairShadow();
	3058	+// for (int i=0; i<obj.size(); i++)
	3059	+// {
	3060	+// obj.get(i).parent = obj;
	3061	+// }
	3062	+ }
	3063	+
	3064	+ refreshContents();
	3065	+ } else
	3066	+ if (source == sortbysizeItem)
2547	3067	{
2548	3068	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2549	3069	{
..	..	@@ -2555,7 +3075,7 @@
2555	3075	ResetModel();
2556	3076	refreshContents();
2557	3077	} else
2558		- if (event.getSource() == sortbynameItem)
	3078	+ if (source == sortbynameItem)
2559	3079	{
2560	3080	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2561	3081	{
..	..	@@ -2567,7 +3087,7 @@
2567	3087	ResetModel();
2568	3088	refreshContents();
2569	3089	} else
2570		- if (event.getSource() == attachPigmentItem)
	3090	+ if (source == attachPigmentItem)
2571	3091	{
2572	3092	String texture = GetFile("Attach pigment");
2573	3093	Object3D obj;
..	..	@@ -2579,7 +3099,7 @@
2579	3099
2580	3100	refreshContents();
2581	3101	} else
2582		- if (event.getSource() == detachPigmentItem)
	3102	+ if (source == detachPigmentItem)
2583	3103	{
2584	3104	Object3D obj;
2585	3105	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2590,7 +3110,7 @@
2590	3110
2591	3111	refreshContents();
2592	3112	} else
2593		- if (event.getSource() == attachBumpItem)
	3113	+ if (source == attachBumpItem)
2594	3114	{
2595	3115	String texture = GetFile("Attach bump");
2596	3116	Object3D obj;
..	..	@@ -2602,7 +3122,7 @@
2602	3122
2603	3123	refreshContents();
2604	3124	} else
2605		- if (event.getSource() == detachBumpItem)
	3125	+ if (source == detachBumpItem)
2606	3126	{
2607	3127	Object3D obj;
2608	3128	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2613,7 +3133,7 @@
2613	3133
2614	3134	refreshContents();
2615	3135	} else
2616		- if (event.getSource() == pigmentBumpItem)
	3136	+ if (source == pigmentBumpItem)
2617	3137	{
2618	3138	Object3D obj;
2619	3139	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2624,158 +3144,237 @@
2624	3144
2625	3145	refreshContents();
2626	3146	} else
2627		- if (event.getSource() == flashSelectionButton)
	3147	+ if (source == flashSelectionButton)
2628	3148	{
2629	3149	CameraPane.flash = true;
2630	3150	refreshContents();
2631	3151	} else
2632		- if (event.getSource() == oneButton)
	3152	+ if (source == oneButton)
2633	3153	{
2634	3154	} else
2635		- if (event.getSource() == twoButton)
	3155	+ if (source == twoButton)
2636	3156	{
2637	3157	radio.layout = twoButton;
	3158	+
	3159	+ if (CameraPane.FULLSCREEN)
	3160	+ fullscreenLayout = radio.layout;
	3161	+
2638	3162	// bug
2639	3163	//gridPanel.setDividerLocation(1.0);
2640	3164	//bigPanel.setDividerLocation(0.0);
2641		- bigThree.remove(scenePanel);
2642		- bigThree.remove(cameraPanel);
2643		- bigThree.remove(XYZPanel);
2644		- aWindowConstraints.gridx = 0;
2645		- aWindowConstraints.gridy = 0;
2646		- aWindowConstraints.gridwidth = 1;
2647		- // aConstraints.gridheight = 3;
2648		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2649		- aWindowConstraints.weightx = 0;
2650		- aWindowConstraints.weighty = 1;
2651		- //bigThree.add(jtp, aWindowConstraints);
2652		- aWindowConstraints.weightx = 1;
2653		- aWindowConstraints.gridwidth = 3;
2654		- // aConstraints.gridheight = 3;
2655		- aWindowConstraints.gridx = 1;
2656		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2657		- bigThree.add(cameraPanel, aWindowConstraints);
2658		- aWindowConstraints.weightx = 0;
2659		- aWindowConstraints.gridx = 4;
2660		- aWindowConstraints.gridwidth = 1;
2661		- // aConstraints.gridheight = 3;
2662		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2663		- //bigThree.add(XYZPanel, aWindowConstraints);
2664		- 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	+
2665	3212	} else
2666		- if (event.getSource() == threeButton)
	3213	+ if (source == threeButton)
2667	3214	{
2668	3215	radio.layout = threeButton;
2669		- bigThree.remove(scenePanel);
2670		- bigThree.remove(cameraPanel);
2671		- bigThree.remove(XYZPanel);
2672		- aWindowConstraints.gridx = 0;
2673		- aWindowConstraints.gridy = 0;
2674		- aWindowConstraints.gridwidth = 1;
2675		- // aConstraints.gridheight = 3;
2676		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2677		- aWindowConstraints.weightx = 0;
2678		- aWindowConstraints.weighty = 1;
2679		- //bigThree.add(jtp, aWindowConstraints);
2680		- aWindowConstraints.weightx = 1;
2681		- aWindowConstraints.gridwidth = 3;
2682		- // aConstraints.gridheight = 3;
2683		- aWindowConstraints.gridx = 1;
2684		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2685		- bigThree.add(cameraPanel, aWindowConstraints);
2686		- aWindowConstraints.weightx = 0;
2687		- aWindowConstraints.gridx = 4;
2688		- aWindowConstraints.gridwidth = 1;
2689		- // aConstraints.gridheight = 3;
2690		- aConstraints.fill = GridBagConstraints.VERTICAL;
2691		- bigThree.add(XYZPanel, aWindowConstraints);
2692		- 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();
2693	3253	} else
2694		- if (event.getSource() == fourButton)
	3254	+ if (source == fourButton)
2695	3255	{
2696	3256	radio.layout = fourButton;
2697		- bigThree.remove(scenePanel);
2698		- bigThree.remove(cameraPanel);
2699		- bigThree.remove(XYZPanel);
2700		- aWindowConstraints.gridx = 0;
2701		- aWindowConstraints.gridy = 0;
2702		- aWindowConstraints.gridwidth = 1;
2703		- // aWindowConstraints.gridheight = 3;
2704		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2705		- aWindowConstraints.weightx = 1;
2706		- aWindowConstraints.weighty = 1;
2707		- bigThree.add(scenePanel, aWindowConstraints);
2708		- aWindowConstraints.weightx = 1;
2709		- aWindowConstraints.gridwidth = 3;
2710		- // aConstraints.gridheight = 3;
2711		- aWindowConstraints.gridx = 1;
2712		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2713		- //bigThree.add(cameraPanel, aWindowConstraints);
2714		- aWindowConstraints.weightx = 0;
2715		- aWindowConstraints.gridx = 4;
2716		- aWindowConstraints.gridwidth = 1;
2717		- // aWindowConstraints.gridheight = 3;
2718		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2719		- //bigThree.add(XYZPanel, aWindowConstraints);
2720		- 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();
2721	3293	} else
2722		- if (event.getSource() == sixButton)
	3294	+ if (source == sixButton)
2723	3295	{
2724	3296	radio.layout = sixButton;
2725		- bigThree.remove(scenePanel);
2726		- bigThree.remove(cameraPanel);
2727		- bigThree.remove(XYZPanel);
2728		- aWindowConstraints.gridx = 0;
2729		- aWindowConstraints.gridy = 0;
2730		- aWindowConstraints.gridwidth = 1;
2731		- // aConstraints.gridheight = 3;
2732		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2733		- aWindowConstraints.weightx = 0;
2734		- aWindowConstraints.weighty = 1;
2735		- bigThree.add(scenePanel, aWindowConstraints);
2736		- aWindowConstraints.weightx = 1;
2737		- aWindowConstraints.gridwidth = 3;
2738		- // aWindowConstraints.gridheight = 3;
2739		- aWindowConstraints.gridx = 1;
2740		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2741		- bigThree.add(cameraPanel, aWindowConstraints);
2742		- aWindowConstraints.weightx = 0;
2743		- aWindowConstraints.gridx = 4;
2744		- aWindowConstraints.gridwidth = 1;
2745		- // aWindowConstraints.gridheight = 3;
2746		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2747		- //bigThree.add(XYZPanel, aConstraints);
2748		- 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();
2749	3334	} else
2750		- if (event.getSource() == sevenButton)
	3335	+ if (source == sevenButton)
2751	3336	{
2752	3337	radio.layout = sevenButton;
2753		- bigThree.remove(scenePanel);
2754		- bigThree.remove(cameraPanel);
2755		- bigThree.remove(XYZPanel);
2756		- aWindowConstraints.gridx = 0;
2757		- aWindowConstraints.gridy = 0;
2758		- aWindowConstraints.gridwidth = 1;
2759		- // aWindowConstraints.gridheight = 3;
2760		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2761		- aWindowConstraints.weightx = 0;
2762		- aWindowConstraints.weighty = 1;
2763		- bigThree.add(scenePanel, aWindowConstraints);
2764		- aWindowConstraints.weightx = 1;
2765		- aWindowConstraints.gridwidth = 3;
2766		- // aWindowConstraints.gridheight = 3;
2767		- aWindowConstraints.gridx = 1;
2768		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2769		- bigThree.add(cameraPanel, aWindowConstraints);
2770		- aWindowConstraints.weightx = 0;
2771		- aWindowConstraints.gridx = 4;
2772		- aWindowConstraints.gridwidth = 1;
2773		- // aConstraints.gridheight = 3;
2774		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2775		- bigThree.add(XYZPanel, aWindowConstraints);
2776		- 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();
2777	3376	} else
2778		- if (event.getSource() == rootButton)
	3377	+ if (source == rootButton)
2779	3378	{
2780	3379	Object3D obj;
2781	3380	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2785,66 +3384,84 @@
2785	3384	EditObject(obj);
2786	3385	}
2787	3386
	3387	+ cameraView.requestFocusInWindow();
2788	3388	refreshContents(true);
2789	3389	} else
2790		- if (event.getSource() == closeButton)
	3390	+ if (source == closeButton)
2791	3391	{
2792	3392	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2793	3393	cRadio ab;
2794	3394	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2795	3395	{
2796	3396	ab = (cRadio)e.nextElement();
2797		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3397	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2798	3398	{
	3399	+ // Patch to avoid bug with transparency.
	3400	+ if (!ab.hadMaterial)
	3401	+ {
	3402	+ ab.object.material = null;
	3403	+ }
	3404	+
2799	3405	buttonGroup.remove(ab);
2800	3406	radioPanel.remove(ab);
2801	3407
2802		- ab.GetObject().editWindow = null;
	3408	+ //ab.GetObject().editWindow = null;
	3409	+ ab.GetObject().manipWindow = null;
2803	3410	// ab.GetObject().objectUI = null; // ?????????
2804	3411
2805	3412	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2806	3413	break;
2807	3414	}
2808	3415	}
	3416	+
	3417	+ cameraView.requestFocusInWindow();
2809	3418	refreshContents(true);
2810	3419	} else
2811		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3420	+ if (source == editItem \|\| source == editButton)
2812	3421	{
	3422	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3423	+ {
	3424	+ Object3D child = (Object3D)e.nextElement();
	3425	+ child.pinned = true;
	3426	+ }
	3427	+
2813	3428	EditSelection(false);
2814	3429	} else
2815		- if (event.getSource() == uneditButton)
	3430	+ if (source == uneditButton)
2816	3431	{
2817	3432	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2818	3433	{
2819	3434	Object3D child = (Object3D)e.nextElement();
2820	3435	if(child.editWindow != null)
2821	3436	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3437	+ child.pinned = false;
2822	3438	child.CloseUI();
2823	3439	listUI.remove(child);
2824	3440
2825		- child.editWindow = null; // ???????????
	3441	+ //child.editWindow = null; // ???????????
2826	3442	}
2827		- objEditor.ctrlPanel.revalidate();
	3443	+ objEditor.ctrlPanel.FlushUI();
2828	3444	//objEditor.jTree.clearSelection();
2829	3445	//objEditor.ResetSliders();
2830	3446	refreshContents(true);
2831	3447	} else
2832		- if (event.getSource() == clearPanelButton)
	3448	+ if (source == clearPanelButton)
2833	3449	{
2834	3450	assert(copy == group);
2835	3451	//copy.ClearUI();
2836	3452	for (Object3D obj : listUI)
2837	3453	{
	3454	+ obj.pinned = false;
2838	3455	obj.CloseUI();
2839	3456	}
2840	3457	listUI.clear();
2841	3458	refreshContents(true);
2842	3459	} else
2843		- if (event.getSource() == allParamsButton)
	3460	+ if (source == allParamsButton)
2844	3461	{
2845	3462	assert(copy == group);
2846	3463
2847		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3464	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2848	3465
2849	3466	for (Object3D obj : listUI)
2850	3467	{
..	..	@@ -2861,19 +3478,19 @@
2861	3478
2862	3479	refreshContents(true);
2863	3480	} else
2864		- if (event.getSource() == unselectButton)
	3481	+ if (source == unselectButton)
2865	3482	{
2866	3483	objEditor.jTree.clearSelection();
2867	3484	// ?? oct 2012 GrafreeD.clipboard.clear();
2868	3485	objEditor.ResetSliders();
2869	3486	refreshContents(true);
2870	3487	} else
2871		- if(event.getSource() instanceof cRadio)
	3488	+ if(source instanceof cRadio)
2872	3489	{
2873	3490	group.parent = keepparent;
2874	3491	group.attributes = 0;
2875	3492	//group.editWindow = null;
2876		- /cRadio/ radio = (cRadio)event.getSource();
	3493	+ /cRadio/ radio = (cRadio)source;
2877	3494	Object3D obj = radio.GetObject();
2878	3495	System.out.println("Edit " + obj);
2879	3496	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2893,7 +3510,10 @@
2893	3510	}
2894	3511
2895	3512	copy = group;
2896		- //CameraPane.theRenderer.object = group;
	3513	+
	3514	+ SetUndoStates();
	3515	+
	3516	+ //Globals.theRenderer.object = group;
2897	3517	if(!useclient)
2898	3518	{
2899	3519	cameraView.renderCamera = radio.camera;
..	..	@@ -2902,25 +3522,50 @@
2902	3522	cameraView.cameras[cameraView.cameracount] = radio.camera;
2903	3523	cameraView.targetLookAt.set(radio.camera.lookAt);
2904	3524	cameraView.object = group;
2905		- cameraView.lighttouched = true;
	3525	+ //cameraView.lighttouched = true;
	3526	+ Globals.lighttouched = true;
2906	3527	topView.object = group;
2907	3528	frontView.object = group;
2908	3529	sideView.object = group;
2909	3530	}
2910		- group.editWindow = this;
	3531	+
	3532	+// fix "+" issue
	3533	+ //group.editWindow = this;
	3534	+ group.manipWindow = this;
	3535	+
2911	3536	/*
2912	3537	currentLayout = radio.layout;
2913	3538	if (currentLayout == null)
2914	3539	currentLayout = sevenButton;
2915	3540	*/
2916	3541	radio.layout.doClick();
	3542	+
	3543	+ ClearUnpinned();
	3544	+ SetPinStates(group.selection.size() > 0);
	3545	+ if (group.selection.size() == 1)
	3546	+ EditSelection(false);
2917	3547	keepparent = group.parent;
2918	3548	// PARENT = NULL or not???
2919	3549	//group.parent = null; // ROOT
2920	3550	//group.attributes = -1;
2921	3551	ResetModel();
	3552	+
	3553	+ cameraView.requestFocusInWindow();
2922	3554	refreshContents(true);
2923		- }
	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	+ }
2924	3569	else
2925	3570	{
2926	3571	//return super.action(event, arg);
..	..	@@ -2929,7 +3574,6 @@
2929	3574	}
2930	3575
2931	3576	boolean useclient = false;
2932		- cRadio radio;
2933	3577
2934	3578	void ToggleRoot()
2935	3579	{
..	..	@@ -2938,7 +3582,7 @@
2938	3582	if (useclient)
2939	3583	{
2940	3584	cameraView.object = client;
2941		- cameraView.lighttouched = true;
	3585	+ Globals.lighttouched = true;
2942	3586	//topView.object = client;
2943	3587	//frontView.object = client;
2944	3588	//sideView.object = client;
..	..	@@ -2946,7 +3590,7 @@
2946	3590	else
2947	3591	{
2948	3592	cameraView.object = group;
2949		- cameraView.lighttouched = true;
	3593	+ Globals.lighttouched = true;
2950	3594	//topView.object = group;
2951	3595	//frontView.object = group;
2952	3596	//sideView.object = group;
..	..	@@ -2981,6 +3625,28 @@
2981	3625	refreshContents();
2982	3626	}
2983	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	+ }
2984	3650
2985	3651	void ResetTransform()
2986	3652	{
..	..	@@ -3093,7 +3759,7 @@
3093	3759	refreshContents();
3094	3760	}
3095	3761
3096		- void ResetCentroid()
	3762	+ void ResetCentroid(boolean full)
3097	3763	{
3098	3764	Object3D obj;
3099	3765	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3108,12 +3774,16 @@
3108	3774	LA.matIdentity(Object3D.mat);
3109	3775	obj.getBounds(minima, maxima, false);
3110	3776	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3111		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3777	+ if (full)
	3778	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3112	3779	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3113	3780	obj.TransformMesh(Object3D.mat);
	3781	+
3114	3782	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3115		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3783	+ if (full)
	3784	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3116	3785	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3786	+
3117	3787	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3118	3788	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3119	3789	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3142,7 +3812,8 @@
3142	3812
3143	3813	int size = obj.MemorySize();
3144	3814
3145		- 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)");
3146	3817	}
3147	3818	}
3148	3819	catch (Exception e)
..	..	@@ -3179,9 +3850,9 @@
3179	3850	obj = (Object3D)e.nextElement();
3180	3851
3181	3852	System.out.println("Object is: " + obj);
3182		- GrafreeD.AnalyzeObject(obj);
	3853	+ Grafreed.AnalyzeObject(obj);
3183	3854	System.out.println("Boundary rep: " + obj.bRep);
3184		- GrafreeD.AnalyzeObject(obj.bRep);
	3855	+ Grafreed.AnalyzeObject(obj.bRep);
3185	3856
3186	3857	// System.err.println((size/1024) + " KB is the size of " + obj);
3187	3858	}
..	..	@@ -3223,6 +3894,13 @@
3223	3894	void GenNormals(boolean crease)
3224	3895	{
3225	3896	group.GenNormalsS(crease);
	3897	+
	3898	+ refreshContents();
	3899	+ }
	3900	+
	3901	+ void GenNormalsMESH()
	3902	+ {
	3903	+ group.GenNormalsMeshS();
3226	3904
3227	3905	refreshContents();
3228	3906	}
..	..	@@ -3395,8 +4073,8 @@
3395	4073
3396	4074	void ParseVertices()
3397	4075	{
3398		- boolean epsequal = GrafreeD.epsequal;
3399		- GrafreeD.epsequal = true;
	4076	+ boolean epsequal = Grafreed.epsequal;
	4077	+ Grafreed.epsequal = true;
3400	4078
3401	4079	for (int i=0; i<group.selection.size(); i++)
3402	4080	{
..	..	@@ -3421,7 +4099,7 @@
3421	4099	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3422	4100	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3423	4101
3424		- g.add(GrafreeD.clipboard);
	4102	+ g.add(Grafreed.clipboard);
3425	4103
3426	4104	buffer.add(g);
3427	4105	}
..	..	@@ -3436,7 +4114,7 @@
3436	4114	makeSomething(buffer, i==group.selection.size()-1);
3437	4115	}
3438	4116
3439		- GrafreeD.epsequal = epsequal;
	4117	+ Grafreed.epsequal = epsequal;
3440	4118
3441	4119	refreshContents();
3442	4120	}
..	..	@@ -3454,7 +4132,16 @@
3454	4132	String pigment = Object3D.GetPigment(tex);
3455	4133	//String bump = Object3D.GetBump(tex);
3456	4134
3457		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.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	+ }
3458	4145
3459	4146	double s = v.s;
3460	4147
..	..	@@ -3542,11 +4229,11 @@
3542	4229
3543	4230	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3544	4231
3545		- boolean random = CameraPane.RANDOM;
3546		- CameraPane.RANDOM = false; // parse all random nodes
	4232	+ boolean random = CameraPane.SWITCH;
	4233	+ CameraPane.SWITCH = false; // parse all random nodes
3547	4234	lowres.linkVerticesThis(null);
3548	4235	lowres.linkVerticesThis(sn);
3549		- CameraPane.RANDOM = random;
	4236	+ CameraPane.SWITCH = random;
3550	4237
3551	4238	System.err.flush();
3552	4239
..	..	@@ -3586,7 +4273,7 @@
3586	4273	return;
3587	4274
3588	4275	Object3D poses = group.selection.get(0);
3589		- Object3D ref = GrafreeD.clipboard.get(0);
	4276	+ Object3D ref = Grafreed.clipboard.get(0);
3590	4277
3591	4278	Object3D newgroup = new Object3D("Po:" + poses.name);
3592	4279
..	..	@@ -3755,7 +4442,7 @@
3755	4442	group.selection.RelinkToSupport(); // july 2014
3756	4443	System.out.println("DONE.");
3757	4444	refreshContents();
3758		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4445	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3759	4446	}
3760	4447
3761	4448	void ReduceMesh(boolean reduction34)
..	..	@@ -3780,9 +4467,9 @@
3780	4467
3781	4468	void ClipMesh()
3782	4469	{
3783		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4470	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3784	4471	{
3785		- Object3D content = GrafreeD.clipboard.get(0);
	4472	+ Object3D content = Grafreed.clipboard.get(0);
3786	4473
3787	4474	if (content instanceof cGroup && ((cGroup)content).transientlink )
3788	4475	content = ((cGroup)content).get(0);
..	..	@@ -3791,7 +4478,7 @@
3791	4478	// {
3792	4479	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3793	4480	// }
3794		- group.selection.ClipMesh(GrafreeD.clipboard);
	4481	+ group.selection.ClipMesh(Grafreed.clipboard);
3795	4482	}
3796	4483	// group.selection.ClipMesh(GrafreeD.clipboard);
3797	4484	System.out.println("DONE.");
..	..	@@ -3838,6 +4525,18 @@
3838	4525	void MarkLeaves(boolean hide)
3839	4526	{
3840	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);
3841	4540	refreshContents();
3842	4541	}
3843	4542
..	..	@@ -3912,10 +4611,6 @@
3912	4611	// }
3913	4612	// }
3914	4613
3915		- static boolean allparams = true;
3916		-
3917		- static Vector<Object3D> listUI = new Vector<Object3D>();
3918		-
3919	4614	void EditSelection(boolean newWindow)
3920	4615	{
3921	4616	// aConstraints.gridy = 0;
..	..	@@ -3923,10 +4618,10 @@
3923	4618	{
3924	4619	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3925	4620	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3926		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4621	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3927	4622
3928	4623	Object3D elem = (Object3D)group.selection.elementAt(i);
3929		- if(elem != group)
	4624	+ if(elem != group \|\| !newWindow)
3930	4625	{
3931	4626	// if (!(elem instanceof Composite))
3932	4627	// newWindow = false;
..	..	@@ -4008,7 +4703,8 @@
4008	4703	//new Exception().printStackTrace();
4009	4704
4010	4705	freezemodel = true;
4011		-
	4706	+ ClearUnpinned();
	4707	+
4012	4708	/**/
4013	4709	//switch (event.id)
4014	4710	{
..	..	@@ -4016,7 +4712,6 @@
4016	4712	//case 702: // Event.LIST_DESELECT
4017	4713	group.deselectAll();
4018	4714	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4019		- objEditor.ClearInfo(); // .GetMaterial());
4020	4715	if (tps != null)
4021	4716	{
4022	4717	for (int i=0; i < tps.length; i++)
..	..	@@ -4025,33 +4720,39 @@
4025	4720
4026	4721	//if (child.parent != null)
4027	4722	//child.parent.addSelectee(child);
	4723	+ objEditor.SetMaterial(child);
4028	4724	group.addSelectee(child);
4029		- objEditor.SetMaterial(child); // .GetMaterial());
4030		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4031		- System.err.println("info : " + child.GetPath());
4032	4725	}
4033	4726	}
4034		- else
4035		- {
4036		- objEditor.SetMaterial(group); // .GetMaterial());
4037		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4038		- System.err.println("info : " + group.GetPath());
4039		- }
	4727	+// else
	4728	+// {
	4729	+// objEditor.SetMaterial(group); // .GetMaterial());
	4730	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4731	+// System.err.println("info : " + group.GetPath());
	4732	+// }
4040	4733
4041		- objEditor.SetText(); // jan 2014
4042		-
4043		- if (flashIt && !CameraPane.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))
4044	4735	CameraPane.flash = true;
4045	4736
4046		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4737	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4047	4738	// a camera
4048	4739	{
4049		- CameraPane.camerachangeframe = 0; // don't refuse it
4050		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4051		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
4052		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	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	+ }
	4745	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4746	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4053	4747	}
4054	4748
	4749	+ if (tps != null && tps.length == 1)
	4750	+ {
	4751	+ EditSelection(false);
	4752	+ }
	4753	+
	4754	+ SetPinStates(tps != null && tps.length > 0);
	4755	+
4055	4756	refreshContents();
4056	4757	//return true;
4057	4758	}
..	..	@@ -4060,6 +4761,35 @@
4060	4761
4061	4762	freezemodel = false;
4062	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	+ }
4063	4793
4064	4794	void linkSomething(Object3D thing)
4065	4795	{
..	..	@@ -4131,16 +4861,19 @@
4131	4861	{
4132	4862	if (group.selection.isEmpty())
4133	4863	return;
4134		- GrafreeD.clipboardIsTempGroup = false;
	4864	+
	4865	+ Grafreed.clipboardIsTempGroup = false;
4135	4866	Composite tGroup = null;
4136	4867	if (group.selection.size() > 0) // 1)
4137	4868	{
4138	4869	tGroup = new cGroup();
4139		- GrafreeD.clipboardIsTempGroup = true;
	4870	+ Grafreed.clipboardIsTempGroup = true;
4140	4871	}
4141	4872
4142	4873	if (cut)
4143	4874	{
	4875	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4876	+// Save();
4144	4877	//int indices[] = jList.getSelectedIndices();
4145	4878	//for (int i = indices.length - 1; i >= 0; i--)
4146	4879	//jList.remove(indices[i]);
..	..	@@ -4176,16 +4909,16 @@
4176	4909	//System.out.println("cut " + child);
4177	4910	//System.out.println("parent = " + child.parent);
4178	4911	// tmp.addChild(child);
4179		- if (GrafreeD.clipboardIsTempGroup)
	4912	+ if (Grafreed.clipboardIsTempGroup)
4180	4913	tGroup.add/Child/(tmp);
4181	4914	else
4182		- GrafreeD.clipboard = tmp;
	4915	+ Grafreed.clipboard = tmp;
4183	4916	}
4184	4917	else
4185		- if (GrafreeD.clipboardIsTempGroup)
	4918	+ if (Grafreed.clipboardIsTempGroup)
4186	4919	tGroup.add/Child/(child);
4187	4920	else
4188		- GrafreeD.clipboard = child;
	4921	+ Grafreed.clipboard = child;
4189	4922	}
4190	4923
4191	4924	//ResetModel();
..	..	@@ -4217,21 +4950,23 @@
4217	4950	//System.out.println("cut " + elem);
4218	4951	//System.out.println("parent = " + elem.parent);
4219	4952	// tmp.addChild(elem);
4220		- if (GrafreeD.clipboardIsTempGroup)
	4953	+ if (Grafreed.clipboardIsTempGroup)
4221	4954	tGroup.add/Child/(tmp);
4222	4955	else
4223		- GrafreeD.clipboard = tmp;
	4956	+ Grafreed.clipboard = tmp;
4224	4957	}
4225	4958	else
4226		- if (GrafreeD.clipboardIsTempGroup)
	4959	+ if (Grafreed.clipboardIsTempGroup)
4227	4960	tGroup.add/Child/(child);
4228	4961	else
4229		- GrafreeD.clipboard = child;
	4962	+ Grafreed.clipboard = child;
4230	4963	}
4231	4964
4232	4965	}
4233		- if (GrafreeD.clipboardIsTempGroup)
4234		- GrafreeD.clipboard = tGroup;
	4966	+
	4967	+ if (Grafreed.clipboardIsTempGroup)
	4968	+ Grafreed.clipboard = tGroup;
	4969	+
4235	4970	if (cut)
4236	4971	{
4237	4972	ResetModel();
..	..	@@ -4241,11 +4976,15 @@
4241	4976
4242	4977	void paste(boolean expand)
4243	4978	{
	4979	+ if (Globals.REPLACEONMAKE)
	4980	+ Save();
	4981	+ boolean keep = Globals.REPLACEONMAKE;
	4982	+ Globals.REPLACEONMAKE = false;
4244	4983	// if (GrafreeD.clipboard == null)
4245	4984	// return;
4246	4985	boolean first = true;
4247	4986
4248		- if (GrafreeD.clipboardIsTempGroup)
	4987	+ if (Grafreed.clipboardIsTempGroup)
4249	4988	{
4250	4989	Composite temp;
4251	4990
..	..	@@ -4256,7 +4995,7 @@
4256	4995	temp = (Composite)Applet3D.clipboard.deepCopy();
4257	4996	*/
4258	4997	Object3D elem;
4259		- 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))
4260	4999	{
4261	5000	Object3D child = (Object3D)e.nextElement();
4262	5001
..	..	@@ -4290,21 +5029,22 @@
4290	5029	//Object3D cb = Applet3D.clipboard;
4291	5030	//temp.addChild(cb);
4292	5031	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4293		- assert(GrafreeD.clipboard.parent == null);
4294		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4295		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4296		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4297		- 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());
4298	5037	else
4299		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4300		- GrafreeD.clipboard.get(0).parent = keepparent;
	5038	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5039	+ Grafreed.clipboard.get(0).parent = keepparent;
4301	5040	}
4302	5041
	5042	+ Globals.REPLACEONMAKE = keep;
4303	5043	ResetModel();
4304	5044	refreshContents();
4305	5045	}
4306	5046
4307		- void pasteInto(boolean copyit)
	5047	+ void pasteInto(boolean copyit, boolean clone)
4308	5048	{
4309	5049	// if (GrafreeD.clipboard == null)
4310	5050	// return;
..	..	@@ -4333,15 +5073,22 @@
4333	5073	if (copyit)
4334	5074	{
4335	5075	// paste(false);
4336		- CloneClipboard(false); // sept 2014
	5076	+ if (clone)
	5077	+ {
	5078	+ CloneClipboard(false); // sept 2014
	5079	+ }
	5080	+ else
	5081	+ {
	5082	+ paste(false);
	5083	+ }
4337	5084	}
4338	5085	else
4339	5086	{
4340	5087	boolean first = true;
4341	5088
4342		- if (GrafreeD.clipboardIsTempGroup)
	5089	+ if (Grafreed.clipboardIsTempGroup)
4343	5090	{
4344		- Composite temp = (Composite)GrafreeD.clipboard;
	5091	+ Composite temp = (Composite)Grafreed.clipboard;
4345	5092	Object3D copy;
4346	5093	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4347	5094	{
..	..	@@ -4351,7 +5098,7 @@
4351	5098	}
4352	5099	} else
4353	5100	{
4354		- linkSomething(GrafreeD.clipboard); //.get(0));
	5101	+ linkSomething(Grafreed.clipboard); //.get(0));
4355	5102	}
4356	5103	}
4357	5104	}
..	..	@@ -4428,6 +5175,10 @@
4428	5175
4429	5176	void group(Object3D csg, boolean grab)
4430	5177	{
	5178	+ if (Globals.REPLACEONMAKE)
	5179	+ Save();
	5180	+ boolean keep = Globals.REPLACEONMAKE;
	5181	+ Globals.REPLACEONMAKE = false;
4431	5182	if (//false) // why??
4432	5183	!group.selection.isEmpty())
4433	5184	{
..	..	@@ -4541,10 +5292,15 @@
4541	5292	//node.add(csg);
4542	5293	//makeSomething(node);
4543	5294	makeSomething(csg);
	5295	+ Globals.REPLACEONMAKE = keep;
4544	5296	}
4545	5297
4546	5298	void Ungroup(Object3D g)
4547	5299	{
	5300	+ if (Globals.REPLACEONMAKE)
	5301	+ Save();
	5302	+ boolean keep = Globals.REPLACEONMAKE;
	5303	+ Globals.REPLACEONMAKE = false;
4548	5304	if (g instanceof HiddenObject)
4549	5305	{
4550	5306	HiddenObject h = (HiddenObject) g;
..	..	@@ -4561,6 +5317,7 @@
4561	5317	objEditor.makeSomething(g.get(i), false);
4562	5318	}
4563	5319	}
	5320	+ Globals.REPLACEONMAKE = keep;
4564	5321	}
4565	5322
4566	5323	void ungroup()
..	..	@@ -4756,21 +5513,6 @@
4756	5513	}
4757	5514	*/
4758	5515
4759		- void ImportGFD()
4760		- {
4761		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4762		- browser.show();
4763		- String filename = browser.getFile();
4764		- if (filename != null && filename.length() > 0)
4765		- {
4766		- String fullname = browser.getDirectory() + filename;
4767		-
4768		- //Object3D readobj =
4769		- objEditor.ReadGFD(fullname, objEditor);
4770		- //makeSomething(readobj);
4771		- }
4772		- }
4773		-
4774	5516	/*
4775	5517	public void Callback(Object obj)
4776	5518	{
..	..	@@ -4794,26 +5536,9 @@
4794	5536	}
4795	5537	*/
4796	5538
4797		- void ImportVRMLX3D()
4798		- {
4799		- if (GrafreeD.standAlone)
4800		- {
4801		- /**/
4802		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4803		- browser.show();
4804		- String filename = browser.getFile();
4805		- if (filename != null && filename.length() > 0)
4806		- {
4807		- String fullname = browser.getDirectory() + filename;
4808		- LoadVRMLX3D(fullname);
4809		- }
4810		- /**/
4811		- }
4812		- }
4813		-
4814	5539	String GetFile(String dialogName)
4815	5540	{
4816		- if (GrafreeD.standAlone)
	5541	+ if (Grafreed.standAlone)
4817	5542	{
4818	5543	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4819	5544	browser.show();
..	..	@@ -4877,10 +5602,33 @@
4877	5602	cButton flashSelectionButton;
4878	5603	cButton editButton;
4879	5604	cButton uneditButton;
	5605	+ JCheckBox allParamsButton;
4880	5606	cButton clearpanelButton;
4881		- cButton allParamsButton;
4882	5607	cButton unselectButton;
4883	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	+
4884	5632	cButton screenfitButton;
4885	5633	cButton screenfitpointButton;
4886	5634	cButton snapobjectButton;
..	..	@@ -4892,14 +5640,6 @@
4892	5640
4893	5641	cButton setsupportButton;
4894	5642
4895		- cButton twoButton;
4896		- cButton sixButton;
4897		- cButton threeButton;
4898		- cButton sevenButton;
4899		- cButton fourButton; // full panel
4900		- cButton oneButton; // full XYZ
4901		- //cButton currentLayout;
4902		-
4903	5643	//
4904	5644	//Composite
4905	5645	Object3D // to do !!
..	..	@@ -4909,9 +5649,11 @@
4909	5649	//JTree jTree;
4910	5650	private MenuItem lookAtItem;
4911	5651	private MenuItem lookFromItem;
4912		- private MenuItem switchItem;
	5652	+ private MenuItem switchViewItem;
4913	5653	private MenuItem cutItem;
4914		- private MenuItem duplicateItem;
	5654	+ private MenuItem undoItem;
	5655	+ private MenuItem redoItem;
	5656	+ private JMenuItem duplicateItem;
4915	5657	private MenuItem cloneItem;
4916	5658	private MenuItem cloneSupportItem;
4917	5659	private MenuItem overwriteGeoItem;
..	..	@@ -4924,7 +5666,7 @@
4924	5666	private MenuItem linkverticesItem;
4925	5667	private MenuItem relinkverticesItem;
4926	5668	private MenuItem setMasterItem;
4927		- private MenuItem resetMeshItem;
	5669	+ private MenuItem resetAllItem;
4928	5670	private MenuItem stepAllItem;
4929	5671	private MenuItem revertMeshItem;
4930	5672	private MenuItem poseMeshItem;
..	..	@@ -4935,6 +5677,7 @@
4935	5677	private MenuItem mergeGeometriesItem;
4936	5678	private MenuItem copyItem;
4937	5679	private MenuItem pasteItem;
	5680	+ private MenuItem pasteIntoItem;
4938	5681	private MenuItem pasteLinkItem;
4939	5682	private MenuItem pasteCloneItem;
4940	5683	private MenuItem pasteExpandItem;
..	..	@@ -4973,6 +5716,10 @@
4973	5716	private MenuItem showleavesItem;
4974	5717	private MenuItem markleavesItem;
4975	5718	private MenuItem unmarkleavesItem;
	5719	+ private MenuItem rewindleavesItem;
	5720	+ private MenuItem unrewindleavesItem;
	5721	+ private MenuItem randomleavesItem;
	5722	+ private MenuItem unrandomleavesItem;
4976	5723
4977	5724	private MenuItem flipVItem;
4978	5725	private MenuItem unflipVItem;
..	..	@@ -4984,15 +5731,17 @@
4984	5731	private MenuItem panoTexturesItem;
4985	5732
4986	5733	private MenuItem resetCentroidItem;
4987		- private MenuItem transformgeometryItem;
	5734	+ private MenuItem resetCentroidXZItem;
4988	5735	private MenuItem resetTransformItem;
	5736	+ private MenuItem transformGeometryItem;
	5737	+ private MenuItem transformChildrenItem;
4989	5738	private MenuItem hideItem;
4990	5739	private MenuItem grabItem;
4991	5740	private MenuItem backItem;
4992	5741	private MenuItem frontItem;
4993	5742	private MenuItem cameraItem;
4994	5743	private MenuItem compositeItem;
4995		- private MenuItem randomItem;
	5744	+ private MenuItem switchItem;
4996	5745	private MenuItem physicsItem;
4997	5746	private MenuItem frameselectorItem;
4998	5747	private MenuItem scriptNodeItem;
..	..	@@ -5007,6 +5756,7 @@
5007	5756
5008	5757	private MenuItem resetParentItem;
5009	5758	private MenuItem repairParentItem;
	5759	+ private MenuItem repairShadowItem;
5010	5760	private MenuItem sortbysizeItem;
5011	5761	private MenuItem sortbynameItem;
5012	5762
..	..	@@ -5031,7 +5781,7 @@
5031	5781	private MenuItem blobItem;
5032	5782	private MenuItem latheItem;
5033	5783	private MenuItem bezierItem;
5034		- private MenuItem checkerItem;
	5784	+ private MenuItem overlayItem;
5035	5785	private MenuItem meshItem;
5036	5786	// private MenuItem meshGroupItem;
5037	5787	private MenuItem springItem;
..	..	@@ -5053,11 +5803,6 @@
5053	5803	private MenuItem doubleItem;
5054	5804	private MenuItem tripleItem;
5055	5805
5056		- private MenuItem importGFDItem;
5057		- private MenuItem importVRMLX3DItem;
5058		- private MenuItem import3DSItem;
5059		- private MenuItem importOBJItem;
5060		-
5061	5806	private MenuItem computeAOItem;
5062	5807	private MenuItem recompileItem;
5063	5808	private MenuItem editScriptItem;
..	..	@@ -5067,4 +5812,8 @@
5067	5812	private MenuItem analyzeItem;
5068	5813	private MenuItem dumpItem;
5069	5814	//boolean freezemodel = false;
	5815	+
	5816	+ Menu cameraMenu;
	5817	+ MenuItem editCameraItem;
	5818	+ MenuItem restoreCameraItem;
5070	5819	}