~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,6 +12,7 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
..	..	@@ -73,7 +74,7 @@
73	74	this.copy = this.group = copy;
74	75	//selectees = this.group.selectees;
75	76
76		- SetupMenu2(objEditor);
	77	+ SetupMenu2(this); //objEditor);
77	78	SetupUI2(objEditor);
78	79	objEditor.SetupUI(true);
79	80	SetupViews(objEditor);
..	..	@@ -97,14 +98,14 @@
97	98
98	99	void CloneClipboard(boolean supports)
99	100	{
100		- assert(GrafreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
102		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	101	+ assert(Grafreed.clipboard.parent == null);
	102	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	103	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	104	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	105	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	106	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	108	+ Grafreed.clipboard.get(0).parent = keepparent;
108	109	}
109	110
110	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +119,7 @@
118	119	// obj.support = null;
119	120	if (!supports)
120	121	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	122	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	123	obj.parent = parent;
123	124	// obj.support = support;
124	125	// clone.support = support; // aout 2013
..	..	@@ -147,8 +148,130 @@
147	148
148	149	//JTextField nameField;
149	150
150		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
151	152	{
	153	+ Menu menu;
	154	+ oe.menuBar.add(menu = new Menu("Edit"));
	155	+ //editItem = menu.add(new MenuItem("Edit"));
	156	+ //editItem.addActionListener(this);
	157	+
	158	+// undoItem = menu.add(new MenuItem("Undo"));
	159	+// undoItem.addActionListener(this);
	160	+// redoItem = menu.add(new MenuItem("Redo"));
	161	+// redoItem.addActionListener(this);
	162	+// menu.add("-");
	163	+ duplicateItem = menu.add(new MenuItem("Duplicate"));
	164	+ duplicateItem.addActionListener(this);
	165	+ cloneItem = menu.add(new MenuItem("Clone"));
	166	+ cloneItem.addActionListener(this);
	167	+ if (Globals.ADVANCED)
	168	+ {
	169	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	170	+ cloneSupportItem.addActionListener(this);
	171	+ }
	172	+ menu.add("-");
	173	+ cutItem = menu.add(new MenuItem("Cut"));
	174	+ cutItem.addActionListener(this);
	175	+ copyItem = menu.add(new MenuItem("Copy"));
	176	+ copyItem.addActionListener(this);
	177	+ pasteItem = menu.add(new MenuItem("Paste"));
	178	+ pasteItem.addActionListener(this);
	179	+ menu.add("-");
	180	+
	181	+ menu.add("-");
	182	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	183	+ pasteIntoItem.addActionListener(this);
	184	+ pasteLinkItem = menu.add(new MenuItem("Paste link"));
	185	+ pasteLinkItem.addActionListener(this);
	186	+ pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	187	+ pasteCloneItem.addActionListener(this);
	188	+// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	189	+// pasteExpandItem.addActionListener(this);
	190	+ menu.add("-");
	191	+ clearItem = menu.add(new MenuItem("Clear"));
	192	+ clearItem.addActionListener(this);
	193	+
	194	+ if (Globals.ADVANCED)
	195	+ {
	196	+ // Deletes the cameras...
	197	+ clearAllItem = menu.add(new MenuItem("Clear All"));
	198	+ clearAllItem.addActionListener(this);
	199	+ }
	200	+
	201	+ menuBar.add(cameraMenu = new Menu("View"));
	202	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	203	+ //zBufferItem.addActionListener(this);
	204	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	205	+ //normalLensItem.addActionListener(this);
	206	+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
	207	+ revertCameraItem.addActionListener(this);
	208	+
	209	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	210	+ toggleFullScreenItem.addItemListener(this);
	211	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	212	+ cameraMenu.add("-");
	213	+
	214	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	215	+ toggleTextureItem.addItemListener(this);
	216	+ toggleTextureItem.setState(CameraPane.textureon);
	217	+
	218	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	219	+ toggleSwitchItem.addItemListener(this);
	220	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	221	+
	222	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	223	+ toggleHandleItem.addItemListener(this);
	224	+ toggleHandleItem.setState(CameraPane.HANDLES);
	225	+
	226	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	227	+ togglePaintItem.addItemListener(this);
	228	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	229	+
	230	+ if (Globals.ADVANCED)
	231	+ {
	232	+ cameraMenu.add("-");
	233	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	234	+ toggleLiveItem.addItemListener(this);
	235	+ toggleLiveItem.setState(Globals.isLIVE());
	236	+
	237	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	238	+ stepItem.addActionListener(this);
	239	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	240	+ // toggleDLItem.addItemListener(this);
	241	+ // toggleDLItem.setState(false);
	242	+
	243	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	244	+ toggleRenderItem.addItemListener(this);
	245	+ toggleRenderItem.setState(!CameraPane.frozen);
	246	+
	247	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	248	+ toggleDebugItem.addItemListener(this);
	249	+ toggleDebugItem.setState(CameraPane.DEBUG);
	250	+
	251	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	252	+ toggleFrustumItem.addItemListener(this);
	253	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	254	+
	255	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	256	+ toggleFootContactItem.addItemListener(this);
	257	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	258	+
	259	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	260	+ toggleTimelineItem.addItemListener(this);
	261	+ }
	262	+
	263	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	264	+// toggleRootItem.addItemListener(this);
	265	+// toggleRootItem.setState(false);
	266	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	267	+// animationItem.addItemListener(this);
	268	+// animationItem.setState(CameraPane.ANIMATION);
	269	+ cameraMenu.add("-");
	270	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	271	+ editCameraItem.addActionListener(this);
	272	+
	273	+ if (Globals.ADVANCED)
	274	+ {
152	275	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153	276	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154	277	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -160,45 +283,17 @@
160	283	lookAtItem.addActionListener(this);
161	284	//lookFromItem.addActinoListener(this);
162	285	//switchItem.addActionListener(this);
163		- Menu menu;
164		- oe.menuBar.add(menu = new Menu("Edit"));
165		- //editItem = menu.add(new MenuItem("Edit"));
166		- //editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
168		- duplicateItem.addActionListener(this);
169		- menu.add("-");
170		- cloneItem = menu.add(new MenuItem("Clone"));
171		- cloneItem.addActionListener(this);
172		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173		- cloneSupportItem.addActionListener(this);
174		- menu.add("-");
175		- cutItem = menu.add(new MenuItem("Cut"));
176		- cutItem.addActionListener(this);
177		- copyItem = menu.add(new MenuItem("Copy"));
178		- copyItem.addActionListener(this);
179		- pasteItem = menu.add(new MenuItem("Paste"));
180		- pasteItem.addActionListener(this);
181		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
182		- pasteLinkItem.addActionListener(this);
183		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184		- pasteCloneItem.addActionListener(this);
185		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186		-// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
189		- clearAllItem = menu.add(new MenuItem("Clear All"));
190		- clearAllItem.addActionListener(this);
191		-
	286	+ }
	287	+
192	288	oe.menuBar.add(menu = new Menu("Setting"));
193		- resetMeshItem = menu.add(new MenuItem("Reset All"));
194		- resetMeshItem.addActionListener(this);
195		- stepAllItem = menu.add(new MenuItem("Step All"));
196		- stepAllItem.addActionListener(this);
	289	+ if (Globals.ADVANCED)
	290	+ {
197	291	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	292	revertMeshItem.addActionListener(this);
199	293	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	294	resetreferencesItem.addActionListener(this);
201	295	menu.add("-");
	296	+ }
202	297	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	298	overwriteGeoItem.addActionListener(this);
204	299	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,19 +305,26 @@
210	305	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	306	overwriteUVItem.addActionListener(this);
212	307	menu.add("-");
	308	+ if (Globals.ADVANCED)
	309	+ {
213	310	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	311	generateMeshItem.addActionListener(this);
215	312	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	313	poseMeshItem.addActionListener(this);
217	314	menu.add("-");
	315	+ }
218	316	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	317	resetsupportItem.addActionListener(this);
220	318	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	319	linkverticesItem.addActionListener(this);
222	320	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	321	relinkverticesItem.addActionListener(this);
	322	+
	323	+ if (Globals.ADVANCED)
	324	+ {
224	325	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	326	setMasterItem.addActionListener(this);
	327	+ }
226	328
227	329	oe.menuBar.add(menu = new Menu("Group"));
228	330	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -233,27 +335,32 @@
233	335	frontItem.addActionListener(this);
234	336	compositeItem = menu.add(new MenuItem("Composite"));
235	337	compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	338	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	339	hideItem.addActionListener(this);
238	340	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	341	ungroupItem.addActionListener(this);
240	342	menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
	343	+ randomItem = menu.add(new MenuItem("Switch node"));
242	344	randomItem.addActionListener(this);
243		- physicsItem = menu.add(new MenuItem("Physics"));
244		- physicsItem.addActionListener(this);
245		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
246		- frameselectorItem.addActionListener(this);
247	345	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	346	switchGeoItem.addActionListener(this);
249	347	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	348	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	349	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	350	morphItem.addActionListener(this);
	351	+
	352	+ if (Globals.ADVANCED)
	353	+ {
	354	+ menu.add("-");
	355	+ physicsItem = menu.add(new MenuItem("Physics"));
	356	+ physicsItem.addActionListener(this);
	357	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	358	+ frameselectorItem.addActionListener(this);
253	359	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	360	scriptNodeItem.addActionListener(this);
255	361	cameraItem = menu.add(new MenuItem("Camera"));
256	362	cameraItem.addActionListener(this);
	363	+ }
257	364
258	365	oe.menuBar.add(menu = new Menu("Object"));
259	366	textureItem = menu.add(new MenuItem("Texture"));
..	..	@@ -268,21 +375,29 @@
268	375	shadowYItem.addActionListener(this);
269	376	shadowZItem = menu.add(new MenuItem("Shadow Z"));
270	377	shadowZItem.addActionListener(this);
	378	+ if (Globals.ADVANCED)
	379	+ {
	380	+ menu.add("-");
271	381	linkerItem = menu.add(new MenuItem("Linker"));
272	382	linkerItem.addActionListener(this);
273		- templateItem = menu.add(new MenuItem("Template"));
274		- templateItem.addActionListener(this);
275	383	attributeItem = menu.add(new MenuItem("Attribute"));
276	384	attributeItem.addActionListener(this);
	385	+ templateItem = menu.add(new MenuItem("Template"));
	386	+ templateItem.addActionListener(this);
277	387	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	388	pointflowItem.addActionListener(this);
	389	+ }
279	390	menu.add("-");
280	391	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	392	resetTransformItem.addActionListener(this);
282	393	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	394	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	395	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	396	+ resetCentroidXZItem.addActionListener(this);
	397	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	398	+ transformGeometryItem.addActionListener(this);
	399	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	400	+ transformChildrenItem.addActionListener(this);
286	401
287	402	oe.menuBar.add(menu = new Menu("Geometry"));
288	403	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +408,11 @@
293	408	genNormalsCADItem.addActionListener(this);
294	409	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	410	genNormalsMESHItem.addActionListener(this);
	411	+ if (Globals.ADVANCED)
	412	+ {
296	413	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
297	414	genNormalsMINEItem.addActionListener(this);
	415	+ }
298	416	stripifyItem = menu.add(new MenuItem("Stripify"));
299	417	stripifyItem.addActionListener(this);
300	418	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +434,34 @@
316	434	reduce34MeshItem.addActionListener(this);
317	435	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	436	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	437	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	438	clipMeshItem.addActionListener(this);
	439	+
	440	+ if (Globals.ADVANCED)
	441	+ {
	442	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	443	+ smoothMeshItem.addActionListener(this);
	444	+ }
323	445
324	446	oe.menuBar.add(menu = new Menu("Attributes"));
325	447	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	448	clearMaterialsItem.addActionListener(this);
	449	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	450	+ resetAllItem.addActionListener(this);
	451	+ stepAllItem = menu.add(new MenuItem("Step All"));
	452	+ stepAllItem.addActionListener(this);
327	453	menu.add("-");
328	454	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	455	liveleavesItem.addActionListener(this);
330	456	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	457	unliveleavesItem.addActionListener(this);
	458	+ if (Globals.ADVANCED)
	459	+ {
332	460	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	461	supportleavesItem.addActionListener(this);
334	462	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	463	unsupportleavesItem.addActionListener(this);
	464	+ }
336	465	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	466	hideleavesItem.addActionListener(this);
338	467	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +470,14 @@
341	470	markleavesItem.addActionListener(this);
342	471	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	472	unmarkleavesItem.addActionListener(this);
	473	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	474	+ rewindleavesItem.addActionListener(this);
	475	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	476	+ unrewindleavesItem.addActionListener(this);
	477	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	478	+ randomleavesItem.addActionListener(this);
	479	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	480	+ unrandomleavesItem.addActionListener(this);
344	481	menu.add("-");
345	482	flipVItem = menu.add(new MenuItem("Flip V"));
346	483	flipVItem.addActionListener(this);
..	..	@@ -376,29 +513,22 @@
376	513	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	514	sortbynameItem.addActionListener(this);
378	515	menu.add("-");
	516	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	517	+ shareGeometriesItem.addActionListener(this);
	518	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	519	+ mergeGeometriesItem.addActionListener(this);
	520	+ if (Globals.ADVANCED)
	521	+ {
	522	+ // Pretty much the same as duplicate and clone.
379	523	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	524	extractGeometriesItem.addActionListener(this);
381	525	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	526	cloneGeometriesItem.addActionListener(this);
383		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
384		- shareGeometriesItem.addActionListener(this);
385		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
386		- mergeGeometriesItem.addActionListener(this);
	527	+ }
387	528
388	529	oe.menuBar.add(menu = new Menu("Insert"));
389	530	buildCreateMenu(menu);
390	531
391		-
392		- oe.menuBar.add(menu = new Menu("Include"));
393		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
394		- importGFDItem.addActionListener(this);
395		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
396		- importVRMLX3DItem.addActionListener(this);
397		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
398		- importOBJItem.addActionListener(this);
399		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
400		- import3DSItem.addActionListener(this);
401		-
402	532	oe.menuBar.add(menu = new Menu("Tools"));
403	533	buildToolsMenu(menu);
404	534	}
..	..	@@ -433,150 +563,110 @@
433	563	oe.radioPanel.add(dummyButton);
434	564	oe.buttonGroup.add(dummyButton);
435	565	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	566	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	567
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	568	+ oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	569	+ undoButton.setToolTipText("Undo changes");
	570	+ undoButton.addActionListener(this);
	571	+
	572	+ oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	573	+ redoButton.setToolTipText("Redo changes");
	574	+ redoButton.addActionListener(this);
	575	+
	576	+ oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	577	+ saveButton.setToolTipText("Save changes");
	578	+ saveButton.addActionListener(this);
	579	+
	580	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	581	+ liveCB.setToolTipText("Enable animation");
441	582	liveCB.addItemListener(this);
442	583
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);
	584	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	585	+ oneStepButton.setToolTipText("Animate one step forward");
	586	+ oneStepButton.addActionListener(this);
	587	+
	588	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	589	+ fastCB.setToolTipText("Fast mode");
461	590	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);
	591	+
	592	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	593	+ trackCB.setToolTipText("Enable tracking");
503	594	trackCB.addItemListener(this);
504	595
505		- oe.aConstraints.gridx += 1;
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	596	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	597	+ screenfitButton.setToolTipText("Screen fit");
507	598	screenfitButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
	599	+
509	600	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
510	601	// 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	602
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);
	603	+ if (Globals.ADVANCED)
	604	+ {
	605	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	606	+ snapobjectButton.addActionListener(this);
	607	+ snapobjectButton.setToolTipText("Snap Object");
	608	+ }
	609	+
	610	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	611	+ flashSelectionButton.setToolTipText("Show selection");
522	612	flashSelectionButton.addActionListener(this);
523		- oe.aConstraints.gridx += 1;
524		- oe.aConstraints.weighty = 0;
525		- oe.aConstraints.gridwidth = 1;
526	613
527		- //
528		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	614	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	615	+
	616	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	617	+ twoButton.setToolTipText("Show center view only");
529	618	twoButton.addActionListener(this);
530		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	619	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
531	620	fourButton.addActionListener(this);
532		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	621	+ fourButton.setToolTipText("Show left panel only");
	622	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	623	+ sixButton.setToolTipText("2-column layout left");
533	624	sixButton.addActionListener(this);
534		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	625	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	626	+ threeButton.setToolTipText("2-column layout right");
535	627	threeButton.addActionListener(this);
536		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	628	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	629	+ sevenButton.setToolTipText("3-column layout");
537	630	sevenButton.addActionListener(this);
538	631	//
539	632
540		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	633	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	634	+ rootButton.setToolTipText("Edit selection in new tab");
541	635	rootButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	636	+
	637	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	638	+ closeButton.setToolTipText("Close tab");
544	639	closeButton.addActionListener(this);
545	640	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
546	641	//clearButton.addActionListener(this);
547		- oe.aConstraints.gridx += 1;
548	642
549		- oe.aConstraints.gridx = 1; //
550		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	643	+ cGridBag commandsPanel = new cGridBag();
	644	+
	645	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	646	+ editButton.setToolTipText("Edit selection");
551	647	editButton.addActionListener(this);
552		- oe.aConstraints.gridx += 1;
553		- oe.aConstraints.weighty = 0;
554		- oe.aConstraints.gridwidth = 1;
555	648
556		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	649	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	650	+ uneditButton.setToolTipText("Unedit selection");
557	651	uneditButton.addActionListener(this);
558	652
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);
	653	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	654	+ allParamsButton.setToolTipText("Edit all params");
571	655	allParamsButton.addActionListener(this);
572	656
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);
	657	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	658	+ clearPanelButton.setToolTipText("Clear edit panel");
	659	+ clearPanelButton.addActionListener(this);
	660	+
	661	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	662	+ unselectButton.setToolTipText("Unselect");
578	663	unselectButton.addActionListener(this);
579	664
	665	+ commandsPanel.preferredHeight = 1;
	666	+
	667	+ oe.treePanel.add(commandsPanel);
	668	+ oe.treePanel.Return();
	669	+
580	670	// oe.aConstraints.gridx += 1;
581	671	// oe.aConstraints.weighty = 0;
582	672	// oe.aConstraints.gridwidth = 1;
..	..	@@ -588,40 +678,37 @@
588	678	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
589	679	// gcButton.addActionListener(this);
590	680
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;
	681	+ cGridBag jSPPanel = new cGridBag();
	682	+
	683	+ JScrollPane jSP;
602	684	//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);
	685	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
604	686	ResetModel();
605		- oe.aConstraints.weighty = 0.5;
606		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
607		- oe.aConstraints.gridy += 1;
608		- oe.aConstraints.gridwidth = 1;
	687	+
	688	+ oe.treePanel.add(jSPPanel);
	689	+ oe.treePanel.Return();
609	690
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);
	691	+ cGridBag copyOptionsPanel = new cGridBag();
	692	+
	693	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	694	+ colorCB.setToolTipText("Copy color when dropped");
614	695	colorCB.addItemListener(this);
615		- oe.aConstraints.gridx += 2;
616		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	696	+
	697	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	698	+ materialCB.setToolTipText("Copy material when dropped");
617	699	materialCB.addItemListener(this);
618		- oe.aConstraints.gridx += 2;
619		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	700	+
	701	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	702	+ textureCB.setToolTipText("Copy texture when dropped");
620	703	textureCB.addItemListener(this);
621	704
622		- oe.aConstraints.gridx = 0;
623		- oe.aConstraints.gridy += 1;
	705	+ copyOptionsPanel.preferredHeight = 1;
	706	+ oe.treePanel.add(copyOptionsPanel);
	707	+ oe.treePanel.Return();
624	708
	709	+// mainPanel.setDividerLocation(0.5); //1.0);
	710	+// mainPanel.setResizeWeight(0.5);
	711	+
625	712	//jList.addListSelectionListener(this);
626	713	oe.jTree.addTreeSelectionListener(this);
627	714	//jTree.setRootVisible(false);
..	..	@@ -643,18 +730,91 @@
643	730	radio.layout = sevenButton;
644	731	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
645	732	}
	733	+
	734	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	735	+ {
	736	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	737	+ boxCB.setToolTipText("Display bounding boxes");
	738	+ boxCB.addItemListener(this);
	739	+
	740	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	741	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	742	+ zoomBoxCB.addItemListener(this);
	743	+
	744	+ if (true) // Globals.ADVANCED)
	745	+ {
	746	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	747	+ supportCB.setToolTipText("Enable rigging");
	748	+ supportCB.addItemListener(this);
	749	+
	750	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	751	+ // localCB.addItemListener(this);
	752	+
	753	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	754	+ crowdCB.setToolTipText("Used for crowds");
	755	+ crowdCB.addItemListener(this);
	756	+
	757	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	758	+ smoothCB.setToolTipText("Snapping delay");
	759	+ smoothCB.addItemListener(this);
	760	+
	761	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	762	+ slowCB.setToolTipText("Smooth interpolation");
	763	+ slowCB.addItemListener(this);
	764	+
	765	+// constraints.gridy += 1;
	766	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	767	+// speakerMocapCB.addItemListener(this);
	768	+
	769	+ if (false)
	770	+ {
	771	+ // handled in scripts
	772	+ //constraints.gridy += 1;
	773	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	774	+ speakerCameraCB.addItemListener(this);
	775	+
	776	+ //constraints.gridy += 1;
	777	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	778	+ speakerFocusCB.addItemListener(this);
	779	+
	780	+ //constraints.gridy += 1;
	781	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	782	+ smoothfocusCB.addItemListener(this);
	783	+ }
	784	+
	785	+//constraints.gridx += 1;
	786	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	787	+// debugCB.addItemListener(this);
	788	+
	789	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	790	+ oeilCB.addItemListener(this);
	791	+
	792	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	793	+ lookAtCB.setToolTipText("Look-at target");
	794	+ lookAtCB.addItemListener(this);
	795	+
	796	+ }
	797	+
	798	+ cGridBag fill = new cGridBag();
	799	+
	800	+ fill.preferredHeight = 200;
	801	+
	802	+ panel.add(fill);
	803	+
	804	+ }
646	805
647	806	void EditObject(Object3D obj)
648	807	{
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();
	808	+ cRadio radioButton = new cRadio(obj.name);
	809	+ radioButton.SetObject(obj);
	810	+ radioButton.layout = sevenButton;
	811	+ radioButton.SetCamera(cameraView.renderCamera, false);
	812	+ radioButton.addActionListener(this);
	813	+ radioPanel.add(radioButton);
	814	+ buttonGroup.add(radioButton);
	815	+ radioButton.doClick();
657	816	}
	817	+
658	818	void SetupViews(ObjEditor oe)
659	819	{
660	820	oe.SetupViews();
..	..	@@ -673,6 +833,7 @@
673	833	JCheckBox fastCB;
674	834	JCheckBox slowCB;
675	835	JCheckBox boxCB;
	836	+ JCheckBox zoomBoxCB;
676	837	JCheckBox trackCB;
677	838	JCheckBox smoothfocusCB;
678	839	// JCheckBox speakerMocapCB;
..	..	@@ -715,10 +876,10 @@
715	876	dropAttributes \|= Object3D.TEXTURE;
716	877	else
717	878	dropAttributes &= ~Object3D.TEXTURE;
718		- }
719		- else if(e.getSource() == liveCB)
	879	+ } else if(e.getSource() == liveCB)
720	880	{
721	881	cameraView.ToggleLive();
	882	+ refreshContents(false);
722	883	}
723	884	else if(e.getSource() == supportCB)
724	885	{
..	..	@@ -753,6 +914,10 @@
753	914	Recompile();
754	915	cameraView.repaint();
755	916	// refreshContents();
	917	+ }
	918	+ else if(e.getSource() == zoomBoxCB)
	919	+ {
	920	+ cameraView.ToggleZoomBoxMode();
756	921	}
757	922	else if(e.getSource() == smoothfocusCB)
758	923	{
..	..	@@ -867,7 +1032,9 @@
867	1032	// objEditor.DropFile((java.io.File[]) object, true);
868	1033	// return;
869	1034	// }
870		- if (string.charAt(0) == '/')
	1035	+
	1036	+ // File path for Mac and Windows
	1037	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
871	1038	{
872	1039	// file(s)
873	1040	String[] names = string.split("\n");
..	..	@@ -894,7 +1061,7 @@
894	1061
895	1062	flashIt = false;
896	1063	CameraPane pane = (CameraPane) target;
897		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1064	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
898	1065	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
899	1066
900	1067	if (group.selection.size() == 1)
..	..	@@ -921,11 +1088,11 @@
921	1088	{
922	1089	loadClipboard(true);
923	1090	objEditor.jTree.setSelectionPath(destinationPath);
924		- pasteInto(false);
	1091	+ pasteInto(false, false);
925	1092	} else {
926	1093	loadClipboard(false);
927	1094	objEditor.jTree.setSelectionPath(destinationPath);
928		- pasteInto(false); // true); // ???
	1095	+ pasteInto(false, false); // true); // ???
929	1096	}
930	1097	}
931	1098	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1047,27 +1214,33 @@
1047	1214	kleinItem.addActionListener(this);
1048	1215	particleItem = menu.add(new MenuItem("Particle system"));
1049	1216	particleItem.addActionListener(this);
	1217	+ if (Globals.ADVANCED)
	1218	+ {
1050	1219	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1051	1220	ragdollItem.addActionListener(this);
1052	1221	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1053	1222	ragdoll2Item.addActionListener(this);
	1223	+ }
1054	1224	menu.add("-");
1055		- meshItem = menu.add(new MenuItem("Mesh"));
	1225	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1056	1226	meshItem.addActionListener(this);
1057	1227	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1058	1228	// meshGroupItem.addActionListener(this);
	1229	+ if (Globals.ADVANCED)
	1230	+ {
1059	1231	springItem = menu.add(new MenuItem("Spring"));
1060	1232	springItem.addActionListener(this);
1061	1233	flagItem = menu.add(new MenuItem("Flag"));
1062	1234	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	1235	blobItem = menu.add(new MenuItem("Blob"));
1068	1236	blobItem.addActionListener(this);
1069	1237	latheItem = menu.add(new MenuItem("Lathe"));
1070	1238	latheItem.addActionListener(this);
	1239	+ }
	1240	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1241	+ bezierItem.addActionListener(this);
	1242	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1243	+ overlayItem.addActionListener(this);
1071	1244	lightItem = menu.add(new MenuItem("Light"));
1072	1245	lightItem.addActionListener(this);
1073	1246	menu.add("-");
..	..	@@ -1077,39 +1250,44 @@
1077	1250	loopItem.addActionListener(this);
1078	1251	doubleItem = menu.add(new MenuItem("Fork"));
1079	1252	doubleItem.addActionListener(this);
	1253	+ if (Globals.ADVANCED)
	1254	+ {
1080	1255	tripleItem = menu.add(new MenuItem("Trident"));
1081	1256	tripleItem.addActionListener(this);
	1257	+ }
1082	1258	}
1083	1259
1084	1260	void buildToolsMenu(Menu menu)
1085	1261	{
1086	1262	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1087	1263	animationItem.addItemListener(this);
1088		- animationItem.setState(CameraPane.ANIMATION);
	1264	+ animationItem.setState(Globals.ANIMATION);
1089	1265
1090	1266	menu.add("-");
1091	1267	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1092	1268	parseverticesItem.addActionListener(this);
1093	1269	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1094	1270	textureFieldItem.addActionListener(this);
1095		- alignItem = menu.add(new MenuItem("Align"));
	1271	+ alignItem = menu.add(new MenuItem("Align Objects"));
1096	1272	alignItem.addActionListener(this);
1097		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1098		- mirrorItem.addActionListener(this);
1099	1273	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1100	1274	reduceMorphItem.addActionListener(this);
1101	1275	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1102	1276	reduce34MorphItem.addActionListener(this);
1103		-
	1277	+ menu.add("-");
1104	1278	menu.add(computeAOItem = new MenuItem("Compute AO"));
1105	1279	computeAOItem.addActionListener(this);
1106		- menu.add("-");
1107	1280
	1281	+ if (Globals.ADVANCED)
	1282	+ {
	1283	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1284	+ mirrorItem.addActionListener(this);
	1285	+ menu.add("-");
1108	1286	menu.add(memoryItem = new MenuItem("Memory Usage"));
1109	1287	memoryItem.addActionListener(this);
1110	1288	menu.add(analyzeItem = new MenuItem("Analyze"));
1111	1289	analyzeItem.addActionListener(this);
1112		- menu.add(dumpItem = new MenuItem("Dump"));
	1290	+ menu.add(dumpItem = new MenuItem("Print"));
1113	1291	dumpItem.addActionListener(this);
1114	1292	// menu.add(pathItem = new MenuItem("From-to path"));
1115	1293	// pathItem.addActionListener(this);
..	..	@@ -1118,6 +1296,8 @@
1118	1296	resetParentItem.addActionListener(this);
1119	1297	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1120	1298	repairParentItem.addActionListener(this);
	1299	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1300	+ repairShadowItem.addActionListener(this);
1121	1301	menu.add(invariantsItem = new MenuItem("Invariants"));
1122	1302	invariantsItem.addActionListener(this);
1123	1303	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1125,6 +1305,7 @@
1125	1305	menu.add("-");
1126	1306	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1127	1307	editScriptItem.addActionListener(this);
	1308	+ }
1128	1309	}
1129	1310
1130	1311	void ScreenFit()
..	..	@@ -1453,9 +1634,9 @@
1453	1634
1454	1635	void Overwrite(int mask)
1455	1636	{
1456		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1637	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1457	1638	{
1458		- Object3D content = GrafreeD.clipboard.get(0);
	1639	+ Object3D content = Grafreed.clipboard.get(0);
1459	1640
1460	1641	if (content instanceof cGroup && ((cGroup)content).transientlink )
1461	1642	content = ((cGroup)content).get(0);
..	..	@@ -1478,6 +1659,7 @@
1478	1659	//
1479	1660	public void actionPerformed(ActionEvent event) // , Object arg)
1480	1661	{
	1662	+ Object source = event.getSource();
1481	1663	/*
1482	1664	if (event.getSource() == nameField)
1483	1665	{
..	..	@@ -1489,11 +1671,11 @@
1489	1671	}
1490	1672	else
1491	1673	*/
1492		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1674	+ if (source == lookAtItem \|\| source == lookFromItem)
1493	1675	{
1494	1676	ScreenFit();
1495	1677	} else
1496		- if (event.getSource() == switchItem)
	1678	+ if (source == switchItem)
1497	1679	{
1498	1680	cVector v1 = new cVector();
1499	1681	cVector v2 = new cVector();
..	..	@@ -1502,11 +1684,11 @@
1502	1684	objEditor.cameraView.renderCamera.setAim(v2, v1);
1503	1685	objEditor.cameraView.repaint();
1504	1686	} else
1505		- if (event.getSource() == rectoidItem)
	1687	+ if (source == rectoidItem)
1506	1688	{
1507	1689	makeSomething(new Box());
1508	1690	} else
1509		- if (event.getSource() == particleItem)
	1691	+ if (source == particleItem)
1510	1692	{
1511	1693	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1512	1694	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1527,9 +1709,9 @@
1527	1709	applyExample(particleGeom, "SMOKE");
1528	1710	makeSomething(particleGeom);
1529	1711	} else
1530		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1712	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1531	1713	{
1532		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1714	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1533	1715
1534	1716	ragdoll.toParent = LA.newMatrix();
1535	1717	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1547,7 +1729,7 @@
1547	1729	} else
1548	1730	/*
1549	1731	*/
1550		- if (event.getSource() == heightFieldItem)
	1732	+ if (source == heightFieldItem)
1551	1733	{
1552	1734	Object3D obj = new Object3D();
1553	1735
..	..	@@ -1585,31 +1767,31 @@
1585	1767
1586	1768	makeSomething(obj);
1587	1769	} else
1588		- if (event.getSource() == gridItem)
	1770	+ if (source == gridItem)
1589	1771	{
1590	1772	makeSomething(new Grid());
1591	1773	} else
1592		- if (event.getSource() == ellipsoidItem)
	1774	+ if (source == ellipsoidItem)
1593	1775	{
1594	1776	makeSomething(new Sphere());
1595	1777	} else
1596		- if (event.getSource() == coneItem)
	1778	+ if (source == coneItem)
1597	1779	{
1598	1780	makeSomething(new Cone());
1599	1781	} else
1600		- if (event.getSource() == torusItem)
	1782	+ if (source == torusItem)
1601	1783	{
1602	1784	makeSomething(new Torus());
1603	1785	} else
1604		- if (event.getSource() == superItem)
	1786	+ if (source == superItem)
1605	1787	{
1606	1788	makeSomething(new Superellipsoid());
1607	1789	} else
1608		- if (event.getSource() == kleinItem)
	1790	+ if (source == kleinItem)
1609	1791	{
1610	1792	makeSomething(new Klein());
1611	1793	} else
1612		- if (event.getSource() == blobItem)
	1794	+ if (source == blobItem)
1613	1795	{
1614	1796	Blob blob = new Blob();
1615	1797	BlobComponent comp = new BlobComponent();
..	..	@@ -1617,15 +1799,15 @@
1617	1799	//blob.retile();
1618	1800	makeSomething(blob);
1619	1801	} else
1620		- if (event.getSource() == latheItem)
	1802	+ if (source == latheItem)
1621	1803	{
1622	1804	makeSomething(new Lathe());
1623	1805	} else
1624		- if (event.getSource() == bezierItem)
	1806	+ if (source == bezierItem)
1625	1807	{
1626	1808	makeSomething(new BezierSurface());
1627	1809	} else
1628		- if (event.getSource() == checkerItem)
	1810	+ if (source == overlayItem)
1629	1811	{
1630	1812	/*
1631	1813	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1640,7 +1822,7 @@
1640	1822	*/
1641	1823	makeSomething(new Checker());
1642	1824	} else
1643		- if (event.getSource() == meshItem)
	1825	+ if (source == meshItem)
1644	1826	{
1645	1827	Object3D itemtomake = new Object3D();
1646	1828	Object3D child;
..	..	@@ -1661,35 +1843,35 @@
1661	1843	makeSomething(child);
1662	1844	}
1663	1845	} else
1664		- if (event.getSource() == springItem)
	1846	+ if (source == springItem)
1665	1847	{
1666	1848	cSpring s = new cSpring();
1667	1849	s.setup();
1668	1850	makeSomething(s);
1669	1851	} else
1670		- if (event.getSource() == flagItem)
	1852	+ if (source == flagItem)
1671	1853	{
1672	1854	cSpring s = new cFlag();
1673	1855	s.setup();
1674	1856	makeSomething(s);
1675	1857	} else
1676		- if (event.getSource() == lightItem)
	1858	+ if (source == lightItem)
1677	1859	{
1678	1860	makeSomething(new Light());
1679	1861	} else
1680		- if (event.getSource() == csgItem)
	1862	+ if (source == csgItem)
1681	1863	{
1682	1864	group(new CSG());
1683	1865	} else
1684		- if (event.getSource() == templateItem)
	1866	+ if (source == templateItem)
1685	1867	{
1686	1868	group(new cTemplate());
1687	1869	} else
1688		- if (event.getSource() == attributeItem)
	1870	+ if (source == attributeItem)
1689	1871	{
1690	1872	makeSomething(new Attribute());
1691	1873	} else
1692		- if (event.getSource() == pointflowItem)
	1874	+ if (source == pointflowItem)
1693	1875	{
1694	1876	makeSomething(new PointFlow());
1695	1877	} else
..	..	@@ -1701,7 +1883,7 @@
1701	1883	} else
1702	1884	*/
1703	1885
1704		- if (event.getSource() == superLoopItem)
	1886	+ if (source == superLoopItem)
1705	1887	{
1706	1888	Composite g = new cGroup();
1707	1889	for (int i=0; i<15; i++)
..	..	@@ -1723,7 +1905,7 @@
1723	1905
1724	1906	group(g);
1725	1907	} else
1726		- if (event.getSource() == loopItem)
	1908	+ if (source == loopItem)
1727	1909	{
1728	1910	Composite csg = new GroupLeaf();
1729	1911	csg.count = 5;
..	..	@@ -1732,7 +1914,7 @@
1732	1914	csg.addChild(child);
1733	1915	child.addChild(csg);
1734	1916	} else
1735		- if (event.getSource() == doubleItem)
	1917	+ if (source == doubleItem)
1736	1918	{
1737	1919	Composite csg = new GroupLeaf();
1738	1920	csg.count = 5;
..	..	@@ -1744,7 +1926,7 @@
1744	1926	csg.addChild(child);
1745	1927	child.addChild(csg);
1746	1928	} else
1747		- if (event.getSource() == tripleItem)
	1929	+ if (source == tripleItem)
1748	1930	{
1749	1931	Composite csg = new GroupLeaf();
1750	1932	csg.count = 4;
..	..	@@ -1759,71 +1941,71 @@
1759	1941	csg.addChild(child);
1760	1942	child.addChild(csg);
1761	1943	} else
1762		-
1763		- if (event.getSource() == importGFDItem)
	1944	+ if (source == computeAOItem)
1764	1945	{
1765		- ImportGFD();
	1946	+ Globals.drawMode = CameraPane.OCCLUSION;
	1947	+ Globals.theRenderer.repaint();
1766	1948	} 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)
	1949	+ if (source == recompileItem)
1785	1950	{
1786	1951	Recompile();
1787	1952	refreshContents();
1788	1953	} else
1789		- if (event.getSource() == editScriptItem)
	1954	+ if (source == editScriptItem)
1790	1955	{
1791	1956	OpenDialog();
1792	1957	refreshContents();
1793	1958	} else
1794		- if (event.getSource() == invariantsItem)
	1959	+ if (source == invariantsItem)
1795	1960	{
1796	1961	System.out.println("Invariants:");
1797		- GrafreeD.grafreeD.universe.invariants();
	1962	+ Grafreed.grafreeD.universe.invariants();
1798	1963	} else
1799		- if (event.getSource() == memoryItem)
	1964	+ if (source == memoryItem)
1800	1965	{
1801	1966	//System.out.println("Invariants:");
1802	1967	PrintMemory();
1803	1968	} else
1804		- if (event.getSource() == pathItem)
	1969	+ if (source == pathItem)
1805	1970	{
1806	1971	PrintPath();
1807	1972	} else
1808		- if (event.getSource() == analyzeItem)
	1973	+ if (source == analyzeItem)
1809	1974	{
1810	1975	AnalyzeObject();
1811	1976	} else
1812		- if (event.getSource() == dumpItem)
	1977	+ if (source == dumpItem)
1813	1978	{
1814	1979	DumpObject();
1815	1980	} else
1816		- if (event.getSource() == screenfitButton)
	1981	+ if (source == undoButton)
	1982	+ {
	1983	+ Undo();
	1984	+ } else
	1985	+ if (source == redoButton)
	1986	+ {
	1987	+ Redo();
	1988	+ } else
	1989	+ if (source == saveButton)
	1990	+ {
	1991	+ Save();
	1992	+ } else
	1993	+ if (source == oneStepButton)
	1994	+ {
	1995	+ Globals.ONESTEP = true;
	1996	+ cameraView.repaint();
	1997	+ } else
	1998	+ if (source == screenfitButton)
1817	1999	{
1818	2000	//Reload(lastConverter, lastFilename, true);
1819	2001	ScreenFit();
1820	2002	} else
1821		- if (event.getSource() == screenfitpointButton)
	2003	+ if (source == screenfitpointButton)
1822	2004	{
1823	2005	//Reload(lastConverter, lastFilename, true);
1824	2006	ScreenFitPoint();
1825	2007	} else
1826		- if (event.getSource() == snapobjectButton)
	2008	+ if (source == snapobjectButton)
1827	2009	{
1828	2010	//Reload(lastConverter, lastFilename, true);
1829	2011	SnapObject();
..	..	@@ -1834,13 +2016,13 @@
1834	2016	// Recompile();
1835	2017	// refreshContents();
1836	2018	// } else
1837		- if (event.getSource() == gcButton)
	2019	+ if (source == gcButton)
1838	2020	{
1839	2021	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1840	2022	System.gc();
1841	2023	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1842	2024	} else
1843		- if (event.getSource() == editLeafItem)
	2025	+ if (source == editLeafItem)
1844	2026	{
1845	2027	Object3D obj;
1846	2028	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1854,62 +2036,74 @@
1854	2036	}
1855	2037	refreshContents(true);
1856	2038	} else
1857		- if (event.getSource() == openWindowItem)
	2039	+ if (source == openWindowItem)
1858	2040	{
1859	2041	EditSelection(true);
1860	2042	} else
1861		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2043	+ if (source == cutItem \|\| source == clearButton)
1862	2044	{
1863	2045	loadClipboard(true);
1864	2046	} else
1865		- if (event.getSource() == duplicateItem)
	2047	+ if (source == undoItem)
1866	2048	{
1867		- Object3D keep = GrafreeD.clipboard;
	2049	+ Undo();
	2050	+ } else
	2051	+ if (source == redoItem)
	2052	+ {
	2053	+ Redo();
	2054	+ } else
	2055	+ if (source == duplicateItem)
	2056	+ {
	2057	+ Object3D keep = Grafreed.clipboard;
1868	2058	loadClipboard(false);
1869	2059	paste(false);
1870		- GrafreeD.clipboard = keep;
	2060	+ Grafreed.clipboard = keep;
1871	2061	} else
1872		- if (event.getSource() == cloneItem)
	2062	+ if (source == cloneItem)
1873	2063	{
1874	2064	CloneSelection(false);
1875	2065	} else
1876		- if (event.getSource() == cloneSupportItem)
	2066	+ if (source == cloneSupportItem)
1877	2067	{
1878	2068	CloneSelection(true);
1879	2069	} else
1880		- if (event.getSource() == copyItem)
	2070	+ if (source == copyItem)
1881	2071	{
1882	2072	loadClipboard(false);
1883	2073	} else
1884		- if (event.getSource() == pasteItem)
	2074	+ if (source == pasteItem)
1885	2075	{
1886	2076	paste(false);
1887	2077	} else
1888		- if (event.getSource() == pasteLinkItem)
	2078	+ if (source == pasteIntoItem)
1889	2079	{
1890		- pasteInto(false);
	2080	+ pasteInto(true, false);
1891	2081	} else
1892		- if (event.getSource() == pasteCloneItem)
	2082	+ if (source == pasteLinkItem)
1893	2083	{
1894		- pasteInto(true);
	2084	+ pasteInto(false, false);
1895	2085	} else
1896		- if (event.getSource() == pasteExpandItem)
	2086	+ if (source == pasteCloneItem)
	2087	+ {
	2088	+ pasteInto(true, true);
	2089	+ } else
	2090	+ if (source == pasteExpandItem)
1897	2091	{
1898	2092	paste(true);
1899	2093	} else
1900		- if (event.getSource() == synchronizeItem)
	2094	+ if (source == synchronizeItem)
1901	2095	{
1902	2096	Overwrite(Object3D.TRANSFORM);
1903	2097	} else
1904		- if (event.getSource() == overwriteNameItem)
	2098	+ if (source == overwriteNameItem)
1905	2099	{
1906	2100	Overwrite(Object3D.NAME);
1907	2101	} else
1908		- if (event.getSource() == overwriteUVItem)
	2102	+ if (source == overwriteUVItem)
1909	2103	{
1910	2104	Overwrite(Object3D.UV);
1911	2105	} else
1912		- if (event.getSource() == overwriteMatItem)
	2106	+ if (source == overwriteMatItem)
1913	2107	{
1914	2108	/* july 2015
1915	2109	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1929,7 +2123,7 @@
1929	2123
1930	2124	Overwrite(dropAttributes);
1931	2125	}
1932		- if (event.getSource() == overwriteGeoItem)
	2126	+ if (source == overwriteGeoItem)
1933	2127	{
1934	2128	Overwrite(Object3D.GEOMETRY);
1935	2129	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1946,7 +2140,7 @@
1946	2140	// refreshContents();
1947	2141	// }
1948	2142	} else
1949		- if (event.getSource() == generateMeshItem)
	2143	+ if (source == generateMeshItem)
1950	2144	{
1951	2145	//if (group.selection.size() == 1)
1952	2146	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1957,7 +2151,7 @@
1957	2151	ResetModel();
1958	2152	refreshContents();
1959	2153	} else
1960		- if (event.getSource() == extractGeometriesItem)
	2154	+ if (source == extractGeometriesItem)
1961	2155	{
1962	2156	boolean one = false;
1963	2157
..	..	@@ -1984,7 +2178,7 @@
1984	2178	ResetModel();
1985	2179	refreshContents();
1986	2180	} else
1987		- if (event.getSource() == cloneGeometriesItem)
	2181	+ if (source == cloneGeometriesItem)
1988	2182	{
1989	2183	boolean one = false;
1990	2184
..	..	@@ -2010,7 +2204,7 @@
2010	2204	ResetModel();
2011	2205	refreshContents();
2012	2206	} else
2013		- if (event.getSource() == shareGeometriesItem)
	2207	+ if (source == shareGeometriesItem)
2014	2208	{
2015	2209	boolean one = false;
2016	2210
..	..	@@ -2040,7 +2234,7 @@
2040	2234	refreshContents();
2041	2235	}
2042	2236	} else
2043		- if (event.getSource() == mergeGeometriesItem)
	2237	+ if (source == mergeGeometriesItem)
2044	2238	{
2045	2239	boolean one = false;
2046	2240
..	..	@@ -2070,7 +2264,7 @@
2070	2264	ResetModel();
2071	2265	refreshContents();
2072	2266	} else
2073		- if (event.getSource() == linkverticesItem)
	2267	+ if (source == linkverticesItem)
2074	2268	{
2075	2269	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2076	2270	// {
..	..	@@ -2083,48 +2277,48 @@
2083	2277	// group.selection.get(0).setMasterThis(content); // should be identity
2084	2278	// refreshContents();
2085	2279	// }
2086		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2280	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2087	2281	{
2088		- Object3D content = GrafreeD.clipboard.get(0);
	2282	+ Object3D content = Grafreed.clipboard.get(0);
2089	2283
2090	2284	if (content instanceof cGroup && ((cGroup)content).transientlink )
2091	2285	content = ((cGroup)content).get(0);
2092	2286
2093		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2287	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2094	2288	for (int i=0; i<group.selection.size(); i++)
2095	2289	{
2096		- boolean random = CameraPane.RANDOM;
2097		- CameraPane.RANDOM = false; // parse all random nodes
	2290	+ boolean random = CameraPane.SWITCH;
	2291	+ CameraPane.SWITCH = false; // parse all random nodes
2098	2292	group.selection.get(i).linkVerticesThis(content);
2099	2293	// group.selection.get(i).setMasterThis(content); // should be identity
2100		- CameraPane.RANDOM = random;
	2294	+ CameraPane.SWITCH = random;
2101	2295	}
2102		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2296	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2103	2297	refreshContents();
2104	2298	}
2105	2299	} else
2106		- if (event.getSource() == resetsupportItem)
	2300	+ if (source == resetsupportItem)
2107	2301	{
2108	2302	for (int i=0; i<group.selection.size(); i++)
2109	2303	{
2110		- boolean random = CameraPane.RANDOM;
2111		- CameraPane.RANDOM = false; // parse all random nodes
	2304	+ boolean random = CameraPane.SWITCH;
	2305	+ CameraPane.SWITCH = false; // parse all random nodes
2112	2306	group.selection.get(i).linkVerticesThis(null);
2113		- CameraPane.RANDOM = random;
	2307	+ CameraPane.SWITCH = random;
2114	2308	}
2115	2309
2116	2310	refreshContents();
2117	2311	} else
2118		- if (event.getSource() == relinkverticesItem)
	2312	+ if (source == relinkverticesItem)
2119	2313	{
2120		- boolean random = CameraPane.RANDOM;
2121		- CameraPane.RANDOM = false; // parse all random nodes
	2314	+ boolean random = CameraPane.SWITCH;
	2315	+ CameraPane.SWITCH = false; // parse all random nodes
2122	2316	group.selection.RelinkToSupport();
2123		- CameraPane.RANDOM = random;
	2317	+ CameraPane.SWITCH = random;
2124	2318
2125	2319	refreshContents();
2126	2320	} else
2127		- if (event.getSource() == resetreferencesItem)
	2321	+ if (source == resetreferencesItem)
2128	2322	{
2129	2323	for (int i=0; i<group.selection.size(); i++)
2130	2324	{
..	..	@@ -2133,11 +2327,11 @@
2133	2327
2134	2328	refreshContents();
2135	2329	} else
2136		- if (event.getSource() == setMasterItem)
	2330	+ if (source == setMasterItem)
2137	2331	{
2138		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2332	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2139	2333	{
2140		- Object3D content = GrafreeD.clipboard.get(0);
	2334	+ Object3D content = Grafreed.clipboard.get(0);
2141	2335
2142	2336	if (content instanceof cGroup && ((cGroup)content).transientlink )
2143	2337	content = ((cGroup)content).get(0);
..	..	@@ -2146,13 +2340,13 @@
2146	2340	refreshContents();
2147	2341	}
2148	2342	} else
2149		- if (event.getSource() == poseMeshItem)
	2343	+ if (source == poseMeshItem)
2150	2344	{
2151	2345	if (group.selection.size() == 1)
2152	2346	{
2153		- if (GrafreeD.clipboard.size() == 1)
	2347	+ if (Grafreed.clipboard.size() == 1)
2154	2348	{
2155		- Object3D content = GrafreeD.clipboard.get(0);
	2349	+ Object3D content = Grafreed.clipboard.get(0);
2156	2350
2157	2351	if (content instanceof cGroup && ((cGroup)content).transientlink )
2158	2352	content = ((cGroup)content).get(0);
..	..	@@ -2165,19 +2359,19 @@
2165	2359	}
2166	2360
2167	2361	} else
2168		- if (event.getSource() == revertMeshItem)
	2362	+ if (source == revertMeshItem)
2169	2363	{
2170	2364	RevertMeshes();
2171	2365	} else
2172		- if (event.getSource() == resetMeshItem)
	2366	+ if (source == resetAllItem)
2173	2367	{
2174	2368	ResetAll();
2175	2369	} else
2176		- if (event.getSource() == stepAllItem)
	2370	+ if (source == stepAllItem)
2177	2371	{
2178	2372	StepAll();
2179	2373	} else
2180		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2374	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2181	2375	{
2182	2376	//int indices[] = jList.getSelectedIndices();
2183	2377	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2185,46 +2379,46 @@
2185	2379
2186	2380	ClearSelection(false);
2187	2381	} else
2188		- if (event.getSource() == clearAllItem)
	2382	+ if (source == clearAllItem)
2189	2383	{
2190	2384	ClearSelection(true);
2191	2385	} else
2192		- if (event.getSource() == grabItem)
	2386	+ if (source == grabItem)
2193	2387	{
2194	2388	group(new cGroup(), true);
2195	2389	} else
2196		- if (event.getSource() == hideItem)
	2390	+ if (source == hideItem)
2197	2391	{
2198	2392	group(new HiddenObject());
2199	2393	} else
2200		- if (event.getSource() == frontItem)
	2394	+ if (source == frontItem)
2201	2395	{
2202	2396	front();
2203	2397	} else
2204		- if (event.getSource() == backItem)
	2398	+ if (source == backItem)
2205	2399	{
2206	2400	back();
2207	2401	} else
2208		- if (event.getSource() == cameraItem)
	2402	+ if (source == cameraItem)
2209	2403	{
2210	2404	makeSomething(new Camera());
2211	2405	} else
2212		- if (event.getSource() == compositeItem)
	2406	+ if (source == compositeItem)
2213	2407	{
2214	2408	group(new Composite());
2215	2409	} else
2216		- if (event.getSource() == randomItem)
	2410	+ if (source == randomItem)
2217	2411	{
2218	2412	RandomNode random = new RandomNode();
2219	2413	group(random);
2220	2414	if (random.size() > 0)
2221		- random.name = random.get(0).name + "Rnd";
	2415	+ random.name = random.get(0).name + "Switch";
2222	2416	} else
2223		- if (event.getSource() == physicsItem)
	2417	+ if (source == physicsItem)
2224	2418	{
2225	2419	group(new PhysicsNode());
2226	2420	} else
2227		- if (event.getSource() == frameselectorItem)
	2421	+ if (source == frameselectorItem)
2228	2422	{
2229	2423	for (int i=0; i<group.selection.size(); i++)
2230	2424	{
..	..	@@ -2236,7 +2430,7 @@
2236	2430	ResetModel();
2237	2431	refreshContents();
2238	2432	} else
2239		- if (event.getSource() == switchGeoItem)
	2433	+ if (source == switchGeoItem)
2240	2434	{
2241	2435	for (int i=0; i<group.selection.size(); i++)
2242	2436	{
..	..	@@ -2248,7 +2442,7 @@
2248	2442	ResetModel();
2249	2443	refreshContents();
2250	2444	} else
2251		- if (event.getSource() == switchTransfoItem)
	2445	+ if (source == switchTransfoItem)
2252	2446	{
2253	2447	for (int i=0; i<group.selection.size(); i++)
2254	2448	{
..	..	@@ -2260,7 +2454,7 @@
2260	2454	ResetModel();
2261	2455	refreshContents();
2262	2456	} else
2263		- if (event.getSource() == morphItem)
	2457	+ if (source == morphItem)
2264	2458	{
2265	2459	for (int i=0; i<group.selection.size(); i++)
2266	2460	{
..	..	@@ -2272,7 +2466,7 @@
2272	2466	ResetModel();
2273	2467	refreshContents();
2274	2468	} else
2275		- if (event.getSource() == scriptNodeItem)
	2469	+ if (source == scriptNodeItem)
2276	2470	{
2277	2471	boolean atleastone = false;
2278	2472
..	..	@@ -2311,31 +2505,31 @@
2311	2505	}
2312	2506	}
2313	2507	} else
2314		- if (event.getSource() == linkerItem)
	2508	+ if (source == linkerItem)
2315	2509	{
2316	2510	group(new cLinker());
2317	2511	} else
2318		- if (event.getSource() == textureItem)
	2512	+ if (source == textureItem)
2319	2513	{
2320	2514	group(new TextureNode());
2321	2515	} else
2322		- if (event.getSource() == billboardItem)
	2516	+ if (source == billboardItem)
2323	2517	{
2324	2518	group(new BillboardNode());
2325	2519	} else
2326		- if (event.getSource() == shadowXItem)
	2520	+ if (source == shadowXItem)
2327	2521	{
2328	2522	CastShadow(0);
2329	2523	} else
2330		- if (event.getSource() == shadowYItem)
	2524	+ if (source == shadowYItem)
2331	2525	{
2332	2526	CastShadow(1);
2333	2527	} else
2334		- if (event.getSource() == shadowZItem)
	2528	+ if (source == shadowZItem)
2335	2529	{
2336	2530	CastShadow(2);
2337	2531	} else
2338		- if (event.getSource() == ungroupItem)
	2532	+ if (source == ungroupItem)
2339	2533	{
2340	2534	//ungroup();
2341	2535	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2347,179 +2541,203 @@
2347	2541
2348	2542	refreshContents();
2349	2543	} else
2350		- if (event.getSource() == genUVItem)
	2544	+ if (source == genUVItem)
2351	2545	{
2352	2546	GenUV();
2353	2547	} else
2354		- if (event.getSource() == genNormalsCADItem)
	2548	+ if (source == genNormalsCADItem)
2355	2549	{
2356	2550	GenNormals(true);
2357	2551	} else
2358		- if (event.getSource() == genNormalsMESHItem)
	2552	+ if (source == genNormalsMESHItem)
2359	2553	{
2360		- GenNormals(true); // TODO
	2554	+ GenNormalsMESH();
2361	2555	} else
2362		- if (event.getSource() == genNormalsORGANItem)
	2556	+ if (source == genNormalsORGANItem)
2363	2557	{
2364	2558	GenNormals(false);
2365	2559	} else
2366		- if (event.getSource() == genNormalsMINEItem)
	2560	+ if (source == genNormalsMINEItem)
2367	2561	{
2368	2562	GenNormalsMINE();
2369	2563	} else
2370		- if (event.getSource() == stripifyItem)
	2564	+ if (source == stripifyItem)
2371	2565	{
2372	2566	Stripify();
2373	2567	} else
2374		- if (event.getSource() == unstripifyItem)
	2568	+ if (source == unstripifyItem)
2375	2569	{
2376	2570	Unstripify();
2377	2571	} else
2378		- if (event.getSource() == trimItem)
	2572	+ if (source == trimItem)
2379	2573	{
2380	2574	Trim();
2381	2575	} else
2382		- if (event.getSource() == untrimItem)
	2576	+ if (source == untrimItem)
2383	2577	{
2384	2578	Untrim();
2385	2579	} else
2386		- if (event.getSource() == clearColorsItem)
	2580	+ if (source == clearColorsItem)
2387	2581	{
2388	2582	ClearColors();
2389	2583	} else
2390		- if (event.getSource() == clearMaterialsItem)
	2584	+ if (source == clearMaterialsItem)
2391	2585	{
2392	2586	ClearMaterials();
2393	2587	} else
2394		- if (event.getSource() == liveleavesItem)
	2588	+ if (source == liveleavesItem)
2395	2589	{
2396	2590	LiveLeaves(true);
2397	2591	} else
2398		- if (event.getSource() == unliveleavesItem)
	2592	+ if (source == unliveleavesItem)
2399	2593	{
2400	2594	LiveLeaves(false);
2401	2595	} else
2402		- if (event.getSource() == supportleavesItem)
	2596	+ if (source == supportleavesItem)
2403	2597	{
2404	2598	SupportLeaves(true);
2405	2599	} else
2406		- if (event.getSource() == unsupportleavesItem)
	2600	+ if (source == unsupportleavesItem)
2407	2601	{
2408	2602	SupportLeaves(false);
2409	2603	} else
2410		- if (event.getSource() == hideleavesItem)
	2604	+ if (source == hideleavesItem)
2411	2605	{
2412	2606	HideLeaves(true);
2413	2607	} else
2414		- if (event.getSource() == showleavesItem)
	2608	+ if (source == showleavesItem)
2415	2609	{
2416	2610	HideLeaves(false);
2417	2611	} else
2418		- if (event.getSource() == markleavesItem)
	2612	+ if (source == markleavesItem)
2419	2613	{
2420	2614	MarkLeaves(true);
2421	2615	} else
2422		- if (event.getSource() == unmarkleavesItem)
	2616	+ if (source == unmarkleavesItem)
2423	2617	{
2424	2618	MarkLeaves(false);
2425	2619	} else
2426		- if (event.getSource() == flipVItem)
	2620	+ if (source == rewindleavesItem)
	2621	+ {
	2622	+ RewindLeaves(true);
	2623	+ } else
	2624	+ if (source == unrewindleavesItem)
	2625	+ {
	2626	+ RewindLeaves(false);
	2627	+ } else
	2628	+ if (source == randomleavesItem)
	2629	+ {
	2630	+ RandomLeaves(true);
	2631	+ } else
	2632	+ if (source == unrandomleavesItem)
	2633	+ {
	2634	+ RandomLeaves(false);
	2635	+ } else
	2636	+ if (source == flipVItem)
2427	2637	{
2428	2638	FlipV(true);
2429	2639	} else
2430		- if (event.getSource() == unflipVItem)
	2640	+ if (source == unflipVItem)
2431	2641	{
2432	2642	FlipV(false);
2433	2643	} else
2434		- if (event.getSource() == lowTexturesItem)
	2644	+ if (source == lowTexturesItem)
2435	2645	{
2436	2646	SetTexRes(0);
2437	2647	} else
2438		- if (event.getSource() == normalTexturesItem)
	2648	+ if (source == normalTexturesItem)
2439	2649	{
2440	2650	SetTexRes(1);
2441	2651	} else
2442		- if (event.getSource() == highTexturesItem)
	2652	+ if (source == highTexturesItem)
2443	2653	{
2444	2654	SetTexRes(2);
2445	2655	} else
2446		- if (event.getSource() == veryhighTexturesItem)
	2656	+ if (source == veryhighTexturesItem)
2447	2657	{
2448	2658	SetTexRes(3);
2449	2659	} else
2450		- if (event.getSource() == maxTexturesItem)
	2660	+ if (source == maxTexturesItem)
2451	2661	{
2452	2662	SetTexRes(4);
2453	2663	} else
2454		- if (event.getSource() == panoTexturesItem)
	2664	+ if (source == panoTexturesItem)
2455	2665	{
2456	2666	SetTexRes(5);
2457	2667	} else
2458		- if (event.getSource() == reverseNormalsItem)
	2668	+ if (source == reverseNormalsItem)
2459	2669	{
2460	2670	ReverseNormals();
2461	2671	} else
2462		- if (event.getSource() == parseverticesItem)
	2672	+ if (source == parseverticesItem)
2463	2673	{
2464	2674	ParseVertices();
2465	2675	} else
2466		- if (event.getSource() == textureFieldItem)
	2676	+ if (source == textureFieldItem)
2467	2677	{
2468	2678	TextureVertices();
2469	2679	} else
2470		- if (event.getSource() == alignItem)
	2680	+ if (source == alignItem)
2471	2681	{
2472	2682	Align();
2473	2683	} else
2474		- if (event.getSource() == mirrorItem)
	2684	+ if (source == mirrorItem)
2475	2685	{
2476	2686	MirrorPoses();
2477	2687	} else
2478		- if (event.getSource() == reduceMorphItem)
	2688	+ if (source == reduceMorphItem)
2479	2689	{
2480	2690	MeshReduction(false);
2481	2691	} else
2482		- if (event.getSource() == reduce34MorphItem)
	2692	+ if (source == reduce34MorphItem)
2483	2693	{
2484	2694	MeshReduction(true);
2485	2695	} else
2486		- if (event.getSource() == reverseTrianglesItem)
	2696	+ if (source == reverseTrianglesItem)
2487	2697	{
2488	2698	ReverseTriangles();
2489	2699	} else
2490		- if (event.getSource() == reduceMeshItem)
	2700	+ if (source == reduceMeshItem)
2491	2701	{
2492	2702	ReduceMesh(false);
2493	2703	} else
2494		- if (event.getSource() == reduce34MeshItem)
	2704	+ if (source == reduce34MeshItem)
2495	2705	{
2496	2706	ReduceMesh(true);
2497	2707	} else
2498		- if (event.getSource() == increaseMeshItem)
	2708	+ if (source == increaseMeshItem)
2499	2709	{
2500	2710	IncreaseMesh();
2501	2711	} else
2502		- if (event.getSource() == clipMeshItem)
	2712	+ if (source == clipMeshItem)
2503	2713	{
2504	2714	ClipMesh();
2505	2715	} else
2506		- if (event.getSource() == smoothMeshItem)
	2716	+ if (source == smoothMeshItem)
2507	2717	{
2508	2718	SmoothMesh();
2509	2719	} else
2510		- if (event.getSource() == transformgeometryItem)
	2720	+ if (source == transformGeometryItem)
2511	2721	{
2512	2722	TransformGeometry();
2513	2723	} else
2514		- if (event.getSource() == resetTransformItem)
	2724	+ if (source == transformChildrenItem)
	2725	+ {
	2726	+ TransformChildren();
	2727	+ } else
	2728	+ if (source == resetTransformItem)
2515	2729	{
2516	2730	ResetTransform();
2517	2731	} else
2518		- if (event.getSource() == resetCentroidItem)
	2732	+ if (source == resetCentroidItem)
2519	2733	{
2520		- ResetCentroid();
	2734	+ ResetCentroid(true);
2521	2735	} else
2522		- if (event.getSource() == resetParentItem)
	2736	+ if (source == resetCentroidXZItem)
	2737	+ {
	2738	+ ResetCentroid(false);
	2739	+ } else
	2740	+ if (source == resetParentItem)
2523	2741	{
2524	2742	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2525	2743	{
..	..	@@ -2529,7 +2747,7 @@
2529	2747
2530	2748	refreshContents();
2531	2749	} else
2532		- if (event.getSource() == repairParentItem)
	2750	+ if (source == repairParentItem)
2533	2751	{
2534	2752	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2535	2753	{
..	..	@@ -2543,7 +2761,21 @@
2543	2761
2544	2762	refreshContents();
2545	2763	} else
2546		- if (event.getSource() == sortbysizeItem)
	2764	+ if (source == repairShadowItem)
	2765	+ {
	2766	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2767	+ {
	2768	+ Object3D obj = (Object3D)e.nextElement();
	2769	+ obj.RepairShadow();
	2770	+// for (int i=0; i<obj.size(); i++)
	2771	+// {
	2772	+// obj.get(i).parent = obj;
	2773	+// }
	2774	+ }
	2775	+
	2776	+ refreshContents();
	2777	+ } else
	2778	+ if (source == sortbysizeItem)
2547	2779	{
2548	2780	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2549	2781	{
..	..	@@ -2555,7 +2787,7 @@
2555	2787	ResetModel();
2556	2788	refreshContents();
2557	2789	} else
2558		- if (event.getSource() == sortbynameItem)
	2790	+ if (source == sortbynameItem)
2559	2791	{
2560	2792	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2561	2793	{
..	..	@@ -2567,7 +2799,7 @@
2567	2799	ResetModel();
2568	2800	refreshContents();
2569	2801	} else
2570		- if (event.getSource() == attachPigmentItem)
	2802	+ if (source == attachPigmentItem)
2571	2803	{
2572	2804	String texture = GetFile("Attach pigment");
2573	2805	Object3D obj;
..	..	@@ -2579,7 +2811,7 @@
2579	2811
2580	2812	refreshContents();
2581	2813	} else
2582		- if (event.getSource() == detachPigmentItem)
	2814	+ if (source == detachPigmentItem)
2583	2815	{
2584	2816	Object3D obj;
2585	2817	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2590,7 +2822,7 @@
2590	2822
2591	2823	refreshContents();
2592	2824	} else
2593		- if (event.getSource() == attachBumpItem)
	2825	+ if (source == attachBumpItem)
2594	2826	{
2595	2827	String texture = GetFile("Attach bump");
2596	2828	Object3D obj;
..	..	@@ -2602,7 +2834,7 @@
2602	2834
2603	2835	refreshContents();
2604	2836	} else
2605		- if (event.getSource() == detachBumpItem)
	2837	+ if (source == detachBumpItem)
2606	2838	{
2607	2839	Object3D obj;
2608	2840	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2613,7 +2845,7 @@
2613	2845
2614	2846	refreshContents();
2615	2847	} else
2616		- if (event.getSource() == pigmentBumpItem)
	2848	+ if (source == pigmentBumpItem)
2617	2849	{
2618	2850	Object3D obj;
2619	2851	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2624,158 +2856,195 @@
2624	2856
2625	2857	refreshContents();
2626	2858	} else
2627		- if (event.getSource() == flashSelectionButton)
	2859	+ if (source == flashSelectionButton)
2628	2860	{
2629	2861	CameraPane.flash = true;
2630	2862	refreshContents();
2631	2863	} else
2632		- if (event.getSource() == oneButton)
	2864	+ if (source == oneButton)
2633	2865	{
2634	2866	} else
2635		- if (event.getSource() == twoButton)
	2867	+ if (source == twoButton)
2636	2868	{
2637	2869	radio.layout = twoButton;
2638	2870	// bug
2639	2871	//gridPanel.setDividerLocation(1.0);
2640	2872	//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();
	2873	+// bigThree.remove(scenePanel);
	2874	+// bigThree.remove(centralPanel);
	2875	+// bigThree.remove(XYZPanel);
	2876	+// aWindowConstraints.gridx = 0;
	2877	+// aWindowConstraints.gridy = 0;
	2878	+// aWindowConstraints.gridwidth = 1;
	2879	+// // aConstraints.gridheight = 3;
	2880	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2881	+// aWindowConstraints.weightx = 0;
	2882	+// aWindowConstraints.weighty = 1;
	2883	+// //bigThree.add(jtp, aWindowConstraints);
	2884	+// aWindowConstraints.weightx = 1;
	2885	+// aWindowConstraints.gridwidth = 3;
	2886	+// // aConstraints.gridheight = 3;
	2887	+// aWindowConstraints.gridx = 1;
	2888	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2889	+// bigThree.add(centralPanel, aWindowConstraints);
	2890	+// aWindowConstraints.weightx = 0;
	2891	+// aWindowConstraints.gridx = 4;
	2892	+// aWindowConstraints.gridwidth = 1;
	2893	+// // aConstraints.gridheight = 3;
	2894	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2895	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2896	+// scenePanel.setVisible(false);
	2897	+// centralPanel.setVisible(true);
	2898	+// XYZPanel.setVisible(false);
	2899	+ bigThree.ClearUI();
	2900	+ bigThree.add(centralPanel);
	2901	+ bigThree.FlushUI();
2665	2902	} else
2666		- if (event.getSource() == threeButton)
	2903	+ if (source == threeButton)
2667	2904	{
2668	2905	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();
	2906	+
	2907	+// bigThree.remove(scenePanel);
	2908	+// bigThree.remove(centralPanel);
	2909	+// bigThree.remove(XYZPanel);
	2910	+// aWindowConstraints.gridx = 0;
	2911	+// aWindowConstraints.gridy = 0;
	2912	+// aWindowConstraints.gridwidth = 1;
	2913	+// // aConstraints.gridheight = 3;
	2914	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2915	+// aWindowConstraints.weightx = 0;
	2916	+// aWindowConstraints.weighty = 1;
	2917	+// //bigThree.add(jtp, aWindowConstraints);
	2918	+// aWindowConstraints.weightx = 1;
	2919	+// aWindowConstraints.gridwidth = 3;
	2920	+// // aConstraints.gridheight = 3;
	2921	+// aWindowConstraints.gridx = 1;
	2922	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2923	+// bigThree.add(centralPanel, aWindowConstraints);
	2924	+// aWindowConstraints.weightx = 0;
	2925	+// aWindowConstraints.gridx = 4;
	2926	+// aWindowConstraints.gridwidth = 1;
	2927	+// // aConstraints.gridheight = 3;
	2928	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2929	+// bigThree.add(XYZPanel, aWindowConstraints);
	2930	+// bigThree.validate();
	2931	+// scenePanel.setVisible(false);
	2932	+// centralPanel.setVisible(true);
	2933	+// XYZPanel.setVisible(true);
	2934	+ bigThree.ClearUI();
	2935	+ bigThree.add(centralPanel);
	2936	+ bigThree.add(XYZPanel);
	2937	+ bigThree.FlushUI();
2693	2938	} else
2694		- if (event.getSource() == fourButton)
	2939	+ if (source == fourButton)
2695	2940	{
2696	2941	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();
	2942	+
	2943	+// bigThree.remove(scenePanel);
	2944	+// bigThree.remove(centralPanel);
	2945	+// bigThree.remove(XYZPanel);
	2946	+// aWindowConstraints.gridx = 0;
	2947	+// aWindowConstraints.gridy = 0;
	2948	+// aWindowConstraints.gridwidth = 1;
	2949	+// // aWindowConstraints.gridheight = 3;
	2950	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2951	+// aWindowConstraints.weightx = 1;
	2952	+// aWindowConstraints.weighty = 1;
	2953	+// bigThree.add(scenePanel, aWindowConstraints);
	2954	+// aWindowConstraints.weightx = 1;
	2955	+// aWindowConstraints.gridwidth = 3;
	2956	+// // aConstraints.gridheight = 3;
	2957	+// aWindowConstraints.gridx = 1;
	2958	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2959	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2960	+// aWindowConstraints.weightx = 0;
	2961	+// aWindowConstraints.gridx = 4;
	2962	+// aWindowConstraints.gridwidth = 1;
	2963	+// // aWindowConstraints.gridheight = 3;
	2964	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2965	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2966	+// bigThree.validate();
	2967	+// scenePanel.setVisible(true);
	2968	+// centralPanel.setVisible(false);
	2969	+// XYZPanel.setVisible(false);
	2970	+ bigThree.ClearUI();
	2971	+ bigThree.add(scenePanel);
	2972	+ bigThree.FlushUI();
2721	2973	} else
2722		- if (event.getSource() == sixButton)
	2974	+ if (source == sixButton)
2723	2975	{
2724	2976	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();
	2977	+
	2978	+// bigThree.remove(scenePanel);
	2979	+// bigThree.remove(centralPanel);
	2980	+// bigThree.remove(XYZPanel);
	2981	+// aWindowConstraints.gridx = 0;
	2982	+// aWindowConstraints.gridy = 0;
	2983	+// aWindowConstraints.gridwidth = 1;
	2984	+// // aConstraints.gridheight = 3;
	2985	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2986	+// aWindowConstraints.weightx = 0;
	2987	+// aWindowConstraints.weighty = 1;
	2988	+// bigThree.add(scenePanel, aWindowConstraints);
	2989	+// aWindowConstraints.weightx = 1;
	2990	+// aWindowConstraints.gridwidth = 3;
	2991	+// // aWindowConstraints.gridheight = 3;
	2992	+// aWindowConstraints.gridx = 1;
	2993	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2994	+// bigThree.add(centralPanel, aWindowConstraints);
	2995	+// aWindowConstraints.weightx = 0;
	2996	+// aWindowConstraints.gridx = 4;
	2997	+// aWindowConstraints.gridwidth = 1;
	2998	+// // aWindowConstraints.gridheight = 3;
	2999	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3000	+// //bigThree.add(XYZPanel, aConstraints);
	3001	+// bigThree.validate();
	3002	+// scenePanel.setVisible(true);
	3003	+// centralPanel.setVisible(true);
	3004	+// XYZPanel.setVisible(false);
	3005	+ bigThree.ClearUI();
	3006	+ bigThree.add(scenePanel);
	3007	+ bigThree.add(centralPanel);
	3008	+ bigThree.FlushUI();
2749	3009	} else
2750		- if (event.getSource() == sevenButton)
	3010	+ if (source == sevenButton)
2751	3011	{
2752	3012	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();
	3013	+
	3014	+// bigThree.remove(scenePanel);
	3015	+// bigThree.remove(centralPanel);
	3016	+// bigThree.remove(XYZPanel);
	3017	+// aWindowConstraints.gridx = 0;
	3018	+// aWindowConstraints.gridy = 0;
	3019	+// aWindowConstraints.gridwidth = 1;
	3020	+// // aWindowConstraints.gridheight = 3;
	3021	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3022	+// aWindowConstraints.weightx = 0;
	3023	+// aWindowConstraints.weighty = 1;
	3024	+// bigThree.add(scenePanel, aWindowConstraints);
	3025	+// aWindowConstraints.weightx = 1;
	3026	+// aWindowConstraints.gridwidth = 3;
	3027	+// // aWindowConstraints.gridheight = 3;
	3028	+// aWindowConstraints.gridx = 1;
	3029	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3030	+// bigThree.add(centralPanel, aWindowConstraints);
	3031	+// aWindowConstraints.weightx = 0;
	3032	+// aWindowConstraints.gridx = 4;
	3033	+// aWindowConstraints.gridwidth = 1;
	3034	+// // aConstraints.gridheight = 3;
	3035	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3036	+// bigThree.add(XYZPanel, aWindowConstraints);
	3037	+// bigThree.validate();
	3038	+// scenePanel.setVisible(true);
	3039	+// centralPanel.setVisible(true);
	3040	+// XYZPanel.setVisible(true);
	3041	+ bigThree.ClearUI();
	3042	+ bigThree.add(scenePanel);
	3043	+ bigThree.add(centralPanel);
	3044	+ bigThree.add(XYZPanel);
	3045	+ bigThree.FlushUI();
2777	3046	} else
2778		- if (event.getSource() == rootButton)
	3047	+ if (source == rootButton)
2779	3048	{
2780	3049	Object3D obj;
2781	3050	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2787,7 +3056,7 @@
2787	3056
2788	3057	refreshContents(true);
2789	3058	} else
2790		- if (event.getSource() == closeButton)
	3059	+ if (source == closeButton)
2791	3060	{
2792	3061	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2793	3062	cRadio ab;
..	..	@@ -2808,11 +3077,11 @@
2808	3077	}
2809	3078	refreshContents(true);
2810	3079	} else
2811		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3080	+ if (source == editItem \|\| source == editButton)
2812	3081	{
2813	3082	EditSelection(false);
2814	3083	} else
2815		- if (event.getSource() == uneditButton)
	3084	+ if (source == uneditButton)
2816	3085	{
2817	3086	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2818	3087	{
..	..	@@ -2822,14 +3091,14 @@
2822	3091	child.CloseUI();
2823	3092	listUI.remove(child);
2824	3093
2825		- child.editWindow = null; // ???????????
	3094	+ //child.editWindow = null; // ???????????
2826	3095	}
2827		- objEditor.ctrlPanel.revalidate();
	3096	+ objEditor.ctrlPanel.FlushUI();
2828	3097	//objEditor.jTree.clearSelection();
2829	3098	//objEditor.ResetSliders();
2830	3099	refreshContents(true);
2831	3100	} else
2832		- if (event.getSource() == clearPanelButton)
	3101	+ if (source == clearPanelButton)
2833	3102	{
2834	3103	assert(copy == group);
2835	3104	//copy.ClearUI();
..	..	@@ -2840,7 +3109,7 @@
2840	3109	listUI.clear();
2841	3110	refreshContents(true);
2842	3111	} else
2843		- if (event.getSource() == allParamsButton)
	3112	+ if (source == allParamsButton)
2844	3113	{
2845	3114	assert(copy == group);
2846	3115
..	..	@@ -2861,19 +3130,19 @@
2861	3130
2862	3131	refreshContents(true);
2863	3132	} else
2864		- if (event.getSource() == unselectButton)
	3133	+ if (source == unselectButton)
2865	3134	{
2866	3135	objEditor.jTree.clearSelection();
2867	3136	// ?? oct 2012 GrafreeD.clipboard.clear();
2868	3137	objEditor.ResetSliders();
2869	3138	refreshContents(true);
2870	3139	} else
2871		- if(event.getSource() instanceof cRadio)
	3140	+ if(source instanceof cRadio)
2872	3141	{
2873	3142	group.parent = keepparent;
2874	3143	group.attributes = 0;
2875	3144	//group.editWindow = null;
2876		- /cRadio/ radio = (cRadio)event.getSource();
	3145	+ /cRadio/ radio = (cRadio)source;
2877	3146	Object3D obj = radio.GetObject();
2878	3147	System.out.println("Edit " + obj);
2879	3148	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2893,7 +3162,7 @@
2893	3162	}
2894	3163
2895	3164	copy = group;
2896		- //CameraPane.theRenderer.object = group;
	3165	+ //Globals.theRenderer.object = group;
2897	3166	if(!useclient)
2898	3167	{
2899	3168	cameraView.renderCamera = radio.camera;
..	..	@@ -2902,12 +3171,16 @@
2902	3171	cameraView.cameras[cameraView.cameracount] = radio.camera;
2903	3172	cameraView.targetLookAt.set(radio.camera.lookAt);
2904	3173	cameraView.object = group;
2905		- cameraView.lighttouched = true;
	3174	+ //cameraView.lighttouched = true;
	3175	+ Globals.lighttouched = true;
2906	3176	topView.object = group;
2907	3177	frontView.object = group;
2908	3178	sideView.object = group;
2909	3179	}
	3180	+
	3181	+// fix "+" issue
2910	3182	group.editWindow = this;
	3183	+
2911	3184	/*
2912	3185	currentLayout = radio.layout;
2913	3186	if (currentLayout == null)
..	..	@@ -2920,7 +3193,20 @@
2920	3193	//group.attributes = -1;
2921	3194	ResetModel();
2922	3195	refreshContents(true);
2923		- }
	3196	+ } else if (event.getSource() == editCameraItem)
	3197	+ {
	3198	+ cameraView.ProtectCamera();
	3199	+ cameraView.repaint();
	3200	+ return;
	3201	+ } else if (event.getSource() == revertCameraItem)
	3202	+ {
	3203	+ cameraView.RevertCamera();
	3204	+ cameraView.repaint();
	3205	+ return;
	3206	+ // } else if (event.getSource() == textureButton)
	3207	+ // {
	3208	+ // return; // true;
	3209	+ }
2924	3210	else
2925	3211	{
2926	3212	//return super.action(event, arg);
..	..	@@ -2938,7 +3224,7 @@
2938	3224	if (useclient)
2939	3225	{
2940	3226	cameraView.object = client;
2941		- cameraView.lighttouched = true;
	3227	+ Globals.lighttouched = true;
2942	3228	//topView.object = client;
2943	3229	//frontView.object = client;
2944	3230	//sideView.object = client;
..	..	@@ -2946,7 +3232,7 @@
2946	3232	else
2947	3233	{
2948	3234	cameraView.object = group;
2949		- cameraView.lighttouched = true;
	3235	+ Globals.lighttouched = true;
2950	3236	//topView.object = group;
2951	3237	//frontView.object = group;
2952	3238	//sideView.object = group;
..	..	@@ -2981,6 +3267,28 @@
2981	3267	refreshContents();
2982	3268	}
2983	3269
	3270	+ void TransformChildren()
	3271	+ {
	3272	+ Object3D obj;
	3273	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3274	+ {
	3275	+ obj = (Object3D)e.nextElement();
	3276	+ obj.KeepTextureMatrices();
	3277	+ obj.TransformChildren();
	3278	+ obj.RestoreTextureMatrices();
	3279	+
	3280	+// if (obj.parent == null)
	3281	+// {
	3282	+// System.out.println("NULL PARENT!");
	3283	+// new Exception().printStackTrace();
	3284	+// }
	3285	+// else
	3286	+// TouchTransform(obj);
	3287	+// //obj.parent.Touch();
	3288	+ }
	3289	+
	3290	+ refreshContents();
	3291	+ }
2984	3292
2985	3293	void ResetTransform()
2986	3294	{
..	..	@@ -3093,7 +3401,7 @@
3093	3401	refreshContents();
3094	3402	}
3095	3403
3096		- void ResetCentroid()
	3404	+ void ResetCentroid(boolean full)
3097	3405	{
3098	3406	Object3D obj;
3099	3407	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3108,12 +3416,16 @@
3108	3416	LA.matIdentity(Object3D.mat);
3109	3417	obj.getBounds(minima, maxima, false);
3110	3418	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3111		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3419	+ if (full)
	3420	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3112	3421	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3113	3422	obj.TransformMesh(Object3D.mat);
	3423	+
3114	3424	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3115		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3425	+ if (full)
	3426	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3116	3427	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3428	+
3117	3429	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3118	3430	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3119	3431	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3142,7 +3454,8 @@
3142	3454
3143	3455	int size = obj.MemorySize();
3144	3456
3145		- System.err.println((size/1024) + " KB is the size of " + obj);
	3457	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3458	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3146	3459	}
3147	3460	}
3148	3461	catch (Exception e)
..	..	@@ -3179,9 +3492,9 @@
3179	3492	obj = (Object3D)e.nextElement();
3180	3493
3181	3494	System.out.println("Object is: " + obj);
3182		- GrafreeD.AnalyzeObject(obj);
	3495	+ Grafreed.AnalyzeObject(obj);
3183	3496	System.out.println("Boundary rep: " + obj.bRep);
3184		- GrafreeD.AnalyzeObject(obj.bRep);
	3497	+ Grafreed.AnalyzeObject(obj.bRep);
3185	3498
3186	3499	// System.err.println((size/1024) + " KB is the size of " + obj);
3187	3500	}
..	..	@@ -3223,6 +3536,13 @@
3223	3536	void GenNormals(boolean crease)
3224	3537	{
3225	3538	group.GenNormalsS(crease);
	3539	+
	3540	+ refreshContents();
	3541	+ }
	3542	+
	3543	+ void GenNormalsMESH()
	3544	+ {
	3545	+ group.GenNormalsMeshS();
3226	3546
3227	3547	refreshContents();
3228	3548	}
..	..	@@ -3395,8 +3715,8 @@
3395	3715
3396	3716	void ParseVertices()
3397	3717	{
3398		- boolean epsequal = GrafreeD.epsequal;
3399		- GrafreeD.epsequal = true;
	3718	+ boolean epsequal = Grafreed.epsequal;
	3719	+ Grafreed.epsequal = true;
3400	3720
3401	3721	for (int i=0; i<group.selection.size(); i++)
3402	3722	{
..	..	@@ -3421,7 +3741,7 @@
3421	3741	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3422	3742	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3423	3743
3424		- g.add(GrafreeD.clipboard);
	3744	+ g.add(Grafreed.clipboard);
3425	3745
3426	3746	buffer.add(g);
3427	3747	}
..	..	@@ -3436,7 +3756,7 @@
3436	3756	makeSomething(buffer, i==group.selection.size()-1);
3437	3757	}
3438	3758
3439		- GrafreeD.epsequal = epsequal;
	3759	+ Grafreed.epsequal = epsequal;
3440	3760
3441	3761	refreshContents();
3442	3762	}
..	..	@@ -3454,7 +3774,16 @@
3454	3774	String pigment = Object3D.GetPigment(tex);
3455	3775	//String bump = Object3D.GetBump(tex);
3456	3776
3457		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3777	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3778	+
	3779	+ try
	3780	+ {
	3781	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3782	+ }
	3783	+ catch (Exception e)
	3784	+ {
	3785	+ System.err.println("FAIL: " + node);
	3786	+ }
3458	3787
3459	3788	double s = v.s;
3460	3789
..	..	@@ -3542,11 +3871,11 @@
3542	3871
3543	3872	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3544	3873
3545		- boolean random = CameraPane.RANDOM;
3546		- CameraPane.RANDOM = false; // parse all random nodes
	3874	+ boolean random = CameraPane.SWITCH;
	3875	+ CameraPane.SWITCH = false; // parse all random nodes
3547	3876	lowres.linkVerticesThis(null);
3548	3877	lowres.linkVerticesThis(sn);
3549		- CameraPane.RANDOM = random;
	3878	+ CameraPane.SWITCH = random;
3550	3879
3551	3880	System.err.flush();
3552	3881
..	..	@@ -3586,7 +3915,7 @@
3586	3915	return;
3587	3916
3588	3917	Object3D poses = group.selection.get(0);
3589		- Object3D ref = GrafreeD.clipboard.get(0);
	3918	+ Object3D ref = Grafreed.clipboard.get(0);
3590	3919
3591	3920	Object3D newgroup = new Object3D("Po:" + poses.name);
3592	3921
..	..	@@ -3755,7 +4084,7 @@
3755	4084	group.selection.RelinkToSupport(); // july 2014
3756	4085	System.out.println("DONE.");
3757	4086	refreshContents();
3758		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4087	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3759	4088	}
3760	4089
3761	4090	void ReduceMesh(boolean reduction34)
..	..	@@ -3780,9 +4109,9 @@
3780	4109
3781	4110	void ClipMesh()
3782	4111	{
3783		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4112	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3784	4113	{
3785		- Object3D content = GrafreeD.clipboard.get(0);
	4114	+ Object3D content = Grafreed.clipboard.get(0);
3786	4115
3787	4116	if (content instanceof cGroup && ((cGroup)content).transientlink )
3788	4117	content = ((cGroup)content).get(0);
..	..	@@ -3791,7 +4120,7 @@
3791	4120	// {
3792	4121	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3793	4122	// }
3794		- group.selection.ClipMesh(GrafreeD.clipboard);
	4123	+ group.selection.ClipMesh(Grafreed.clipboard);
3795	4124	}
3796	4125	// group.selection.ClipMesh(GrafreeD.clipboard);
3797	4126	System.out.println("DONE.");
..	..	@@ -3838,6 +4167,18 @@
3838	4167	void MarkLeaves(boolean hide)
3839	4168	{
3840	4169	group.selection.MarkLeaves(hide);
	4170	+ refreshContents();
	4171	+ }
	4172	+
	4173	+ void RewindLeaves(boolean hide)
	4174	+ {
	4175	+ group.selection.RewindLeaves(hide);
	4176	+ refreshContents();
	4177	+ }
	4178	+
	4179	+ void RandomLeaves(boolean hide)
	4180	+ {
	4181	+ group.selection.RandomLeaves(hide);
3841	4182	refreshContents();
3842	4183	}
3843	4184
..	..	@@ -3926,7 +4267,7 @@
3926	4267	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3927	4268
3928	4269	Object3D elem = (Object3D)group.selection.elementAt(i);
3929		- if(elem != group)
	4270	+ if(elem != group \|\| !newWindow)
3930	4271	{
3931	4272	// if (!(elem instanceof Composite))
3932	4273	// newWindow = false;
..	..	@@ -4016,7 +4357,6 @@
4016	4357	//case 702: // Event.LIST_DESELECT
4017	4358	group.deselectAll();
4018	4359	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4019		- objEditor.ClearInfo(); // .GetMaterial());
4020	4360	if (tps != null)
4021	4361	{
4022	4362	for (int i=0; i < tps.length; i++)
..	..	@@ -4025,31 +4365,30 @@
4025	4365
4026	4366	//if (child.parent != null)
4027	4367	//child.parent.addSelectee(child);
	4368	+ objEditor.SetMaterial(child);
4028	4369	group.addSelectee(child);
4029		- objEditor.SetMaterial(child); // .GetMaterial());
4030		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4031		- System.err.println("info : " + child.GetPath());
4032	4370	}
4033	4371	}
4034		- else
4035		- {
4036		- objEditor.SetMaterial(group); // .GetMaterial());
4037		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4038		- System.err.println("info : " + group.GetPath());
4039		- }
	4372	+// else
	4373	+// {
	4374	+// objEditor.SetMaterial(group); // .GetMaterial());
	4375	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4376	+// System.err.println("info : " + group.GetPath());
	4377	+// }
4040	4378
4041		- objEditor.SetText(); // jan 2014
4042		-
4043		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4379	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4044	4380	CameraPane.flash = true;
4045	4381
4046		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4382	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4047	4383	// a camera
4048	4384	{
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;
	4385	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4386	+ {
	4387	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4388	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4389	+ }
	4390	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4391	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4053	4392	}
4054	4393
4055	4394	refreshContents();
..	..	@@ -4060,6 +4399,26 @@
4060	4399
4061	4400	freezemodel = false;
4062	4401	}
	4402	+
	4403	+ void refreshContents(boolean cp)
	4404	+ {
	4405	+ if (!Globals.MOUSEDRAGGED)
	4406	+ {
	4407	+ objEditor.ClearInfo(); // .GetMaterial());
	4408	+
	4409	+ for (int i=0; i < group.selection.Size(); i++)
	4410	+ {
	4411	+ Object3D child = (Object3D) group.selection.get(i);
	4412	+
	4413	+ objEditor.AddInfo(child, this, true);
	4414	+ System.err.println("info : " + child.GetPath());
	4415	+ }
	4416	+
	4417	+ objEditor.SetText(); // jan 2014
	4418	+ }
	4419	+
	4420	+ super.refreshContents(cp);
	4421	+ }
4063	4422
4064	4423	void linkSomething(Object3D thing)
4065	4424	{
..	..	@@ -4131,16 +4490,18 @@
4131	4490	{
4132	4491	if (group.selection.isEmpty())
4133	4492	return;
4134		- GrafreeD.clipboardIsTempGroup = false;
	4493	+
	4494	+ Grafreed.clipboardIsTempGroup = false;
4135	4495	Composite tGroup = null;
4136	4496	if (group.selection.size() > 0) // 1)
4137	4497	{
4138	4498	tGroup = new cGroup();
4139		- GrafreeD.clipboardIsTempGroup = true;
	4499	+ Grafreed.clipboardIsTempGroup = true;
4140	4500	}
4141	4501
4142	4502	if (cut)
4143	4503	{
	4504	+ Save();
4144	4505	//int indices[] = jList.getSelectedIndices();
4145	4506	//for (int i = indices.length - 1; i >= 0; i--)
4146	4507	//jList.remove(indices[i]);
..	..	@@ -4176,16 +4537,16 @@
4176	4537	//System.out.println("cut " + child);
4177	4538	//System.out.println("parent = " + child.parent);
4178	4539	// tmp.addChild(child);
4179		- if (GrafreeD.clipboardIsTempGroup)
	4540	+ if (Grafreed.clipboardIsTempGroup)
4180	4541	tGroup.add/Child/(tmp);
4181	4542	else
4182		- GrafreeD.clipboard = tmp;
	4543	+ Grafreed.clipboard = tmp;
4183	4544	}
4184	4545	else
4185		- if (GrafreeD.clipboardIsTempGroup)
	4546	+ if (Grafreed.clipboardIsTempGroup)
4186	4547	tGroup.add/Child/(child);
4187	4548	else
4188		- GrafreeD.clipboard = child;
	4549	+ Grafreed.clipboard = child;
4189	4550	}
4190	4551
4191	4552	//ResetModel();
..	..	@@ -4217,21 +4578,23 @@
4217	4578	//System.out.println("cut " + elem);
4218	4579	//System.out.println("parent = " + elem.parent);
4219	4580	// tmp.addChild(elem);
4220		- if (GrafreeD.clipboardIsTempGroup)
	4581	+ if (Grafreed.clipboardIsTempGroup)
4221	4582	tGroup.add/Child/(tmp);
4222	4583	else
4223		- GrafreeD.clipboard = tmp;
	4584	+ Grafreed.clipboard = tmp;
4224	4585	}
4225	4586	else
4226		- if (GrafreeD.clipboardIsTempGroup)
	4587	+ if (Grafreed.clipboardIsTempGroup)
4227	4588	tGroup.add/Child/(child);
4228	4589	else
4229		- GrafreeD.clipboard = child;
	4590	+ Grafreed.clipboard = child;
4230	4591	}
4231	4592
4232	4593	}
4233		- if (GrafreeD.clipboardIsTempGroup)
4234		- GrafreeD.clipboard = tGroup;
	4594	+
	4595	+ if (Grafreed.clipboardIsTempGroup)
	4596	+ Grafreed.clipboard = tGroup;
	4597	+
4235	4598	if (cut)
4236	4599	{
4237	4600	ResetModel();
..	..	@@ -4245,7 +4608,7 @@
4245	4608	// return;
4246	4609	boolean first = true;
4247	4610
4248		- if (GrafreeD.clipboardIsTempGroup)
	4611	+ if (Grafreed.clipboardIsTempGroup)
4249	4612	{
4250	4613	Composite temp;
4251	4614
..	..	@@ -4256,7 +4619,7 @@
4256	4619	temp = (Composite)Applet3D.clipboard.deepCopy();
4257	4620	*/
4258	4621	Object3D elem;
4259		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4622	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4260	4623	{
4261	4624	Object3D child = (Object3D)e.nextElement();
4262	4625
..	..	@@ -4290,21 +4653,21 @@
4290	4653	//Object3D cb = Applet3D.clipboard;
4291	4654	//temp.addChild(cb);
4292	4655	//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());
	4656	+ assert(Grafreed.clipboard.parent == null);
	4657	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4658	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4659	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4660	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4298	4661	else
4299		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4300		- GrafreeD.clipboard.get(0).parent = keepparent;
	4662	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4663	+ Grafreed.clipboard.get(0).parent = keepparent;
4301	4664	}
4302	4665
4303	4666	ResetModel();
4304	4667	refreshContents();
4305	4668	}
4306	4669
4307		- void pasteInto(boolean copyit)
	4670	+ void pasteInto(boolean copyit, boolean clone)
4308	4671	{
4309	4672	// if (GrafreeD.clipboard == null)
4310	4673	// return;
..	..	@@ -4333,15 +4696,22 @@
4333	4696	if (copyit)
4334	4697	{
4335	4698	// paste(false);
4336		- CloneClipboard(false); // sept 2014
	4699	+ if (clone)
	4700	+ {
	4701	+ CloneClipboard(false); // sept 2014
	4702	+ }
	4703	+ else
	4704	+ {
	4705	+ paste(false);
	4706	+ }
4337	4707	}
4338	4708	else
4339	4709	{
4340	4710	boolean first = true;
4341	4711
4342		- if (GrafreeD.clipboardIsTempGroup)
	4712	+ if (Grafreed.clipboardIsTempGroup)
4343	4713	{
4344		- Composite temp = (Composite)GrafreeD.clipboard;
	4714	+ Composite temp = (Composite)Grafreed.clipboard;
4345	4715	Object3D copy;
4346	4716	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4347	4717	{
..	..	@@ -4351,7 +4721,7 @@
4351	4721	}
4352	4722	} else
4353	4723	{
4354		- linkSomething(GrafreeD.clipboard); //.get(0));
	4724	+ linkSomething(Grafreed.clipboard); //.get(0));
4355	4725	}
4356	4726	}
4357	4727	}
..	..	@@ -4756,21 +5126,6 @@
4756	5126	}
4757	5127	*/
4758	5128
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	5129	/*
4775	5130	public void Callback(Object obj)
4776	5131	{
..	..	@@ -4794,26 +5149,9 @@
4794	5149	}
4795	5150	*/
4796	5151
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	5152	String GetFile(String dialogName)
4815	5153	{
4816		- if (GrafreeD.standAlone)
	5154	+ if (Grafreed.standAlone)
4817	5155	{
4818	5156	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4819	5157	browser.show();
..	..	@@ -4877,10 +5215,15 @@
4877	5215	cButton flashSelectionButton;
4878	5216	cButton editButton;
4879	5217	cButton uneditButton;
	5218	+ JCheckBox allParamsButton;
4880	5219	cButton clearpanelButton;
4881		- cButton allParamsButton;
4882	5220	cButton unselectButton;
4883	5221
	5222	+ cButton saveButton;
	5223	+ cButton undoButton;
	5224	+ cButton redoButton;
	5225	+ cButton oneStepButton;
	5226	+
4884	5227	cButton screenfitButton;
4885	5228	cButton screenfitpointButton;
4886	5229	cButton snapobjectButton;
..	..	@@ -4911,6 +5254,8 @@
4911	5254	private MenuItem lookFromItem;
4912	5255	private MenuItem switchItem;
4913	5256	private MenuItem cutItem;
	5257	+ private MenuItem undoItem;
	5258	+ private MenuItem redoItem;
4914	5259	private MenuItem duplicateItem;
4915	5260	private MenuItem cloneItem;
4916	5261	private MenuItem cloneSupportItem;
..	..	@@ -4924,7 +5269,7 @@
4924	5269	private MenuItem linkverticesItem;
4925	5270	private MenuItem relinkverticesItem;
4926	5271	private MenuItem setMasterItem;
4927		- private MenuItem resetMeshItem;
	5272	+ private MenuItem resetAllItem;
4928	5273	private MenuItem stepAllItem;
4929	5274	private MenuItem revertMeshItem;
4930	5275	private MenuItem poseMeshItem;
..	..	@@ -4935,6 +5280,7 @@
4935	5280	private MenuItem mergeGeometriesItem;
4936	5281	private MenuItem copyItem;
4937	5282	private MenuItem pasteItem;
	5283	+ private MenuItem pasteIntoItem;
4938	5284	private MenuItem pasteLinkItem;
4939	5285	private MenuItem pasteCloneItem;
4940	5286	private MenuItem pasteExpandItem;
..	..	@@ -4973,6 +5319,10 @@
4973	5319	private MenuItem showleavesItem;
4974	5320	private MenuItem markleavesItem;
4975	5321	private MenuItem unmarkleavesItem;
	5322	+ private MenuItem rewindleavesItem;
	5323	+ private MenuItem unrewindleavesItem;
	5324	+ private MenuItem randomleavesItem;
	5325	+ private MenuItem unrandomleavesItem;
4976	5326
4977	5327	private MenuItem flipVItem;
4978	5328	private MenuItem unflipVItem;
..	..	@@ -4984,8 +5334,10 @@
4984	5334	private MenuItem panoTexturesItem;
4985	5335
4986	5336	private MenuItem resetCentroidItem;
4987		- private MenuItem transformgeometryItem;
	5337	+ private MenuItem resetCentroidXZItem;
4988	5338	private MenuItem resetTransformItem;
	5339	+ private MenuItem transformGeometryItem;
	5340	+ private MenuItem transformChildrenItem;
4989	5341	private MenuItem hideItem;
4990	5342	private MenuItem grabItem;
4991	5343	private MenuItem backItem;
..	..	@@ -5007,6 +5359,7 @@
5007	5359
5008	5360	private MenuItem resetParentItem;
5009	5361	private MenuItem repairParentItem;
	5362	+ private MenuItem repairShadowItem;
5010	5363	private MenuItem sortbysizeItem;
5011	5364	private MenuItem sortbynameItem;
5012	5365
..	..	@@ -5031,7 +5384,7 @@
5031	5384	private MenuItem blobItem;
5032	5385	private MenuItem latheItem;
5033	5386	private MenuItem bezierItem;
5034		- private MenuItem checkerItem;
	5387	+ private MenuItem overlayItem;
5035	5388	private MenuItem meshItem;
5036	5389	// private MenuItem meshGroupItem;
5037	5390	private MenuItem springItem;
..	..	@@ -5053,11 +5406,6 @@
5053	5406	private MenuItem doubleItem;
5054	5407	private MenuItem tripleItem;
5055	5408
5056		- private MenuItem importGFDItem;
5057		- private MenuItem importVRMLX3DItem;
5058		- private MenuItem import3DSItem;
5059		- private MenuItem importOBJItem;
5060		-
5061	5409	private MenuItem computeAOItem;
5062	5410	private MenuItem recompileItem;
5063	5411	private MenuItem editScriptItem;
..	..	@@ -5067,4 +5415,8 @@
5067	5415	private MenuItem analyzeItem;
5068	5416	private MenuItem dumpItem;
5069	5417	//boolean freezemodel = false;
	5418	+
	5419	+ Menu cameraMenu;
	5420	+ MenuItem editCameraItem;
	5421	+ MenuItem revertCameraItem;
5070	5422	}