~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);
..	..	@@ -97,14 +98,14 @@
97	98
98	99	void CloneClipboard(boolean supports)
99	100	{
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));
	101	+ assert(Grafreed.clipboard.parent == null);
	102	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	103	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	104	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	105	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	106	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	108	+ Grafreed.clipboard.get(0).parent = keepparent;
108	109	}
109	110
110	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +119,7 @@
118	119	// obj.support = null;
119	120	if (!supports)
120	121	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	122	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	123	obj.parent = parent;
123	124	// obj.support = support;
124	125	// clone.support = support; // aout 2013
..	..	@@ -147,8 +148,130 @@
147	148
148	149	//JTextField nameField;
149	150
150		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
151	152	{
	153	+ Menu menu;
	154	+ oe.menuBar.add(menu = new Menu("Edit"));
	155	+ //editItem = menu.add(new MenuItem("Edit"));
	156	+ //editItem.addActionListener(this);
	157	+
	158	+// undoItem = menu.add(new MenuItem("Undo"));
	159	+// undoItem.addActionListener(this);
	160	+// redoItem = menu.add(new MenuItem("Redo"));
	161	+// redoItem.addActionListener(this);
	162	+// menu.add("-");
	163	+ duplicateItem = menu.add(new MenuItem("Duplicate"));
	164	+ duplicateItem.addActionListener(this);
	165	+ cloneItem = menu.add(new MenuItem("Clone"));
	166	+ cloneItem.addActionListener(this);
	167	+ if (Globals.ADVANCED)
	168	+ {
	169	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	170	+ cloneSupportItem.addActionListener(this);
	171	+ }
	172	+ menu.add("-");
	173	+ cutItem = menu.add(new MenuItem("Cut"));
	174	+ cutItem.addActionListener(this);
	175	+ copyItem = menu.add(new MenuItem("Copy"));
	176	+ copyItem.addActionListener(this);
	177	+ pasteItem = menu.add(new MenuItem("Paste"));
	178	+ pasteItem.addActionListener(this);
	179	+ menu.add("-");
	180	+
	181	+ menu.add("-");
	182	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	183	+ pasteIntoItem.addActionListener(this);
	184	+ pasteLinkItem = menu.add(new MenuItem("Paste link"));
	185	+ pasteLinkItem.addActionListener(this);
	186	+ pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	187	+ pasteCloneItem.addActionListener(this);
	188	+// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	189	+// pasteExpandItem.addActionListener(this);
	190	+ menu.add("-");
	191	+ clearItem = menu.add(new MenuItem("Clear"));
	192	+ clearItem.addActionListener(this);
	193	+
	194	+ if (Globals.ADVANCED)
	195	+ {
	196	+ // Deletes the cameras...
	197	+ clearAllItem = menu.add(new MenuItem("Clear All"));
	198	+ clearAllItem.addActionListener(this);
	199	+ }
	200	+
	201	+ menuBar.add(cameraMenu = new Menu("View"));
	202	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	203	+ //zBufferItem.addActionListener(this);
	204	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	205	+ //normalLensItem.addActionListener(this);
	206	+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
	207	+ revertCameraItem.addActionListener(this);
	208	+
	209	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	210	+ toggleFullScreenItem.addItemListener(this);
	211	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	212	+ cameraMenu.add("-");
	213	+
	214	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	215	+ toggleTextureItem.addItemListener(this);
	216	+ toggleTextureItem.setState(CameraPane.textureon);
	217	+
	218	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	219	+ toggleSwitchItem.addItemListener(this);
	220	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	221	+
	222	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	223	+ toggleHandleItem.addItemListener(this);
	224	+ toggleHandleItem.setState(CameraPane.HANDLES);
	225	+
	226	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	227	+ togglePaintItem.addItemListener(this);
	228	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	229	+
	230	+ if (Globals.ADVANCED)
	231	+ {
	232	+ cameraMenu.add("-");
	233	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	234	+ toggleLiveItem.addItemListener(this);
	235	+ toggleLiveItem.setState(Globals.isLIVE());
	236	+
	237	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	238	+ stepItem.addActionListener(this);
	239	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	240	+ // toggleDLItem.addItemListener(this);
	241	+ // toggleDLItem.setState(false);
	242	+
	243	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	244	+ toggleRenderItem.addItemListener(this);
	245	+ toggleRenderItem.setState(!CameraPane.frozen);
	246	+
	247	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	248	+ toggleDebugItem.addItemListener(this);
	249	+ toggleDebugItem.setState(Globals.DEBUG);
	250	+
	251	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	252	+ toggleFrustumItem.addItemListener(this);
	253	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	254	+
	255	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	256	+ toggleFootContactItem.addItemListener(this);
	257	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	258	+
	259	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	260	+ toggleTimelineItem.addItemListener(this);
	261	+ }
	262	+
	263	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	264	+// toggleRootItem.addItemListener(this);
	265	+// toggleRootItem.setState(false);
	266	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	267	+// animationItem.addItemListener(this);
	268	+// animationItem.setState(CameraPane.ANIMATION);
	269	+ cameraMenu.add("-");
	270	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	271	+ editCameraItem.addActionListener(this);
	272	+
	273	+ if (Globals.ADVANCED)
	274	+ {
152	275	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153	276	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154	277	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -160,45 +283,17 @@
160	283	lookAtItem.addActionListener(this);
161	284	//lookFromItem.addActinoListener(this);
162	285	//switchItem.addActionListener(this);
163		- Menu menu;
164		- oe.menuBar.add(menu = new Menu("Edit"));
165		- //editItem = menu.add(new MenuItem("Edit"));
166		- //editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
168		- duplicateItem.addActionListener(this);
169		- menu.add("-");
170		- cloneItem = menu.add(new MenuItem("Clone"));
171		- cloneItem.addActionListener(this);
172		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173		- cloneSupportItem.addActionListener(this);
174		- menu.add("-");
175		- cutItem = menu.add(new MenuItem("Cut"));
176		- cutItem.addActionListener(this);
177		- copyItem = menu.add(new MenuItem("Copy"));
178		- copyItem.addActionListener(this);
179		- pasteItem = menu.add(new MenuItem("Paste"));
180		- pasteItem.addActionListener(this);
181		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
182		- pasteLinkItem.addActionListener(this);
183		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184		- pasteCloneItem.addActionListener(this);
185		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186		-// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
189		- clearAllItem = menu.add(new MenuItem("Clear All"));
190		- clearAllItem.addActionListener(this);
191		-
	286	+ }
	287	+
192	288	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);
	289	+ if (Globals.ADVANCED)
	290	+ {
197	291	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	292	revertMeshItem.addActionListener(this);
199	293	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	294	resetreferencesItem.addActionListener(this);
201	295	menu.add("-");
	296	+ }
202	297	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	298	overwriteGeoItem.addActionListener(this);
204	299	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,19 +305,26 @@
210	305	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	306	overwriteUVItem.addActionListener(this);
212	307	menu.add("-");
	308	+ if (Globals.ADVANCED)
	309	+ {
213	310	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	311	generateMeshItem.addActionListener(this);
215	312	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	313	poseMeshItem.addActionListener(this);
217	314	menu.add("-");
	315	+ }
218	316	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	317	resetsupportItem.addActionListener(this);
220	318	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	319	linkverticesItem.addActionListener(this);
222	320	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	321	relinkverticesItem.addActionListener(this);
	322	+
	323	+ if (Globals.ADVANCED)
	324	+ {
224	325	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	326	setMasterItem.addActionListener(this);
	327	+ }
226	328
227	329	oe.menuBar.add(menu = new Menu("Group"));
228	330	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -233,27 +335,32 @@
233	335	frontItem.addActionListener(this);
234	336	compositeItem = menu.add(new MenuItem("Composite"));
235	337	compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	338	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	339	hideItem.addActionListener(this);
238	340	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	341	ungroupItem.addActionListener(this);
240	342	menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
	343	+ randomItem = menu.add(new MenuItem("Switch node"));
242	344	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);
247	345	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	346	switchGeoItem.addActionListener(this);
249	347	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	348	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	349	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	350	morphItem.addActionListener(this);
	351	+
	352	+ if (Globals.ADVANCED)
	353	+ {
	354	+ menu.add("-");
	355	+ physicsItem = menu.add(new MenuItem("Physics"));
	356	+ physicsItem.addActionListener(this);
	357	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	358	+ frameselectorItem.addActionListener(this);
253	359	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	360	scriptNodeItem.addActionListener(this);
255	361	cameraItem = menu.add(new MenuItem("Camera"));
256	362	cameraItem.addActionListener(this);
	363	+ }
257	364
258	365	oe.menuBar.add(menu = new Menu("Object"));
259	366	textureItem = menu.add(new MenuItem("Texture"));
..	..	@@ -268,21 +375,29 @@
268	375	shadowYItem.addActionListener(this);
269	376	shadowZItem = menu.add(new MenuItem("Shadow Z"));
270	377	shadowZItem.addActionListener(this);
	378	+ if (Globals.ADVANCED)
	379	+ {
	380	+ menu.add("-");
271	381	linkerItem = menu.add(new MenuItem("Linker"));
272	382	linkerItem.addActionListener(this);
273		- templateItem = menu.add(new MenuItem("Template"));
274		- templateItem.addActionListener(this);
275	383	attributeItem = menu.add(new MenuItem("Attribute"));
276	384	attributeItem.addActionListener(this);
	385	+ templateItem = menu.add(new MenuItem("Template"));
	386	+ templateItem.addActionListener(this);
277	387	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	388	pointflowItem.addActionListener(this);
	389	+ }
279	390	menu.add("-");
280	391	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	392	resetTransformItem.addActionListener(this);
282	393	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	394	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	395	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	396	+ resetCentroidXZItem.addActionListener(this);
	397	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	398	+ transformGeometryItem.addActionListener(this);
	399	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	400	+ transformChildrenItem.addActionListener(this);
286	401
287	402	oe.menuBar.add(menu = new Menu("Geometry"));
288	403	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +408,11 @@
293	408	genNormalsCADItem.addActionListener(this);
294	409	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	410	genNormalsMESHItem.addActionListener(this);
	411	+ if (Globals.ADVANCED)
	412	+ {
296	413	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
297	414	genNormalsMINEItem.addActionListener(this);
	415	+ }
298	416	stripifyItem = menu.add(new MenuItem("Stripify"));
299	417	stripifyItem.addActionListener(this);
300	418	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +434,34 @@
316	434	reduce34MeshItem.addActionListener(this);
317	435	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	436	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	437	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	438	clipMeshItem.addActionListener(this);
	439	+
	440	+ if (Globals.ADVANCED)
	441	+ {
	442	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	443	+ smoothMeshItem.addActionListener(this);
	444	+ }
323	445
324	446	oe.menuBar.add(menu = new Menu("Attributes"));
325	447	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	448	clearMaterialsItem.addActionListener(this);
	449	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	450	+ resetAllItem.addActionListener(this);
	451	+ stepAllItem = menu.add(new MenuItem("Step All"));
	452	+ stepAllItem.addActionListener(this);
327	453	menu.add("-");
328	454	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	455	liveleavesItem.addActionListener(this);
330	456	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	457	unliveleavesItem.addActionListener(this);
	458	+ if (Globals.ADVANCED)
	459	+ {
332	460	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	461	supportleavesItem.addActionListener(this);
334	462	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	463	unsupportleavesItem.addActionListener(this);
	464	+ }
336	465	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	466	hideleavesItem.addActionListener(this);
338	467	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +470,14 @@
341	470	markleavesItem.addActionListener(this);
342	471	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	472	unmarkleavesItem.addActionListener(this);
	473	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	474	+ rewindleavesItem.addActionListener(this);
	475	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	476	+ unrewindleavesItem.addActionListener(this);
	477	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	478	+ randomleavesItem.addActionListener(this);
	479	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	480	+ unrandomleavesItem.addActionListener(this);
344	481	menu.add("-");
345	482	flipVItem = menu.add(new MenuItem("Flip V"));
346	483	flipVItem.addActionListener(this);
..	..	@@ -376,35 +513,40 @@
376	513	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	514	sortbynameItem.addActionListener(this);
378	515	menu.add("-");
	516	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	517	+ shareGeometriesItem.addActionListener(this);
	518	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	519	+ mergeGeometriesItem.addActionListener(this);
	520	+ if (Globals.ADVANCED)
	521	+ {
	522	+ // Pretty much the same as duplicate and clone.
379	523	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	524	extractGeometriesItem.addActionListener(this);
381	525	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	526	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);
	527	+ }
387	528
388	529	oe.menuBar.add(menu = new Menu("Insert"));
389	530	buildCreateMenu(menu);
390	531
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	532	oe.menuBar.add(menu = new Menu("Tools"));
403	533	buildToolsMenu(menu);
404	534	}
405	535
406	536	void SetupUI2(ObjEditor oe)
407	537	{
	538	+ // June 2019
	539	+ if (oe == null)
	540	+ {
	541	+ //super.SetupUI2(this);
	542	+ //return;
	543	+ }
	544	+
	545	+ if (copy != group)
	546	+ {
	547	+ //super.SetupUI2(this);
	548	+ }
	549	+
408	550	//new Exception().printStackTrace();
409	551
410	552	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -433,150 +575,122 @@
433	575	oe.radioPanel.add(dummyButton);
434	576	oe.buttonGroup.add(dummyButton);
435	577	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	578	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	579
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	580	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	581	+ //minButton.setToolTipText("Minimize window");
	582	+ //minButton.addActionListener(this);
	583	+
	584	+ oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	585	+ maxButton.setToolTipText("Maximize window");
	586	+ maxButton.addActionListener(this);
	587	+
	588	+ oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	589	+ fullButton.setToolTipText("Full-screen window");
	590	+ fullButton.addActionListener(this);
	591	+
	592	+ oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	593	+ undoButton.setToolTipText("Undo changes");
	594	+ undoButton.addActionListener(this);
	595	+
	596	+ oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	597	+ redoButton.setToolTipText("Redo changes");
	598	+ redoButton.addActionListener(this);
	599	+
	600	+ oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	601	+ saveButton.setToolTipText("Save changes");
	602	+ saveButton.addActionListener(this);
	603	+
	604	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	605	+ liveCB.setToolTipText("Enable animation");
441	606	liveCB.addItemListener(this);
442	607
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);
	608	+ oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ oneStepButton.setToolTipText("Animate one step forward");
	610	+ oneStepButton.addActionListener(this);
	611	+
	612	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	613	+ fastCB.setToolTipText("Fast mode");
461	614	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);
468		-
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);
	615	+
	616	+ oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
	617	+ trackCB.setToolTipText("Enable tracking");
503	618	trackCB.addItemListener(this);
504	619
505		- oe.aConstraints.gridx += 1;
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	620	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	621	+ screenfitButton.setToolTipText("Screen fit");
507	622	screenfitButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
	623	+
509	624	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
510	625	// 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	626
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);
	627	+ if (Globals.ADVANCED)
	628	+ {
	629	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	630	+ snapobjectButton.addActionListener(this);
	631	+ snapobjectButton.setToolTipText("Snap Object");
	632	+ }
	633	+
	634	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	635	+ flashSelectionButton.setToolTipText("Show selection");
522	636	flashSelectionButton.addActionListener(this);
523		- oe.aConstraints.gridx += 1;
524		- oe.aConstraints.weighty = 0;
525		- oe.aConstraints.gridwidth = 1;
526	637
527		- //
528		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	638	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	639	+
	640	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	641	+ twoButton.setToolTipText("Show center view only");
529	642	twoButton.addActionListener(this);
530		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	643	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
531	644	fourButton.addActionListener(this);
532		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	645	+ fourButton.setToolTipText("Show left panel only");
	646	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	647	+ sixButton.setToolTipText("2-column layout left");
533	648	sixButton.addActionListener(this);
534		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	649	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	650	+ threeButton.setToolTipText("2-column layout right");
535	651	threeButton.addActionListener(this);
536		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	652	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	653	+ sevenButton.setToolTipText("3-column layout");
537	654	sevenButton.addActionListener(this);
538	655	//
539	656
540		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	657	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	658	+ rootButton.setToolTipText("Edit selection in new tab");
541	659	rootButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	660	+
	661	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	662	+ closeButton.setToolTipText("Close tab");
544	663	closeButton.addActionListener(this);
545	664	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
546	665	//clearButton.addActionListener(this);
547		- oe.aConstraints.gridx += 1;
548	666
549		- oe.aConstraints.gridx = 1; //
550		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	667	+ cGridBag commandsPanel = new cGridBag();
	668	+
	669	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	670	+ editButton.setToolTipText("Edit selection");
551	671	editButton.addActionListener(this);
552		- oe.aConstraints.gridx += 1;
553		- oe.aConstraints.weighty = 0;
554		- oe.aConstraints.gridwidth = 1;
555	672
556		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	673	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	674	+ uneditButton.setToolTipText("Unedit selection");
557	675	uneditButton.addActionListener(this);
558	676
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);
	677	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	678	+ allParamsButton.setToolTipText("Edit all params");
571	679	allParamsButton.addActionListener(this);
572	680
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);
	681	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	682	+ clearPanelButton.setToolTipText("Clear edit panel");
	683	+ clearPanelButton.addActionListener(this);
	684	+
	685	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	686	+ unselectButton.setToolTipText("Unselect");
578	687	unselectButton.addActionListener(this);
579	688
	689	+ commandsPanel.preferredHeight = 1;
	690	+
	691	+ oe.treePanel.add(commandsPanel);
	692	+ oe.treePanel.Return();
	693	+
580	694	// oe.aConstraints.gridx += 1;
581	695	// oe.aConstraints.weighty = 0;
582	696	// oe.aConstraints.gridwidth = 1;
..	..	@@ -588,40 +702,37 @@
588	702	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
589	703	// gcButton.addActionListener(this);
590	704
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;
	705	+ cGridBag jSPPanel = new cGridBag();
	706	+
	707	+ JScrollPane jSP;
602	708	//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);
	709	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
604	710	ResetModel();
605		- oe.aConstraints.weighty = 0.5;
606		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
607		- oe.aConstraints.gridy += 1;
608		- oe.aConstraints.gridwidth = 1;
	711	+
	712	+ oe.treePanel.add(jSPPanel);
	713	+ oe.treePanel.Return();
609	714
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);
	715	+ cGridBag copyOptionsPanel = new cGridBag();
	716	+
	717	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	718	+ colorCB.setToolTipText("Copy color when dropped");
614	719	colorCB.addItemListener(this);
615		- oe.aConstraints.gridx += 2;
616		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	720	+
	721	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	722	+ materialCB.setToolTipText("Copy material when dropped");
617	723	materialCB.addItemListener(this);
618		- oe.aConstraints.gridx += 2;
619		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	724	+
	725	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	726	+ textureCB.setToolTipText("Copy texture when dropped");
620	727	textureCB.addItemListener(this);
621	728
622		- oe.aConstraints.gridx = 0;
623		- oe.aConstraints.gridy += 1;
	729	+ copyOptionsPanel.preferredHeight = 1;
	730	+ oe.treePanel.add(copyOptionsPanel);
	731	+ oe.treePanel.Return();
624	732
	733	+// mainPanel.setDividerLocation(0.5); //1.0);
	734	+// mainPanel.setResizeWeight(0.5);
	735	+
625	736	//jList.addListSelectionListener(this);
626	737	oe.jTree.addTreeSelectionListener(this);
627	738	//jTree.setRootVisible(false);
..	..	@@ -643,20 +754,95 @@
643	754	radio.layout = sevenButton;
644	755	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
645	756	}
	757	+
	758	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	759	+ {
	760	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	761	+ boxCB.setToolTipText("Display bounding boxes");
	762	+ boxCB.addItemListener(this);
	763	+
	764	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	765	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	766	+ zoomBoxCB.addItemListener(this);
	767	+
	768	+ if (true) // Globals.ADVANCED)
	769	+ {
	770	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	771	+ supportCB.setToolTipText("Enable rigging");
	772	+ supportCB.addItemListener(this);
	773	+
	774	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	775	+ // localCB.addItemListener(this);
	776	+
	777	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	778	+ crowdCB.setToolTipText("Used for crowds");
	779	+ crowdCB.addItemListener(this);
	780	+
	781	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	782	+ smoothCB.setToolTipText("Snapping delay");
	783	+ smoothCB.addItemListener(this);
	784	+
	785	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	786	+ slowCB.setToolTipText("Smooth interpolation");
	787	+ slowCB.addItemListener(this);
	788	+
	789	+// constraints.gridy += 1;
	790	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	791	+// speakerMocapCB.addItemListener(this);
	792	+
	793	+ if (false)
	794	+ {
	795	+ // handled in scripts
	796	+ //constraints.gridy += 1;
	797	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	798	+ speakerCameraCB.addItemListener(this);
	799	+
	800	+ //constraints.gridy += 1;
	801	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	802	+ speakerFocusCB.addItemListener(this);
	803	+
	804	+ //constraints.gridy += 1;
	805	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	806	+ smoothfocusCB.addItemListener(this);
	807	+ }
	808	+
	809	+//constraints.gridx += 1;
	810	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	811	+// debugCB.addItemListener(this);
	812	+
	813	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	814	+ oeilCB.addItemListener(this);
	815	+
	816	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	817	+ lookAtCB.setToolTipText("Look-at target");
	818	+ lookAtCB.addItemListener(this);
	819	+
	820	+ }
	821	+
	822	+ cGridBag fill = new cGridBag();
	823	+
	824	+ fill.preferredHeight = 200;
	825	+
	826	+ panel.add(fill);
	827	+
	828	+ }
646	829
647	830	void EditObject(Object3D obj)
648	831	{
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();
	832	+ cRadio radioButton = new cRadio(obj.name);
	833	+ radioButton.SetObject(obj);
	834	+ radioButton.layout = sevenButton;
	835	+ radioButton.SetCamera(cameraView.renderCamera, false);
	836	+ radioButton.addActionListener(this);
	837	+ radioPanel.add(radioButton);
	838	+ buttonGroup.add(radioButton);
	839	+ radioButton.doClick();
657	840	}
	841	+
658	842	void SetupViews(ObjEditor oe)
659	843	{
	844	+ theFrame = this;
	845	+
660	846	oe.SetupViews();
661	847
662	848	System.out.println("SetupViews");
..	..	@@ -673,6 +859,7 @@
673	859	JCheckBox fastCB;
674	860	JCheckBox slowCB;
675	861	JCheckBox boxCB;
	862	+ JCheckBox zoomBoxCB;
676	863	JCheckBox trackCB;
677	864	JCheckBox smoothfocusCB;
678	865	// JCheckBox speakerMocapCB;
..	..	@@ -715,10 +902,10 @@
715	902	dropAttributes \|= Object3D.TEXTURE;
716	903	else
717	904	dropAttributes &= ~Object3D.TEXTURE;
718		- }
719		- else if(e.getSource() == liveCB)
	905	+ } else if(e.getSource() == liveCB)
720	906	{
721	907	cameraView.ToggleLive();
	908	+ refreshContents(false);
722	909	}
723	910	else if(e.getSource() == supportCB)
724	911	{
..	..	@@ -753,6 +940,10 @@
753	940	Recompile();
754	941	cameraView.repaint();
755	942	// refreshContents();
	943	+ }
	944	+ else if(e.getSource() == zoomBoxCB)
	945	+ {
	946	+ cameraView.ToggleZoomBoxMode();
756	947	}
757	948	else if(e.getSource() == smoothfocusCB)
758	949	{
..	..	@@ -867,7 +1058,9 @@
867	1058	// objEditor.DropFile((java.io.File[]) object, true);
868	1059	// return;
869	1060	// }
870		- if (string.charAt(0) == '/')
	1061	+
	1062	+ // File path for Mac and Windows
	1063	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
871	1064	{
872	1065	// file(s)
873	1066	String[] names = string.split("\n");
..	..	@@ -894,7 +1087,7 @@
894	1087
895	1088	flashIt = false;
896	1089	CameraPane pane = (CameraPane) target;
897		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1090	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
898	1091	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
899	1092
900	1093	if (group.selection.size() == 1)
..	..	@@ -921,11 +1114,11 @@
921	1114	{
922	1115	loadClipboard(true);
923	1116	objEditor.jTree.setSelectionPath(destinationPath);
924		- pasteInto(false);
	1117	+ pasteInto(false, false);
925	1118	} else {
926	1119	loadClipboard(false);
927	1120	objEditor.jTree.setSelectionPath(destinationPath);
928		- pasteInto(false); // true); // ???
	1121	+ pasteInto(false, false); // true); // ???
929	1122	}
930	1123	}
931	1124	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1047,27 +1240,33 @@
1047	1240	kleinItem.addActionListener(this);
1048	1241	particleItem = menu.add(new MenuItem("Particle system"));
1049	1242	particleItem.addActionListener(this);
	1243	+ if (Globals.ADVANCED)
	1244	+ {
1050	1245	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1051	1246	ragdollItem.addActionListener(this);
1052	1247	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1053	1248	ragdoll2Item.addActionListener(this);
	1249	+ }
1054	1250	menu.add("-");
1055		- meshItem = menu.add(new MenuItem("Mesh"));
	1251	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1056	1252	meshItem.addActionListener(this);
1057	1253	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1058	1254	// meshGroupItem.addActionListener(this);
	1255	+ if (Globals.ADVANCED)
	1256	+ {
1059	1257	springItem = menu.add(new MenuItem("Spring"));
1060	1258	springItem.addActionListener(this);
1061	1259	flagItem = menu.add(new MenuItem("Flag"));
1062	1260	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	1261	blobItem = menu.add(new MenuItem("Blob"));
1068	1262	blobItem.addActionListener(this);
1069	1263	latheItem = menu.add(new MenuItem("Lathe"));
1070	1264	latheItem.addActionListener(this);
	1265	+ }
	1266	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1267	+ bezierItem.addActionListener(this);
	1268	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1269	+ overlayItem.addActionListener(this);
1071	1270	lightItem = menu.add(new MenuItem("Light"));
1072	1271	lightItem.addActionListener(this);
1073	1272	menu.add("-");
..	..	@@ -1077,39 +1276,44 @@
1077	1276	loopItem.addActionListener(this);
1078	1277	doubleItem = menu.add(new MenuItem("Fork"));
1079	1278	doubleItem.addActionListener(this);
	1279	+ if (Globals.ADVANCED)
	1280	+ {
1080	1281	tripleItem = menu.add(new MenuItem("Trident"));
1081	1282	tripleItem.addActionListener(this);
	1283	+ }
1082	1284	}
1083	1285
1084	1286	void buildToolsMenu(Menu menu)
1085	1287	{
1086	1288	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1087	1289	animationItem.addItemListener(this);
1088		- animationItem.setState(CameraPane.ANIMATION);
	1290	+ animationItem.setState(Globals.ANIMATION);
1089	1291
1090	1292	menu.add("-");
1091	1293	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1092	1294	parseverticesItem.addActionListener(this);
1093	1295	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1094	1296	textureFieldItem.addActionListener(this);
1095		- alignItem = menu.add(new MenuItem("Align"));
	1297	+ alignItem = menu.add(new MenuItem("Align Objects"));
1096	1298	alignItem.addActionListener(this);
1097		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1098		- mirrorItem.addActionListener(this);
1099	1299	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1100	1300	reduceMorphItem.addActionListener(this);
1101	1301	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1102	1302	reduce34MorphItem.addActionListener(this);
1103		-
	1303	+ menu.add("-");
1104	1304	menu.add(computeAOItem = new MenuItem("Compute AO"));
1105	1305	computeAOItem.addActionListener(this);
1106		- menu.add("-");
1107	1306
	1307	+ if (Globals.ADVANCED)
	1308	+ {
	1309	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1310	+ mirrorItem.addActionListener(this);
	1311	+ menu.add("-");
1108	1312	menu.add(memoryItem = new MenuItem("Memory Usage"));
1109	1313	memoryItem.addActionListener(this);
1110	1314	menu.add(analyzeItem = new MenuItem("Analyze"));
1111	1315	analyzeItem.addActionListener(this);
1112		- menu.add(dumpItem = new MenuItem("Dump"));
	1316	+ menu.add(dumpItem = new MenuItem("Print"));
1113	1317	dumpItem.addActionListener(this);
1114	1318	// menu.add(pathItem = new MenuItem("From-to path"));
1115	1319	// pathItem.addActionListener(this);
..	..	@@ -1118,6 +1322,8 @@
1118	1322	resetParentItem.addActionListener(this);
1119	1323	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1120	1324	repairParentItem.addActionListener(this);
	1325	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1326	+ repairShadowItem.addActionListener(this);
1121	1327	menu.add(invariantsItem = new MenuItem("Invariants"));
1122	1328	invariantsItem.addActionListener(this);
1123	1329	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1125,6 +1331,7 @@
1125	1331	menu.add("-");
1126	1332	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1127	1333	editScriptItem.addActionListener(this);
	1334	+ }
1128	1335	}
1129	1336
1130	1337	void ScreenFit()
..	..	@@ -1453,9 +1660,9 @@
1453	1660
1454	1661	void Overwrite(int mask)
1455	1662	{
1456		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1663	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1457	1664	{
1458		- Object3D content = GrafreeD.clipboard.get(0);
	1665	+ Object3D content = Grafreed.clipboard.get(0);
1459	1666
1460	1667	if (content instanceof cGroup && ((cGroup)content).transientlink )
1461	1668	content = ((cGroup)content).get(0);
..	..	@@ -1478,6 +1685,7 @@
1478	1685	//
1479	1686	public void actionPerformed(ActionEvent event) // , Object arg)
1480	1687	{
	1688	+ Object source = event.getSource();
1481	1689	/*
1482	1690	if (event.getSource() == nameField)
1483	1691	{
..	..	@@ -1489,11 +1697,11 @@
1489	1697	}
1490	1698	else
1491	1699	*/
1492		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1700	+ if (source == lookAtItem \|\| source == lookFromItem)
1493	1701	{
1494	1702	ScreenFit();
1495	1703	} else
1496		- if (event.getSource() == switchItem)
	1704	+ if (source == switchItem)
1497	1705	{
1498	1706	cVector v1 = new cVector();
1499	1707	cVector v2 = new cVector();
..	..	@@ -1502,11 +1710,11 @@
1502	1710	objEditor.cameraView.renderCamera.setAim(v2, v1);
1503	1711	objEditor.cameraView.repaint();
1504	1712	} else
1505		- if (event.getSource() == rectoidItem)
	1713	+ if (source == rectoidItem)
1506	1714	{
1507	1715	makeSomething(new Box());
1508	1716	} else
1509		- if (event.getSource() == particleItem)
	1717	+ if (source == particleItem)
1510	1718	{
1511	1719	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1512	1720	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1527,9 +1735,9 @@
1527	1735	applyExample(particleGeom, "SMOKE");
1528	1736	makeSomething(particleGeom);
1529	1737	} else
1530		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1738	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1531	1739	{
1532		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1740	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1533	1741
1534	1742	ragdoll.toParent = LA.newMatrix();
1535	1743	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1547,7 +1755,7 @@
1547	1755	} else
1548	1756	/*
1549	1757	*/
1550		- if (event.getSource() == heightFieldItem)
	1758	+ if (source == heightFieldItem)
1551	1759	{
1552	1760	Object3D obj = new Object3D();
1553	1761
..	..	@@ -1585,31 +1793,31 @@
1585	1793
1586	1794	makeSomething(obj);
1587	1795	} else
1588		- if (event.getSource() == gridItem)
	1796	+ if (source == gridItem)
1589	1797	{
1590	1798	makeSomething(new Grid());
1591	1799	} else
1592		- if (event.getSource() == ellipsoidItem)
	1800	+ if (source == ellipsoidItem)
1593	1801	{
1594	1802	makeSomething(new Sphere());
1595	1803	} else
1596		- if (event.getSource() == coneItem)
	1804	+ if (source == coneItem)
1597	1805	{
1598	1806	makeSomething(new Cone());
1599	1807	} else
1600		- if (event.getSource() == torusItem)
	1808	+ if (source == torusItem)
1601	1809	{
1602	1810	makeSomething(new Torus());
1603	1811	} else
1604		- if (event.getSource() == superItem)
	1812	+ if (source == superItem)
1605	1813	{
1606	1814	makeSomething(new Superellipsoid());
1607	1815	} else
1608		- if (event.getSource() == kleinItem)
	1816	+ if (source == kleinItem)
1609	1817	{
1610	1818	makeSomething(new Klein());
1611	1819	} else
1612		- if (event.getSource() == blobItem)
	1820	+ if (source == blobItem)
1613	1821	{
1614	1822	Blob blob = new Blob();
1615	1823	BlobComponent comp = new BlobComponent();
..	..	@@ -1617,15 +1825,15 @@
1617	1825	//blob.retile();
1618	1826	makeSomething(blob);
1619	1827	} else
1620		- if (event.getSource() == latheItem)
	1828	+ if (source == latheItem)
1621	1829	{
1622	1830	makeSomething(new Lathe());
1623	1831	} else
1624		- if (event.getSource() == bezierItem)
	1832	+ if (source == bezierItem)
1625	1833	{
1626	1834	makeSomething(new BezierSurface());
1627	1835	} else
1628		- if (event.getSource() == checkerItem)
	1836	+ if (source == overlayItem)
1629	1837	{
1630	1838	/*
1631	1839	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1640,7 +1848,7 @@
1640	1848	*/
1641	1849	makeSomething(new Checker());
1642	1850	} else
1643		- if (event.getSource() == meshItem)
	1851	+ if (source == meshItem)
1644	1852	{
1645	1853	Object3D itemtomake = new Object3D();
1646	1854	Object3D child;
..	..	@@ -1661,35 +1869,35 @@
1661	1869	makeSomething(child);
1662	1870	}
1663	1871	} else
1664		- if (event.getSource() == springItem)
	1872	+ if (source == springItem)
1665	1873	{
1666	1874	cSpring s = new cSpring();
1667	1875	s.setup();
1668	1876	makeSomething(s);
1669	1877	} else
1670		- if (event.getSource() == flagItem)
	1878	+ if (source == flagItem)
1671	1879	{
1672	1880	cSpring s = new cFlag();
1673	1881	s.setup();
1674	1882	makeSomething(s);
1675	1883	} else
1676		- if (event.getSource() == lightItem)
	1884	+ if (source == lightItem)
1677	1885	{
1678	1886	makeSomething(new Light());
1679	1887	} else
1680		- if (event.getSource() == csgItem)
	1888	+ if (source == csgItem)
1681	1889	{
1682	1890	group(new CSG());
1683	1891	} else
1684		- if (event.getSource() == templateItem)
	1892	+ if (source == templateItem)
1685	1893	{
1686	1894	group(new cTemplate());
1687	1895	} else
1688		- if (event.getSource() == attributeItem)
	1896	+ if (source == attributeItem)
1689	1897	{
1690	1898	makeSomething(new Attribute());
1691	1899	} else
1692		- if (event.getSource() == pointflowItem)
	1900	+ if (source == pointflowItem)
1693	1901	{
1694	1902	makeSomething(new PointFlow());
1695	1903	} else
..	..	@@ -1701,7 +1909,7 @@
1701	1909	} else
1702	1910	*/
1703	1911
1704		- if (event.getSource() == superLoopItem)
	1912	+ if (source == superLoopItem)
1705	1913	{
1706	1914	Composite g = new cGroup();
1707	1915	for (int i=0; i<15; i++)
..	..	@@ -1723,7 +1931,7 @@
1723	1931
1724	1932	group(g);
1725	1933	} else
1726		- if (event.getSource() == loopItem)
	1934	+ if (source == loopItem)
1727	1935	{
1728	1936	Composite csg = new GroupLeaf();
1729	1937	csg.count = 5;
..	..	@@ -1732,7 +1940,7 @@
1732	1940	csg.addChild(child);
1733	1941	child.addChild(csg);
1734	1942	} else
1735		- if (event.getSource() == doubleItem)
	1943	+ if (source == doubleItem)
1736	1944	{
1737	1945	Composite csg = new GroupLeaf();
1738	1946	csg.count = 5;
..	..	@@ -1744,7 +1952,7 @@
1744	1952	csg.addChild(child);
1745	1953	child.addChild(csg);
1746	1954	} else
1747		- if (event.getSource() == tripleItem)
	1955	+ if (source == tripleItem)
1748	1956	{
1749	1957	Composite csg = new GroupLeaf();
1750	1958	csg.count = 4;
..	..	@@ -1759,71 +1967,83 @@
1759	1967	csg.addChild(child);
1760	1968	child.addChild(csg);
1761	1969	} else
1762		-
1763		- if (event.getSource() == importGFDItem)
	1970	+ if (source == computeAOItem)
1764	1971	{
1765		- ImportGFD();
	1972	+ Globals.drawMode = CameraPane.OCCLUSION;
	1973	+ Globals.theRenderer.repaint();
1766	1974	} 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)
	1975	+ if (source == recompileItem)
1785	1976	{
1786	1977	Recompile();
1787	1978	refreshContents();
1788	1979	} else
1789		- if (event.getSource() == editScriptItem)
	1980	+ if (source == editScriptItem)
1790	1981	{
1791	1982	OpenDialog();
1792	1983	refreshContents();
1793	1984	} else
1794		- if (event.getSource() == invariantsItem)
	1985	+ if (source == invariantsItem)
1795	1986	{
1796	1987	System.out.println("Invariants:");
1797		- GrafreeD.theApplet3D.universe.invariants();
	1988	+ Grafreed.grafreeD.universe.invariants();
1798	1989	} else
1799		- if (event.getSource() == memoryItem)
	1990	+ if (source == memoryItem)
1800	1991	{
1801	1992	//System.out.println("Invariants:");
1802	1993	PrintMemory();
1803	1994	} else
1804		- if (event.getSource() == pathItem)
	1995	+ if (source == pathItem)
1805	1996	{
1806	1997	PrintPath();
1807	1998	} else
1808		- if (event.getSource() == analyzeItem)
	1999	+ if (source == analyzeItem)
1809	2000	{
1810	2001	AnalyzeObject();
1811	2002	} else
1812		- if (event.getSource() == dumpItem)
	2003	+ if (source == dumpItem)
1813	2004	{
1814	2005	DumpObject();
1815	2006	} else
1816		- if (event.getSource() == screenfitButton)
	2007	+ if (source == minButton)
	2008	+ {
	2009	+ Minimize();
	2010	+ } else
	2011	+ if (source == maxButton)
	2012	+ {
	2013	+ Maximize();
	2014	+ } else
	2015	+ if (source == fullButton)
	2016	+ {
	2017	+ ToggleFullScreen();
	2018	+ } else
	2019	+ if (source == undoButton)
	2020	+ {
	2021	+ Undo();
	2022	+ } else
	2023	+ if (source == redoButton)
	2024	+ {
	2025	+ Redo();
	2026	+ } else
	2027	+ if (source == saveButton)
	2028	+ {
	2029	+ Save();
	2030	+ } else
	2031	+ if (source == oneStepButton)
	2032	+ {
	2033	+ Globals.ONESTEP = true;
	2034	+ cameraView.repaint();
	2035	+ } else
	2036	+ if (source == screenfitButton)
1817	2037	{
1818	2038	//Reload(lastConverter, lastFilename, true);
1819	2039	ScreenFit();
1820	2040	} else
1821		- if (event.getSource() == screenfitpointButton)
	2041	+ if (source == screenfitpointButton)
1822	2042	{
1823	2043	//Reload(lastConverter, lastFilename, true);
1824	2044	ScreenFitPoint();
1825	2045	} else
1826		- if (event.getSource() == snapobjectButton)
	2046	+ if (source == snapobjectButton)
1827	2047	{
1828	2048	//Reload(lastConverter, lastFilename, true);
1829	2049	SnapObject();
..	..	@@ -1834,13 +2054,13 @@
1834	2054	// Recompile();
1835	2055	// refreshContents();
1836	2056	// } else
1837		- if (event.getSource() == gcButton)
	2057	+ if (source == gcButton)
1838	2058	{
1839	2059	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1840	2060	System.gc();
1841	2061	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1842	2062	} else
1843		- if (event.getSource() == editLeafItem)
	2063	+ if (source == editLeafItem)
1844	2064	{
1845	2065	Object3D obj;
1846	2066	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1854,62 +2074,74 @@
1854	2074	}
1855	2075	refreshContents(true);
1856	2076	} else
1857		- if (event.getSource() == openWindowItem)
	2077	+ if (source == openWindowItem)
1858	2078	{
1859	2079	EditSelection(true);
1860	2080	} else
1861		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2081	+ if (source == cutItem \|\| source == clearButton)
1862	2082	{
1863	2083	loadClipboard(true);
1864	2084	} else
1865		- if (event.getSource() == duplicateItem)
	2085	+ if (source == undoItem)
1866	2086	{
1867		- Object3D keep = GrafreeD.clipboard;
	2087	+ Undo();
	2088	+ } else
	2089	+ if (source == redoItem)
	2090	+ {
	2091	+ Redo();
	2092	+ } else
	2093	+ if (source == duplicateItem)
	2094	+ {
	2095	+ Object3D keep = Grafreed.clipboard;
1868	2096	loadClipboard(false);
1869	2097	paste(false);
1870		- GrafreeD.clipboard = keep;
	2098	+ Grafreed.clipboard = keep;
1871	2099	} else
1872		- if (event.getSource() == cloneItem)
	2100	+ if (source == cloneItem)
1873	2101	{
1874	2102	CloneSelection(false);
1875	2103	} else
1876		- if (event.getSource() == cloneSupportItem)
	2104	+ if (source == cloneSupportItem)
1877	2105	{
1878	2106	CloneSelection(true);
1879	2107	} else
1880		- if (event.getSource() == copyItem)
	2108	+ if (source == copyItem)
1881	2109	{
1882	2110	loadClipboard(false);
1883	2111	} else
1884		- if (event.getSource() == pasteItem)
	2112	+ if (source == pasteItem)
1885	2113	{
1886	2114	paste(false);
1887	2115	} else
1888		- if (event.getSource() == pasteLinkItem)
	2116	+ if (source == pasteIntoItem)
1889	2117	{
1890		- pasteInto(false);
	2118	+ pasteInto(true, false);
1891	2119	} else
1892		- if (event.getSource() == pasteCloneItem)
	2120	+ if (source == pasteLinkItem)
1893	2121	{
1894		- pasteInto(true);
	2122	+ pasteInto(false, false);
1895	2123	} else
1896		- if (event.getSource() == pasteExpandItem)
	2124	+ if (source == pasteCloneItem)
	2125	+ {
	2126	+ pasteInto(true, true);
	2127	+ } else
	2128	+ if (source == pasteExpandItem)
1897	2129	{
1898	2130	paste(true);
1899	2131	} else
1900		- if (event.getSource() == synchronizeItem)
	2132	+ if (source == synchronizeItem)
1901	2133	{
1902	2134	Overwrite(Object3D.TRANSFORM);
1903	2135	} else
1904		- if (event.getSource() == overwriteNameItem)
	2136	+ if (source == overwriteNameItem)
1905	2137	{
1906	2138	Overwrite(Object3D.NAME);
1907	2139	} else
1908		- if (event.getSource() == overwriteUVItem)
	2140	+ if (source == overwriteUVItem)
1909	2141	{
1910	2142	Overwrite(Object3D.UV);
1911	2143	} else
1912		- if (event.getSource() == overwriteMatItem)
	2144	+ if (source == overwriteMatItem)
1913	2145	{
1914	2146	/* july 2015
1915	2147	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1929,7 +2161,7 @@
1929	2161
1930	2162	Overwrite(dropAttributes);
1931	2163	}
1932		- if (event.getSource() == overwriteGeoItem)
	2164	+ if (source == overwriteGeoItem)
1933	2165	{
1934	2166	Overwrite(Object3D.GEOMETRY);
1935	2167	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1946,7 +2178,7 @@
1946	2178	// refreshContents();
1947	2179	// }
1948	2180	} else
1949		- if (event.getSource() == generateMeshItem)
	2181	+ if (source == generateMeshItem)
1950	2182	{
1951	2183	//if (group.selection.size() == 1)
1952	2184	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1957,7 +2189,7 @@
1957	2189	ResetModel();
1958	2190	refreshContents();
1959	2191	} else
1960		- if (event.getSource() == extractGeometriesItem)
	2192	+ if (source == extractGeometriesItem)
1961	2193	{
1962	2194	boolean one = false;
1963	2195
..	..	@@ -1984,7 +2216,7 @@
1984	2216	ResetModel();
1985	2217	refreshContents();
1986	2218	} else
1987		- if (event.getSource() == cloneGeometriesItem)
	2219	+ if (source == cloneGeometriesItem)
1988	2220	{
1989	2221	boolean one = false;
1990	2222
..	..	@@ -2010,7 +2242,7 @@
2010	2242	ResetModel();
2011	2243	refreshContents();
2012	2244	} else
2013		- if (event.getSource() == shareGeometriesItem)
	2245	+ if (source == shareGeometriesItem)
2014	2246	{
2015	2247	boolean one = false;
2016	2248
..	..	@@ -2040,7 +2272,7 @@
2040	2272	refreshContents();
2041	2273	}
2042	2274	} else
2043		- if (event.getSource() == mergeGeometriesItem)
	2275	+ if (source == mergeGeometriesItem)
2044	2276	{
2045	2277	boolean one = false;
2046	2278
..	..	@@ -2070,7 +2302,7 @@
2070	2302	ResetModel();
2071	2303	refreshContents();
2072	2304	} else
2073		- if (event.getSource() == linkverticesItem)
	2305	+ if (source == linkverticesItem)
2074	2306	{
2075	2307	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2076	2308	// {
..	..	@@ -2083,48 +2315,48 @@
2083	2315	// group.selection.get(0).setMasterThis(content); // should be identity
2084	2316	// refreshContents();
2085	2317	// }
2086		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2318	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2087	2319	{
2088		- Object3D content = GrafreeD.clipboard.get(0);
	2320	+ Object3D content = Grafreed.clipboard.get(0);
2089	2321
2090	2322	if (content instanceof cGroup && ((cGroup)content).transientlink )
2091	2323	content = ((cGroup)content).get(0);
2092	2324
2093		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2325	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2094	2326	for (int i=0; i<group.selection.size(); i++)
2095	2327	{
2096		- boolean random = CameraPane.RANDOM;
2097		- CameraPane.RANDOM = false; // parse all random nodes
	2328	+ boolean random = CameraPane.SWITCH;
	2329	+ CameraPane.SWITCH = false; // parse all random nodes
2098	2330	group.selection.get(i).linkVerticesThis(content);
2099	2331	// group.selection.get(i).setMasterThis(content); // should be identity
2100		- CameraPane.RANDOM = random;
	2332	+ CameraPane.SWITCH = random;
2101	2333	}
2102		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2334	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2103	2335	refreshContents();
2104	2336	}
2105	2337	} else
2106		- if (event.getSource() == resetsupportItem)
	2338	+ if (source == resetsupportItem)
2107	2339	{
2108	2340	for (int i=0; i<group.selection.size(); i++)
2109	2341	{
2110		- boolean random = CameraPane.RANDOM;
2111		- CameraPane.RANDOM = false; // parse all random nodes
	2342	+ boolean random = CameraPane.SWITCH;
	2343	+ CameraPane.SWITCH = false; // parse all random nodes
2112	2344	group.selection.get(i).linkVerticesThis(null);
2113		- CameraPane.RANDOM = random;
	2345	+ CameraPane.SWITCH = random;
2114	2346	}
2115	2347
2116	2348	refreshContents();
2117	2349	} else
2118		- if (event.getSource() == relinkverticesItem)
	2350	+ if (source == relinkverticesItem)
2119	2351	{
2120		- boolean random = CameraPane.RANDOM;
2121		- CameraPane.RANDOM = false; // parse all random nodes
	2352	+ boolean random = CameraPane.SWITCH;
	2353	+ CameraPane.SWITCH = false; // parse all random nodes
2122	2354	group.selection.RelinkToSupport();
2123		- CameraPane.RANDOM = random;
	2355	+ CameraPane.SWITCH = random;
2124	2356
2125	2357	refreshContents();
2126	2358	} else
2127		- if (event.getSource() == resetreferencesItem)
	2359	+ if (source == resetreferencesItem)
2128	2360	{
2129	2361	for (int i=0; i<group.selection.size(); i++)
2130	2362	{
..	..	@@ -2133,11 +2365,11 @@
2133	2365
2134	2366	refreshContents();
2135	2367	} else
2136		- if (event.getSource() == setMasterItem)
	2368	+ if (source == setMasterItem)
2137	2369	{
2138		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2370	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2139	2371	{
2140		- Object3D content = GrafreeD.clipboard.get(0);
	2372	+ Object3D content = Grafreed.clipboard.get(0);
2141	2373
2142	2374	if (content instanceof cGroup && ((cGroup)content).transientlink )
2143	2375	content = ((cGroup)content).get(0);
..	..	@@ -2146,13 +2378,13 @@
2146	2378	refreshContents();
2147	2379	}
2148	2380	} else
2149		- if (event.getSource() == poseMeshItem)
	2381	+ if (source == poseMeshItem)
2150	2382	{
2151	2383	if (group.selection.size() == 1)
2152	2384	{
2153		- if (GrafreeD.clipboard.size() == 1)
	2385	+ if (Grafreed.clipboard.size() == 1)
2154	2386	{
2155		- Object3D content = GrafreeD.clipboard.get(0);
	2387	+ Object3D content = Grafreed.clipboard.get(0);
2156	2388
2157	2389	if (content instanceof cGroup && ((cGroup)content).transientlink )
2158	2390	content = ((cGroup)content).get(0);
..	..	@@ -2165,19 +2397,19 @@
2165	2397	}
2166	2398
2167	2399	} else
2168		- if (event.getSource() == revertMeshItem)
	2400	+ if (source == revertMeshItem)
2169	2401	{
2170	2402	RevertMeshes();
2171	2403	} else
2172		- if (event.getSource() == resetMeshItem)
	2404	+ if (source == resetAllItem)
2173	2405	{
2174	2406	ResetAll();
2175	2407	} else
2176		- if (event.getSource() == stepAllItem)
	2408	+ if (source == stepAllItem)
2177	2409	{
2178	2410	StepAll();
2179	2411	} else
2180		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2412	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2181	2413	{
2182	2414	//int indices[] = jList.getSelectedIndices();
2183	2415	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2185,46 +2417,46 @@
2185	2417
2186	2418	ClearSelection(false);
2187	2419	} else
2188		- if (event.getSource() == clearAllItem)
	2420	+ if (source == clearAllItem)
2189	2421	{
2190	2422	ClearSelection(true);
2191	2423	} else
2192		- if (event.getSource() == grabItem)
	2424	+ if (source == grabItem)
2193	2425	{
2194	2426	group(new cGroup(), true);
2195	2427	} else
2196		- if (event.getSource() == hideItem)
	2428	+ if (source == hideItem)
2197	2429	{
2198	2430	group(new HiddenObject());
2199	2431	} else
2200		- if (event.getSource() == frontItem)
	2432	+ if (source == frontItem)
2201	2433	{
2202	2434	front();
2203	2435	} else
2204		- if (event.getSource() == backItem)
	2436	+ if (source == backItem)
2205	2437	{
2206	2438	back();
2207	2439	} else
2208		- if (event.getSource() == cameraItem)
	2440	+ if (source == cameraItem)
2209	2441	{
2210	2442	makeSomething(new Camera());
2211	2443	} else
2212		- if (event.getSource() == compositeItem)
	2444	+ if (source == compositeItem)
2213	2445	{
2214	2446	group(new Composite());
2215	2447	} else
2216		- if (event.getSource() == randomItem)
	2448	+ if (source == randomItem)
2217	2449	{
2218	2450	RandomNode random = new RandomNode();
2219	2451	group(random);
2220	2452	if (random.size() > 0)
2221		- random.name = random.get(0).name + "Rnd";
	2453	+ random.name = random.get(0).name + "Switch";
2222	2454	} else
2223		- if (event.getSource() == physicsItem)
	2455	+ if (source == physicsItem)
2224	2456	{
2225	2457	group(new PhysicsNode());
2226	2458	} else
2227		- if (event.getSource() == frameselectorItem)
	2459	+ if (source == frameselectorItem)
2228	2460	{
2229	2461	for (int i=0; i<group.selection.size(); i++)
2230	2462	{
..	..	@@ -2236,7 +2468,7 @@
2236	2468	ResetModel();
2237	2469	refreshContents();
2238	2470	} else
2239		- if (event.getSource() == switchGeoItem)
	2471	+ if (source == switchGeoItem)
2240	2472	{
2241	2473	for (int i=0; i<group.selection.size(); i++)
2242	2474	{
..	..	@@ -2248,7 +2480,7 @@
2248	2480	ResetModel();
2249	2481	refreshContents();
2250	2482	} else
2251		- if (event.getSource() == switchTransfoItem)
	2483	+ if (source == switchTransfoItem)
2252	2484	{
2253	2485	for (int i=0; i<group.selection.size(); i++)
2254	2486	{
..	..	@@ -2260,7 +2492,7 @@
2260	2492	ResetModel();
2261	2493	refreshContents();
2262	2494	} else
2263		- if (event.getSource() == morphItem)
	2495	+ if (source == morphItem)
2264	2496	{
2265	2497	for (int i=0; i<group.selection.size(); i++)
2266	2498	{
..	..	@@ -2272,7 +2504,7 @@
2272	2504	ResetModel();
2273	2505	refreshContents();
2274	2506	} else
2275		- if (event.getSource() == scriptNodeItem)
	2507	+ if (source == scriptNodeItem)
2276	2508	{
2277	2509	boolean atleastone = false;
2278	2510
..	..	@@ -2311,31 +2543,31 @@
2311	2543	}
2312	2544	}
2313	2545	} else
2314		- if (event.getSource() == linkerItem)
	2546	+ if (source == linkerItem)
2315	2547	{
2316	2548	group(new cLinker());
2317	2549	} else
2318		- if (event.getSource() == textureItem)
	2550	+ if (source == textureItem)
2319	2551	{
2320	2552	group(new TextureNode());
2321	2553	} else
2322		- if (event.getSource() == billboardItem)
	2554	+ if (source == billboardItem)
2323	2555	{
2324	2556	group(new BillboardNode());
2325	2557	} else
2326		- if (event.getSource() == shadowXItem)
	2558	+ if (source == shadowXItem)
2327	2559	{
2328	2560	CastShadow(0);
2329	2561	} else
2330		- if (event.getSource() == shadowYItem)
	2562	+ if (source == shadowYItem)
2331	2563	{
2332	2564	CastShadow(1);
2333	2565	} else
2334		- if (event.getSource() == shadowZItem)
	2566	+ if (source == shadowZItem)
2335	2567	{
2336	2568	CastShadow(2);
2337	2569	} else
2338		- if (event.getSource() == ungroupItem)
	2570	+ if (source == ungroupItem)
2339	2571	{
2340	2572	//ungroup();
2341	2573	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2347,179 +2579,203 @@
2347	2579
2348	2580	refreshContents();
2349	2581	} else
2350		- if (event.getSource() == genUVItem)
	2582	+ if (source == genUVItem)
2351	2583	{
2352	2584	GenUV();
2353	2585	} else
2354		- if (event.getSource() == genNormalsCADItem)
	2586	+ if (source == genNormalsCADItem)
2355	2587	{
2356	2588	GenNormals(true);
2357	2589	} else
2358		- if (event.getSource() == genNormalsMESHItem)
	2590	+ if (source == genNormalsMESHItem)
2359	2591	{
2360		- GenNormals(true); // TODO
	2592	+ GenNormalsMESH();
2361	2593	} else
2362		- if (event.getSource() == genNormalsORGANItem)
	2594	+ if (source == genNormalsORGANItem)
2363	2595	{
2364	2596	GenNormals(false);
2365	2597	} else
2366		- if (event.getSource() == genNormalsMINEItem)
	2598	+ if (source == genNormalsMINEItem)
2367	2599	{
2368	2600	GenNormalsMINE();
2369	2601	} else
2370		- if (event.getSource() == stripifyItem)
	2602	+ if (source == stripifyItem)
2371	2603	{
2372	2604	Stripify();
2373	2605	} else
2374		- if (event.getSource() == unstripifyItem)
	2606	+ if (source == unstripifyItem)
2375	2607	{
2376	2608	Unstripify();
2377	2609	} else
2378		- if (event.getSource() == trimItem)
	2610	+ if (source == trimItem)
2379	2611	{
2380	2612	Trim();
2381	2613	} else
2382		- if (event.getSource() == untrimItem)
	2614	+ if (source == untrimItem)
2383	2615	{
2384	2616	Untrim();
2385	2617	} else
2386		- if (event.getSource() == clearColorsItem)
	2618	+ if (source == clearColorsItem)
2387	2619	{
2388	2620	ClearColors();
2389	2621	} else
2390		- if (event.getSource() == clearMaterialsItem)
	2622	+ if (source == clearMaterialsItem)
2391	2623	{
2392	2624	ClearMaterials();
2393	2625	} else
2394		- if (event.getSource() == liveleavesItem)
	2626	+ if (source == liveleavesItem)
2395	2627	{
2396	2628	LiveLeaves(true);
2397	2629	} else
2398		- if (event.getSource() == unliveleavesItem)
	2630	+ if (source == unliveleavesItem)
2399	2631	{
2400	2632	LiveLeaves(false);
2401	2633	} else
2402		- if (event.getSource() == supportleavesItem)
	2634	+ if (source == supportleavesItem)
2403	2635	{
2404	2636	SupportLeaves(true);
2405	2637	} else
2406		- if (event.getSource() == unsupportleavesItem)
	2638	+ if (source == unsupportleavesItem)
2407	2639	{
2408	2640	SupportLeaves(false);
2409	2641	} else
2410		- if (event.getSource() == hideleavesItem)
	2642	+ if (source == hideleavesItem)
2411	2643	{
2412	2644	HideLeaves(true);
2413	2645	} else
2414		- if (event.getSource() == showleavesItem)
	2646	+ if (source == showleavesItem)
2415	2647	{
2416	2648	HideLeaves(false);
2417	2649	} else
2418		- if (event.getSource() == markleavesItem)
	2650	+ if (source == markleavesItem)
2419	2651	{
2420	2652	MarkLeaves(true);
2421	2653	} else
2422		- if (event.getSource() == unmarkleavesItem)
	2654	+ if (source == unmarkleavesItem)
2423	2655	{
2424	2656	MarkLeaves(false);
2425	2657	} else
2426		- if (event.getSource() == flipVItem)
	2658	+ if (source == rewindleavesItem)
	2659	+ {
	2660	+ RewindLeaves(true);
	2661	+ } else
	2662	+ if (source == unrewindleavesItem)
	2663	+ {
	2664	+ RewindLeaves(false);
	2665	+ } else
	2666	+ if (source == randomleavesItem)
	2667	+ {
	2668	+ RandomLeaves(true);
	2669	+ } else
	2670	+ if (source == unrandomleavesItem)
	2671	+ {
	2672	+ RandomLeaves(false);
	2673	+ } else
	2674	+ if (source == flipVItem)
2427	2675	{
2428	2676	FlipV(true);
2429	2677	} else
2430		- if (event.getSource() == unflipVItem)
	2678	+ if (source == unflipVItem)
2431	2679	{
2432	2680	FlipV(false);
2433	2681	} else
2434		- if (event.getSource() == lowTexturesItem)
	2682	+ if (source == lowTexturesItem)
2435	2683	{
2436	2684	SetTexRes(0);
2437	2685	} else
2438		- if (event.getSource() == normalTexturesItem)
	2686	+ if (source == normalTexturesItem)
2439	2687	{
2440	2688	SetTexRes(1);
2441	2689	} else
2442		- if (event.getSource() == highTexturesItem)
	2690	+ if (source == highTexturesItem)
2443	2691	{
2444	2692	SetTexRes(2);
2445	2693	} else
2446		- if (event.getSource() == veryhighTexturesItem)
	2694	+ if (source == veryhighTexturesItem)
2447	2695	{
2448	2696	SetTexRes(3);
2449	2697	} else
2450		- if (event.getSource() == maxTexturesItem)
	2698	+ if (source == maxTexturesItem)
2451	2699	{
2452	2700	SetTexRes(4);
2453	2701	} else
2454		- if (event.getSource() == panoTexturesItem)
	2702	+ if (source == panoTexturesItem)
2455	2703	{
2456	2704	SetTexRes(5);
2457	2705	} else
2458		- if (event.getSource() == reverseNormalsItem)
	2706	+ if (source == reverseNormalsItem)
2459	2707	{
2460	2708	ReverseNormals();
2461	2709	} else
2462		- if (event.getSource() == parseverticesItem)
	2710	+ if (source == parseverticesItem)
2463	2711	{
2464	2712	ParseVertices();
2465	2713	} else
2466		- if (event.getSource() == textureFieldItem)
	2714	+ if (source == textureFieldItem)
2467	2715	{
2468	2716	TextureVertices();
2469	2717	} else
2470		- if (event.getSource() == alignItem)
	2718	+ if (source == alignItem)
2471	2719	{
2472	2720	Align();
2473	2721	} else
2474		- if (event.getSource() == mirrorItem)
	2722	+ if (source == mirrorItem)
2475	2723	{
2476	2724	MirrorPoses();
2477	2725	} else
2478		- if (event.getSource() == reduceMorphItem)
	2726	+ if (source == reduceMorphItem)
2479	2727	{
2480	2728	MeshReduction(false);
2481	2729	} else
2482		- if (event.getSource() == reduce34MorphItem)
	2730	+ if (source == reduce34MorphItem)
2483	2731	{
2484	2732	MeshReduction(true);
2485	2733	} else
2486		- if (event.getSource() == reverseTrianglesItem)
	2734	+ if (source == reverseTrianglesItem)
2487	2735	{
2488	2736	ReverseTriangles();
2489	2737	} else
2490		- if (event.getSource() == reduceMeshItem)
	2738	+ if (source == reduceMeshItem)
2491	2739	{
2492	2740	ReduceMesh(false);
2493	2741	} else
2494		- if (event.getSource() == reduce34MeshItem)
	2742	+ if (source == reduce34MeshItem)
2495	2743	{
2496	2744	ReduceMesh(true);
2497	2745	} else
2498		- if (event.getSource() == increaseMeshItem)
	2746	+ if (source == increaseMeshItem)
2499	2747	{
2500	2748	IncreaseMesh();
2501	2749	} else
2502		- if (event.getSource() == clipMeshItem)
	2750	+ if (source == clipMeshItem)
2503	2751	{
2504	2752	ClipMesh();
2505	2753	} else
2506		- if (event.getSource() == smoothMeshItem)
	2754	+ if (source == smoothMeshItem)
2507	2755	{
2508	2756	SmoothMesh();
2509	2757	} else
2510		- if (event.getSource() == transformgeometryItem)
	2758	+ if (source == transformGeometryItem)
2511	2759	{
2512	2760	TransformGeometry();
2513	2761	} else
2514		- if (event.getSource() == resetTransformItem)
	2762	+ if (source == transformChildrenItem)
	2763	+ {
	2764	+ TransformChildren();
	2765	+ } else
	2766	+ if (source == resetTransformItem)
2515	2767	{
2516	2768	ResetTransform();
2517	2769	} else
2518		- if (event.getSource() == resetCentroidItem)
	2770	+ if (source == resetCentroidItem)
2519	2771	{
2520		- ResetCentroid();
	2772	+ ResetCentroid(true);
2521	2773	} else
2522		- if (event.getSource() == resetParentItem)
	2774	+ if (source == resetCentroidXZItem)
	2775	+ {
	2776	+ ResetCentroid(false);
	2777	+ } else
	2778	+ if (source == resetParentItem)
2523	2779	{
2524	2780	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2525	2781	{
..	..	@@ -2529,7 +2785,7 @@
2529	2785
2530	2786	refreshContents();
2531	2787	} else
2532		- if (event.getSource() == repairParentItem)
	2788	+ if (source == repairParentItem)
2533	2789	{
2534	2790	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2535	2791	{
..	..	@@ -2543,7 +2799,21 @@
2543	2799
2544	2800	refreshContents();
2545	2801	} else
2546		- if (event.getSource() == sortbysizeItem)
	2802	+ if (source == repairShadowItem)
	2803	+ {
	2804	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2805	+ {
	2806	+ Object3D obj = (Object3D)e.nextElement();
	2807	+ obj.RepairShadow();
	2808	+// for (int i=0; i<obj.size(); i++)
	2809	+// {
	2810	+// obj.get(i).parent = obj;
	2811	+// }
	2812	+ }
	2813	+
	2814	+ refreshContents();
	2815	+ } else
	2816	+ if (source == sortbysizeItem)
2547	2817	{
2548	2818	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2549	2819	{
..	..	@@ -2555,7 +2825,7 @@
2555	2825	ResetModel();
2556	2826	refreshContents();
2557	2827	} else
2558		- if (event.getSource() == sortbynameItem)
	2828	+ if (source == sortbynameItem)
2559	2829	{
2560	2830	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2561	2831	{
..	..	@@ -2567,7 +2837,7 @@
2567	2837	ResetModel();
2568	2838	refreshContents();
2569	2839	} else
2570		- if (event.getSource() == attachPigmentItem)
	2840	+ if (source == attachPigmentItem)
2571	2841	{
2572	2842	String texture = GetFile("Attach pigment");
2573	2843	Object3D obj;
..	..	@@ -2579,7 +2849,7 @@
2579	2849
2580	2850	refreshContents();
2581	2851	} else
2582		- if (event.getSource() == detachPigmentItem)
	2852	+ if (source == detachPigmentItem)
2583	2853	{
2584	2854	Object3D obj;
2585	2855	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2590,7 +2860,7 @@
2590	2860
2591	2861	refreshContents();
2592	2862	} else
2593		- if (event.getSource() == attachBumpItem)
	2863	+ if (source == attachBumpItem)
2594	2864	{
2595	2865	String texture = GetFile("Attach bump");
2596	2866	Object3D obj;
..	..	@@ -2602,7 +2872,7 @@
2602	2872
2603	2873	refreshContents();
2604	2874	} else
2605		- if (event.getSource() == detachBumpItem)
	2875	+ if (source == detachBumpItem)
2606	2876	{
2607	2877	Object3D obj;
2608	2878	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2613,7 +2883,7 @@
2613	2883
2614	2884	refreshContents();
2615	2885	} else
2616		- if (event.getSource() == pigmentBumpItem)
	2886	+ if (source == pigmentBumpItem)
2617	2887	{
2618	2888	Object3D obj;
2619	2889	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2624,158 +2894,221 @@
2624	2894
2625	2895	refreshContents();
2626	2896	} else
2627		- if (event.getSource() == flashSelectionButton)
	2897	+ if (source == flashSelectionButton)
2628	2898	{
2629	2899	CameraPane.flash = true;
2630	2900	refreshContents();
2631	2901	} else
2632		- if (event.getSource() == oneButton)
	2902	+ if (source == oneButton)
2633	2903	{
2634	2904	} else
2635		- if (event.getSource() == twoButton)
	2905	+ if (source == twoButton)
2636	2906	{
2637	2907	radio.layout = twoButton;
2638	2908	// bug
2639	2909	//gridPanel.setDividerLocation(1.0);
2640	2910	//bigPanel.setDividerLocation(0.0);
2641		- bigThree.remove(jtp);
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();
	2911	+// bigThree.remove(scenePanel);
	2912	+// bigThree.remove(centralPanel);
	2913	+// bigThree.remove(XYZPanel);
	2914	+// aWindowConstraints.gridx = 0;
	2915	+// aWindowConstraints.gridy = 0;
	2916	+// aWindowConstraints.gridwidth = 1;
	2917	+// // aConstraints.gridheight = 3;
	2918	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2919	+// aWindowConstraints.weightx = 0;
	2920	+// aWindowConstraints.weighty = 1;
	2921	+// //bigThree.add(jtp, aWindowConstraints);
	2922	+// aWindowConstraints.weightx = 1;
	2923	+// aWindowConstraints.gridwidth = 3;
	2924	+// // aConstraints.gridheight = 3;
	2925	+// aWindowConstraints.gridx = 1;
	2926	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2927	+// bigThree.add(centralPanel, aWindowConstraints);
	2928	+// aWindowConstraints.weightx = 0;
	2929	+// aWindowConstraints.gridx = 4;
	2930	+// aWindowConstraints.gridwidth = 1;
	2931	+// // aConstraints.gridheight = 3;
	2932	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2933	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2934	+// scenePanel.setVisible(false);
	2935	+// centralPanel.setVisible(true);
	2936	+// XYZPanel.setVisible(false);
	2937	+ bigThree.ClearUI();
	2938	+ bigThree.add(centralPanel);
	2939	+ bigThree.FlushUI();
	2940	+
	2941	+ cameraView.requestFocusInWindow();
	2942	+
	2943	+// refreshContents(true);
	2944	+//
	2945	+// try
	2946	+// {
	2947	+// java.awt.Robot bot = new java.awt.Robot();
	2948	+// int mask = InputEvent.BUTTON1_MASK;
	2949	+// bot.mouseMove(100, 100);
	2950	+// bot.mousePress(mask);
	2951	+// bot.mouseRelease(mask);
	2952	+// }
	2953	+// catch (Exception e)
	2954	+// {
	2955	+//
	2956	+// }
	2957	+
2665	2958	} else
2666		- if (event.getSource() == threeButton)
	2959	+ if (source == threeButton)
2667	2960	{
2668	2961	radio.layout = threeButton;
2669		- bigThree.remove(jtp);
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();
	2962	+
	2963	+// bigThree.remove(scenePanel);
	2964	+// bigThree.remove(centralPanel);
	2965	+// bigThree.remove(XYZPanel);
	2966	+// aWindowConstraints.gridx = 0;
	2967	+// aWindowConstraints.gridy = 0;
	2968	+// aWindowConstraints.gridwidth = 1;
	2969	+// // aConstraints.gridheight = 3;
	2970	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2971	+// aWindowConstraints.weightx = 0;
	2972	+// aWindowConstraints.weighty = 1;
	2973	+// //bigThree.add(jtp, aWindowConstraints);
	2974	+// aWindowConstraints.weightx = 1;
	2975	+// aWindowConstraints.gridwidth = 3;
	2976	+// // aConstraints.gridheight = 3;
	2977	+// aWindowConstraints.gridx = 1;
	2978	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2979	+// bigThree.add(centralPanel, aWindowConstraints);
	2980	+// aWindowConstraints.weightx = 0;
	2981	+// aWindowConstraints.gridx = 4;
	2982	+// aWindowConstraints.gridwidth = 1;
	2983	+// // aConstraints.gridheight = 3;
	2984	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2985	+// bigThree.add(XYZPanel, aWindowConstraints);
	2986	+// bigThree.validate();
	2987	+// scenePanel.setVisible(false);
	2988	+// centralPanel.setVisible(true);
	2989	+// XYZPanel.setVisible(true);
	2990	+ bigThree.ClearUI();
	2991	+ bigThree.add(centralPanel);
	2992	+ bigThree.add(XYZPanel);
	2993	+ bigThree.FlushUI();
	2994	+
	2995	+ cameraView.requestFocusInWindow();
2693	2996	} else
2694		- if (event.getSource() == fourButton)
	2997	+ if (source == fourButton)
2695	2998	{
2696	2999	radio.layout = fourButton;
2697		- bigThree.remove(jtp);
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(jtp, 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();
	3000	+
	3001	+// bigThree.remove(scenePanel);
	3002	+// bigThree.remove(centralPanel);
	3003	+// bigThree.remove(XYZPanel);
	3004	+// aWindowConstraints.gridx = 0;
	3005	+// aWindowConstraints.gridy = 0;
	3006	+// aWindowConstraints.gridwidth = 1;
	3007	+// // aWindowConstraints.gridheight = 3;
	3008	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3009	+// aWindowConstraints.weightx = 1;
	3010	+// aWindowConstraints.weighty = 1;
	3011	+// bigThree.add(scenePanel, aWindowConstraints);
	3012	+// aWindowConstraints.weightx = 1;
	3013	+// aWindowConstraints.gridwidth = 3;
	3014	+// // aConstraints.gridheight = 3;
	3015	+// aWindowConstraints.gridx = 1;
	3016	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3017	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3018	+// aWindowConstraints.weightx = 0;
	3019	+// aWindowConstraints.gridx = 4;
	3020	+// aWindowConstraints.gridwidth = 1;
	3021	+// // aWindowConstraints.gridheight = 3;
	3022	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3023	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3024	+// bigThree.validate();
	3025	+// scenePanel.setVisible(true);
	3026	+// centralPanel.setVisible(false);
	3027	+// XYZPanel.setVisible(false);
	3028	+ bigThree.ClearUI();
	3029	+ bigThree.add(scenePanel);
	3030	+ bigThree.FlushUI();
	3031	+
	3032	+ cameraView.requestFocusInWindow();
2721	3033	} else
2722		- if (event.getSource() == sixButton)
	3034	+ if (source == sixButton)
2723	3035	{
2724	3036	radio.layout = sixButton;
2725		- bigThree.remove(jtp);
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(jtp, 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();
	3037	+
	3038	+// bigThree.remove(scenePanel);
	3039	+// bigThree.remove(centralPanel);
	3040	+// bigThree.remove(XYZPanel);
	3041	+// aWindowConstraints.gridx = 0;
	3042	+// aWindowConstraints.gridy = 0;
	3043	+// aWindowConstraints.gridwidth = 1;
	3044	+// // aConstraints.gridheight = 3;
	3045	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3046	+// aWindowConstraints.weightx = 0;
	3047	+// aWindowConstraints.weighty = 1;
	3048	+// bigThree.add(scenePanel, aWindowConstraints);
	3049	+// aWindowConstraints.weightx = 1;
	3050	+// aWindowConstraints.gridwidth = 3;
	3051	+// // aWindowConstraints.gridheight = 3;
	3052	+// aWindowConstraints.gridx = 1;
	3053	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3054	+// bigThree.add(centralPanel, aWindowConstraints);
	3055	+// aWindowConstraints.weightx = 0;
	3056	+// aWindowConstraints.gridx = 4;
	3057	+// aWindowConstraints.gridwidth = 1;
	3058	+// // aWindowConstraints.gridheight = 3;
	3059	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3060	+// //bigThree.add(XYZPanel, aConstraints);
	3061	+// bigThree.validate();
	3062	+// scenePanel.setVisible(true);
	3063	+// centralPanel.setVisible(true);
	3064	+// XYZPanel.setVisible(false);
	3065	+ bigThree.ClearUI();
	3066	+ bigThree.add(scenePanel);
	3067	+ bigThree.add(centralPanel);
	3068	+ bigThree.FlushUI();
	3069	+
	3070	+ cameraView.requestFocusInWindow();
2749	3071	} else
2750		- if (event.getSource() == sevenButton)
	3072	+ if (source == sevenButton)
2751	3073	{
2752	3074	radio.layout = sevenButton;
2753		- bigThree.remove(jtp);
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(jtp, 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();
	3075	+
	3076	+// bigThree.remove(scenePanel);
	3077	+// bigThree.remove(centralPanel);
	3078	+// bigThree.remove(XYZPanel);
	3079	+// aWindowConstraints.gridx = 0;
	3080	+// aWindowConstraints.gridy = 0;
	3081	+// aWindowConstraints.gridwidth = 1;
	3082	+// // aWindowConstraints.gridheight = 3;
	3083	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3084	+// aWindowConstraints.weightx = 0;
	3085	+// aWindowConstraints.weighty = 1;
	3086	+// bigThree.add(scenePanel, aWindowConstraints);
	3087	+// aWindowConstraints.weightx = 1;
	3088	+// aWindowConstraints.gridwidth = 3;
	3089	+// // aWindowConstraints.gridheight = 3;
	3090	+// aWindowConstraints.gridx = 1;
	3091	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3092	+// bigThree.add(centralPanel, aWindowConstraints);
	3093	+// aWindowConstraints.weightx = 0;
	3094	+// aWindowConstraints.gridx = 4;
	3095	+// aWindowConstraints.gridwidth = 1;
	3096	+// // aConstraints.gridheight = 3;
	3097	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3098	+// bigThree.add(XYZPanel, aWindowConstraints);
	3099	+// bigThree.validate();
	3100	+// scenePanel.setVisible(true);
	3101	+// centralPanel.setVisible(true);
	3102	+// XYZPanel.setVisible(true);
	3103	+ bigThree.ClearUI();
	3104	+ bigThree.add(scenePanel);
	3105	+ bigThree.add(centralPanel);
	3106	+ bigThree.add(XYZPanel);
	3107	+ bigThree.FlushUI();
	3108	+
	3109	+ cameraView.requestFocusInWindow();
2777	3110	} else
2778		- if (event.getSource() == rootButton)
	3111	+ if (source == rootButton)
2779	3112	{
2780	3113	Object3D obj;
2781	3114	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2785,9 +3118,10 @@
2785	3118	EditObject(obj);
2786	3119	}
2787	3120
	3121	+ cameraView.requestFocusInWindow();
2788	3122	refreshContents(true);
2789	3123	} else
2790		- if (event.getSource() == closeButton)
	3124	+ if (source == closeButton)
2791	3125	{
2792	3126	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2793	3127	cRadio ab;
..	..	@@ -2806,13 +3140,15 @@
2806	3140	break;
2807	3141	}
2808	3142	}
	3143	+
	3144	+ cameraView.requestFocusInWindow();
2809	3145	refreshContents(true);
2810	3146	} else
2811		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3147	+ if (source == editItem \|\| source == editButton)
2812	3148	{
2813	3149	EditSelection(false);
2814	3150	} else
2815		- if (event.getSource() == uneditButton)
	3151	+ if (source == uneditButton)
2816	3152	{
2817	3153	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2818	3154	{
..	..	@@ -2822,14 +3158,14 @@
2822	3158	child.CloseUI();
2823	3159	listUI.remove(child);
2824	3160
2825		- child.editWindow = null; // ???????????
	3161	+ //child.editWindow = null; // ???????????
2826	3162	}
2827		- objEditor.ctrlPanel.revalidate();
	3163	+ objEditor.ctrlPanel.FlushUI();
2828	3164	//objEditor.jTree.clearSelection();
2829	3165	//objEditor.ResetSliders();
2830	3166	refreshContents(true);
2831	3167	} else
2832		- if (event.getSource() == clearPanelButton)
	3168	+ if (source == clearPanelButton)
2833	3169	{
2834	3170	assert(copy == group);
2835	3171	//copy.ClearUI();
..	..	@@ -2840,7 +3176,7 @@
2840	3176	listUI.clear();
2841	3177	refreshContents(true);
2842	3178	} else
2843		- if (event.getSource() == allParamsButton)
	3179	+ if (source == allParamsButton)
2844	3180	{
2845	3181	assert(copy == group);
2846	3182
..	..	@@ -2861,19 +3197,19 @@
2861	3197
2862	3198	refreshContents(true);
2863	3199	} else
2864		- if (event.getSource() == unselectButton)
	3200	+ if (source == unselectButton)
2865	3201	{
2866	3202	objEditor.jTree.clearSelection();
2867	3203	// ?? oct 2012 GrafreeD.clipboard.clear();
2868	3204	objEditor.ResetSliders();
2869	3205	refreshContents(true);
2870	3206	} else
2871		- if(event.getSource() instanceof cRadio)
	3207	+ if(source instanceof cRadio)
2872	3208	{
2873	3209	group.parent = keepparent;
2874	3210	group.attributes = 0;
2875	3211	//group.editWindow = null;
2876		- /cRadio/ radio = (cRadio)event.getSource();
	3212	+ /cRadio/ radio = (cRadio)source;
2877	3213	Object3D obj = radio.GetObject();
2878	3214	System.out.println("Edit " + obj);
2879	3215	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2893,7 +3229,7 @@
2893	3229	}
2894	3230
2895	3231	copy = group;
2896		- //CameraPane.theRenderer.object = group;
	3232	+ //Globals.theRenderer.object = group;
2897	3233	if(!useclient)
2898	3234	{
2899	3235	cameraView.renderCamera = radio.camera;
..	..	@@ -2902,12 +3238,16 @@
2902	3238	cameraView.cameras[cameraView.cameracount] = radio.camera;
2903	3239	cameraView.targetLookAt.set(radio.camera.lookAt);
2904	3240	cameraView.object = group;
2905		- cameraView.lighttouched = true;
	3241	+ //cameraView.lighttouched = true;
	3242	+ Globals.lighttouched = true;
2906	3243	topView.object = group;
2907	3244	frontView.object = group;
2908	3245	sideView.object = group;
2909	3246	}
2910		- group.editWindow = this;
	3247	+
	3248	+// fix "+" issue
	3249	+ //group.editWindow = this;
	3250	+
2911	3251	/*
2912	3252	currentLayout = radio.layout;
2913	3253	if (currentLayout == null)
..	..	@@ -2919,8 +3259,23 @@
2919	3259	//group.parent = null; // ROOT
2920	3260	//group.attributes = -1;
2921	3261	ResetModel();
	3262	+
	3263	+ cameraView.requestFocusInWindow();
2922	3264	refreshContents(true);
2923		- }
	3265	+ } else if (event.getSource() == editCameraItem)
	3266	+ {
	3267	+ cameraView.ProtectCamera();
	3268	+ cameraView.repaint();
	3269	+ return;
	3270	+ } else if (event.getSource() == revertCameraItem)
	3271	+ {
	3272	+ cameraView.RevertCamera();
	3273	+ cameraView.repaint();
	3274	+ return;
	3275	+ // } else if (event.getSource() == textureButton)
	3276	+ // {
	3277	+ // return; // true;
	3278	+ }
2924	3279	else
2925	3280	{
2926	3281	//return super.action(event, arg);
..	..	@@ -2929,7 +3284,6 @@
2929	3284	}
2930	3285
2931	3286	boolean useclient = false;
2932		- cRadio radio;
2933	3287
2934	3288	void ToggleRoot()
2935	3289	{
..	..	@@ -2938,7 +3292,7 @@
2938	3292	if (useclient)
2939	3293	{
2940	3294	cameraView.object = client;
2941		- cameraView.lighttouched = true;
	3295	+ Globals.lighttouched = true;
2942	3296	//topView.object = client;
2943	3297	//frontView.object = client;
2944	3298	//sideView.object = client;
..	..	@@ -2946,7 +3300,7 @@
2946	3300	else
2947	3301	{
2948	3302	cameraView.object = group;
2949		- cameraView.lighttouched = true;
	3303	+ Globals.lighttouched = true;
2950	3304	//topView.object = group;
2951	3305	//frontView.object = group;
2952	3306	//sideView.object = group;
..	..	@@ -2981,6 +3335,28 @@
2981	3335	refreshContents();
2982	3336	}
2983	3337
	3338	+ void TransformChildren()
	3339	+ {
	3340	+ Object3D obj;
	3341	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3342	+ {
	3343	+ obj = (Object3D)e.nextElement();
	3344	+ obj.KeepTextureMatrices();
	3345	+ obj.TransformChildren();
	3346	+ obj.RestoreTextureMatrices();
	3347	+
	3348	+// if (obj.parent == null)
	3349	+// {
	3350	+// System.out.println("NULL PARENT!");
	3351	+// new Exception().printStackTrace();
	3352	+// }
	3353	+// else
	3354	+// TouchTransform(obj);
	3355	+// //obj.parent.Touch();
	3356	+ }
	3357	+
	3358	+ refreshContents();
	3359	+ }
2984	3360
2985	3361	void ResetTransform()
2986	3362	{
..	..	@@ -3093,7 +3469,7 @@
3093	3469	refreshContents();
3094	3470	}
3095	3471
3096		- void ResetCentroid()
	3472	+ void ResetCentroid(boolean full)
3097	3473	{
3098	3474	Object3D obj;
3099	3475	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3108,12 +3484,16 @@
3108	3484	LA.matIdentity(Object3D.mat);
3109	3485	obj.getBounds(minima, maxima, false);
3110	3486	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3111		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3487	+ if (full)
	3488	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3112	3489	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3113	3490	obj.TransformMesh(Object3D.mat);
	3491	+
3114	3492	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3115		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3493	+ if (full)
	3494	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3116	3495	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3496	+
3117	3497	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3118	3498	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3119	3499	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3142,7 +3522,8 @@
3142	3522
3143	3523	int size = obj.MemorySize();
3144	3524
3145		- System.err.println((size/1024) + " KB is the size of " + obj);
	3525	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3526	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3146	3527	}
3147	3528	}
3148	3529	catch (Exception e)
..	..	@@ -3179,9 +3560,9 @@
3179	3560	obj = (Object3D)e.nextElement();
3180	3561
3181	3562	System.out.println("Object is: " + obj);
3182		- GrafreeD.AnalyzeObject(obj);
	3563	+ Grafreed.AnalyzeObject(obj);
3183	3564	System.out.println("Boundary rep: " + obj.bRep);
3184		- GrafreeD.AnalyzeObject(obj.bRep);
	3565	+ Grafreed.AnalyzeObject(obj.bRep);
3185	3566
3186	3567	// System.err.println((size/1024) + " KB is the size of " + obj);
3187	3568	}
..	..	@@ -3223,6 +3604,13 @@
3223	3604	void GenNormals(boolean crease)
3224	3605	{
3225	3606	group.GenNormalsS(crease);
	3607	+
	3608	+ refreshContents();
	3609	+ }
	3610	+
	3611	+ void GenNormalsMESH()
	3612	+ {
	3613	+ group.GenNormalsMeshS();
3226	3614
3227	3615	refreshContents();
3228	3616	}
..	..	@@ -3395,8 +3783,8 @@
3395	3783
3396	3784	void ParseVertices()
3397	3785	{
3398		- boolean epsequal = GrafreeD.epsequal;
3399		- GrafreeD.epsequal = true;
	3786	+ boolean epsequal = Grafreed.epsequal;
	3787	+ Grafreed.epsequal = true;
3400	3788
3401	3789	for (int i=0; i<group.selection.size(); i++)
3402	3790	{
..	..	@@ -3421,7 +3809,7 @@
3421	3809	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3422	3810	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3423	3811
3424		- g.add(GrafreeD.clipboard);
	3812	+ g.add(Grafreed.clipboard);
3425	3813
3426	3814	buffer.add(g);
3427	3815	}
..	..	@@ -3436,7 +3824,7 @@
3436	3824	makeSomething(buffer, i==group.selection.size()-1);
3437	3825	}
3438	3826
3439		- GrafreeD.epsequal = epsequal;
	3827	+ Grafreed.epsequal = epsequal;
3440	3828
3441	3829	refreshContents();
3442	3830	}
..	..	@@ -3454,7 +3842,16 @@
3454	3842	String pigment = Object3D.GetPigment(tex);
3455	3843	//String bump = Object3D.GetBump(tex);
3456	3844
3457		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3845	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3846	+
	3847	+ try
	3848	+ {
	3849	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3850	+ }
	3851	+ catch (Exception e)
	3852	+ {
	3853	+ System.err.println("FAIL: " + node);
	3854	+ }
3458	3855
3459	3856	double s = v.s;
3460	3857
..	..	@@ -3542,11 +3939,11 @@
3542	3939
3543	3940	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3544	3941
3545		- boolean random = CameraPane.RANDOM;
3546		- CameraPane.RANDOM = false; // parse all random nodes
	3942	+ boolean random = CameraPane.SWITCH;
	3943	+ CameraPane.SWITCH = false; // parse all random nodes
3547	3944	lowres.linkVerticesThis(null);
3548	3945	lowres.linkVerticesThis(sn);
3549		- CameraPane.RANDOM = random;
	3946	+ CameraPane.SWITCH = random;
3550	3947
3551	3948	System.err.flush();
3552	3949
..	..	@@ -3586,7 +3983,7 @@
3586	3983	return;
3587	3984
3588	3985	Object3D poses = group.selection.get(0);
3589		- Object3D ref = GrafreeD.clipboard.get(0);
	3986	+ Object3D ref = Grafreed.clipboard.get(0);
3590	3987
3591	3988	Object3D newgroup = new Object3D("Po:" + poses.name);
3592	3989
..	..	@@ -3755,7 +4152,7 @@
3755	4152	group.selection.RelinkToSupport(); // july 2014
3756	4153	System.out.println("DONE.");
3757	4154	refreshContents();
3758		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4155	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3759	4156	}
3760	4157
3761	4158	void ReduceMesh(boolean reduction34)
..	..	@@ -3780,9 +4177,9 @@
3780	4177
3781	4178	void ClipMesh()
3782	4179	{
3783		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4180	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3784	4181	{
3785		- Object3D content = GrafreeD.clipboard.get(0);
	4182	+ Object3D content = Grafreed.clipboard.get(0);
3786	4183
3787	4184	if (content instanceof cGroup && ((cGroup)content).transientlink )
3788	4185	content = ((cGroup)content).get(0);
..	..	@@ -3791,7 +4188,7 @@
3791	4188	// {
3792	4189	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3793	4190	// }
3794		- group.selection.ClipMesh(GrafreeD.clipboard);
	4191	+ group.selection.ClipMesh(Grafreed.clipboard);
3795	4192	}
3796	4193	// group.selection.ClipMesh(GrafreeD.clipboard);
3797	4194	System.out.println("DONE.");
..	..	@@ -3838,6 +4235,18 @@
3838	4235	void MarkLeaves(boolean hide)
3839	4236	{
3840	4237	group.selection.MarkLeaves(hide);
	4238	+ refreshContents();
	4239	+ }
	4240	+
	4241	+ void RewindLeaves(boolean hide)
	4242	+ {
	4243	+ group.selection.RewindLeaves(hide);
	4244	+ refreshContents();
	4245	+ }
	4246	+
	4247	+ void RandomLeaves(boolean hide)
	4248	+ {
	4249	+ group.selection.RandomLeaves(hide);
3841	4250	refreshContents();
3842	4251	}
3843	4252
..	..	@@ -3926,7 +4335,7 @@
3926	4335	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3927	4336
3928	4337	Object3D elem = (Object3D)group.selection.elementAt(i);
3929		- if(elem != group)
	4338	+ if(elem != group \|\| !newWindow)
3930	4339	{
3931	4340	// if (!(elem instanceof Composite))
3932	4341	// newWindow = false;
..	..	@@ -4016,7 +4425,6 @@
4016	4425	//case 702: // Event.LIST_DESELECT
4017	4426	group.deselectAll();
4018	4427	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4019		- objEditor.ClearInfo(); // .GetMaterial());
4020	4428	if (tps != null)
4021	4429	{
4022	4430	for (int i=0; i < tps.length; i++)
..	..	@@ -4025,31 +4433,30 @@
4025	4433
4026	4434	//if (child.parent != null)
4027	4435	//child.parent.addSelectee(child);
	4436	+ objEditor.SetMaterial(child);
4028	4437	group.addSelectee(child);
4029		- objEditor.SetMaterial(child); // .GetMaterial());
4030		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4031		- System.err.println("info : " + child.GetPath());
4032	4438	}
4033	4439	}
4034		- else
4035		- {
4036		- objEditor.SetMaterial(group); // .GetMaterial());
4037		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4038		- System.err.println("info : " + group.GetPath());
4039		- }
	4440	+// else
	4441	+// {
	4442	+// objEditor.SetMaterial(group); // .GetMaterial());
	4443	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4444	+// System.err.println("info : " + group.GetPath());
	4445	+// }
4040	4446
4041		- objEditor.SetText(); // jan 2014
4042		-
4043		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4447	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4044	4448	CameraPane.flash = true;
4045	4449
4046		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4450	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4047	4451	// a camera
4048	4452	{
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;
	4453	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4454	+ {
	4455	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4456	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4457	+ }
	4458	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4459	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4053	4460	}
4054	4461
4055	4462	refreshContents();
..	..	@@ -4060,6 +4467,26 @@
4060	4467
4061	4468	freezemodel = false;
4062	4469	}
	4470	+
	4471	+ void refreshContents(boolean cp)
	4472	+ {
	4473	+ if (!Globals.MOUSEDRAGGED)
	4474	+ {
	4475	+ objEditor.ClearInfo(); // .GetMaterial());
	4476	+
	4477	+ for (int i=0; i < group.selection.Size(); i++)
	4478	+ {
	4479	+ Object3D child = (Object3D) group.selection.get(i);
	4480	+
	4481	+ objEditor.AddInfo(child, this, true);
	4482	+ System.err.println("info : " + child.GetPath());
	4483	+ }
	4484	+
	4485	+ objEditor.SetText(); // jan 2014
	4486	+ }
	4487	+
	4488	+ super.refreshContents(cp);
	4489	+ }
4063	4490
4064	4491	void linkSomething(Object3D thing)
4065	4492	{
..	..	@@ -4131,16 +4558,18 @@
4131	4558	{
4132	4559	if (group.selection.isEmpty())
4133	4560	return;
4134		- GrafreeD.clipboardIsTempGroup = false;
	4561	+
	4562	+ Grafreed.clipboardIsTempGroup = false;
4135	4563	Composite tGroup = null;
4136	4564	if (group.selection.size() > 0) // 1)
4137	4565	{
4138	4566	tGroup = new cGroup();
4139		- GrafreeD.clipboardIsTempGroup = true;
	4567	+ Grafreed.clipboardIsTempGroup = true;
4140	4568	}
4141	4569
4142	4570	if (cut)
4143	4571	{
	4572	+ Save();
4144	4573	//int indices[] = jList.getSelectedIndices();
4145	4574	//for (int i = indices.length - 1; i >= 0; i--)
4146	4575	//jList.remove(indices[i]);
..	..	@@ -4176,16 +4605,16 @@
4176	4605	//System.out.println("cut " + child);
4177	4606	//System.out.println("parent = " + child.parent);
4178	4607	// tmp.addChild(child);
4179		- if (GrafreeD.clipboardIsTempGroup)
	4608	+ if (Grafreed.clipboardIsTempGroup)
4180	4609	tGroup.add/Child/(tmp);
4181	4610	else
4182		- GrafreeD.clipboard = tmp;
	4611	+ Grafreed.clipboard = tmp;
4183	4612	}
4184	4613	else
4185		- if (GrafreeD.clipboardIsTempGroup)
	4614	+ if (Grafreed.clipboardIsTempGroup)
4186	4615	tGroup.add/Child/(child);
4187	4616	else
4188		- GrafreeD.clipboard = child;
	4617	+ Grafreed.clipboard = child;
4189	4618	}
4190	4619
4191	4620	//ResetModel();
..	..	@@ -4217,21 +4646,23 @@
4217	4646	//System.out.println("cut " + elem);
4218	4647	//System.out.println("parent = " + elem.parent);
4219	4648	// tmp.addChild(elem);
4220		- if (GrafreeD.clipboardIsTempGroup)
	4649	+ if (Grafreed.clipboardIsTempGroup)
4221	4650	tGroup.add/Child/(tmp);
4222	4651	else
4223		- GrafreeD.clipboard = tmp;
	4652	+ Grafreed.clipboard = tmp;
4224	4653	}
4225	4654	else
4226		- if (GrafreeD.clipboardIsTempGroup)
	4655	+ if (Grafreed.clipboardIsTempGroup)
4227	4656	tGroup.add/Child/(child);
4228	4657	else
4229		- GrafreeD.clipboard = child;
	4658	+ Grafreed.clipboard = child;
4230	4659	}
4231	4660
4232	4661	}
4233		- if (GrafreeD.clipboardIsTempGroup)
4234		- GrafreeD.clipboard = tGroup;
	4662	+
	4663	+ if (Grafreed.clipboardIsTempGroup)
	4664	+ Grafreed.clipboard = tGroup;
	4665	+
4235	4666	if (cut)
4236	4667	{
4237	4668	ResetModel();
..	..	@@ -4245,7 +4676,7 @@
4245	4676	// return;
4246	4677	boolean first = true;
4247	4678
4248		- if (GrafreeD.clipboardIsTempGroup)
	4679	+ if (Grafreed.clipboardIsTempGroup)
4249	4680	{
4250	4681	Composite temp;
4251	4682
..	..	@@ -4256,7 +4687,7 @@
4256	4687	temp = (Composite)Applet3D.clipboard.deepCopy();
4257	4688	*/
4258	4689	Object3D elem;
4259		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4690	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4260	4691	{
4261	4692	Object3D child = (Object3D)e.nextElement();
4262	4693
..	..	@@ -4290,21 +4721,21 @@
4290	4721	//Object3D cb = Applet3D.clipboard;
4291	4722	//temp.addChild(cb);
4292	4723	//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());
	4724	+ assert(Grafreed.clipboard.parent == null);
	4725	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4726	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4727	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4728	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4298	4729	else
4299		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4300		- GrafreeD.clipboard.get(0).parent = keepparent;
	4730	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4731	+ Grafreed.clipboard.get(0).parent = keepparent;
4301	4732	}
4302	4733
4303	4734	ResetModel();
4304	4735	refreshContents();
4305	4736	}
4306	4737
4307		- void pasteInto(boolean copyit)
	4738	+ void pasteInto(boolean copyit, boolean clone)
4308	4739	{
4309	4740	// if (GrafreeD.clipboard == null)
4310	4741	// return;
..	..	@@ -4333,15 +4764,22 @@
4333	4764	if (copyit)
4334	4765	{
4335	4766	// paste(false);
4336		- CloneClipboard(false); // sept 2014
	4767	+ if (clone)
	4768	+ {
	4769	+ CloneClipboard(false); // sept 2014
	4770	+ }
	4771	+ else
	4772	+ {
	4773	+ paste(false);
	4774	+ }
4337	4775	}
4338	4776	else
4339	4777	{
4340	4778	boolean first = true;
4341	4779
4342		- if (GrafreeD.clipboardIsTempGroup)
	4780	+ if (Grafreed.clipboardIsTempGroup)
4343	4781	{
4344		- Composite temp = (Composite)GrafreeD.clipboard;
	4782	+ Composite temp = (Composite)Grafreed.clipboard;
4345	4783	Object3D copy;
4346	4784	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4347	4785	{
..	..	@@ -4351,7 +4789,7 @@
4351	4789	}
4352	4790	} else
4353	4791	{
4354		- linkSomething(GrafreeD.clipboard); //.get(0));
	4792	+ linkSomething(Grafreed.clipboard); //.get(0));
4355	4793	}
4356	4794	}
4357	4795	}
..	..	@@ -4756,21 +5194,6 @@
4756	5194	}
4757	5195	*/
4758	5196
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	5197	/*
4775	5198	public void Callback(Object obj)
4776	5199	{
..	..	@@ -4794,26 +5217,9 @@
4794	5217	}
4795	5218	*/
4796	5219
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	5220	String GetFile(String dialogName)
4815	5221	{
4816		- if (GrafreeD.standAlone)
	5222	+ if (Grafreed.standAlone)
4817	5223	{
4818	5224	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4819	5225	browser.show();
..	..	@@ -4877,10 +5283,18 @@
4877	5283	cButton flashSelectionButton;
4878	5284	cButton editButton;
4879	5285	cButton uneditButton;
	5286	+ JCheckBox allParamsButton;
4880	5287	cButton clearpanelButton;
4881		- cButton allParamsButton;
4882	5288	cButton unselectButton;
4883	5289
	5290	+ cButton minButton;
	5291	+ cButton maxButton;
	5292	+ cButton fullButton;
	5293	+ cButton undoButton;
	5294	+ cButton redoButton;
	5295	+ cButton saveButton;
	5296	+ cButton oneStepButton;
	5297	+
4884	5298	cButton screenfitButton;
4885	5299	cButton screenfitpointButton;
4886	5300	cButton snapobjectButton;
..	..	@@ -4891,14 +5305,6 @@
4891	5305	cButton closeButton;
4892	5306
4893	5307	cButton setsupportButton;
4894		-
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	5308
4903	5309	//
4904	5310	//Composite
..	..	@@ -4911,6 +5317,8 @@
4911	5317	private MenuItem lookFromItem;
4912	5318	private MenuItem switchItem;
4913	5319	private MenuItem cutItem;
	5320	+ private MenuItem undoItem;
	5321	+ private MenuItem redoItem;
4914	5322	private MenuItem duplicateItem;
4915	5323	private MenuItem cloneItem;
4916	5324	private MenuItem cloneSupportItem;
..	..	@@ -4924,7 +5332,7 @@
4924	5332	private MenuItem linkverticesItem;
4925	5333	private MenuItem relinkverticesItem;
4926	5334	private MenuItem setMasterItem;
4927		- private MenuItem resetMeshItem;
	5335	+ private MenuItem resetAllItem;
4928	5336	private MenuItem stepAllItem;
4929	5337	private MenuItem revertMeshItem;
4930	5338	private MenuItem poseMeshItem;
..	..	@@ -4935,6 +5343,7 @@
4935	5343	private MenuItem mergeGeometriesItem;
4936	5344	private MenuItem copyItem;
4937	5345	private MenuItem pasteItem;
	5346	+ private MenuItem pasteIntoItem;
4938	5347	private MenuItem pasteLinkItem;
4939	5348	private MenuItem pasteCloneItem;
4940	5349	private MenuItem pasteExpandItem;
..	..	@@ -4973,6 +5382,10 @@
4973	5382	private MenuItem showleavesItem;
4974	5383	private MenuItem markleavesItem;
4975	5384	private MenuItem unmarkleavesItem;
	5385	+ private MenuItem rewindleavesItem;
	5386	+ private MenuItem unrewindleavesItem;
	5387	+ private MenuItem randomleavesItem;
	5388	+ private MenuItem unrandomleavesItem;
4976	5389
4977	5390	private MenuItem flipVItem;
4978	5391	private MenuItem unflipVItem;
..	..	@@ -4984,8 +5397,10 @@
4984	5397	private MenuItem panoTexturesItem;
4985	5398
4986	5399	private MenuItem resetCentroidItem;
4987		- private MenuItem transformgeometryItem;
	5400	+ private MenuItem resetCentroidXZItem;
4988	5401	private MenuItem resetTransformItem;
	5402	+ private MenuItem transformGeometryItem;
	5403	+ private MenuItem transformChildrenItem;
4989	5404	private MenuItem hideItem;
4990	5405	private MenuItem grabItem;
4991	5406	private MenuItem backItem;
..	..	@@ -5007,6 +5422,7 @@
5007	5422
5008	5423	private MenuItem resetParentItem;
5009	5424	private MenuItem repairParentItem;
	5425	+ private MenuItem repairShadowItem;
5010	5426	private MenuItem sortbysizeItem;
5011	5427	private MenuItem sortbynameItem;
5012	5428
..	..	@@ -5031,7 +5447,7 @@
5031	5447	private MenuItem blobItem;
5032	5448	private MenuItem latheItem;
5033	5449	private MenuItem bezierItem;
5034		- private MenuItem checkerItem;
	5450	+ private MenuItem overlayItem;
5035	5451	private MenuItem meshItem;
5036	5452	// private MenuItem meshGroupItem;
5037	5453	private MenuItem springItem;
..	..	@@ -5053,11 +5469,6 @@
5053	5469	private MenuItem doubleItem;
5054	5470	private MenuItem tripleItem;
5055	5471
5056		- private MenuItem importGFDItem;
5057		- private MenuItem importVRMLX3DItem;
5058		- private MenuItem import3DSItem;
5059		- private MenuItem importOBJItem;
5060		-
5061	5472	private MenuItem computeAOItem;
5062	5473	private MenuItem recompileItem;
5063	5474	private MenuItem editScriptItem;
..	..	@@ -5067,4 +5478,8 @@
5067	5478	private MenuItem analyzeItem;
5068	5479	private MenuItem dumpItem;
5069	5480	//boolean freezemodel = false;
	5481	+
	5482	+ Menu cameraMenu;
	5483	+ MenuItem editCameraItem;
	5484	+ MenuItem revertCameraItem;
5070	5485	}