~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"));
..	..	@@ -376,29 +505,22 @@
376	505	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	506	sortbynameItem.addActionListener(this);
378	507	menu.add("-");
	508	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	509	+ shareGeometriesItem.addActionListener(this);
	510	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	511	+ mergeGeometriesItem.addActionListener(this);
	512	+ if (Globals.ADVANCED)
	513	+ {
	514	+ // Pretty much the same as duplicate and clone.
379	515	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	516	extractGeometriesItem.addActionListener(this);
381	517	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	518	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);
	519	+ }
387	520
388	521	oe.menuBar.add(menu = new Menu("Insert"));
389	522	buildCreateMenu(menu);
390	523
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	524	oe.menuBar.add(menu = new Menu("Tools"));
403	525	buildToolsMenu(menu);
404	526	}
..	..	@@ -433,153 +555,110 @@
433	555	oe.radioPanel.add(dummyButton);
434	556	oe.buttonGroup.add(dummyButton);
435	557	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	558	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	559
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
	560	+ oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	561	+ undoButton.setToolTipText("Undo changes");
	562	+ undoButton.addActionListener(this);
	563	+
	564	+ oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	565	+ redoButton.setToolTipText("Redo changes");
	566	+ redoButton.addActionListener(this);
	567	+
	568	+ oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	569	+ saveButton.setToolTipText("Save changes");
	570	+ saveButton.addActionListener(this);
	571	+
	572	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	573	+ liveCB.setToolTipText("Enable animation");
441	574	liveCB.addItemListener(this);
442	575
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", Globals.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);
	576	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	577	+ oneStepButton.setToolTipText("Animate one step forward");
	578	+ oneStepButton.addActionListener(this);
	579	+
	580	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	581	+ fastCB.setToolTipText("Fast mode");
461	582	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);
	583	+
	584	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	585	+ trackCB.setToolTipText("Enable tracking");
503	586	trackCB.addItemListener(this);
504	587
505		- oe.aConstraints.gridx += 1;
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	588	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	589	+ screenfitButton.setToolTipText("Screen fit");
507	590	screenfitButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
	591	+
509	592	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
510	593	// 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	594
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);
	595	+ if (Globals.ADVANCED)
	596	+ {
	597	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	598	+ snapobjectButton.addActionListener(this);
	599	+ snapobjectButton.setToolTipText("Snap Object");
	600	+ }
	601	+
	602	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	603	+ flashSelectionButton.setToolTipText("Show selection");
522	604	flashSelectionButton.addActionListener(this);
523	605
524		- oe.toolbarPanel.add(new cButton(" ", false));
	606	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
525	607
526		- oe.aConstraints.gridx += 1;
527		- oe.aConstraints.weighty = 0;
528		- oe.aConstraints.gridwidth = 1;
529		-
530		- //
531		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	608	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ twoButton.setToolTipText("Show center view only");
532	610	twoButton.addActionListener(this);
533		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	611	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
534	612	fourButton.addActionListener(this);
535		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	613	+ fourButton.setToolTipText("Show left panel only");
	614	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ sixButton.setToolTipText("2-column layout left");
536	616	sixButton.addActionListener(this);
537		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	617	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	618	+ threeButton.setToolTipText("2-column layout right");
538	619	threeButton.addActionListener(this);
539		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	620	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	621	+ sevenButton.setToolTipText("3-column layout");
540	622	sevenButton.addActionListener(this);
541	623	//
542	624
543		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	625	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	626	+ rootButton.setToolTipText("Edit selection in new tab");
544	627	rootButton.addActionListener(this);
545		- oe.aConstraints.gridx += 1;
546		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	628	+
	629	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	630	+ closeButton.setToolTipText("Close tab");
547	631	closeButton.addActionListener(this);
548	632	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
549	633	//clearButton.addActionListener(this);
550		- oe.aConstraints.gridx += 1;
551	634
552		- oe.aConstraints.gridx = 1; //
553		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	635	+ cGridBag commandsPanel = new cGridBag();
	636	+
	637	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	638	+ editButton.setToolTipText("Edit selection");
554	639	editButton.addActionListener(this);
555		- oe.aConstraints.gridx += 1;
556		- oe.aConstraints.weighty = 0;
557		- oe.aConstraints.gridwidth = 1;
558	640
559		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	641	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	642	+ uneditButton.setToolTipText("Unedit selection");
560	643	uneditButton.addActionListener(this);
561	644
562		- oe.aConstraints.gridx += 1;
563		- oe.aConstraints.weighty = 0;
564		- oe.aConstraints.gridwidth = 1;
565		-
566		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
567		- clearPanelButton.addActionListener(this);
568		-
569		- oe.aConstraints.gridx += 1;
570		- oe.aConstraints.weighty = 0;
571		- oe.aConstraints.gridwidth = 1;
572		-
573		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	645	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	646	+ allParamsButton.setToolTipText("Edit all params");
574	647	allParamsButton.addActionListener(this);
575	648
576		- oe.aConstraints.gridx += 1;
577		- oe.aConstraints.weighty = 0;
578		- oe.aConstraints.gridwidth = 1;
579		-
580		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	649	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	650	+ clearPanelButton.setToolTipText("Clear edit panel");
	651	+ clearPanelButton.addActionListener(this);
	652	+
	653	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	654	+ unselectButton.setToolTipText("Unselect");
581	655	unselectButton.addActionListener(this);
582	656
	657	+ commandsPanel.preferredHeight = 1;
	658	+
	659	+ oe.treePanel.add(commandsPanel);
	660	+ oe.treePanel.Return();
	661	+
583	662	// oe.aConstraints.gridx += 1;
584	663	// oe.aConstraints.weighty = 0;
585	664	// oe.aConstraints.gridwidth = 1;
..	..	@@ -591,40 +670,37 @@
591	670	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
592	671	// gcButton.addActionListener(this);
593	672
594		- oe.aConstraints.gridx = 0;
595		- oe.aConstraints.gridy += 1;
596		-
597		- //ctrlPanel.add(objList = new List(5, true));
598		- oe.aConstraints.gridwidth = 100;
599		- // oe.aConstraints.gridheight = 100;
600		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
601		- oe.aConstraints.gridheight = 1;
602		- oe.aConstraints.weighty = 0.5;
603		- oe.aConstraints.gridx = 0;
604		- JScrollPane jSP;
	673	+ cGridBag jSPPanel = new cGridBag();
	674	+
	675	+ JScrollPane jSP;
605	676	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
606		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	677	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
607	678	ResetModel();
608		- oe.aConstraints.weighty = 0.5;
609		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
610		- oe.aConstraints.gridy += 1;
611		- oe.aConstraints.gridwidth = 1;
	679	+
	680	+ oe.treePanel.add(jSPPanel);
	681	+ oe.treePanel.Return();
612	682
613		- oe.aConstraints.weighty = 0;
614		- oe.aConstraints.gridwidth = 2;
615		-
616		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
	683	+ cGridBag copyOptionsPanel = new cGridBag();
	684	+
	685	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	686	+ colorCB.setToolTipText("Copy color when dropped");
617	687	colorCB.addItemListener(this);
618		- oe.aConstraints.gridx += 2;
619		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	688	+
	689	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	690	+ materialCB.setToolTipText("Copy material when dropped");
620	691	materialCB.addItemListener(this);
621		- oe.aConstraints.gridx += 2;
622		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	692	+
	693	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	694	+ textureCB.setToolTipText("Copy texture when dropped");
623	695	textureCB.addItemListener(this);
624	696
625		- oe.aConstraints.gridx = 0;
626		- oe.aConstraints.gridy += 1;
	697	+ copyOptionsPanel.preferredHeight = 1;
	698	+ oe.treePanel.add(copyOptionsPanel);
	699	+ oe.treePanel.Return();
627	700
	701	+// mainPanel.setDividerLocation(0.5); //1.0);
	702	+// mainPanel.setResizeWeight(0.5);
	703	+
628	704	//jList.addListSelectionListener(this);
629	705	oe.jTree.addTreeSelectionListener(this);
630	706	//jTree.setRootVisible(false);
..	..	@@ -646,6 +722,78 @@
646	722	radio.layout = sevenButton;
647	723	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
648	724	}
	725	+
	726	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	727	+ {
	728	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	729	+ boxCB.setToolTipText("Display bounding boxes");
	730	+ boxCB.addItemListener(this);
	731	+
	732	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	733	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	734	+ zoomBoxCB.addItemListener(this);
	735	+
	736	+ if (true) // Globals.ADVANCED)
	737	+ {
	738	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	739	+ supportCB.setToolTipText("Enable rigging");
	740	+ supportCB.addItemListener(this);
	741	+
	742	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	743	+ // localCB.addItemListener(this);
	744	+
	745	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	746	+ crowdCB.setToolTipText("Used for crowds");
	747	+ crowdCB.addItemListener(this);
	748	+
	749	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	750	+ smoothCB.setToolTipText("Snapping delay");
	751	+ smoothCB.addItemListener(this);
	752	+
	753	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	754	+ slowCB.setToolTipText("Smooth interpolation");
	755	+ slowCB.addItemListener(this);
	756	+
	757	+// constraints.gridy += 1;
	758	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	759	+// speakerMocapCB.addItemListener(this);
	760	+
	761	+ if (false)
	762	+ {
	763	+ // handled in scripts
	764	+ //constraints.gridy += 1;
	765	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	766	+ speakerCameraCB.addItemListener(this);
	767	+
	768	+ //constraints.gridy += 1;
	769	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	770	+ speakerFocusCB.addItemListener(this);
	771	+
	772	+ //constraints.gridy += 1;
	773	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	774	+ smoothfocusCB.addItemListener(this);
	775	+ }
	776	+
	777	+//constraints.gridx += 1;
	778	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	779	+// debugCB.addItemListener(this);
	780	+
	781	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	782	+ oeilCB.addItemListener(this);
	783	+
	784	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	785	+ lookAtCB.setToolTipText("Look-at target");
	786	+ lookAtCB.addItemListener(this);
	787	+
	788	+ }
	789	+
	790	+ cGridBag fill = new cGridBag();
	791	+
	792	+ fill.preferredHeight = 200;
	793	+
	794	+ panel.add(fill);
	795	+
	796	+ }
649	797
650	798	void EditObject(Object3D obj)
651	799	{
..	..	@@ -658,6 +806,7 @@
658	806	buttonGroup.add(radioButton);
659	807	radioButton.doClick();
660	808	}
	809	+
661	810	void SetupViews(ObjEditor oe)
662	811	{
663	812	oe.SetupViews();
..	..	@@ -676,6 +825,7 @@
676	825	JCheckBox fastCB;
677	826	JCheckBox slowCB;
678	827	JCheckBox boxCB;
	828	+ JCheckBox zoomBoxCB;
679	829	JCheckBox trackCB;
680	830	JCheckBox smoothfocusCB;
681	831	// JCheckBox speakerMocapCB;
..	..	@@ -721,6 +871,7 @@
721	871	} else if(e.getSource() == liveCB)
722	872	{
723	873	cameraView.ToggleLive();
	874	+ refreshContents(false);
724	875	}
725	876	else if(e.getSource() == supportCB)
726	877	{
..	..	@@ -755,6 +906,10 @@
755	906	Recompile();
756	907	cameraView.repaint();
757	908	// refreshContents();
	909	+ }
	910	+ else if(e.getSource() == zoomBoxCB)
	911	+ {
	912	+ cameraView.ToggleZoomBoxMode();
758	913	}
759	914	else if(e.getSource() == smoothfocusCB)
760	915	{
..	..	@@ -869,7 +1024,9 @@
869	1024	// objEditor.DropFile((java.io.File[]) object, true);
870	1025	// return;
871	1026	// }
872		- if (string.charAt(0) == '/')
	1027	+
	1028	+ // File path for Mac and Windows
	1029	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
873	1030	{
874	1031	// file(s)
875	1032	String[] names = string.split("\n");
..	..	@@ -896,7 +1053,7 @@
896	1053
897	1054	flashIt = false;
898	1055	CameraPane pane = (CameraPane) target;
899		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1056	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
900	1057	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
901	1058
902	1059	if (group.selection.size() == 1)
..	..	@@ -923,11 +1080,11 @@
923	1080	{
924	1081	loadClipboard(true);
925	1082	objEditor.jTree.setSelectionPath(destinationPath);
926		- pasteInto(false);
	1083	+ pasteInto(false, false);
927	1084	} else {
928	1085	loadClipboard(false);
929	1086	objEditor.jTree.setSelectionPath(destinationPath);
930		- pasteInto(false); // true); // ???
	1087	+ pasteInto(false, false); // true); // ???
931	1088	}
932	1089	}
933	1090	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1049,27 +1206,33 @@
1049	1206	kleinItem.addActionListener(this);
1050	1207	particleItem = menu.add(new MenuItem("Particle system"));
1051	1208	particleItem.addActionListener(this);
	1209	+ if (Globals.ADVANCED)
	1210	+ {
1052	1211	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1053	1212	ragdollItem.addActionListener(this);
1054	1213	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1055	1214	ragdoll2Item.addActionListener(this);
	1215	+ }
1056	1216	menu.add("-");
1057		- meshItem = menu.add(new MenuItem("Mesh"));
	1217	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1058	1218	meshItem.addActionListener(this);
1059	1219	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1060	1220	// meshGroupItem.addActionListener(this);
	1221	+ if (Globals.ADVANCED)
	1222	+ {
1061	1223	springItem = menu.add(new MenuItem("Spring"));
1062	1224	springItem.addActionListener(this);
1063	1225	flagItem = menu.add(new MenuItem("Flag"));
1064	1226	flagItem.addActionListener(this);
1065		- bezierItem = menu.add(new MenuItem("Patch"));
1066		- bezierItem.addActionListener(this);
1067		- checkerItem = menu.add(new MenuItem("Checker"));
1068		- checkerItem.addActionListener(this);
1069	1227	blobItem = menu.add(new MenuItem("Blob"));
1070	1228	blobItem.addActionListener(this);
1071	1229	latheItem = menu.add(new MenuItem("Lathe"));
1072	1230	latheItem.addActionListener(this);
	1231	+ }
	1232	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1233	+ bezierItem.addActionListener(this);
	1234	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1235	+ overlayItem.addActionListener(this);
1073	1236	lightItem = menu.add(new MenuItem("Light"));
1074	1237	lightItem.addActionListener(this);
1075	1238	menu.add("-");
..	..	@@ -1079,39 +1242,44 @@
1079	1242	loopItem.addActionListener(this);
1080	1243	doubleItem = menu.add(new MenuItem("Fork"));
1081	1244	doubleItem.addActionListener(this);
	1245	+ if (Globals.ADVANCED)
	1246	+ {
1082	1247	tripleItem = menu.add(new MenuItem("Trident"));
1083	1248	tripleItem.addActionListener(this);
	1249	+ }
1084	1250	}
1085	1251
1086	1252	void buildToolsMenu(Menu menu)
1087	1253	{
1088	1254	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1089	1255	animationItem.addItemListener(this);
1090		- animationItem.setState(CameraPane.ANIMATION);
	1256	+ animationItem.setState(Globals.ANIMATION);
1091	1257
1092	1258	menu.add("-");
1093	1259	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1094	1260	parseverticesItem.addActionListener(this);
1095	1261	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1096	1262	textureFieldItem.addActionListener(this);
1097		- alignItem = menu.add(new MenuItem("Align"));
	1263	+ alignItem = menu.add(new MenuItem("Align Objects"));
1098	1264	alignItem.addActionListener(this);
1099		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1100		- mirrorItem.addActionListener(this);
1101	1265	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1102	1266	reduceMorphItem.addActionListener(this);
1103	1267	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1104	1268	reduce34MorphItem.addActionListener(this);
1105		-
	1269	+ menu.add("-");
1106	1270	menu.add(computeAOItem = new MenuItem("Compute AO"));
1107	1271	computeAOItem.addActionListener(this);
1108		- menu.add("-");
1109	1272
	1273	+ if (Globals.ADVANCED)
	1274	+ {
	1275	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1276	+ mirrorItem.addActionListener(this);
	1277	+ menu.add("-");
1110	1278	menu.add(memoryItem = new MenuItem("Memory Usage"));
1111	1279	memoryItem.addActionListener(this);
1112	1280	menu.add(analyzeItem = new MenuItem("Analyze"));
1113	1281	analyzeItem.addActionListener(this);
1114		- menu.add(dumpItem = new MenuItem("Dump"));
	1282	+ menu.add(dumpItem = new MenuItem("Print"));
1115	1283	dumpItem.addActionListener(this);
1116	1284	// menu.add(pathItem = new MenuItem("From-to path"));
1117	1285	// pathItem.addActionListener(this);
..	..	@@ -1129,6 +1297,7 @@
1129	1297	menu.add("-");
1130	1298	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1131	1299	editScriptItem.addActionListener(this);
	1300	+ }
1132	1301	}
1133	1302
1134	1303	void ScreenFit()
..	..	@@ -1457,9 +1626,9 @@
1457	1626
1458	1627	void Overwrite(int mask)
1459	1628	{
1460		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1629	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1461	1630	{
1462		- Object3D content = GrafreeD.clipboard.get(0);
	1631	+ Object3D content = Grafreed.clipboard.get(0);
1463	1632
1464	1633	if (content instanceof cGroup && ((cGroup)content).transientlink )
1465	1634	content = ((cGroup)content).get(0);
..	..	@@ -1482,6 +1651,7 @@
1482	1651	//
1483	1652	public void actionPerformed(ActionEvent event) // , Object arg)
1484	1653	{
	1654	+ Object source = event.getSource();
1485	1655	/*
1486	1656	if (event.getSource() == nameField)
1487	1657	{
..	..	@@ -1493,11 +1663,11 @@
1493	1663	}
1494	1664	else
1495	1665	*/
1496		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1666	+ if (source == lookAtItem \|\| source == lookFromItem)
1497	1667	{
1498	1668	ScreenFit();
1499	1669	} else
1500		- if (event.getSource() == switchItem)
	1670	+ if (source == switchItem)
1501	1671	{
1502	1672	cVector v1 = new cVector();
1503	1673	cVector v2 = new cVector();
..	..	@@ -1506,11 +1676,11 @@
1506	1676	objEditor.cameraView.renderCamera.setAim(v2, v1);
1507	1677	objEditor.cameraView.repaint();
1508	1678	} else
1509		- if (event.getSource() == rectoidItem)
	1679	+ if (source == rectoidItem)
1510	1680	{
1511	1681	makeSomething(new Box());
1512	1682	} else
1513		- if (event.getSource() == particleItem)
	1683	+ if (source == particleItem)
1514	1684	{
1515	1685	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1516	1686	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1531,9 +1701,9 @@
1531	1701	applyExample(particleGeom, "SMOKE");
1532	1702	makeSomething(particleGeom);
1533	1703	} else
1534		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1704	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1535	1705	{
1536		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1706	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1537	1707
1538	1708	ragdoll.toParent = LA.newMatrix();
1539	1709	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1551,7 +1721,7 @@
1551	1721	} else
1552	1722	/*
1553	1723	*/
1554		- if (event.getSource() == heightFieldItem)
	1724	+ if (source == heightFieldItem)
1555	1725	{
1556	1726	Object3D obj = new Object3D();
1557	1727
..	..	@@ -1589,31 +1759,31 @@
1589	1759
1590	1760	makeSomething(obj);
1591	1761	} else
1592		- if (event.getSource() == gridItem)
	1762	+ if (source == gridItem)
1593	1763	{
1594	1764	makeSomething(new Grid());
1595	1765	} else
1596		- if (event.getSource() == ellipsoidItem)
	1766	+ if (source == ellipsoidItem)
1597	1767	{
1598	1768	makeSomething(new Sphere());
1599	1769	} else
1600		- if (event.getSource() == coneItem)
	1770	+ if (source == coneItem)
1601	1771	{
1602	1772	makeSomething(new Cone());
1603	1773	} else
1604		- if (event.getSource() == torusItem)
	1774	+ if (source == torusItem)
1605	1775	{
1606	1776	makeSomething(new Torus());
1607	1777	} else
1608		- if (event.getSource() == superItem)
	1778	+ if (source == superItem)
1609	1779	{
1610	1780	makeSomething(new Superellipsoid());
1611	1781	} else
1612		- if (event.getSource() == kleinItem)
	1782	+ if (source == kleinItem)
1613	1783	{
1614	1784	makeSomething(new Klein());
1615	1785	} else
1616		- if (event.getSource() == blobItem)
	1786	+ if (source == blobItem)
1617	1787	{
1618	1788	Blob blob = new Blob();
1619	1789	BlobComponent comp = new BlobComponent();
..	..	@@ -1621,15 +1791,15 @@
1621	1791	//blob.retile();
1622	1792	makeSomething(blob);
1623	1793	} else
1624		- if (event.getSource() == latheItem)
	1794	+ if (source == latheItem)
1625	1795	{
1626	1796	makeSomething(new Lathe());
1627	1797	} else
1628		- if (event.getSource() == bezierItem)
	1798	+ if (source == bezierItem)
1629	1799	{
1630	1800	makeSomething(new BezierSurface());
1631	1801	} else
1632		- if (event.getSource() == checkerItem)
	1802	+ if (source == overlayItem)
1633	1803	{
1634	1804	/*
1635	1805	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1644,7 +1814,7 @@
1644	1814	*/
1645	1815	makeSomething(new Checker());
1646	1816	} else
1647		- if (event.getSource() == meshItem)
	1817	+ if (source == meshItem)
1648	1818	{
1649	1819	Object3D itemtomake = new Object3D();
1650	1820	Object3D child;
..	..	@@ -1665,35 +1835,35 @@
1665	1835	makeSomething(child);
1666	1836	}
1667	1837	} else
1668		- if (event.getSource() == springItem)
	1838	+ if (source == springItem)
1669	1839	{
1670	1840	cSpring s = new cSpring();
1671	1841	s.setup();
1672	1842	makeSomething(s);
1673	1843	} else
1674		- if (event.getSource() == flagItem)
	1844	+ if (source == flagItem)
1675	1845	{
1676	1846	cSpring s = new cFlag();
1677	1847	s.setup();
1678	1848	makeSomething(s);
1679	1849	} else
1680		- if (event.getSource() == lightItem)
	1850	+ if (source == lightItem)
1681	1851	{
1682	1852	makeSomething(new Light());
1683	1853	} else
1684		- if (event.getSource() == csgItem)
	1854	+ if (source == csgItem)
1685	1855	{
1686	1856	group(new CSG());
1687	1857	} else
1688		- if (event.getSource() == templateItem)
	1858	+ if (source == templateItem)
1689	1859	{
1690	1860	group(new cTemplate());
1691	1861	} else
1692		- if (event.getSource() == attributeItem)
	1862	+ if (source == attributeItem)
1693	1863	{
1694	1864	makeSomething(new Attribute());
1695	1865	} else
1696		- if (event.getSource() == pointflowItem)
	1866	+ if (source == pointflowItem)
1697	1867	{
1698	1868	makeSomething(new PointFlow());
1699	1869	} else
..	..	@@ -1705,7 +1875,7 @@
1705	1875	} else
1706	1876	*/
1707	1877
1708		- if (event.getSource() == superLoopItem)
	1878	+ if (source == superLoopItem)
1709	1879	{
1710	1880	Composite g = new cGroup();
1711	1881	for (int i=0; i<15; i++)
..	..	@@ -1727,7 +1897,7 @@
1727	1897
1728	1898	group(g);
1729	1899	} else
1730		- if (event.getSource() == loopItem)
	1900	+ if (source == loopItem)
1731	1901	{
1732	1902	Composite csg = new GroupLeaf();
1733	1903	csg.count = 5;
..	..	@@ -1736,7 +1906,7 @@
1736	1906	csg.addChild(child);
1737	1907	child.addChild(csg);
1738	1908	} else
1739		- if (event.getSource() == doubleItem)
	1909	+ if (source == doubleItem)
1740	1910	{
1741	1911	Composite csg = new GroupLeaf();
1742	1912	csg.count = 5;
..	..	@@ -1748,7 +1918,7 @@
1748	1918	csg.addChild(child);
1749	1919	child.addChild(csg);
1750	1920	} else
1751		- if (event.getSource() == tripleItem)
	1921	+ if (source == tripleItem)
1752	1922	{
1753	1923	Composite csg = new GroupLeaf();
1754	1924	csg.count = 4;
..	..	@@ -1763,71 +1933,71 @@
1763	1933	csg.addChild(child);
1764	1934	child.addChild(csg);
1765	1935	} else
1766		-
1767		- if (event.getSource() == importGFDItem)
1768		- {
1769		- ImportGFD();
1770		- } else
1771		- if (event.getSource() == importVRMLX3DItem)
1772		- {
1773		- ImportVRMLX3D();
1774		- } else
1775		- if (event.getSource() == import3DSItem)
1776		- {
1777		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1778		- } else
1779		- if (event.getSource() == importOBJItem)
1780		- {
1781		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1782		- } else
1783		- if (event.getSource() == computeAOItem)
	1936	+ if (source == computeAOItem)
1784	1937	{
1785	1938	Globals.drawMode = CameraPane.OCCLUSION;
1786		- CameraPane.theRenderer.repaint();
	1939	+ Globals.theRenderer.repaint();
1787	1940	} else
1788		- if (event.getSource() == recompileItem)
	1941	+ if (source == recompileItem)
1789	1942	{
1790	1943	Recompile();
1791	1944	refreshContents();
1792	1945	} else
1793		- if (event.getSource() == editScriptItem)
	1946	+ if (source == editScriptItem)
1794	1947	{
1795	1948	OpenDialog();
1796	1949	refreshContents();
1797	1950	} else
1798		- if (event.getSource() == invariantsItem)
	1951	+ if (source == invariantsItem)
1799	1952	{
1800	1953	System.out.println("Invariants:");
1801		- GrafreeD.grafreeD.universe.invariants();
	1954	+ Grafreed.grafreeD.universe.invariants();
1802	1955	} else
1803		- if (event.getSource() == memoryItem)
	1956	+ if (source == memoryItem)
1804	1957	{
1805	1958	//System.out.println("Invariants:");
1806	1959	PrintMemory();
1807	1960	} else
1808		- if (event.getSource() == pathItem)
	1961	+ if (source == pathItem)
1809	1962	{
1810	1963	PrintPath();
1811	1964	} else
1812		- if (event.getSource() == analyzeItem)
	1965	+ if (source == analyzeItem)
1813	1966	{
1814	1967	AnalyzeObject();
1815	1968	} else
1816		- if (event.getSource() == dumpItem)
	1969	+ if (source == dumpItem)
1817	1970	{
1818	1971	DumpObject();
1819	1972	} else
1820		- if (event.getSource() == screenfitButton)
	1973	+ if (source == undoButton)
	1974	+ {
	1975	+ Undo();
	1976	+ } else
	1977	+ if (source == redoButton)
	1978	+ {
	1979	+ Redo();
	1980	+ } else
	1981	+ if (source == saveButton)
	1982	+ {
	1983	+ Save();
	1984	+ } else
	1985	+ if (source == oneStepButton)
	1986	+ {
	1987	+ Globals.ONESTEP = true;
	1988	+ cameraView.repaint();
	1989	+ } else
	1990	+ if (source == screenfitButton)
1821	1991	{
1822	1992	//Reload(lastConverter, lastFilename, true);
1823	1993	ScreenFit();
1824	1994	} else
1825		- if (event.getSource() == screenfitpointButton)
	1995	+ if (source == screenfitpointButton)
1826	1996	{
1827	1997	//Reload(lastConverter, lastFilename, true);
1828	1998	ScreenFitPoint();
1829	1999	} else
1830		- if (event.getSource() == snapobjectButton)
	2000	+ if (source == snapobjectButton)
1831	2001	{
1832	2002	//Reload(lastConverter, lastFilename, true);
1833	2003	SnapObject();
..	..	@@ -1838,13 +2008,13 @@
1838	2008	// Recompile();
1839	2009	// refreshContents();
1840	2010	// } else
1841		- if (event.getSource() == gcButton)
	2011	+ if (source == gcButton)
1842	2012	{
1843	2013	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1844	2014	System.gc();
1845	2015	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1846	2016	} else
1847		- if (event.getSource() == editLeafItem)
	2017	+ if (source == editLeafItem)
1848	2018	{
1849	2019	Object3D obj;
1850	2020	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1858,62 +2028,74 @@
1858	2028	}
1859	2029	refreshContents(true);
1860	2030	} else
1861		- if (event.getSource() == openWindowItem)
	2031	+ if (source == openWindowItem)
1862	2032	{
1863	2033	EditSelection(true);
1864	2034	} else
1865		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2035	+ if (source == cutItem \|\| source == clearButton)
1866	2036	{
1867	2037	loadClipboard(true);
1868	2038	} else
1869		- if (event.getSource() == duplicateItem)
	2039	+ if (source == undoItem)
1870	2040	{
1871		- Object3D keep = GrafreeD.clipboard;
	2041	+ Undo();
	2042	+ } else
	2043	+ if (source == redoItem)
	2044	+ {
	2045	+ Redo();
	2046	+ } else
	2047	+ if (source == duplicateItem)
	2048	+ {
	2049	+ Object3D keep = Grafreed.clipboard;
1872	2050	loadClipboard(false);
1873	2051	paste(false);
1874		- GrafreeD.clipboard = keep;
	2052	+ Grafreed.clipboard = keep;
1875	2053	} else
1876		- if (event.getSource() == cloneItem)
	2054	+ if (source == cloneItem)
1877	2055	{
1878	2056	CloneSelection(false);
1879	2057	} else
1880		- if (event.getSource() == cloneSupportItem)
	2058	+ if (source == cloneSupportItem)
1881	2059	{
1882	2060	CloneSelection(true);
1883	2061	} else
1884		- if (event.getSource() == copyItem)
	2062	+ if (source == copyItem)
1885	2063	{
1886	2064	loadClipboard(false);
1887	2065	} else
1888		- if (event.getSource() == pasteItem)
	2066	+ if (source == pasteItem)
1889	2067	{
1890	2068	paste(false);
1891	2069	} else
1892		- if (event.getSource() == pasteLinkItem)
	2070	+ if (source == pasteIntoItem)
1893	2071	{
1894		- pasteInto(false);
	2072	+ pasteInto(true, false);
1895	2073	} else
1896		- if (event.getSource() == pasteCloneItem)
	2074	+ if (source == pasteLinkItem)
1897	2075	{
1898		- pasteInto(true);
	2076	+ pasteInto(false, false);
1899	2077	} else
1900		- if (event.getSource() == pasteExpandItem)
	2078	+ if (source == pasteCloneItem)
	2079	+ {
	2080	+ pasteInto(true, true);
	2081	+ } else
	2082	+ if (source == pasteExpandItem)
1901	2083	{
1902	2084	paste(true);
1903	2085	} else
1904		- if (event.getSource() == synchronizeItem)
	2086	+ if (source == synchronizeItem)
1905	2087	{
1906	2088	Overwrite(Object3D.TRANSFORM);
1907	2089	} else
1908		- if (event.getSource() == overwriteNameItem)
	2090	+ if (source == overwriteNameItem)
1909	2091	{
1910	2092	Overwrite(Object3D.NAME);
1911	2093	} else
1912		- if (event.getSource() == overwriteUVItem)
	2094	+ if (source == overwriteUVItem)
1913	2095	{
1914	2096	Overwrite(Object3D.UV);
1915	2097	} else
1916		- if (event.getSource() == overwriteMatItem)
	2098	+ if (source == overwriteMatItem)
1917	2099	{
1918	2100	/* july 2015
1919	2101	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1933,7 +2115,7 @@
1933	2115
1934	2116	Overwrite(dropAttributes);
1935	2117	}
1936		- if (event.getSource() == overwriteGeoItem)
	2118	+ if (source == overwriteGeoItem)
1937	2119	{
1938	2120	Overwrite(Object3D.GEOMETRY);
1939	2121	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1950,7 +2132,7 @@
1950	2132	// refreshContents();
1951	2133	// }
1952	2134	} else
1953		- if (event.getSource() == generateMeshItem)
	2135	+ if (source == generateMeshItem)
1954	2136	{
1955	2137	//if (group.selection.size() == 1)
1956	2138	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1961,7 +2143,7 @@
1961	2143	ResetModel();
1962	2144	refreshContents();
1963	2145	} else
1964		- if (event.getSource() == extractGeometriesItem)
	2146	+ if (source == extractGeometriesItem)
1965	2147	{
1966	2148	boolean one = false;
1967	2149
..	..	@@ -1988,7 +2170,7 @@
1988	2170	ResetModel();
1989	2171	refreshContents();
1990	2172	} else
1991		- if (event.getSource() == cloneGeometriesItem)
	2173	+ if (source == cloneGeometriesItem)
1992	2174	{
1993	2175	boolean one = false;
1994	2176
..	..	@@ -2014,7 +2196,7 @@
2014	2196	ResetModel();
2015	2197	refreshContents();
2016	2198	} else
2017		- if (event.getSource() == shareGeometriesItem)
	2199	+ if (source == shareGeometriesItem)
2018	2200	{
2019	2201	boolean one = false;
2020	2202
..	..	@@ -2044,7 +2226,7 @@
2044	2226	refreshContents();
2045	2227	}
2046	2228	} else
2047		- if (event.getSource() == mergeGeometriesItem)
	2229	+ if (source == mergeGeometriesItem)
2048	2230	{
2049	2231	boolean one = false;
2050	2232
..	..	@@ -2074,7 +2256,7 @@
2074	2256	ResetModel();
2075	2257	refreshContents();
2076	2258	} else
2077		- if (event.getSource() == linkverticesItem)
	2259	+ if (source == linkverticesItem)
2078	2260	{
2079	2261	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2080	2262	// {
..	..	@@ -2087,48 +2269,48 @@
2087	2269	// group.selection.get(0).setMasterThis(content); // should be identity
2088	2270	// refreshContents();
2089	2271	// }
2090		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2272	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2091	2273	{
2092		- Object3D content = GrafreeD.clipboard.get(0);
	2274	+ Object3D content = Grafreed.clipboard.get(0);
2093	2275
2094	2276	if (content instanceof cGroup && ((cGroup)content).transientlink )
2095	2277	content = ((cGroup)content).get(0);
2096	2278
2097		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2279	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2098	2280	for (int i=0; i<group.selection.size(); i++)
2099	2281	{
2100		- boolean random = CameraPane.RANDOM;
2101		- CameraPane.RANDOM = false; // parse all random nodes
	2282	+ boolean random = CameraPane.SWITCH;
	2283	+ CameraPane.SWITCH = false; // parse all random nodes
2102	2284	group.selection.get(i).linkVerticesThis(content);
2103	2285	// group.selection.get(i).setMasterThis(content); // should be identity
2104		- CameraPane.RANDOM = random;
	2286	+ CameraPane.SWITCH = random;
2105	2287	}
2106		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2288	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2107	2289	refreshContents();
2108	2290	}
2109	2291	} else
2110		- if (event.getSource() == resetsupportItem)
	2292	+ if (source == resetsupportItem)
2111	2293	{
2112	2294	for (int i=0; i<group.selection.size(); i++)
2113	2295	{
2114		- boolean random = CameraPane.RANDOM;
2115		- CameraPane.RANDOM = false; // parse all random nodes
	2296	+ boolean random = CameraPane.SWITCH;
	2297	+ CameraPane.SWITCH = false; // parse all random nodes
2116	2298	group.selection.get(i).linkVerticesThis(null);
2117		- CameraPane.RANDOM = random;
	2299	+ CameraPane.SWITCH = random;
2118	2300	}
2119	2301
2120	2302	refreshContents();
2121	2303	} else
2122		- if (event.getSource() == relinkverticesItem)
	2304	+ if (source == relinkverticesItem)
2123	2305	{
2124		- boolean random = CameraPane.RANDOM;
2125		- CameraPane.RANDOM = false; // parse all random nodes
	2306	+ boolean random = CameraPane.SWITCH;
	2307	+ CameraPane.SWITCH = false; // parse all random nodes
2126	2308	group.selection.RelinkToSupport();
2127		- CameraPane.RANDOM = random;
	2309	+ CameraPane.SWITCH = random;
2128	2310
2129	2311	refreshContents();
2130	2312	} else
2131		- if (event.getSource() == resetreferencesItem)
	2313	+ if (source == resetreferencesItem)
2132	2314	{
2133	2315	for (int i=0; i<group.selection.size(); i++)
2134	2316	{
..	..	@@ -2137,11 +2319,11 @@
2137	2319
2138	2320	refreshContents();
2139	2321	} else
2140		- if (event.getSource() == setMasterItem)
	2322	+ if (source == setMasterItem)
2141	2323	{
2142		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2324	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2143	2325	{
2144		- Object3D content = GrafreeD.clipboard.get(0);
	2326	+ Object3D content = Grafreed.clipboard.get(0);
2145	2327
2146	2328	if (content instanceof cGroup && ((cGroup)content).transientlink )
2147	2329	content = ((cGroup)content).get(0);
..	..	@@ -2150,13 +2332,13 @@
2150	2332	refreshContents();
2151	2333	}
2152	2334	} else
2153		- if (event.getSource() == poseMeshItem)
	2335	+ if (source == poseMeshItem)
2154	2336	{
2155	2337	if (group.selection.size() == 1)
2156	2338	{
2157		- if (GrafreeD.clipboard.size() == 1)
	2339	+ if (Grafreed.clipboard.size() == 1)
2158	2340	{
2159		- Object3D content = GrafreeD.clipboard.get(0);
	2341	+ Object3D content = Grafreed.clipboard.get(0);
2160	2342
2161	2343	if (content instanceof cGroup && ((cGroup)content).transientlink )
2162	2344	content = ((cGroup)content).get(0);
..	..	@@ -2169,19 +2351,19 @@
2169	2351	}
2170	2352
2171	2353	} else
2172		- if (event.getSource() == revertMeshItem)
	2354	+ if (source == revertMeshItem)
2173	2355	{
2174	2356	RevertMeshes();
2175	2357	} else
2176		- if (event.getSource() == resetMeshItem)
	2358	+ if (source == resetAllItem)
2177	2359	{
2178	2360	ResetAll();
2179	2361	} else
2180		- if (event.getSource() == stepAllItem)
	2362	+ if (source == stepAllItem)
2181	2363	{
2182	2364	StepAll();
2183	2365	} else
2184		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2366	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2185	2367	{
2186	2368	//int indices[] = jList.getSelectedIndices();
2187	2369	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2189,46 +2371,46 @@
2189	2371
2190	2372	ClearSelection(false);
2191	2373	} else
2192		- if (event.getSource() == clearAllItem)
	2374	+ if (source == clearAllItem)
2193	2375	{
2194	2376	ClearSelection(true);
2195	2377	} else
2196		- if (event.getSource() == grabItem)
	2378	+ if (source == grabItem)
2197	2379	{
2198	2380	group(new cGroup(), true);
2199	2381	} else
2200		- if (event.getSource() == hideItem)
	2382	+ if (source == hideItem)
2201	2383	{
2202	2384	group(new HiddenObject());
2203	2385	} else
2204		- if (event.getSource() == frontItem)
	2386	+ if (source == frontItem)
2205	2387	{
2206	2388	front();
2207	2389	} else
2208		- if (event.getSource() == backItem)
	2390	+ if (source == backItem)
2209	2391	{
2210	2392	back();
2211	2393	} else
2212		- if (event.getSource() == cameraItem)
	2394	+ if (source == cameraItem)
2213	2395	{
2214	2396	makeSomething(new Camera());
2215	2397	} else
2216		- if (event.getSource() == compositeItem)
	2398	+ if (source == compositeItem)
2217	2399	{
2218	2400	group(new Composite());
2219	2401	} else
2220		- if (event.getSource() == randomItem)
	2402	+ if (source == randomItem)
2221	2403	{
2222	2404	RandomNode random = new RandomNode();
2223	2405	group(random);
2224	2406	if (random.size() > 0)
2225		- random.name = random.get(0).name + "Rnd";
	2407	+ random.name = random.get(0).name + "Switch";
2226	2408	} else
2227		- if (event.getSource() == physicsItem)
	2409	+ if (source == physicsItem)
2228	2410	{
2229	2411	group(new PhysicsNode());
2230	2412	} else
2231		- if (event.getSource() == frameselectorItem)
	2413	+ if (source == frameselectorItem)
2232	2414	{
2233	2415	for (int i=0; i<group.selection.size(); i++)
2234	2416	{
..	..	@@ -2240,7 +2422,7 @@
2240	2422	ResetModel();
2241	2423	refreshContents();
2242	2424	} else
2243		- if (event.getSource() == switchGeoItem)
	2425	+ if (source == switchGeoItem)
2244	2426	{
2245	2427	for (int i=0; i<group.selection.size(); i++)
2246	2428	{
..	..	@@ -2252,7 +2434,7 @@
2252	2434	ResetModel();
2253	2435	refreshContents();
2254	2436	} else
2255		- if (event.getSource() == switchTransfoItem)
	2437	+ if (source == switchTransfoItem)
2256	2438	{
2257	2439	for (int i=0; i<group.selection.size(); i++)
2258	2440	{
..	..	@@ -2264,7 +2446,7 @@
2264	2446	ResetModel();
2265	2447	refreshContents();
2266	2448	} else
2267		- if (event.getSource() == morphItem)
	2449	+ if (source == morphItem)
2268	2450	{
2269	2451	for (int i=0; i<group.selection.size(); i++)
2270	2452	{
..	..	@@ -2276,7 +2458,7 @@
2276	2458	ResetModel();
2277	2459	refreshContents();
2278	2460	} else
2279		- if (event.getSource() == scriptNodeItem)
	2461	+ if (source == scriptNodeItem)
2280	2462	{
2281	2463	boolean atleastone = false;
2282	2464
..	..	@@ -2315,31 +2497,31 @@
2315	2497	}
2316	2498	}
2317	2499	} else
2318		- if (event.getSource() == linkerItem)
	2500	+ if (source == linkerItem)
2319	2501	{
2320	2502	group(new cLinker());
2321	2503	} else
2322		- if (event.getSource() == textureItem)
	2504	+ if (source == textureItem)
2323	2505	{
2324	2506	group(new TextureNode());
2325	2507	} else
2326		- if (event.getSource() == billboardItem)
	2508	+ if (source == billboardItem)
2327	2509	{
2328	2510	group(new BillboardNode());
2329	2511	} else
2330		- if (event.getSource() == shadowXItem)
	2512	+ if (source == shadowXItem)
2331	2513	{
2332	2514	CastShadow(0);
2333	2515	} else
2334		- if (event.getSource() == shadowYItem)
	2516	+ if (source == shadowYItem)
2335	2517	{
2336	2518	CastShadow(1);
2337	2519	} else
2338		- if (event.getSource() == shadowZItem)
	2520	+ if (source == shadowZItem)
2339	2521	{
2340	2522	CastShadow(2);
2341	2523	} else
2342		- if (event.getSource() == ungroupItem)
	2524	+ if (source == ungroupItem)
2343	2525	{
2344	2526	//ungroup();
2345	2527	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2351,179 +2533,187 @@
2351	2533
2352	2534	refreshContents();
2353	2535	} else
2354		- if (event.getSource() == genUVItem)
	2536	+ if (source == genUVItem)
2355	2537	{
2356	2538	GenUV();
2357	2539	} else
2358		- if (event.getSource() == genNormalsCADItem)
	2540	+ if (source == genNormalsCADItem)
2359	2541	{
2360	2542	GenNormals(true);
2361	2543	} else
2362		- if (event.getSource() == genNormalsMESHItem)
	2544	+ if (source == genNormalsMESHItem)
2363	2545	{
2364		- GenNormals(true); // TODO
	2546	+ GenNormalsMESH();
2365	2547	} else
2366		- if (event.getSource() == genNormalsORGANItem)
	2548	+ if (source == genNormalsORGANItem)
2367	2549	{
2368	2550	GenNormals(false);
2369	2551	} else
2370		- if (event.getSource() == genNormalsMINEItem)
	2552	+ if (source == genNormalsMINEItem)
2371	2553	{
2372	2554	GenNormalsMINE();
2373	2555	} else
2374		- if (event.getSource() == stripifyItem)
	2556	+ if (source == stripifyItem)
2375	2557	{
2376	2558	Stripify();
2377	2559	} else
2378		- if (event.getSource() == unstripifyItem)
	2560	+ if (source == unstripifyItem)
2379	2561	{
2380	2562	Unstripify();
2381	2563	} else
2382		- if (event.getSource() == trimItem)
	2564	+ if (source == trimItem)
2383	2565	{
2384	2566	Trim();
2385	2567	} else
2386		- if (event.getSource() == untrimItem)
	2568	+ if (source == untrimItem)
2387	2569	{
2388	2570	Untrim();
2389	2571	} else
2390		- if (event.getSource() == clearColorsItem)
	2572	+ if (source == clearColorsItem)
2391	2573	{
2392	2574	ClearColors();
2393	2575	} else
2394		- if (event.getSource() == clearMaterialsItem)
	2576	+ if (source == clearMaterialsItem)
2395	2577	{
2396	2578	ClearMaterials();
2397	2579	} else
2398		- if (event.getSource() == liveleavesItem)
	2580	+ if (source == liveleavesItem)
2399	2581	{
2400	2582	LiveLeaves(true);
2401	2583	} else
2402		- if (event.getSource() == unliveleavesItem)
	2584	+ if (source == unliveleavesItem)
2403	2585	{
2404	2586	LiveLeaves(false);
2405	2587	} else
2406		- if (event.getSource() == supportleavesItem)
	2588	+ if (source == supportleavesItem)
2407	2589	{
2408	2590	SupportLeaves(true);
2409	2591	} else
2410		- if (event.getSource() == unsupportleavesItem)
	2592	+ if (source == unsupportleavesItem)
2411	2593	{
2412	2594	SupportLeaves(false);
2413	2595	} else
2414		- if (event.getSource() == hideleavesItem)
	2596	+ if (source == hideleavesItem)
2415	2597	{
2416	2598	HideLeaves(true);
2417	2599	} else
2418		- if (event.getSource() == showleavesItem)
	2600	+ if (source == showleavesItem)
2419	2601	{
2420	2602	HideLeaves(false);
2421	2603	} else
2422		- if (event.getSource() == markleavesItem)
	2604	+ if (source == markleavesItem)
2423	2605	{
2424	2606	MarkLeaves(true);
2425	2607	} else
2426		- if (event.getSource() == unmarkleavesItem)
	2608	+ if (source == unmarkleavesItem)
2427	2609	{
2428	2610	MarkLeaves(false);
2429	2611	} else
2430		- if (event.getSource() == flipVItem)
	2612	+ if (source == flipVItem)
2431	2613	{
2432	2614	FlipV(true);
2433	2615	} else
2434		- if (event.getSource() == unflipVItem)
	2616	+ if (source == unflipVItem)
2435	2617	{
2436	2618	FlipV(false);
2437	2619	} else
2438		- if (event.getSource() == lowTexturesItem)
	2620	+ if (source == lowTexturesItem)
2439	2621	{
2440	2622	SetTexRes(0);
2441	2623	} else
2442		- if (event.getSource() == normalTexturesItem)
	2624	+ if (source == normalTexturesItem)
2443	2625	{
2444	2626	SetTexRes(1);
2445	2627	} else
2446		- if (event.getSource() == highTexturesItem)
	2628	+ if (source == highTexturesItem)
2447	2629	{
2448	2630	SetTexRes(2);
2449	2631	} else
2450		- if (event.getSource() == veryhighTexturesItem)
	2632	+ if (source == veryhighTexturesItem)
2451	2633	{
2452	2634	SetTexRes(3);
2453	2635	} else
2454		- if (event.getSource() == maxTexturesItem)
	2636	+ if (source == maxTexturesItem)
2455	2637	{
2456	2638	SetTexRes(4);
2457	2639	} else
2458		- if (event.getSource() == panoTexturesItem)
	2640	+ if (source == panoTexturesItem)
2459	2641	{
2460	2642	SetTexRes(5);
2461	2643	} else
2462		- if (event.getSource() == reverseNormalsItem)
	2644	+ if (source == reverseNormalsItem)
2463	2645	{
2464	2646	ReverseNormals();
2465	2647	} else
2466		- if (event.getSource() == parseverticesItem)
	2648	+ if (source == parseverticesItem)
2467	2649	{
2468	2650	ParseVertices();
2469	2651	} else
2470		- if (event.getSource() == textureFieldItem)
	2652	+ if (source == textureFieldItem)
2471	2653	{
2472	2654	TextureVertices();
2473	2655	} else
2474		- if (event.getSource() == alignItem)
	2656	+ if (source == alignItem)
2475	2657	{
2476	2658	Align();
2477	2659	} else
2478		- if (event.getSource() == mirrorItem)
	2660	+ if (source == mirrorItem)
2479	2661	{
2480	2662	MirrorPoses();
2481	2663	} else
2482		- if (event.getSource() == reduceMorphItem)
	2664	+ if (source == reduceMorphItem)
2483	2665	{
2484	2666	MeshReduction(false);
2485	2667	} else
2486		- if (event.getSource() == reduce34MorphItem)
	2668	+ if (source == reduce34MorphItem)
2487	2669	{
2488	2670	MeshReduction(true);
2489	2671	} else
2490		- if (event.getSource() == reverseTrianglesItem)
	2672	+ if (source == reverseTrianglesItem)
2491	2673	{
2492	2674	ReverseTriangles();
2493	2675	} else
2494		- if (event.getSource() == reduceMeshItem)
	2676	+ if (source == reduceMeshItem)
2495	2677	{
2496	2678	ReduceMesh(false);
2497	2679	} else
2498		- if (event.getSource() == reduce34MeshItem)
	2680	+ if (source == reduce34MeshItem)
2499	2681	{
2500	2682	ReduceMesh(true);
2501	2683	} else
2502		- if (event.getSource() == increaseMeshItem)
	2684	+ if (source == increaseMeshItem)
2503	2685	{
2504	2686	IncreaseMesh();
2505	2687	} else
2506		- if (event.getSource() == clipMeshItem)
	2688	+ if (source == clipMeshItem)
2507	2689	{
2508	2690	ClipMesh();
2509	2691	} else
2510		- if (event.getSource() == smoothMeshItem)
	2692	+ if (source == smoothMeshItem)
2511	2693	{
2512	2694	SmoothMesh();
2513	2695	} else
2514		- if (event.getSource() == transformgeometryItem)
	2696	+ if (source == transformGeometryItem)
2515	2697	{
2516	2698	TransformGeometry();
2517	2699	} else
2518		- if (event.getSource() == resetTransformItem)
	2700	+ if (source == transformChildrenItem)
	2701	+ {
	2702	+ TransformChildren();
	2703	+ } else
	2704	+ if (source == resetTransformItem)
2519	2705	{
2520	2706	ResetTransform();
2521	2707	} else
2522		- if (event.getSource() == resetCentroidItem)
	2708	+ if (source == resetCentroidItem)
2523	2709	{
2524		- ResetCentroid();
	2710	+ ResetCentroid(true);
2525	2711	} else
2526		- if (event.getSource() == resetParentItem)
	2712	+ if (source == resetCentroidXZItem)
	2713	+ {
	2714	+ ResetCentroid(false);
	2715	+ } else
	2716	+ if (source == resetParentItem)
2527	2717	{
2528	2718	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2529	2719	{
..	..	@@ -2533,7 +2723,7 @@
2533	2723
2534	2724	refreshContents();
2535	2725	} else
2536		- if (event.getSource() == repairParentItem)
	2726	+ if (source == repairParentItem)
2537	2727	{
2538	2728	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2539	2729	{
..	..	@@ -2547,7 +2737,7 @@
2547	2737
2548	2738	refreshContents();
2549	2739	} else
2550		- if (event.getSource() == repairShadowItem)
	2740	+ if (source == repairShadowItem)
2551	2741	{
2552	2742	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2553	2743	{
..	..	@@ -2561,7 +2751,7 @@
2561	2751
2562	2752	refreshContents();
2563	2753	} else
2564		- if (event.getSource() == sortbysizeItem)
	2754	+ if (source == sortbysizeItem)
2565	2755	{
2566	2756	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2567	2757	{
..	..	@@ -2573,7 +2763,7 @@
2573	2763	ResetModel();
2574	2764	refreshContents();
2575	2765	} else
2576		- if (event.getSource() == sortbynameItem)
	2766	+ if (source == sortbynameItem)
2577	2767	{
2578	2768	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2579	2769	{
..	..	@@ -2585,7 +2775,7 @@
2585	2775	ResetModel();
2586	2776	refreshContents();
2587	2777	} else
2588		- if (event.getSource() == attachPigmentItem)
	2778	+ if (source == attachPigmentItem)
2589	2779	{
2590	2780	String texture = GetFile("Attach pigment");
2591	2781	Object3D obj;
..	..	@@ -2597,7 +2787,7 @@
2597	2787
2598	2788	refreshContents();
2599	2789	} else
2600		- if (event.getSource() == detachPigmentItem)
	2790	+ if (source == detachPigmentItem)
2601	2791	{
2602	2792	Object3D obj;
2603	2793	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2608,7 +2798,7 @@
2608	2798
2609	2799	refreshContents();
2610	2800	} else
2611		- if (event.getSource() == attachBumpItem)
	2801	+ if (source == attachBumpItem)
2612	2802	{
2613	2803	String texture = GetFile("Attach bump");
2614	2804	Object3D obj;
..	..	@@ -2620,7 +2810,7 @@
2620	2810
2621	2811	refreshContents();
2622	2812	} else
2623		- if (event.getSource() == detachBumpItem)
	2813	+ if (source == detachBumpItem)
2624	2814	{
2625	2815	Object3D obj;
2626	2816	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2631,7 +2821,7 @@
2631	2821
2632	2822	refreshContents();
2633	2823	} else
2634		- if (event.getSource() == pigmentBumpItem)
	2824	+ if (source == pigmentBumpItem)
2635	2825	{
2636	2826	Object3D obj;
2637	2827	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2642,158 +2832,195 @@
2642	2832
2643	2833	refreshContents();
2644	2834	} else
2645		- if (event.getSource() == flashSelectionButton)
	2835	+ if (source == flashSelectionButton)
2646	2836	{
2647	2837	CameraPane.flash = true;
2648	2838	refreshContents();
2649	2839	} else
2650		- if (event.getSource() == oneButton)
	2840	+ if (source == oneButton)
2651	2841	{
2652	2842	} else
2653		- if (event.getSource() == twoButton)
	2843	+ if (source == twoButton)
2654	2844	{
2655	2845	radio.layout = twoButton;
2656	2846	// bug
2657	2847	//gridPanel.setDividerLocation(1.0);
2658	2848	//bigPanel.setDividerLocation(0.0);
2659		- bigThree.remove(scenePanel);
2660		- bigThree.remove(centralPanel);
2661		- bigThree.remove(XYZPanel);
2662		- aWindowConstraints.gridx = 0;
2663		- aWindowConstraints.gridy = 0;
2664		- aWindowConstraints.gridwidth = 1;
2665		- // aConstraints.gridheight = 3;
2666		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2667		- aWindowConstraints.weightx = 0;
2668		- aWindowConstraints.weighty = 1;
2669		- //bigThree.add(jtp, aWindowConstraints);
2670		- aWindowConstraints.weightx = 1;
2671		- aWindowConstraints.gridwidth = 3;
2672		- // aConstraints.gridheight = 3;
2673		- aWindowConstraints.gridx = 1;
2674		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2675		- bigThree.add(centralPanel, aWindowConstraints);
2676		- aWindowConstraints.weightx = 0;
2677		- aWindowConstraints.gridx = 4;
2678		- aWindowConstraints.gridwidth = 1;
2679		- // aConstraints.gridheight = 3;
2680		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2681		- //bigThree.add(XYZPanel, aWindowConstraints);
2682		- bigThree.revalidate();
	2849	+// bigThree.remove(scenePanel);
	2850	+// bigThree.remove(centralPanel);
	2851	+// bigThree.remove(XYZPanel);
	2852	+// aWindowConstraints.gridx = 0;
	2853	+// aWindowConstraints.gridy = 0;
	2854	+// aWindowConstraints.gridwidth = 1;
	2855	+// // aConstraints.gridheight = 3;
	2856	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2857	+// aWindowConstraints.weightx = 0;
	2858	+// aWindowConstraints.weighty = 1;
	2859	+// //bigThree.add(jtp, aWindowConstraints);
	2860	+// aWindowConstraints.weightx = 1;
	2861	+// aWindowConstraints.gridwidth = 3;
	2862	+// // aConstraints.gridheight = 3;
	2863	+// aWindowConstraints.gridx = 1;
	2864	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2865	+// bigThree.add(centralPanel, aWindowConstraints);
	2866	+// aWindowConstraints.weightx = 0;
	2867	+// aWindowConstraints.gridx = 4;
	2868	+// aWindowConstraints.gridwidth = 1;
	2869	+// // aConstraints.gridheight = 3;
	2870	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2871	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2872	+// scenePanel.setVisible(false);
	2873	+// centralPanel.setVisible(true);
	2874	+// XYZPanel.setVisible(false);
	2875	+ bigThree.ClearUI();
	2876	+ bigThree.add(centralPanel);
	2877	+ bigThree.FlushUI();
2683	2878	} else
2684		- if (event.getSource() == threeButton)
	2879	+ if (source == threeButton)
2685	2880	{
2686	2881	radio.layout = threeButton;
2687		- bigThree.remove(scenePanel);
2688		- bigThree.remove(centralPanel);
2689		- bigThree.remove(XYZPanel);
2690		- aWindowConstraints.gridx = 0;
2691		- aWindowConstraints.gridy = 0;
2692		- aWindowConstraints.gridwidth = 1;
2693		- // aConstraints.gridheight = 3;
2694		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2695		- aWindowConstraints.weightx = 0;
2696		- aWindowConstraints.weighty = 1;
2697		- //bigThree.add(jtp, aWindowConstraints);
2698		- aWindowConstraints.weightx = 1;
2699		- aWindowConstraints.gridwidth = 3;
2700		- // aConstraints.gridheight = 3;
2701		- aWindowConstraints.gridx = 1;
2702		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2703		- bigThree.add(centralPanel, aWindowConstraints);
2704		- aWindowConstraints.weightx = 0;
2705		- aWindowConstraints.gridx = 4;
2706		- aWindowConstraints.gridwidth = 1;
2707		- // aConstraints.gridheight = 3;
2708		- aConstraints.fill = GridBagConstraints.VERTICAL;
2709		- bigThree.add(XYZPanel, aWindowConstraints);
2710		- bigThree.revalidate();
	2882	+
	2883	+// bigThree.remove(scenePanel);
	2884	+// bigThree.remove(centralPanel);
	2885	+// bigThree.remove(XYZPanel);
	2886	+// aWindowConstraints.gridx = 0;
	2887	+// aWindowConstraints.gridy = 0;
	2888	+// aWindowConstraints.gridwidth = 1;
	2889	+// // aConstraints.gridheight = 3;
	2890	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2891	+// aWindowConstraints.weightx = 0;
	2892	+// aWindowConstraints.weighty = 1;
	2893	+// //bigThree.add(jtp, aWindowConstraints);
	2894	+// aWindowConstraints.weightx = 1;
	2895	+// aWindowConstraints.gridwidth = 3;
	2896	+// // aConstraints.gridheight = 3;
	2897	+// aWindowConstraints.gridx = 1;
	2898	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2899	+// bigThree.add(centralPanel, aWindowConstraints);
	2900	+// aWindowConstraints.weightx = 0;
	2901	+// aWindowConstraints.gridx = 4;
	2902	+// aWindowConstraints.gridwidth = 1;
	2903	+// // aConstraints.gridheight = 3;
	2904	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2905	+// bigThree.add(XYZPanel, aWindowConstraints);
	2906	+// bigThree.validate();
	2907	+// scenePanel.setVisible(false);
	2908	+// centralPanel.setVisible(true);
	2909	+// XYZPanel.setVisible(true);
	2910	+ bigThree.ClearUI();
	2911	+ bigThree.add(centralPanel);
	2912	+ bigThree.add(XYZPanel);
	2913	+ bigThree.FlushUI();
2711	2914	} else
2712		- if (event.getSource() == fourButton)
	2915	+ if (source == fourButton)
2713	2916	{
2714	2917	radio.layout = fourButton;
2715		- bigThree.remove(scenePanel);
2716		- bigThree.remove(centralPanel);
2717		- bigThree.remove(XYZPanel);
2718		- aWindowConstraints.gridx = 0;
2719		- aWindowConstraints.gridy = 0;
2720		- aWindowConstraints.gridwidth = 1;
2721		- // aWindowConstraints.gridheight = 3;
2722		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2723		- aWindowConstraints.weightx = 1;
2724		- aWindowConstraints.weighty = 1;
2725		- bigThree.add(scenePanel, aWindowConstraints);
2726		- aWindowConstraints.weightx = 1;
2727		- aWindowConstraints.gridwidth = 3;
2728		- // aConstraints.gridheight = 3;
2729		- aWindowConstraints.gridx = 1;
2730		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2731		- //bigThree.add(cameraPanel, aWindowConstraints);
2732		- aWindowConstraints.weightx = 0;
2733		- aWindowConstraints.gridx = 4;
2734		- aWindowConstraints.gridwidth = 1;
2735		- // aWindowConstraints.gridheight = 3;
2736		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2737		- //bigThree.add(XYZPanel, aWindowConstraints);
2738		- bigThree.revalidate();
	2918	+
	2919	+// bigThree.remove(scenePanel);
	2920	+// bigThree.remove(centralPanel);
	2921	+// bigThree.remove(XYZPanel);
	2922	+// aWindowConstraints.gridx = 0;
	2923	+// aWindowConstraints.gridy = 0;
	2924	+// aWindowConstraints.gridwidth = 1;
	2925	+// // aWindowConstraints.gridheight = 3;
	2926	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2927	+// aWindowConstraints.weightx = 1;
	2928	+// aWindowConstraints.weighty = 1;
	2929	+// bigThree.add(scenePanel, aWindowConstraints);
	2930	+// aWindowConstraints.weightx = 1;
	2931	+// aWindowConstraints.gridwidth = 3;
	2932	+// // aConstraints.gridheight = 3;
	2933	+// aWindowConstraints.gridx = 1;
	2934	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2935	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2936	+// aWindowConstraints.weightx = 0;
	2937	+// aWindowConstraints.gridx = 4;
	2938	+// aWindowConstraints.gridwidth = 1;
	2939	+// // aWindowConstraints.gridheight = 3;
	2940	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2941	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2942	+// bigThree.validate();
	2943	+// scenePanel.setVisible(true);
	2944	+// centralPanel.setVisible(false);
	2945	+// XYZPanel.setVisible(false);
	2946	+ bigThree.ClearUI();
	2947	+ bigThree.add(scenePanel);
	2948	+ bigThree.FlushUI();
2739	2949	} else
2740		- if (event.getSource() == sixButton)
	2950	+ if (source == sixButton)
2741	2951	{
2742	2952	radio.layout = sixButton;
2743		- bigThree.remove(scenePanel);
2744		- bigThree.remove(centralPanel);
2745		- bigThree.remove(XYZPanel);
2746		- aWindowConstraints.gridx = 0;
2747		- aWindowConstraints.gridy = 0;
2748		- aWindowConstraints.gridwidth = 1;
2749		- // aConstraints.gridheight = 3;
2750		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2751		- aWindowConstraints.weightx = 0;
2752		- aWindowConstraints.weighty = 1;
2753		- bigThree.add(scenePanel, aWindowConstraints);
2754		- aWindowConstraints.weightx = 1;
2755		- aWindowConstraints.gridwidth = 3;
2756		- // aWindowConstraints.gridheight = 3;
2757		- aWindowConstraints.gridx = 1;
2758		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2759		- bigThree.add(centralPanel, aWindowConstraints);
2760		- aWindowConstraints.weightx = 0;
2761		- aWindowConstraints.gridx = 4;
2762		- aWindowConstraints.gridwidth = 1;
2763		- // aWindowConstraints.gridheight = 3;
2764		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2765		- //bigThree.add(XYZPanel, aConstraints);
2766		- bigThree.revalidate();
	2953	+
	2954	+// bigThree.remove(scenePanel);
	2955	+// bigThree.remove(centralPanel);
	2956	+// bigThree.remove(XYZPanel);
	2957	+// aWindowConstraints.gridx = 0;
	2958	+// aWindowConstraints.gridy = 0;
	2959	+// aWindowConstraints.gridwidth = 1;
	2960	+// // aConstraints.gridheight = 3;
	2961	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2962	+// aWindowConstraints.weightx = 0;
	2963	+// aWindowConstraints.weighty = 1;
	2964	+// bigThree.add(scenePanel, aWindowConstraints);
	2965	+// aWindowConstraints.weightx = 1;
	2966	+// aWindowConstraints.gridwidth = 3;
	2967	+// // aWindowConstraints.gridheight = 3;
	2968	+// aWindowConstraints.gridx = 1;
	2969	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2970	+// bigThree.add(centralPanel, aWindowConstraints);
	2971	+// aWindowConstraints.weightx = 0;
	2972	+// aWindowConstraints.gridx = 4;
	2973	+// aWindowConstraints.gridwidth = 1;
	2974	+// // aWindowConstraints.gridheight = 3;
	2975	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2976	+// //bigThree.add(XYZPanel, aConstraints);
	2977	+// bigThree.validate();
	2978	+// scenePanel.setVisible(true);
	2979	+// centralPanel.setVisible(true);
	2980	+// XYZPanel.setVisible(false);
	2981	+ bigThree.ClearUI();
	2982	+ bigThree.add(scenePanel);
	2983	+ bigThree.add(centralPanel);
	2984	+ bigThree.FlushUI();
2767	2985	} else
2768		- if (event.getSource() == sevenButton)
	2986	+ if (source == sevenButton)
2769	2987	{
2770	2988	radio.layout = sevenButton;
2771		- bigThree.remove(scenePanel);
2772		- bigThree.remove(centralPanel);
2773		- bigThree.remove(XYZPanel);
2774		- aWindowConstraints.gridx = 0;
2775		- aWindowConstraints.gridy = 0;
2776		- aWindowConstraints.gridwidth = 1;
2777		- // aWindowConstraints.gridheight = 3;
2778		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2779		- aWindowConstraints.weightx = 0;
2780		- aWindowConstraints.weighty = 1;
2781		- bigThree.add(scenePanel, aWindowConstraints);
2782		- aWindowConstraints.weightx = 1;
2783		- aWindowConstraints.gridwidth = 3;
2784		- // aWindowConstraints.gridheight = 3;
2785		- aWindowConstraints.gridx = 1;
2786		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2787		- bigThree.add(centralPanel, aWindowConstraints);
2788		- aWindowConstraints.weightx = 0;
2789		- aWindowConstraints.gridx = 4;
2790		- aWindowConstraints.gridwidth = 1;
2791		- // aConstraints.gridheight = 3;
2792		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2793		- bigThree.add(XYZPanel, aWindowConstraints);
2794		- bigThree.revalidate();
	2989	+
	2990	+// bigThree.remove(scenePanel);
	2991	+// bigThree.remove(centralPanel);
	2992	+// bigThree.remove(XYZPanel);
	2993	+// aWindowConstraints.gridx = 0;
	2994	+// aWindowConstraints.gridy = 0;
	2995	+// aWindowConstraints.gridwidth = 1;
	2996	+// // aWindowConstraints.gridheight = 3;
	2997	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2998	+// aWindowConstraints.weightx = 0;
	2999	+// aWindowConstraints.weighty = 1;
	3000	+// bigThree.add(scenePanel, aWindowConstraints);
	3001	+// aWindowConstraints.weightx = 1;
	3002	+// aWindowConstraints.gridwidth = 3;
	3003	+// // aWindowConstraints.gridheight = 3;
	3004	+// aWindowConstraints.gridx = 1;
	3005	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3006	+// bigThree.add(centralPanel, aWindowConstraints);
	3007	+// aWindowConstraints.weightx = 0;
	3008	+// aWindowConstraints.gridx = 4;
	3009	+// aWindowConstraints.gridwidth = 1;
	3010	+// // aConstraints.gridheight = 3;
	3011	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3012	+// bigThree.add(XYZPanel, aWindowConstraints);
	3013	+// bigThree.validate();
	3014	+// scenePanel.setVisible(true);
	3015	+// centralPanel.setVisible(true);
	3016	+// XYZPanel.setVisible(true);
	3017	+ bigThree.ClearUI();
	3018	+ bigThree.add(scenePanel);
	3019	+ bigThree.add(centralPanel);
	3020	+ bigThree.add(XYZPanel);
	3021	+ bigThree.FlushUI();
2795	3022	} else
2796		- if (event.getSource() == rootButton)
	3023	+ if (source == rootButton)
2797	3024	{
2798	3025	Object3D obj;
2799	3026	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2805,7 +3032,7 @@
2805	3032
2806	3033	refreshContents(true);
2807	3034	} else
2808		- if (event.getSource() == closeButton)
	3035	+ if (source == closeButton)
2809	3036	{
2810	3037	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2811	3038	cRadio ab;
..	..	@@ -2826,11 +3053,11 @@
2826	3053	}
2827	3054	refreshContents(true);
2828	3055	} else
2829		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3056	+ if (source == editItem \|\| source == editButton)
2830	3057	{
2831	3058	EditSelection(false);
2832	3059	} else
2833		- if (event.getSource() == uneditButton)
	3060	+ if (source == uneditButton)
2834	3061	{
2835	3062	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2836	3063	{
..	..	@@ -2840,14 +3067,14 @@
2840	3067	child.CloseUI();
2841	3068	listUI.remove(child);
2842	3069
2843		- child.editWindow = null; // ???????????
	3070	+ //child.editWindow = null; // ???????????
2844	3071	}
2845		- objEditor.ctrlPanel.revalidate();
	3072	+ objEditor.ctrlPanel.FlushUI();
2846	3073	//objEditor.jTree.clearSelection();
2847	3074	//objEditor.ResetSliders();
2848	3075	refreshContents(true);
2849	3076	} else
2850		- if (event.getSource() == clearPanelButton)
	3077	+ if (source == clearPanelButton)
2851	3078	{
2852	3079	assert(copy == group);
2853	3080	//copy.ClearUI();
..	..	@@ -2858,7 +3085,7 @@
2858	3085	listUI.clear();
2859	3086	refreshContents(true);
2860	3087	} else
2861		- if (event.getSource() == allParamsButton)
	3088	+ if (source == allParamsButton)
2862	3089	{
2863	3090	assert(copy == group);
2864	3091
..	..	@@ -2879,19 +3106,19 @@
2879	3106
2880	3107	refreshContents(true);
2881	3108	} else
2882		- if (event.getSource() == unselectButton)
	3109	+ if (source == unselectButton)
2883	3110	{
2884	3111	objEditor.jTree.clearSelection();
2885	3112	// ?? oct 2012 GrafreeD.clipboard.clear();
2886	3113	objEditor.ResetSliders();
2887	3114	refreshContents(true);
2888	3115	} else
2889		- if(event.getSource() instanceof cRadio)
	3116	+ if(source instanceof cRadio)
2890	3117	{
2891	3118	group.parent = keepparent;
2892	3119	group.attributes = 0;
2893	3120	//group.editWindow = null;
2894		- /cRadio/ radio = (cRadio)event.getSource();
	3121	+ /cRadio/ radio = (cRadio)source;
2895	3122	Object3D obj = radio.GetObject();
2896	3123	System.out.println("Edit " + obj);
2897	3124	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2911,7 +3138,7 @@
2911	3138	}
2912	3139
2913	3140	copy = group;
2914		- //CameraPane.theRenderer.object = group;
	3141	+ //Globals.theRenderer.object = group;
2915	3142	if(!useclient)
2916	3143	{
2917	3144	cameraView.renderCamera = radio.camera;
..	..	@@ -2926,7 +3153,10 @@
2926	3153	frontView.object = group;
2927	3154	sideView.object = group;
2928	3155	}
	3156	+
	3157	+// fix "+" issue
2929	3158	group.editWindow = this;
	3159	+
2930	3160	/*
2931	3161	currentLayout = radio.layout;
2932	3162	if (currentLayout == null)
..	..	@@ -2939,7 +3169,20 @@
2939	3169	//group.attributes = -1;
2940	3170	ResetModel();
2941	3171	refreshContents(true);
2942		- }
	3172	+ } else if (event.getSource() == editCameraItem)
	3173	+ {
	3174	+ cameraView.ProtectCamera();
	3175	+ cameraView.repaint();
	3176	+ return;
	3177	+ } else if (event.getSource() == revertCameraItem)
	3178	+ {
	3179	+ cameraView.RevertCamera();
	3180	+ cameraView.repaint();
	3181	+ return;
	3182	+ // } else if (event.getSource() == textureButton)
	3183	+ // {
	3184	+ // return; // true;
	3185	+ }
2943	3186	else
2944	3187	{
2945	3188	//return super.action(event, arg);
..	..	@@ -3000,6 +3243,28 @@
3000	3243	refreshContents();
3001	3244	}
3002	3245
	3246	+ void TransformChildren()
	3247	+ {
	3248	+ Object3D obj;
	3249	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3250	+ {
	3251	+ obj = (Object3D)e.nextElement();
	3252	+ obj.KeepTextureMatrices();
	3253	+ obj.TransformChildren();
	3254	+ obj.RestoreTextureMatrices();
	3255	+
	3256	+// if (obj.parent == null)
	3257	+// {
	3258	+// System.out.println("NULL PARENT!");
	3259	+// new Exception().printStackTrace();
	3260	+// }
	3261	+// else
	3262	+// TouchTransform(obj);
	3263	+// //obj.parent.Touch();
	3264	+ }
	3265	+
	3266	+ refreshContents();
	3267	+ }
3003	3268
3004	3269	void ResetTransform()
3005	3270	{
..	..	@@ -3112,7 +3377,7 @@
3112	3377	refreshContents();
3113	3378	}
3114	3379
3115		- void ResetCentroid()
	3380	+ void ResetCentroid(boolean full)
3116	3381	{
3117	3382	Object3D obj;
3118	3383	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3127,12 +3392,16 @@
3127	3392	LA.matIdentity(Object3D.mat);
3128	3393	obj.getBounds(minima, maxima, false);
3129	3394	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3130		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3395	+ if (full)
	3396	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3131	3397	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3132	3398	obj.TransformMesh(Object3D.mat);
	3399	+
3133	3400	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3134		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3401	+ if (full)
	3402	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3135	3403	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3404	+
3136	3405	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3137	3406	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3138	3407	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3161,7 +3430,8 @@
3161	3430
3162	3431	int size = obj.MemorySize();
3163	3432
3164		- System.err.println((size/1024) + " KB is the size of " + obj);
	3433	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3434	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3165	3435	}
3166	3436	}
3167	3437	catch (Exception e)
..	..	@@ -3198,9 +3468,9 @@
3198	3468	obj = (Object3D)e.nextElement();
3199	3469
3200	3470	System.out.println("Object is: " + obj);
3201		- GrafreeD.AnalyzeObject(obj);
	3471	+ Grafreed.AnalyzeObject(obj);
3202	3472	System.out.println("Boundary rep: " + obj.bRep);
3203		- GrafreeD.AnalyzeObject(obj.bRep);
	3473	+ Grafreed.AnalyzeObject(obj.bRep);
3204	3474
3205	3475	// System.err.println((size/1024) + " KB is the size of " + obj);
3206	3476	}
..	..	@@ -3242,6 +3512,13 @@
3242	3512	void GenNormals(boolean crease)
3243	3513	{
3244	3514	group.GenNormalsS(crease);
	3515	+
	3516	+ refreshContents();
	3517	+ }
	3518	+
	3519	+ void GenNormalsMESH()
	3520	+ {
	3521	+ group.GenNormalsMeshS();
3245	3522
3246	3523	refreshContents();
3247	3524	}
..	..	@@ -3414,8 +3691,8 @@
3414	3691
3415	3692	void ParseVertices()
3416	3693	{
3417		- boolean epsequal = GrafreeD.epsequal;
3418		- GrafreeD.epsequal = true;
	3694	+ boolean epsequal = Grafreed.epsequal;
	3695	+ Grafreed.epsequal = true;
3419	3696
3420	3697	for (int i=0; i<group.selection.size(); i++)
3421	3698	{
..	..	@@ -3440,7 +3717,7 @@
3440	3717	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3441	3718	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3442	3719
3443		- g.add(GrafreeD.clipboard);
	3720	+ g.add(Grafreed.clipboard);
3444	3721
3445	3722	buffer.add(g);
3446	3723	}
..	..	@@ -3455,7 +3732,7 @@
3455	3732	makeSomething(buffer, i==group.selection.size()-1);
3456	3733	}
3457	3734
3458		- GrafreeD.epsequal = epsequal;
	3735	+ Grafreed.epsequal = epsequal;
3459	3736
3460	3737	refreshContents();
3461	3738	}
..	..	@@ -3473,7 +3750,16 @@
3473	3750	String pigment = Object3D.GetPigment(tex);
3474	3751	//String bump = Object3D.GetBump(tex);
3475	3752
3476		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3753	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3754	+
	3755	+ try
	3756	+ {
	3757	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3758	+ }
	3759	+ catch (Exception e)
	3760	+ {
	3761	+ System.err.println("FAIL: " + node);
	3762	+ }
3477	3763
3478	3764	double s = v.s;
3479	3765
..	..	@@ -3561,11 +3847,11 @@
3561	3847
3562	3848	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3563	3849
3564		- boolean random = CameraPane.RANDOM;
3565		- CameraPane.RANDOM = false; // parse all random nodes
	3850	+ boolean random = CameraPane.SWITCH;
	3851	+ CameraPane.SWITCH = false; // parse all random nodes
3566	3852	lowres.linkVerticesThis(null);
3567	3853	lowres.linkVerticesThis(sn);
3568		- CameraPane.RANDOM = random;
	3854	+ CameraPane.SWITCH = random;
3569	3855
3570	3856	System.err.flush();
3571	3857
..	..	@@ -3605,7 +3891,7 @@
3605	3891	return;
3606	3892
3607	3893	Object3D poses = group.selection.get(0);
3608		- Object3D ref = GrafreeD.clipboard.get(0);
	3894	+ Object3D ref = Grafreed.clipboard.get(0);
3609	3895
3610	3896	Object3D newgroup = new Object3D("Po:" + poses.name);
3611	3897
..	..	@@ -3774,7 +4060,7 @@
3774	4060	group.selection.RelinkToSupport(); // july 2014
3775	4061	System.out.println("DONE.");
3776	4062	refreshContents();
3777		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4063	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3778	4064	}
3779	4065
3780	4066	void ReduceMesh(boolean reduction34)
..	..	@@ -3799,9 +4085,9 @@
3799	4085
3800	4086	void ClipMesh()
3801	4087	{
3802		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4088	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3803	4089	{
3804		- Object3D content = GrafreeD.clipboard.get(0);
	4090	+ Object3D content = Grafreed.clipboard.get(0);
3805	4091
3806	4092	if (content instanceof cGroup && ((cGroup)content).transientlink )
3807	4093	content = ((cGroup)content).get(0);
..	..	@@ -3810,7 +4096,7 @@
3810	4096	// {
3811	4097	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3812	4098	// }
3813		- group.selection.ClipMesh(GrafreeD.clipboard);
	4099	+ group.selection.ClipMesh(Grafreed.clipboard);
3814	4100	}
3815	4101	// group.selection.ClipMesh(GrafreeD.clipboard);
3816	4102	System.out.println("DONE.");
..	..	@@ -3945,7 +4231,7 @@
3945	4231	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3946	4232
3947	4233	Object3D elem = (Object3D)group.selection.elementAt(i);
3948		- if(elem != group)
	4234	+ if(elem != group \|\| !newWindow)
3949	4235	{
3950	4236	// if (!(elem instanceof Composite))
3951	4237	// newWindow = false;
..	..	@@ -4035,7 +4321,6 @@
4035	4321	//case 702: // Event.LIST_DESELECT
4036	4322	group.deselectAll();
4037	4323	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4038		- objEditor.ClearInfo(); // .GetMaterial());
4039	4324	if (tps != null)
4040	4325	{
4041	4326	for (int i=0; i < tps.length; i++)
..	..	@@ -4044,31 +4329,30 @@
4044	4329
4045	4330	//if (child.parent != null)
4046	4331	//child.parent.addSelectee(child);
	4332	+ objEditor.SetMaterial(child);
4047	4333	group.addSelectee(child);
4048		- objEditor.SetMaterial(child); // .GetMaterial());
4049		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4050		- System.err.println("info : " + child.GetPath());
4051	4334	}
4052	4335	}
4053		- else
4054		- {
4055		- objEditor.SetMaterial(group); // .GetMaterial());
4056		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4057		- System.err.println("info : " + group.GetPath());
4058		- }
	4336	+// else
	4337	+// {
	4338	+// objEditor.SetMaterial(group); // .GetMaterial());
	4339	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4340	+// System.err.println("info : " + group.GetPath());
	4341	+// }
4059	4342
4060		- objEditor.SetText(); // jan 2014
4061		-
4062		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4343	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4063	4344	CameraPane.flash = true;
4064	4345
4065		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4346	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4066	4347	// a camera
4067	4348	{
4068		- CameraPane.camerachangeframe = 0; // don't refuse it
4069		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4070		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
4071		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4349	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4350	+ {
	4351	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4352	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4353	+ }
	4354	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4355	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4072	4356	}
4073	4357
4074	4358	refreshContents();
..	..	@@ -4079,6 +4363,26 @@
4079	4363
4080	4364	freezemodel = false;
4081	4365	}
	4366	+
	4367	+ void refreshContents(boolean cp)
	4368	+ {
	4369	+ if (!Globals.MOUSEDRAGGED)
	4370	+ {
	4371	+ objEditor.ClearInfo(); // .GetMaterial());
	4372	+
	4373	+ for (int i=0; i < group.selection.Size(); i++)
	4374	+ {
	4375	+ Object3D child = (Object3D) group.selection.get(i);
	4376	+
	4377	+ objEditor.AddInfo(child, this, true);
	4378	+ System.err.println("info : " + child.GetPath());
	4379	+ }
	4380	+
	4381	+ objEditor.SetText(); // jan 2014
	4382	+ }
	4383	+
	4384	+ super.refreshContents(cp);
	4385	+ }
4082	4386
4083	4387	void linkSomething(Object3D thing)
4084	4388	{
..	..	@@ -4150,16 +4454,18 @@
4150	4454	{
4151	4455	if (group.selection.isEmpty())
4152	4456	return;
4153		- GrafreeD.clipboardIsTempGroup = false;
	4457	+
	4458	+ Grafreed.clipboardIsTempGroup = false;
4154	4459	Composite tGroup = null;
4155	4460	if (group.selection.size() > 0) // 1)
4156	4461	{
4157	4462	tGroup = new cGroup();
4158		- GrafreeD.clipboardIsTempGroup = true;
	4463	+ Grafreed.clipboardIsTempGroup = true;
4159	4464	}
4160	4465
4161	4466	if (cut)
4162	4467	{
	4468	+ Save();
4163	4469	//int indices[] = jList.getSelectedIndices();
4164	4470	//for (int i = indices.length - 1; i >= 0; i--)
4165	4471	//jList.remove(indices[i]);
..	..	@@ -4195,16 +4501,16 @@
4195	4501	//System.out.println("cut " + child);
4196	4502	//System.out.println("parent = " + child.parent);
4197	4503	// tmp.addChild(child);
4198		- if (GrafreeD.clipboardIsTempGroup)
	4504	+ if (Grafreed.clipboardIsTempGroup)
4199	4505	tGroup.add/Child/(tmp);
4200	4506	else
4201		- GrafreeD.clipboard = tmp;
	4507	+ Grafreed.clipboard = tmp;
4202	4508	}
4203	4509	else
4204		- if (GrafreeD.clipboardIsTempGroup)
	4510	+ if (Grafreed.clipboardIsTempGroup)
4205	4511	tGroup.add/Child/(child);
4206	4512	else
4207		- GrafreeD.clipboard = child;
	4513	+ Grafreed.clipboard = child;
4208	4514	}
4209	4515
4210	4516	//ResetModel();
..	..	@@ -4236,21 +4542,23 @@
4236	4542	//System.out.println("cut " + elem);
4237	4543	//System.out.println("parent = " + elem.parent);
4238	4544	// tmp.addChild(elem);
4239		- if (GrafreeD.clipboardIsTempGroup)
	4545	+ if (Grafreed.clipboardIsTempGroup)
4240	4546	tGroup.add/Child/(tmp);
4241	4547	else
4242		- GrafreeD.clipboard = tmp;
	4548	+ Grafreed.clipboard = tmp;
4243	4549	}
4244	4550	else
4245		- if (GrafreeD.clipboardIsTempGroup)
	4551	+ if (Grafreed.clipboardIsTempGroup)
4246	4552	tGroup.add/Child/(child);
4247	4553	else
4248		- GrafreeD.clipboard = child;
	4554	+ Grafreed.clipboard = child;
4249	4555	}
4250	4556
4251	4557	}
4252		- if (GrafreeD.clipboardIsTempGroup)
4253		- GrafreeD.clipboard = tGroup;
	4558	+
	4559	+ if (Grafreed.clipboardIsTempGroup)
	4560	+ Grafreed.clipboard = tGroup;
	4561	+
4254	4562	if (cut)
4255	4563	{
4256	4564	ResetModel();
..	..	@@ -4264,7 +4572,7 @@
4264	4572	// return;
4265	4573	boolean first = true;
4266	4574
4267		- if (GrafreeD.clipboardIsTempGroup)
	4575	+ if (Grafreed.clipboardIsTempGroup)
4268	4576	{
4269	4577	Composite temp;
4270	4578
..	..	@@ -4275,7 +4583,7 @@
4275	4583	temp = (Composite)Applet3D.clipboard.deepCopy();
4276	4584	*/
4277	4585	Object3D elem;
4278		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4586	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4279	4587	{
4280	4588	Object3D child = (Object3D)e.nextElement();
4281	4589
..	..	@@ -4309,21 +4617,21 @@
4309	4617	//Object3D cb = Applet3D.clipboard;
4310	4618	//temp.addChild(cb);
4311	4619	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4312		- assert(GrafreeD.clipboard.parent == null);
4313		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4314		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4315		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4316		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4620	+ assert(Grafreed.clipboard.parent == null);
	4621	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4622	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4623	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4624	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4317	4625	else
4318		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4319		- GrafreeD.clipboard.get(0).parent = keepparent;
	4626	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4627	+ Grafreed.clipboard.get(0).parent = keepparent;
4320	4628	}
4321	4629
4322	4630	ResetModel();
4323	4631	refreshContents();
4324	4632	}
4325	4633
4326		- void pasteInto(boolean copyit)
	4634	+ void pasteInto(boolean copyit, boolean clone)
4327	4635	{
4328	4636	// if (GrafreeD.clipboard == null)
4329	4637	// return;
..	..	@@ -4352,15 +4660,22 @@
4352	4660	if (copyit)
4353	4661	{
4354	4662	// paste(false);
4355		- CloneClipboard(false); // sept 2014
	4663	+ if (clone)
	4664	+ {
	4665	+ CloneClipboard(false); // sept 2014
	4666	+ }
	4667	+ else
	4668	+ {
	4669	+ paste(false);
	4670	+ }
4356	4671	}
4357	4672	else
4358	4673	{
4359	4674	boolean first = true;
4360	4675
4361		- if (GrafreeD.clipboardIsTempGroup)
	4676	+ if (Grafreed.clipboardIsTempGroup)
4362	4677	{
4363		- Composite temp = (Composite)GrafreeD.clipboard;
	4678	+ Composite temp = (Composite)Grafreed.clipboard;
4364	4679	Object3D copy;
4365	4680	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4366	4681	{
..	..	@@ -4370,7 +4685,7 @@
4370	4685	}
4371	4686	} else
4372	4687	{
4373		- linkSomething(GrafreeD.clipboard); //.get(0));
	4688	+ linkSomething(Grafreed.clipboard); //.get(0));
4374	4689	}
4375	4690	}
4376	4691	}
..	..	@@ -4775,21 +5090,6 @@
4775	5090	}
4776	5091	*/
4777	5092
4778		- void ImportGFD()
4779		- {
4780		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4781		- browser.show();
4782		- String filename = browser.getFile();
4783		- if (filename != null && filename.length() > 0)
4784		- {
4785		- String fullname = browser.getDirectory() + filename;
4786		-
4787		- //Object3D readobj =
4788		- objEditor.ReadGFD(fullname, objEditor);
4789		- //makeSomething(readobj);
4790		- }
4791		- }
4792		-
4793	5093	/*
4794	5094	public void Callback(Object obj)
4795	5095	{
..	..	@@ -4813,26 +5113,9 @@
4813	5113	}
4814	5114	*/
4815	5115
4816		- void ImportVRMLX3D()
4817		- {
4818		- if (GrafreeD.standAlone)
4819		- {
4820		- /**/
4821		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4822		- browser.show();
4823		- String filename = browser.getFile();
4824		- if (filename != null && filename.length() > 0)
4825		- {
4826		- String fullname = browser.getDirectory() + filename;
4827		- LoadVRMLX3D(fullname);
4828		- }
4829		- /**/
4830		- }
4831		- }
4832		-
4833	5116	String GetFile(String dialogName)
4834	5117	{
4835		- if (GrafreeD.standAlone)
	5118	+ if (Grafreed.standAlone)
4836	5119	{
4837	5120	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4838	5121	browser.show();
..	..	@@ -4896,10 +5179,15 @@
4896	5179	cButton flashSelectionButton;
4897	5180	cButton editButton;
4898	5181	cButton uneditButton;
	5182	+ JCheckBox allParamsButton;
4899	5183	cButton clearpanelButton;
4900		- cButton allParamsButton;
4901	5184	cButton unselectButton;
4902	5185
	5186	+ cButton saveButton;
	5187	+ cButton undoButton;
	5188	+ cButton redoButton;
	5189	+ cButton oneStepButton;
	5190	+
4903	5191	cButton screenfitButton;
4904	5192	cButton screenfitpointButton;
4905	5193	cButton snapobjectButton;
..	..	@@ -4930,6 +5218,8 @@
4930	5218	private MenuItem lookFromItem;
4931	5219	private MenuItem switchItem;
4932	5220	private MenuItem cutItem;
	5221	+ private MenuItem undoItem;
	5222	+ private MenuItem redoItem;
4933	5223	private MenuItem duplicateItem;
4934	5224	private MenuItem cloneItem;
4935	5225	private MenuItem cloneSupportItem;
..	..	@@ -4943,7 +5233,7 @@
4943	5233	private MenuItem linkverticesItem;
4944	5234	private MenuItem relinkverticesItem;
4945	5235	private MenuItem setMasterItem;
4946		- private MenuItem resetMeshItem;
	5236	+ private MenuItem resetAllItem;
4947	5237	private MenuItem stepAllItem;
4948	5238	private MenuItem revertMeshItem;
4949	5239	private MenuItem poseMeshItem;
..	..	@@ -4954,6 +5244,7 @@
4954	5244	private MenuItem mergeGeometriesItem;
4955	5245	private MenuItem copyItem;
4956	5246	private MenuItem pasteItem;
	5247	+ private MenuItem pasteIntoItem;
4957	5248	private MenuItem pasteLinkItem;
4958	5249	private MenuItem pasteCloneItem;
4959	5250	private MenuItem pasteExpandItem;
..	..	@@ -5003,8 +5294,10 @@
5003	5294	private MenuItem panoTexturesItem;
5004	5295
5005	5296	private MenuItem resetCentroidItem;
5006		- private MenuItem transformgeometryItem;
	5297	+ private MenuItem resetCentroidXZItem;
5007	5298	private MenuItem resetTransformItem;
	5299	+ private MenuItem transformGeometryItem;
	5300	+ private MenuItem transformChildrenItem;
5008	5301	private MenuItem hideItem;
5009	5302	private MenuItem grabItem;
5010	5303	private MenuItem backItem;
..	..	@@ -5051,7 +5344,7 @@
5051	5344	private MenuItem blobItem;
5052	5345	private MenuItem latheItem;
5053	5346	private MenuItem bezierItem;
5054		- private MenuItem checkerItem;
	5347	+ private MenuItem overlayItem;
5055	5348	private MenuItem meshItem;
5056	5349	// private MenuItem meshGroupItem;
5057	5350	private MenuItem springItem;
..	..	@@ -5073,11 +5366,6 @@
5073	5366	private MenuItem doubleItem;
5074	5367	private MenuItem tripleItem;
5075	5368
5076		- private MenuItem importGFDItem;
5077		- private MenuItem importVRMLX3DItem;
5078		- private MenuItem import3DSItem;
5079		- private MenuItem importOBJItem;
5080		-
5081	5369	private MenuItem computeAOItem;
5082	5370	private MenuItem recompileItem;
5083	5371	private MenuItem editScriptItem;
..	..	@@ -5087,4 +5375,8 @@
5087	5375	private MenuItem analyzeItem;
5088	5376	private MenuItem dumpItem;
5089	5377	//boolean freezemodel = false;
	5378	+
	5379	+ Menu cameraMenu;
	5380	+ MenuItem editCameraItem;
	5381	+ MenuItem revertCameraItem;
5090	5382	}