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