~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,110 +555,110 @@
433	555	oe.radioPanel.add(dummyButton);
434	556	oe.buttonGroup.add(dummyButton);
435	557	*/
436		- aConstraints.gridy += 1;
437		-
438	558	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	559
440		- oe.aConstraints.gridwidth = 1;
441		- oe.aConstraints.gridx = 0;
	560	+ oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	561	+ undoButton.setToolTipText("Undo changes");
	562	+ undoButton.addActionListener(this);
442	563
443		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
444		- liveCB.setToolTipText("Enabled animation");
	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");
445	574	liveCB.addItemListener(this);
446	575
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), 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");
	582	+ fastCB.addItemListener(this);
	583	+
	584	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
449	585	trackCB.setToolTipText("Enable tracking");
450	586	trackCB.addItemListener(this);
451	587
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	588	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
454	589	screenfitButton.setToolTipText("Screen fit");
455	590	screenfitButton.addActionListener(this);
456		- oe.aConstraints.gridx += 1;
	591	+
457	592	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
458	593	// screenfitpointButton.addActionListener(this);
459		-// oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
461		- snapobjectButton.addActionListener(this);
462		- snapobjectButton.setToolTipText("Snap Object");
463		- oe.aConstraints.gridx += 1;
464	594
465		- //aConstraints.gridx = 0;
466		- //aConstraints.gridy += 1;
467		- oe.aConstraints.weighty = 0;
468		- oe.aConstraints.gridwidth = 1;
469		-
470		- 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);
471	603	flashSelectionButton.setToolTipText("Show selection");
472	604	flashSelectionButton.addActionListener(this);
473	605
474		- oe.toolbarPanel.add(new cButton(" ", false));
	606	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
475	607
476		- oe.aConstraints.gridx += 1;
477		- oe.aConstraints.weighty = 0;
478		- oe.aConstraints.gridwidth = 1;
479		-
480		- //
481		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	608	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
482	609	twoButton.setToolTipText("Show center view only");
483	610	twoButton.addActionListener(this);
484		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	611	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	612	fourButton.addActionListener(this);
486	613	fourButton.setToolTipText("Show left panel only");
487		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	614	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
488	615	sixButton.setToolTipText("2-column layout left");
489	616	sixButton.addActionListener(this);
490		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	617	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
491	618	threeButton.setToolTipText("2-column layout right");
492	619	threeButton.addActionListener(this);
493		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	620	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
494	621	sevenButton.setToolTipText("3-column layout");
495	622	sevenButton.addActionListener(this);
496	623	//
497	624
498		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
499		- rootButton.setToolTipText("Edit object in new tab");
	625	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	626	+ rootButton.setToolTipText("Edit selection in new tab");
500	627	rootButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	628	+
	629	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
503	630	closeButton.setToolTipText("Close tab");
504	631	closeButton.addActionListener(this);
505	632	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
506	633	//clearButton.addActionListener(this);
507		- oe.aConstraints.gridx += 1;
508	634
509		- oe.aConstraints.gridx = 1; //
510		- 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");
511	639	editButton.addActionListener(this);
512		- oe.aConstraints.gridx += 1;
513		- oe.aConstraints.weighty = 0;
514		- oe.aConstraints.gridwidth = 1;
515	640
516		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	641	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	642	+ uneditButton.setToolTipText("Unedit selection");
517	643	uneditButton.addActionListener(this);
518	644
519		- oe.aConstraints.gridx += 1;
520		- oe.aConstraints.weighty = 0;
521		- oe.aConstraints.gridwidth = 1;
522		-
523		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
524		- clearPanelButton.addActionListener(this);
525		-
526		- oe.aConstraints.gridx += 1;
527		- oe.aConstraints.weighty = 0;
528		- oe.aConstraints.gridwidth = 1;
529		-
530		- 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");
531	647	allParamsButton.addActionListener(this);
532	648
533		- oe.aConstraints.gridx += 1;
534		- oe.aConstraints.weighty = 0;
535		- oe.aConstraints.gridwidth = 1;
536		-
537		- 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");
538	655	unselectButton.addActionListener(this);
539	656
	657	+ commandsPanel.preferredHeight = 1;
	658	+
	659	+ oe.treePanel.add(commandsPanel);
	660	+ oe.treePanel.Return();
	661	+
540	662	// oe.aConstraints.gridx += 1;
541	663	// oe.aConstraints.weighty = 0;
542	664	// oe.aConstraints.gridwidth = 1;
..	..	@@ -548,40 +670,37 @@
548	670	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
549	671	// gcButton.addActionListener(this);
550	672
551		- oe.aConstraints.gridx = 0;
552		- oe.aConstraints.gridy += 1;
553		-
554		- //ctrlPanel.add(objList = new List(5, true));
555		- oe.aConstraints.gridwidth = 100;
556		- // oe.aConstraints.gridheight = 100;
557		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
558		- oe.aConstraints.gridheight = 1;
559		- oe.aConstraints.weighty = 0.5;
560		- oe.aConstraints.gridx = 0;
561		- JScrollPane jSP;
	673	+ cGridBag jSPPanel = new cGridBag();
	674	+
	675	+ JScrollPane jSP;
562	676	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
563		- 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);
564	678	ResetModel();
565		- oe.aConstraints.weighty = 0.5;
566		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
567		- oe.aConstraints.gridy += 1;
568		- oe.aConstraints.gridwidth = 1;
	679	+
	680	+ oe.treePanel.add(jSPPanel);
	681	+ oe.treePanel.Return();
569	682
570		- oe.aConstraints.weighty = 0;
571		- oe.aConstraints.gridwidth = 2;
572		-
573		- 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");
574	687	colorCB.addItemListener(this);
575		- oe.aConstraints.gridx += 2;
576		- 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");
577	691	materialCB.addItemListener(this);
578		- oe.aConstraints.gridx += 2;
579		- 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");
580	695	textureCB.addItemListener(this);
581	696
582		- oe.aConstraints.gridx = 0;
583		- oe.aConstraints.gridy += 1;
	697	+ copyOptionsPanel.preferredHeight = 1;
	698	+ oe.treePanel.add(copyOptionsPanel);
	699	+ oe.treePanel.Return();
584	700
	701	+// mainPanel.setDividerLocation(0.5); //1.0);
	702	+// mainPanel.setResizeWeight(0.5);
	703	+
585	704	//jList.addListSelectionListener(this);
586	705	oe.jTree.addTreeSelectionListener(this);
587	706	//jTree.setRootVisible(false);
..	..	@@ -604,45 +723,37 @@
604	723	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
605	724	}
606	725
607		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	726	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
608	727	{
609		- constraints.gridx = 0;
610		- constraints.gridy = 0;
611		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), constraints);
612		- fastCB.setToolTipText("Fast mode");
613		- fastCB.addItemListener(this);
614		- constraints.gridy += 1;
615		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), constraints);
616		- supportCB.setToolTipText("Enabled rigging");
617		- supportCB.addItemListener(this);
618		-
619		- // constraints.gridy += 1;
620		- // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
621		- // localCB.addItemListener(this);
622		-
623		- constraints.gridy += 1;
624		- panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), constraints);
625		- crowdCB.setToolTipText("Used for crowds");
626		- crowdCB.addItemListener(this);
627		-
628		- constraints.gridy += 1;
629		- panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), constraints);
630		- smoothCB.setToolTipText("Snapping delay");
631		- smoothCB.addItemListener(this);
632		-
633		- constraints.gridy += 1;
634		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), constraints);
635		- slowCB.setToolTipText("Smooth interpolation");
636		- slowCB.addItemListener(this);
637		- constraints.gridy += 1;
638		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), constraints);
	728	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
639	729	boxCB.setToolTipText("Display bounding boxes");
640	730	boxCB.addItemListener(this);
641		- constraints.gridy += 1;
642		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), constraints);
	731	+
	732	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
643	733	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
644	734	zoomBoxCB.addItemListener(this);
645	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	+
646	757	// constraints.gridy += 1;
647	758	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
648	759	// speakerMocapCB.addItemListener(this);
..	..	@@ -650,16 +761,16 @@
650	761	if (false)
651	762	{
652	763	// handled in scripts
653		- constraints.gridy += 1;
654		- panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), constraints);
	764	+ //constraints.gridy += 1;
	765	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
655	766	speakerCameraCB.addItemListener(this);
656	767
657		- constraints.gridy += 1;
658		- panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), constraints);
	768	+ //constraints.gridy += 1;
	769	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
659	770	speakerFocusCB.addItemListener(this);
660	771
661		- constraints.gridy += 1;
662		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), constraints);
	772	+ //constraints.gridy += 1;
	773	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
663	774	smoothfocusCB.addItemListener(this);
664	775	}
665	776
..	..	@@ -667,14 +778,20 @@
667	778	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
668	779	// debugCB.addItemListener(this);
669	780
670		- constraints.gridy += 1;
671		- panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), constraints);
	781	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
672	782	oeilCB.addItemListener(this);
673	783
674		- constraints.gridy += 1;
675		- panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), constraints);
	784	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
676	785	lookAtCB.setToolTipText("Look-at target");
677	786	lookAtCB.addItemListener(this);
	787	+
	788	+ }
	789	+
	790	+ cGridBag fill = new cGridBag();
	791	+
	792	+ fill.preferredHeight = 200;
	793	+
	794	+ panel.add(fill);
678	795
679	796	}
680	797
..	..	@@ -689,6 +806,7 @@
689	806	buttonGroup.add(radioButton);
690	807	radioButton.doClick();
691	808	}
	809	+
692	810	void SetupViews(ObjEditor oe)
693	811	{
694	812	oe.SetupViews();
..	..	@@ -905,7 +1023,9 @@
905	1023	// objEditor.DropFile((java.io.File[]) object, true);
906	1024	// return;
907	1025	// }
908		- if (string.charAt(0) == '/')
	1026	+
	1027	+ // File path for Mac and Windows
	1028	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
909	1029	{
910	1030	// file(s)
911	1031	String[] names = string.split("\n");
..	..	@@ -932,7 +1052,7 @@
932	1052
933	1053	flashIt = false;
934	1054	CameraPane pane = (CameraPane) target;
935		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1055	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
936	1056	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
937	1057
938	1058	if (group.selection.size() == 1)
..	..	@@ -959,11 +1079,11 @@
959	1079	{
960	1080	loadClipboard(true);
961	1081	objEditor.jTree.setSelectionPath(destinationPath);
962		- pasteInto(false);
	1082	+ pasteInto(false, false);
963	1083	} else {
964	1084	loadClipboard(false);
965	1085	objEditor.jTree.setSelectionPath(destinationPath);
966		- pasteInto(false); // true); // ???
	1086	+ pasteInto(false, false); // true); // ???
967	1087	}
968	1088	}
969	1089	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1085,27 +1205,33 @@
1085	1205	kleinItem.addActionListener(this);
1086	1206	particleItem = menu.add(new MenuItem("Particle system"));
1087	1207	particleItem.addActionListener(this);
	1208	+ if (Globals.ADVANCED)
	1209	+ {
1088	1210	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1089	1211	ragdollItem.addActionListener(this);
1090	1212	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1091	1213	ragdoll2Item.addActionListener(this);
	1214	+ }
1092	1215	menu.add("-");
1093		- meshItem = menu.add(new MenuItem("Mesh"));
	1216	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1094	1217	meshItem.addActionListener(this);
1095	1218	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1096	1219	// meshGroupItem.addActionListener(this);
	1220	+ if (Globals.ADVANCED)
	1221	+ {
1097	1222	springItem = menu.add(new MenuItem("Spring"));
1098	1223	springItem.addActionListener(this);
1099	1224	flagItem = menu.add(new MenuItem("Flag"));
1100	1225	flagItem.addActionListener(this);
1101		- bezierItem = menu.add(new MenuItem("Patch"));
1102		- bezierItem.addActionListener(this);
1103		- checkerItem = menu.add(new MenuItem("Checker"));
1104		- checkerItem.addActionListener(this);
1105	1226	blobItem = menu.add(new MenuItem("Blob"));
1106	1227	blobItem.addActionListener(this);
1107	1228	latheItem = menu.add(new MenuItem("Lathe"));
1108	1229	latheItem.addActionListener(this);
	1230	+ }
	1231	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1232	+ bezierItem.addActionListener(this);
	1233	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1234	+ overlayItem.addActionListener(this);
1109	1235	lightItem = menu.add(new MenuItem("Light"));
1110	1236	lightItem.addActionListener(this);
1111	1237	menu.add("-");
..	..	@@ -1115,34 +1241,39 @@
1115	1241	loopItem.addActionListener(this);
1116	1242	doubleItem = menu.add(new MenuItem("Fork"));
1117	1243	doubleItem.addActionListener(this);
	1244	+ if (Globals.ADVANCED)
	1245	+ {
1118	1246	tripleItem = menu.add(new MenuItem("Trident"));
1119	1247	tripleItem.addActionListener(this);
	1248	+ }
1120	1249	}
1121	1250
1122	1251	void buildToolsMenu(Menu menu)
1123	1252	{
1124	1253	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1125	1254	animationItem.addItemListener(this);
1126		- animationItem.setState(CameraPane.ANIMATION);
	1255	+ animationItem.setState(Globals.ANIMATION);
1127	1256
1128	1257	menu.add("-");
1129	1258	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1130	1259	parseverticesItem.addActionListener(this);
1131	1260	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1132	1261	textureFieldItem.addActionListener(this);
1133		- alignItem = menu.add(new MenuItem("Align"));
	1262	+ alignItem = menu.add(new MenuItem("Align Objects"));
1134	1263	alignItem.addActionListener(this);
1135		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1136		- mirrorItem.addActionListener(this);
1137	1264	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1138	1265	reduceMorphItem.addActionListener(this);
1139	1266	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1140	1267	reduce34MorphItem.addActionListener(this);
1141		-
	1268	+ menu.add("-");
1142	1269	menu.add(computeAOItem = new MenuItem("Compute AO"));
1143	1270	computeAOItem.addActionListener(this);
1144		- menu.add("-");
1145	1271
	1272	+ if (Globals.ADVANCED)
	1273	+ {
	1274	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1275	+ mirrorItem.addActionListener(this);
	1276	+ menu.add("-");
1146	1277	menu.add(memoryItem = new MenuItem("Memory Usage"));
1147	1278	memoryItem.addActionListener(this);
1148	1279	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1165,6 +1296,7 @@
1165	1296	menu.add("-");
1166	1297	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1167	1298	editScriptItem.addActionListener(this);
	1299	+ }
1168	1300	}
1169	1301
1170	1302	void ScreenFit()
..	..	@@ -1493,9 +1625,9 @@
1493	1625
1494	1626	void Overwrite(int mask)
1495	1627	{
1496		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1628	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1497	1629	{
1498		- Object3D content = GrafreeD.clipboard.get(0);
	1630	+ Object3D content = Grafreed.clipboard.get(0);
1499	1631
1500	1632	if (content instanceof cGroup && ((cGroup)content).transientlink )
1501	1633	content = ((cGroup)content).get(0);
..	..	@@ -1518,6 +1650,7 @@
1518	1650	//
1519	1651	public void actionPerformed(ActionEvent event) // , Object arg)
1520	1652	{
	1653	+ Object source = event.getSource();
1521	1654	/*
1522	1655	if (event.getSource() == nameField)
1523	1656	{
..	..	@@ -1529,11 +1662,11 @@
1529	1662	}
1530	1663	else
1531	1664	*/
1532		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1665	+ if (source == lookAtItem \|\| source == lookFromItem)
1533	1666	{
1534	1667	ScreenFit();
1535	1668	} else
1536		- if (event.getSource() == switchItem)
	1669	+ if (source == switchItem)
1537	1670	{
1538	1671	cVector v1 = new cVector();
1539	1672	cVector v2 = new cVector();
..	..	@@ -1542,11 +1675,11 @@
1542	1675	objEditor.cameraView.renderCamera.setAim(v2, v1);
1543	1676	objEditor.cameraView.repaint();
1544	1677	} else
1545		- if (event.getSource() == rectoidItem)
	1678	+ if (source == rectoidItem)
1546	1679	{
1547	1680	makeSomething(new Box());
1548	1681	} else
1549		- if (event.getSource() == particleItem)
	1682	+ if (source == particleItem)
1550	1683	{
1551	1684	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1552	1685	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1567,9 +1700,9 @@
1567	1700	applyExample(particleGeom, "SMOKE");
1568	1701	makeSomething(particleGeom);
1569	1702	} else
1570		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1703	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1571	1704	{
1572		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1705	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1573	1706
1574	1707	ragdoll.toParent = LA.newMatrix();
1575	1708	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1587,7 +1720,7 @@
1587	1720	} else
1588	1721	/*
1589	1722	*/
1590		- if (event.getSource() == heightFieldItem)
	1723	+ if (source == heightFieldItem)
1591	1724	{
1592	1725	Object3D obj = new Object3D();
1593	1726
..	..	@@ -1625,31 +1758,31 @@
1625	1758
1626	1759	makeSomething(obj);
1627	1760	} else
1628		- if (event.getSource() == gridItem)
	1761	+ if (source == gridItem)
1629	1762	{
1630	1763	makeSomething(new Grid());
1631	1764	} else
1632		- if (event.getSource() == ellipsoidItem)
	1765	+ if (source == ellipsoidItem)
1633	1766	{
1634	1767	makeSomething(new Sphere());
1635	1768	} else
1636		- if (event.getSource() == coneItem)
	1769	+ if (source == coneItem)
1637	1770	{
1638	1771	makeSomething(new Cone());
1639	1772	} else
1640		- if (event.getSource() == torusItem)
	1773	+ if (source == torusItem)
1641	1774	{
1642	1775	makeSomething(new Torus());
1643	1776	} else
1644		- if (event.getSource() == superItem)
	1777	+ if (source == superItem)
1645	1778	{
1646	1779	makeSomething(new Superellipsoid());
1647	1780	} else
1648		- if (event.getSource() == kleinItem)
	1781	+ if (source == kleinItem)
1649	1782	{
1650	1783	makeSomething(new Klein());
1651	1784	} else
1652		- if (event.getSource() == blobItem)
	1785	+ if (source == blobItem)
1653	1786	{
1654	1787	Blob blob = new Blob();
1655	1788	BlobComponent comp = new BlobComponent();
..	..	@@ -1657,15 +1790,15 @@
1657	1790	//blob.retile();
1658	1791	makeSomething(blob);
1659	1792	} else
1660		- if (event.getSource() == latheItem)
	1793	+ if (source == latheItem)
1661	1794	{
1662	1795	makeSomething(new Lathe());
1663	1796	} else
1664		- if (event.getSource() == bezierItem)
	1797	+ if (source == bezierItem)
1665	1798	{
1666	1799	makeSomething(new BezierSurface());
1667	1800	} else
1668		- if (event.getSource() == checkerItem)
	1801	+ if (source == overlayItem)
1669	1802	{
1670	1803	/*
1671	1804	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1680,7 +1813,7 @@
1680	1813	*/
1681	1814	makeSomething(new Checker());
1682	1815	} else
1683		- if (event.getSource() == meshItem)
	1816	+ if (source == meshItem)
1684	1817	{
1685	1818	Object3D itemtomake = new Object3D();
1686	1819	Object3D child;
..	..	@@ -1701,35 +1834,35 @@
1701	1834	makeSomething(child);
1702	1835	}
1703	1836	} else
1704		- if (event.getSource() == springItem)
	1837	+ if (source == springItem)
1705	1838	{
1706	1839	cSpring s = new cSpring();
1707	1840	s.setup();
1708	1841	makeSomething(s);
1709	1842	} else
1710		- if (event.getSource() == flagItem)
	1843	+ if (source == flagItem)
1711	1844	{
1712	1845	cSpring s = new cFlag();
1713	1846	s.setup();
1714	1847	makeSomething(s);
1715	1848	} else
1716		- if (event.getSource() == lightItem)
	1849	+ if (source == lightItem)
1717	1850	{
1718	1851	makeSomething(new Light());
1719	1852	} else
1720		- if (event.getSource() == csgItem)
	1853	+ if (source == csgItem)
1721	1854	{
1722	1855	group(new CSG());
1723	1856	} else
1724		- if (event.getSource() == templateItem)
	1857	+ if (source == templateItem)
1725	1858	{
1726	1859	group(new cTemplate());
1727	1860	} else
1728		- if (event.getSource() == attributeItem)
	1861	+ if (source == attributeItem)
1729	1862	{
1730	1863	makeSomething(new Attribute());
1731	1864	} else
1732		- if (event.getSource() == pointflowItem)
	1865	+ if (source == pointflowItem)
1733	1866	{
1734	1867	makeSomething(new PointFlow());
1735	1868	} else
..	..	@@ -1741,7 +1874,7 @@
1741	1874	} else
1742	1875	*/
1743	1876
1744		- if (event.getSource() == superLoopItem)
	1877	+ if (source == superLoopItem)
1745	1878	{
1746	1879	Composite g = new cGroup();
1747	1880	for (int i=0; i<15; i++)
..	..	@@ -1763,7 +1896,7 @@
1763	1896
1764	1897	group(g);
1765	1898	} else
1766		- if (event.getSource() == loopItem)
	1899	+ if (source == loopItem)
1767	1900	{
1768	1901	Composite csg = new GroupLeaf();
1769	1902	csg.count = 5;
..	..	@@ -1772,7 +1905,7 @@
1772	1905	csg.addChild(child);
1773	1906	child.addChild(csg);
1774	1907	} else
1775		- if (event.getSource() == doubleItem)
	1908	+ if (source == doubleItem)
1776	1909	{
1777	1910	Composite csg = new GroupLeaf();
1778	1911	csg.count = 5;
..	..	@@ -1784,7 +1917,7 @@
1784	1917	csg.addChild(child);
1785	1918	child.addChild(csg);
1786	1919	} else
1787		- if (event.getSource() == tripleItem)
	1920	+ if (source == tripleItem)
1788	1921	{
1789	1922	Composite csg = new GroupLeaf();
1790	1923	csg.count = 4;
..	..	@@ -1799,71 +1932,71 @@
1799	1932	csg.addChild(child);
1800	1933	child.addChild(csg);
1801	1934	} else
1802		-
1803		- if (event.getSource() == importGFDItem)
1804		- {
1805		- ImportGFD();
1806		- } else
1807		- if (event.getSource() == importVRMLX3DItem)
1808		- {
1809		- ImportVRMLX3D();
1810		- } else
1811		- if (event.getSource() == import3DSItem)
1812		- {
1813		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1814		- } else
1815		- if (event.getSource() == importOBJItem)
1816		- {
1817		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1818		- } else
1819		- if (event.getSource() == computeAOItem)
	1935	+ if (source == computeAOItem)
1820	1936	{
1821	1937	Globals.drawMode = CameraPane.OCCLUSION;
1822	1938	Globals.theRenderer.repaint();
1823	1939	} else
1824		- if (event.getSource() == recompileItem)
	1940	+ if (source == recompileItem)
1825	1941	{
1826	1942	Recompile();
1827	1943	refreshContents();
1828	1944	} else
1829		- if (event.getSource() == editScriptItem)
	1945	+ if (source == editScriptItem)
1830	1946	{
1831	1947	OpenDialog();
1832	1948	refreshContents();
1833	1949	} else
1834		- if (event.getSource() == invariantsItem)
	1950	+ if (source == invariantsItem)
1835	1951	{
1836	1952	System.out.println("Invariants:");
1837		- GrafreeD.grafreeD.universe.invariants();
	1953	+ Grafreed.grafreeD.universe.invariants();
1838	1954	} else
1839		- if (event.getSource() == memoryItem)
	1955	+ if (source == memoryItem)
1840	1956	{
1841	1957	//System.out.println("Invariants:");
1842	1958	PrintMemory();
1843	1959	} else
1844		- if (event.getSource() == pathItem)
	1960	+ if (source == pathItem)
1845	1961	{
1846	1962	PrintPath();
1847	1963	} else
1848		- if (event.getSource() == analyzeItem)
	1964	+ if (source == analyzeItem)
1849	1965	{
1850	1966	AnalyzeObject();
1851	1967	} else
1852		- if (event.getSource() == dumpItem)
	1968	+ if (source == dumpItem)
1853	1969	{
1854	1970	DumpObject();
1855	1971	} else
1856		- if (event.getSource() == screenfitButton)
	1972	+ if (source == undoButton)
	1973	+ {
	1974	+ Undo();
	1975	+ } else
	1976	+ if (source == redoButton)
	1977	+ {
	1978	+ Redo();
	1979	+ } else
	1980	+ if (source == saveButton)
	1981	+ {
	1982	+ Save();
	1983	+ } else
	1984	+ if (source == oneStepButton)
	1985	+ {
	1986	+ Globals.ONESTEP = true;
	1987	+ cameraView.repaint();
	1988	+ } else
	1989	+ if (source == screenfitButton)
1857	1990	{
1858	1991	//Reload(lastConverter, lastFilename, true);
1859	1992	ScreenFit();
1860	1993	} else
1861		- if (event.getSource() == screenfitpointButton)
	1994	+ if (source == screenfitpointButton)
1862	1995	{
1863	1996	//Reload(lastConverter, lastFilename, true);
1864	1997	ScreenFitPoint();
1865	1998	} else
1866		- if (event.getSource() == snapobjectButton)
	1999	+ if (source == snapobjectButton)
1867	2000	{
1868	2001	//Reload(lastConverter, lastFilename, true);
1869	2002	SnapObject();
..	..	@@ -1874,13 +2007,13 @@
1874	2007	// Recompile();
1875	2008	// refreshContents();
1876	2009	// } else
1877		- if (event.getSource() == gcButton)
	2010	+ if (source == gcButton)
1878	2011	{
1879	2012	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1880	2013	System.gc();
1881	2014	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1882	2015	} else
1883		- if (event.getSource() == editLeafItem)
	2016	+ if (source == editLeafItem)
1884	2017	{
1885	2018	Object3D obj;
1886	2019	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1894,62 +2027,74 @@
1894	2027	}
1895	2028	refreshContents(true);
1896	2029	} else
1897		- if (event.getSource() == openWindowItem)
	2030	+ if (source == openWindowItem)
1898	2031	{
1899	2032	EditSelection(true);
1900	2033	} else
1901		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2034	+ if (source == cutItem \|\| source == clearButton)
1902	2035	{
1903	2036	loadClipboard(true);
1904	2037	} else
1905		- if (event.getSource() == duplicateItem)
	2038	+ if (source == undoItem)
1906	2039	{
1907		- Object3D keep = GrafreeD.clipboard;
	2040	+ Undo();
	2041	+ } else
	2042	+ if (source == redoItem)
	2043	+ {
	2044	+ Redo();
	2045	+ } else
	2046	+ if (source == duplicateItem)
	2047	+ {
	2048	+ Object3D keep = Grafreed.clipboard;
1908	2049	loadClipboard(false);
1909	2050	paste(false);
1910		- GrafreeD.clipboard = keep;
	2051	+ Grafreed.clipboard = keep;
1911	2052	} else
1912		- if (event.getSource() == cloneItem)
	2053	+ if (source == cloneItem)
1913	2054	{
1914	2055	CloneSelection(false);
1915	2056	} else
1916		- if (event.getSource() == cloneSupportItem)
	2057	+ if (source == cloneSupportItem)
1917	2058	{
1918	2059	CloneSelection(true);
1919	2060	} else
1920		- if (event.getSource() == copyItem)
	2061	+ if (source == copyItem)
1921	2062	{
1922	2063	loadClipboard(false);
1923	2064	} else
1924		- if (event.getSource() == pasteItem)
	2065	+ if (source == pasteItem)
1925	2066	{
1926	2067	paste(false);
1927	2068	} else
1928		- if (event.getSource() == pasteLinkItem)
	2069	+ if (source == pasteIntoItem)
1929	2070	{
1930		- pasteInto(false);
	2071	+ pasteInto(true, false);
1931	2072	} else
1932		- if (event.getSource() == pasteCloneItem)
	2073	+ if (source == pasteLinkItem)
1933	2074	{
1934		- pasteInto(true);
	2075	+ pasteInto(false, false);
1935	2076	} else
1936		- if (event.getSource() == pasteExpandItem)
	2077	+ if (source == pasteCloneItem)
	2078	+ {
	2079	+ pasteInto(true, true);
	2080	+ } else
	2081	+ if (source == pasteExpandItem)
1937	2082	{
1938	2083	paste(true);
1939	2084	} else
1940		- if (event.getSource() == synchronizeItem)
	2085	+ if (source == synchronizeItem)
1941	2086	{
1942	2087	Overwrite(Object3D.TRANSFORM);
1943	2088	} else
1944		- if (event.getSource() == overwriteNameItem)
	2089	+ if (source == overwriteNameItem)
1945	2090	{
1946	2091	Overwrite(Object3D.NAME);
1947	2092	} else
1948		- if (event.getSource() == overwriteUVItem)
	2093	+ if (source == overwriteUVItem)
1949	2094	{
1950	2095	Overwrite(Object3D.UV);
1951	2096	} else
1952		- if (event.getSource() == overwriteMatItem)
	2097	+ if (source == overwriteMatItem)
1953	2098	{
1954	2099	/* july 2015
1955	2100	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1969,7 +2114,7 @@
1969	2114
1970	2115	Overwrite(dropAttributes);
1971	2116	}
1972		- if (event.getSource() == overwriteGeoItem)
	2117	+ if (source == overwriteGeoItem)
1973	2118	{
1974	2119	Overwrite(Object3D.GEOMETRY);
1975	2120	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1986,7 +2131,7 @@
1986	2131	// refreshContents();
1987	2132	// }
1988	2133	} else
1989		- if (event.getSource() == generateMeshItem)
	2134	+ if (source == generateMeshItem)
1990	2135	{
1991	2136	//if (group.selection.size() == 1)
1992	2137	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1997,7 +2142,7 @@
1997	2142	ResetModel();
1998	2143	refreshContents();
1999	2144	} else
2000		- if (event.getSource() == extractGeometriesItem)
	2145	+ if (source == extractGeometriesItem)
2001	2146	{
2002	2147	boolean one = false;
2003	2148
..	..	@@ -2024,7 +2169,7 @@
2024	2169	ResetModel();
2025	2170	refreshContents();
2026	2171	} else
2027		- if (event.getSource() == cloneGeometriesItem)
	2172	+ if (source == cloneGeometriesItem)
2028	2173	{
2029	2174	boolean one = false;
2030	2175
..	..	@@ -2050,7 +2195,7 @@
2050	2195	ResetModel();
2051	2196	refreshContents();
2052	2197	} else
2053		- if (event.getSource() == shareGeometriesItem)
	2198	+ if (source == shareGeometriesItem)
2054	2199	{
2055	2200	boolean one = false;
2056	2201
..	..	@@ -2080,7 +2225,7 @@
2080	2225	refreshContents();
2081	2226	}
2082	2227	} else
2083		- if (event.getSource() == mergeGeometriesItem)
	2228	+ if (source == mergeGeometriesItem)
2084	2229	{
2085	2230	boolean one = false;
2086	2231
..	..	@@ -2110,7 +2255,7 @@
2110	2255	ResetModel();
2111	2256	refreshContents();
2112	2257	} else
2113		- if (event.getSource() == linkverticesItem)
	2258	+ if (source == linkverticesItem)
2114	2259	{
2115	2260	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2116	2261	// {
..	..	@@ -2123,9 +2268,9 @@
2123	2268	// group.selection.get(0).setMasterThis(content); // should be identity
2124	2269	// refreshContents();
2125	2270	// }
2126		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2271	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2127	2272	{
2128		- Object3D content = GrafreeD.clipboard.get(0);
	2273	+ Object3D content = Grafreed.clipboard.get(0);
2129	2274
2130	2275	if (content instanceof cGroup && ((cGroup)content).transientlink )
2131	2276	content = ((cGroup)content).get(0);
..	..	@@ -2133,38 +2278,38 @@
2133	2278	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2134	2279	for (int i=0; i<group.selection.size(); i++)
2135	2280	{
2136		- boolean random = CameraPane.RANDOM;
2137		- CameraPane.RANDOM = false; // parse all random nodes
	2281	+ boolean random = CameraPane.SWITCH;
	2282	+ CameraPane.SWITCH = false; // parse all random nodes
2138	2283	group.selection.get(i).linkVerticesThis(content);
2139	2284	// group.selection.get(i).setMasterThis(content); // should be identity
2140		- CameraPane.RANDOM = random;
	2285	+ CameraPane.SWITCH = random;
2141	2286	}
2142	2287	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2143	2288	refreshContents();
2144	2289	}
2145	2290	} else
2146		- if (event.getSource() == resetsupportItem)
	2291	+ if (source == resetsupportItem)
2147	2292	{
2148	2293	for (int i=0; i<group.selection.size(); i++)
2149	2294	{
2150		- boolean random = CameraPane.RANDOM;
2151		- CameraPane.RANDOM = false; // parse all random nodes
	2295	+ boolean random = CameraPane.SWITCH;
	2296	+ CameraPane.SWITCH = false; // parse all random nodes
2152	2297	group.selection.get(i).linkVerticesThis(null);
2153		- CameraPane.RANDOM = random;
	2298	+ CameraPane.SWITCH = random;
2154	2299	}
2155	2300
2156	2301	refreshContents();
2157	2302	} else
2158		- if (event.getSource() == relinkverticesItem)
	2303	+ if (source == relinkverticesItem)
2159	2304	{
2160		- boolean random = CameraPane.RANDOM;
2161		- CameraPane.RANDOM = false; // parse all random nodes
	2305	+ boolean random = CameraPane.SWITCH;
	2306	+ CameraPane.SWITCH = false; // parse all random nodes
2162	2307	group.selection.RelinkToSupport();
2163		- CameraPane.RANDOM = random;
	2308	+ CameraPane.SWITCH = random;
2164	2309
2165	2310	refreshContents();
2166	2311	} else
2167		- if (event.getSource() == resetreferencesItem)
	2312	+ if (source == resetreferencesItem)
2168	2313	{
2169	2314	for (int i=0; i<group.selection.size(); i++)
2170	2315	{
..	..	@@ -2173,11 +2318,11 @@
2173	2318
2174	2319	refreshContents();
2175	2320	} else
2176		- if (event.getSource() == setMasterItem)
	2321	+ if (source == setMasterItem)
2177	2322	{
2178		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2323	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2179	2324	{
2180		- Object3D content = GrafreeD.clipboard.get(0);
	2325	+ Object3D content = Grafreed.clipboard.get(0);
2181	2326
2182	2327	if (content instanceof cGroup && ((cGroup)content).transientlink )
2183	2328	content = ((cGroup)content).get(0);
..	..	@@ -2186,13 +2331,13 @@
2186	2331	refreshContents();
2187	2332	}
2188	2333	} else
2189		- if (event.getSource() == poseMeshItem)
	2334	+ if (source == poseMeshItem)
2190	2335	{
2191	2336	if (group.selection.size() == 1)
2192	2337	{
2193		- if (GrafreeD.clipboard.size() == 1)
	2338	+ if (Grafreed.clipboard.size() == 1)
2194	2339	{
2195		- Object3D content = GrafreeD.clipboard.get(0);
	2340	+ Object3D content = Grafreed.clipboard.get(0);
2196	2341
2197	2342	if (content instanceof cGroup && ((cGroup)content).transientlink )
2198	2343	content = ((cGroup)content).get(0);
..	..	@@ -2205,19 +2350,19 @@
2205	2350	}
2206	2351
2207	2352	} else
2208		- if (event.getSource() == revertMeshItem)
	2353	+ if (source == revertMeshItem)
2209	2354	{
2210	2355	RevertMeshes();
2211	2356	} else
2212		- if (event.getSource() == resetMeshItem)
	2357	+ if (source == resetAllItem)
2213	2358	{
2214	2359	ResetAll();
2215	2360	} else
2216		- if (event.getSource() == stepAllItem)
	2361	+ if (source == stepAllItem)
2217	2362	{
2218	2363	StepAll();
2219	2364	} else
2220		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2365	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2221	2366	{
2222	2367	//int indices[] = jList.getSelectedIndices();
2223	2368	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2225,46 +2370,46 @@
2225	2370
2226	2371	ClearSelection(false);
2227	2372	} else
2228		- if (event.getSource() == clearAllItem)
	2373	+ if (source == clearAllItem)
2229	2374	{
2230	2375	ClearSelection(true);
2231	2376	} else
2232		- if (event.getSource() == grabItem)
	2377	+ if (source == grabItem)
2233	2378	{
2234	2379	group(new cGroup(), true);
2235	2380	} else
2236		- if (event.getSource() == hideItem)
	2381	+ if (source == hideItem)
2237	2382	{
2238	2383	group(new HiddenObject());
2239	2384	} else
2240		- if (event.getSource() == frontItem)
	2385	+ if (source == frontItem)
2241	2386	{
2242	2387	front();
2243	2388	} else
2244		- if (event.getSource() == backItem)
	2389	+ if (source == backItem)
2245	2390	{
2246	2391	back();
2247	2392	} else
2248		- if (event.getSource() == cameraItem)
	2393	+ if (source == cameraItem)
2249	2394	{
2250	2395	makeSomething(new Camera());
2251	2396	} else
2252		- if (event.getSource() == compositeItem)
	2397	+ if (source == compositeItem)
2253	2398	{
2254	2399	group(new Composite());
2255	2400	} else
2256		- if (event.getSource() == randomItem)
	2401	+ if (source == randomItem)
2257	2402	{
2258	2403	RandomNode random = new RandomNode();
2259	2404	group(random);
2260	2405	if (random.size() > 0)
2261		- random.name = random.get(0).name + "Rnd";
	2406	+ random.name = random.get(0).name + "Switch";
2262	2407	} else
2263		- if (event.getSource() == physicsItem)
	2408	+ if (source == physicsItem)
2264	2409	{
2265	2410	group(new PhysicsNode());
2266	2411	} else
2267		- if (event.getSource() == frameselectorItem)
	2412	+ if (source == frameselectorItem)
2268	2413	{
2269	2414	for (int i=0; i<group.selection.size(); i++)
2270	2415	{
..	..	@@ -2276,7 +2421,7 @@
2276	2421	ResetModel();
2277	2422	refreshContents();
2278	2423	} else
2279		- if (event.getSource() == switchGeoItem)
	2424	+ if (source == switchGeoItem)
2280	2425	{
2281	2426	for (int i=0; i<group.selection.size(); i++)
2282	2427	{
..	..	@@ -2288,7 +2433,7 @@
2288	2433	ResetModel();
2289	2434	refreshContents();
2290	2435	} else
2291		- if (event.getSource() == switchTransfoItem)
	2436	+ if (source == switchTransfoItem)
2292	2437	{
2293	2438	for (int i=0; i<group.selection.size(); i++)
2294	2439	{
..	..	@@ -2300,7 +2445,7 @@
2300	2445	ResetModel();
2301	2446	refreshContents();
2302	2447	} else
2303		- if (event.getSource() == morphItem)
	2448	+ if (source == morphItem)
2304	2449	{
2305	2450	for (int i=0; i<group.selection.size(); i++)
2306	2451	{
..	..	@@ -2312,7 +2457,7 @@
2312	2457	ResetModel();
2313	2458	refreshContents();
2314	2459	} else
2315		- if (event.getSource() == scriptNodeItem)
	2460	+ if (source == scriptNodeItem)
2316	2461	{
2317	2462	boolean atleastone = false;
2318	2463
..	..	@@ -2351,31 +2496,31 @@
2351	2496	}
2352	2497	}
2353	2498	} else
2354		- if (event.getSource() == linkerItem)
	2499	+ if (source == linkerItem)
2355	2500	{
2356	2501	group(new cLinker());
2357	2502	} else
2358		- if (event.getSource() == textureItem)
	2503	+ if (source == textureItem)
2359	2504	{
2360	2505	group(new TextureNode());
2361	2506	} else
2362		- if (event.getSource() == billboardItem)
	2507	+ if (source == billboardItem)
2363	2508	{
2364	2509	group(new BillboardNode());
2365	2510	} else
2366		- if (event.getSource() == shadowXItem)
	2511	+ if (source == shadowXItem)
2367	2512	{
2368	2513	CastShadow(0);
2369	2514	} else
2370		- if (event.getSource() == shadowYItem)
	2515	+ if (source == shadowYItem)
2371	2516	{
2372	2517	CastShadow(1);
2373	2518	} else
2374		- if (event.getSource() == shadowZItem)
	2519	+ if (source == shadowZItem)
2375	2520	{
2376	2521	CastShadow(2);
2377	2522	} else
2378		- if (event.getSource() == ungroupItem)
	2523	+ if (source == ungroupItem)
2379	2524	{
2380	2525	//ungroup();
2381	2526	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2387,179 +2532,187 @@
2387	2532
2388	2533	refreshContents();
2389	2534	} else
2390		- if (event.getSource() == genUVItem)
	2535	+ if (source == genUVItem)
2391	2536	{
2392	2537	GenUV();
2393	2538	} else
2394		- if (event.getSource() == genNormalsCADItem)
	2539	+ if (source == genNormalsCADItem)
2395	2540	{
2396	2541	GenNormals(true);
2397	2542	} else
2398		- if (event.getSource() == genNormalsMESHItem)
	2543	+ if (source == genNormalsMESHItem)
2399	2544	{
2400		- GenNormals(true); // TODO
	2545	+ GenNormalsMESH();
2401	2546	} else
2402		- if (event.getSource() == genNormalsORGANItem)
	2547	+ if (source == genNormalsORGANItem)
2403	2548	{
2404	2549	GenNormals(false);
2405	2550	} else
2406		- if (event.getSource() == genNormalsMINEItem)
	2551	+ if (source == genNormalsMINEItem)
2407	2552	{
2408	2553	GenNormalsMINE();
2409	2554	} else
2410		- if (event.getSource() == stripifyItem)
	2555	+ if (source == stripifyItem)
2411	2556	{
2412	2557	Stripify();
2413	2558	} else
2414		- if (event.getSource() == unstripifyItem)
	2559	+ if (source == unstripifyItem)
2415	2560	{
2416	2561	Unstripify();
2417	2562	} else
2418		- if (event.getSource() == trimItem)
	2563	+ if (source == trimItem)
2419	2564	{
2420	2565	Trim();
2421	2566	} else
2422		- if (event.getSource() == untrimItem)
	2567	+ if (source == untrimItem)
2423	2568	{
2424	2569	Untrim();
2425	2570	} else
2426		- if (event.getSource() == clearColorsItem)
	2571	+ if (source == clearColorsItem)
2427	2572	{
2428	2573	ClearColors();
2429	2574	} else
2430		- if (event.getSource() == clearMaterialsItem)
	2575	+ if (source == clearMaterialsItem)
2431	2576	{
2432	2577	ClearMaterials();
2433	2578	} else
2434		- if (event.getSource() == liveleavesItem)
	2579	+ if (source == liveleavesItem)
2435	2580	{
2436	2581	LiveLeaves(true);
2437	2582	} else
2438		- if (event.getSource() == unliveleavesItem)
	2583	+ if (source == unliveleavesItem)
2439	2584	{
2440	2585	LiveLeaves(false);
2441	2586	} else
2442		- if (event.getSource() == supportleavesItem)
	2587	+ if (source == supportleavesItem)
2443	2588	{
2444	2589	SupportLeaves(true);
2445	2590	} else
2446		- if (event.getSource() == unsupportleavesItem)
	2591	+ if (source == unsupportleavesItem)
2447	2592	{
2448	2593	SupportLeaves(false);
2449	2594	} else
2450		- if (event.getSource() == hideleavesItem)
	2595	+ if (source == hideleavesItem)
2451	2596	{
2452	2597	HideLeaves(true);
2453	2598	} else
2454		- if (event.getSource() == showleavesItem)
	2599	+ if (source == showleavesItem)
2455	2600	{
2456	2601	HideLeaves(false);
2457	2602	} else
2458		- if (event.getSource() == markleavesItem)
	2603	+ if (source == markleavesItem)
2459	2604	{
2460	2605	MarkLeaves(true);
2461	2606	} else
2462		- if (event.getSource() == unmarkleavesItem)
	2607	+ if (source == unmarkleavesItem)
2463	2608	{
2464	2609	MarkLeaves(false);
2465	2610	} else
2466		- if (event.getSource() == flipVItem)
	2611	+ if (source == flipVItem)
2467	2612	{
2468	2613	FlipV(true);
2469	2614	} else
2470		- if (event.getSource() == unflipVItem)
	2615	+ if (source == unflipVItem)
2471	2616	{
2472	2617	FlipV(false);
2473	2618	} else
2474		- if (event.getSource() == lowTexturesItem)
	2619	+ if (source == lowTexturesItem)
2475	2620	{
2476	2621	SetTexRes(0);
2477	2622	} else
2478		- if (event.getSource() == normalTexturesItem)
	2623	+ if (source == normalTexturesItem)
2479	2624	{
2480	2625	SetTexRes(1);
2481	2626	} else
2482		- if (event.getSource() == highTexturesItem)
	2627	+ if (source == highTexturesItem)
2483	2628	{
2484	2629	SetTexRes(2);
2485	2630	} else
2486		- if (event.getSource() == veryhighTexturesItem)
	2631	+ if (source == veryhighTexturesItem)
2487	2632	{
2488	2633	SetTexRes(3);
2489	2634	} else
2490		- if (event.getSource() == maxTexturesItem)
	2635	+ if (source == maxTexturesItem)
2491	2636	{
2492	2637	SetTexRes(4);
2493	2638	} else
2494		- if (event.getSource() == panoTexturesItem)
	2639	+ if (source == panoTexturesItem)
2495	2640	{
2496	2641	SetTexRes(5);
2497	2642	} else
2498		- if (event.getSource() == reverseNormalsItem)
	2643	+ if (source == reverseNormalsItem)
2499	2644	{
2500	2645	ReverseNormals();
2501	2646	} else
2502		- if (event.getSource() == parseverticesItem)
	2647	+ if (source == parseverticesItem)
2503	2648	{
2504	2649	ParseVertices();
2505	2650	} else
2506		- if (event.getSource() == textureFieldItem)
	2651	+ if (source == textureFieldItem)
2507	2652	{
2508	2653	TextureVertices();
2509	2654	} else
2510		- if (event.getSource() == alignItem)
	2655	+ if (source == alignItem)
2511	2656	{
2512	2657	Align();
2513	2658	} else
2514		- if (event.getSource() == mirrorItem)
	2659	+ if (source == mirrorItem)
2515	2660	{
2516	2661	MirrorPoses();
2517	2662	} else
2518		- if (event.getSource() == reduceMorphItem)
	2663	+ if (source == reduceMorphItem)
2519	2664	{
2520	2665	MeshReduction(false);
2521	2666	} else
2522		- if (event.getSource() == reduce34MorphItem)
	2667	+ if (source == reduce34MorphItem)
2523	2668	{
2524	2669	MeshReduction(true);
2525	2670	} else
2526		- if (event.getSource() == reverseTrianglesItem)
	2671	+ if (source == reverseTrianglesItem)
2527	2672	{
2528	2673	ReverseTriangles();
2529	2674	} else
2530		- if (event.getSource() == reduceMeshItem)
	2675	+ if (source == reduceMeshItem)
2531	2676	{
2532	2677	ReduceMesh(false);
2533	2678	} else
2534		- if (event.getSource() == reduce34MeshItem)
	2679	+ if (source == reduce34MeshItem)
2535	2680	{
2536	2681	ReduceMesh(true);
2537	2682	} else
2538		- if (event.getSource() == increaseMeshItem)
	2683	+ if (source == increaseMeshItem)
2539	2684	{
2540	2685	IncreaseMesh();
2541	2686	} else
2542		- if (event.getSource() == clipMeshItem)
	2687	+ if (source == clipMeshItem)
2543	2688	{
2544	2689	ClipMesh();
2545	2690	} else
2546		- if (event.getSource() == smoothMeshItem)
	2691	+ if (source == smoothMeshItem)
2547	2692	{
2548	2693	SmoothMesh();
2549	2694	} else
2550		- if (event.getSource() == transformgeometryItem)
	2695	+ if (source == transformGeometryItem)
2551	2696	{
2552	2697	TransformGeometry();
2553	2698	} else
2554		- if (event.getSource() == resetTransformItem)
	2699	+ if (source == transformChildrenItem)
	2700	+ {
	2701	+ TransformChildren();
	2702	+ } else
	2703	+ if (source == resetTransformItem)
2555	2704	{
2556	2705	ResetTransform();
2557	2706	} else
2558		- if (event.getSource() == resetCentroidItem)
	2707	+ if (source == resetCentroidItem)
2559	2708	{
2560		- ResetCentroid();
	2709	+ ResetCentroid(true);
2561	2710	} else
2562		- if (event.getSource() == resetParentItem)
	2711	+ if (source == resetCentroidXZItem)
	2712	+ {
	2713	+ ResetCentroid(false);
	2714	+ } else
	2715	+ if (source == resetParentItem)
2563	2716	{
2564	2717	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2565	2718	{
..	..	@@ -2569,7 +2722,7 @@
2569	2722
2570	2723	refreshContents();
2571	2724	} else
2572		- if (event.getSource() == repairParentItem)
	2725	+ if (source == repairParentItem)
2573	2726	{
2574	2727	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2575	2728	{
..	..	@@ -2583,7 +2736,7 @@
2583	2736
2584	2737	refreshContents();
2585	2738	} else
2586		- if (event.getSource() == repairShadowItem)
	2739	+ if (source == repairShadowItem)
2587	2740	{
2588	2741	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2589	2742	{
..	..	@@ -2597,7 +2750,7 @@
2597	2750
2598	2751	refreshContents();
2599	2752	} else
2600		- if (event.getSource() == sortbysizeItem)
	2753	+ if (source == sortbysizeItem)
2601	2754	{
2602	2755	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2603	2756	{
..	..	@@ -2609,7 +2762,7 @@
2609	2762	ResetModel();
2610	2763	refreshContents();
2611	2764	} else
2612		- if (event.getSource() == sortbynameItem)
	2765	+ if (source == sortbynameItem)
2613	2766	{
2614	2767	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2615	2768	{
..	..	@@ -2621,7 +2774,7 @@
2621	2774	ResetModel();
2622	2775	refreshContents();
2623	2776	} else
2624		- if (event.getSource() == attachPigmentItem)
	2777	+ if (source == attachPigmentItem)
2625	2778	{
2626	2779	String texture = GetFile("Attach pigment");
2627	2780	Object3D obj;
..	..	@@ -2633,7 +2786,7 @@
2633	2786
2634	2787	refreshContents();
2635	2788	} else
2636		- if (event.getSource() == detachPigmentItem)
	2789	+ if (source == detachPigmentItem)
2637	2790	{
2638	2791	Object3D obj;
2639	2792	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2644,7 +2797,7 @@
2644	2797
2645	2798	refreshContents();
2646	2799	} else
2647		- if (event.getSource() == attachBumpItem)
	2800	+ if (source == attachBumpItem)
2648	2801	{
2649	2802	String texture = GetFile("Attach bump");
2650	2803	Object3D obj;
..	..	@@ -2656,7 +2809,7 @@
2656	2809
2657	2810	refreshContents();
2658	2811	} else
2659		- if (event.getSource() == detachBumpItem)
	2812	+ if (source == detachBumpItem)
2660	2813	{
2661	2814	Object3D obj;
2662	2815	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2667,7 +2820,7 @@
2667	2820
2668	2821	refreshContents();
2669	2822	} else
2670		- if (event.getSource() == pigmentBumpItem)
	2823	+ if (source == pigmentBumpItem)
2671	2824	{
2672	2825	Object3D obj;
2673	2826	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2678,158 +2831,195 @@
2678	2831
2679	2832	refreshContents();
2680	2833	} else
2681		- if (event.getSource() == flashSelectionButton)
	2834	+ if (source == flashSelectionButton)
2682	2835	{
2683	2836	CameraPane.flash = true;
2684	2837	refreshContents();
2685	2838	} else
2686		- if (event.getSource() == oneButton)
	2839	+ if (source == oneButton)
2687	2840	{
2688	2841	} else
2689		- if (event.getSource() == twoButton)
	2842	+ if (source == twoButton)
2690	2843	{
2691	2844	radio.layout = twoButton;
2692	2845	// bug
2693	2846	//gridPanel.setDividerLocation(1.0);
2694	2847	//bigPanel.setDividerLocation(0.0);
2695		- bigThree.remove(scenePanel);
2696		- bigThree.remove(centralPanel);
2697		- bigThree.remove(XYZPanel);
2698		- aWindowConstraints.gridx = 0;
2699		- aWindowConstraints.gridy = 0;
2700		- aWindowConstraints.gridwidth = 1;
2701		- // aConstraints.gridheight = 3;
2702		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2703		- aWindowConstraints.weightx = 0;
2704		- aWindowConstraints.weighty = 1;
2705		- //bigThree.add(jtp, aWindowConstraints);
2706		- aWindowConstraints.weightx = 1;
2707		- aWindowConstraints.gridwidth = 3;
2708		- // aConstraints.gridheight = 3;
2709		- aWindowConstraints.gridx = 1;
2710		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2711		- bigThree.add(centralPanel, aWindowConstraints);
2712		- aWindowConstraints.weightx = 0;
2713		- aWindowConstraints.gridx = 4;
2714		- aWindowConstraints.gridwidth = 1;
2715		- // aConstraints.gridheight = 3;
2716		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2717		- //bigThree.add(XYZPanel, aWindowConstraints);
2718		- bigThree.revalidate();
	2848	+// bigThree.remove(scenePanel);
	2849	+// bigThree.remove(centralPanel);
	2850	+// bigThree.remove(XYZPanel);
	2851	+// aWindowConstraints.gridx = 0;
	2852	+// aWindowConstraints.gridy = 0;
	2853	+// aWindowConstraints.gridwidth = 1;
	2854	+// // aConstraints.gridheight = 3;
	2855	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2856	+// aWindowConstraints.weightx = 0;
	2857	+// aWindowConstraints.weighty = 1;
	2858	+// //bigThree.add(jtp, aWindowConstraints);
	2859	+// aWindowConstraints.weightx = 1;
	2860	+// aWindowConstraints.gridwidth = 3;
	2861	+// // aConstraints.gridheight = 3;
	2862	+// aWindowConstraints.gridx = 1;
	2863	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2864	+// bigThree.add(centralPanel, aWindowConstraints);
	2865	+// aWindowConstraints.weightx = 0;
	2866	+// aWindowConstraints.gridx = 4;
	2867	+// aWindowConstraints.gridwidth = 1;
	2868	+// // aConstraints.gridheight = 3;
	2869	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2870	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2871	+// scenePanel.setVisible(false);
	2872	+// centralPanel.setVisible(true);
	2873	+// XYZPanel.setVisible(false);
	2874	+ bigThree.ClearUI();
	2875	+ bigThree.add(centralPanel);
	2876	+ bigThree.FlushUI();
2719	2877	} else
2720		- if (event.getSource() == threeButton)
	2878	+ if (source == threeButton)
2721	2879	{
2722	2880	radio.layout = threeButton;
2723		- bigThree.remove(scenePanel);
2724		- bigThree.remove(centralPanel);
2725		- bigThree.remove(XYZPanel);
2726		- aWindowConstraints.gridx = 0;
2727		- aWindowConstraints.gridy = 0;
2728		- aWindowConstraints.gridwidth = 1;
2729		- // aConstraints.gridheight = 3;
2730		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2731		- aWindowConstraints.weightx = 0;
2732		- aWindowConstraints.weighty = 1;
2733		- //bigThree.add(jtp, aWindowConstraints);
2734		- aWindowConstraints.weightx = 1;
2735		- aWindowConstraints.gridwidth = 3;
2736		- // aConstraints.gridheight = 3;
2737		- aWindowConstraints.gridx = 1;
2738		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2739		- bigThree.add(centralPanel, aWindowConstraints);
2740		- aWindowConstraints.weightx = 0;
2741		- aWindowConstraints.gridx = 4;
2742		- aWindowConstraints.gridwidth = 1;
2743		- // aConstraints.gridheight = 3;
2744		- aConstraints.fill = GridBagConstraints.VERTICAL;
2745		- bigThree.add(XYZPanel, aWindowConstraints);
2746		- bigThree.revalidate();
	2881	+
	2882	+// bigThree.remove(scenePanel);
	2883	+// bigThree.remove(centralPanel);
	2884	+// bigThree.remove(XYZPanel);
	2885	+// aWindowConstraints.gridx = 0;
	2886	+// aWindowConstraints.gridy = 0;
	2887	+// aWindowConstraints.gridwidth = 1;
	2888	+// // aConstraints.gridheight = 3;
	2889	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2890	+// aWindowConstraints.weightx = 0;
	2891	+// aWindowConstraints.weighty = 1;
	2892	+// //bigThree.add(jtp, aWindowConstraints);
	2893	+// aWindowConstraints.weightx = 1;
	2894	+// aWindowConstraints.gridwidth = 3;
	2895	+// // aConstraints.gridheight = 3;
	2896	+// aWindowConstraints.gridx = 1;
	2897	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2898	+// bigThree.add(centralPanel, aWindowConstraints);
	2899	+// aWindowConstraints.weightx = 0;
	2900	+// aWindowConstraints.gridx = 4;
	2901	+// aWindowConstraints.gridwidth = 1;
	2902	+// // aConstraints.gridheight = 3;
	2903	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2904	+// bigThree.add(XYZPanel, aWindowConstraints);
	2905	+// bigThree.validate();
	2906	+// scenePanel.setVisible(false);
	2907	+// centralPanel.setVisible(true);
	2908	+// XYZPanel.setVisible(true);
	2909	+ bigThree.ClearUI();
	2910	+ bigThree.add(centralPanel);
	2911	+ bigThree.add(XYZPanel);
	2912	+ bigThree.FlushUI();
2747	2913	} else
2748		- if (event.getSource() == fourButton)
	2914	+ if (source == fourButton)
2749	2915	{
2750	2916	radio.layout = fourButton;
2751		- bigThree.remove(scenePanel);
2752		- bigThree.remove(centralPanel);
2753		- bigThree.remove(XYZPanel);
2754		- aWindowConstraints.gridx = 0;
2755		- aWindowConstraints.gridy = 0;
2756		- aWindowConstraints.gridwidth = 1;
2757		- // aWindowConstraints.gridheight = 3;
2758		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2759		- aWindowConstraints.weightx = 1;
2760		- aWindowConstraints.weighty = 1;
2761		- bigThree.add(scenePanel, aWindowConstraints);
2762		- aWindowConstraints.weightx = 1;
2763		- aWindowConstraints.gridwidth = 3;
2764		- // aConstraints.gridheight = 3;
2765		- aWindowConstraints.gridx = 1;
2766		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2767		- //bigThree.add(cameraPanel, aWindowConstraints);
2768		- aWindowConstraints.weightx = 0;
2769		- aWindowConstraints.gridx = 4;
2770		- aWindowConstraints.gridwidth = 1;
2771		- // aWindowConstraints.gridheight = 3;
2772		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2773		- //bigThree.add(XYZPanel, aWindowConstraints);
2774		- bigThree.revalidate();
	2917	+
	2918	+// bigThree.remove(scenePanel);
	2919	+// bigThree.remove(centralPanel);
	2920	+// bigThree.remove(XYZPanel);
	2921	+// aWindowConstraints.gridx = 0;
	2922	+// aWindowConstraints.gridy = 0;
	2923	+// aWindowConstraints.gridwidth = 1;
	2924	+// // aWindowConstraints.gridheight = 3;
	2925	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2926	+// aWindowConstraints.weightx = 1;
	2927	+// aWindowConstraints.weighty = 1;
	2928	+// bigThree.add(scenePanel, aWindowConstraints);
	2929	+// aWindowConstraints.weightx = 1;
	2930	+// aWindowConstraints.gridwidth = 3;
	2931	+// // aConstraints.gridheight = 3;
	2932	+// aWindowConstraints.gridx = 1;
	2933	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2934	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2935	+// aWindowConstraints.weightx = 0;
	2936	+// aWindowConstraints.gridx = 4;
	2937	+// aWindowConstraints.gridwidth = 1;
	2938	+// // aWindowConstraints.gridheight = 3;
	2939	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2940	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2941	+// bigThree.validate();
	2942	+// scenePanel.setVisible(true);
	2943	+// centralPanel.setVisible(false);
	2944	+// XYZPanel.setVisible(false);
	2945	+ bigThree.ClearUI();
	2946	+ bigThree.add(scenePanel);
	2947	+ bigThree.FlushUI();
2775	2948	} else
2776		- if (event.getSource() == sixButton)
	2949	+ if (source == sixButton)
2777	2950	{
2778	2951	radio.layout = sixButton;
2779		- bigThree.remove(scenePanel);
2780		- bigThree.remove(centralPanel);
2781		- bigThree.remove(XYZPanel);
2782		- aWindowConstraints.gridx = 0;
2783		- aWindowConstraints.gridy = 0;
2784		- aWindowConstraints.gridwidth = 1;
2785		- // aConstraints.gridheight = 3;
2786		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2787		- aWindowConstraints.weightx = 0;
2788		- aWindowConstraints.weighty = 1;
2789		- bigThree.add(scenePanel, aWindowConstraints);
2790		- aWindowConstraints.weightx = 1;
2791		- aWindowConstraints.gridwidth = 3;
2792		- // aWindowConstraints.gridheight = 3;
2793		- aWindowConstraints.gridx = 1;
2794		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2795		- bigThree.add(centralPanel, aWindowConstraints);
2796		- aWindowConstraints.weightx = 0;
2797		- aWindowConstraints.gridx = 4;
2798		- aWindowConstraints.gridwidth = 1;
2799		- // aWindowConstraints.gridheight = 3;
2800		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2801		- //bigThree.add(XYZPanel, aConstraints);
2802		- bigThree.revalidate();
	2952	+
	2953	+// bigThree.remove(scenePanel);
	2954	+// bigThree.remove(centralPanel);
	2955	+// bigThree.remove(XYZPanel);
	2956	+// aWindowConstraints.gridx = 0;
	2957	+// aWindowConstraints.gridy = 0;
	2958	+// aWindowConstraints.gridwidth = 1;
	2959	+// // aConstraints.gridheight = 3;
	2960	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2961	+// aWindowConstraints.weightx = 0;
	2962	+// aWindowConstraints.weighty = 1;
	2963	+// bigThree.add(scenePanel, aWindowConstraints);
	2964	+// aWindowConstraints.weightx = 1;
	2965	+// aWindowConstraints.gridwidth = 3;
	2966	+// // aWindowConstraints.gridheight = 3;
	2967	+// aWindowConstraints.gridx = 1;
	2968	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2969	+// bigThree.add(centralPanel, aWindowConstraints);
	2970	+// aWindowConstraints.weightx = 0;
	2971	+// aWindowConstraints.gridx = 4;
	2972	+// aWindowConstraints.gridwidth = 1;
	2973	+// // aWindowConstraints.gridheight = 3;
	2974	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2975	+// //bigThree.add(XYZPanel, aConstraints);
	2976	+// bigThree.validate();
	2977	+// scenePanel.setVisible(true);
	2978	+// centralPanel.setVisible(true);
	2979	+// XYZPanel.setVisible(false);
	2980	+ bigThree.ClearUI();
	2981	+ bigThree.add(scenePanel);
	2982	+ bigThree.add(centralPanel);
	2983	+ bigThree.FlushUI();
2803	2984	} else
2804		- if (event.getSource() == sevenButton)
	2985	+ if (source == sevenButton)
2805	2986	{
2806	2987	radio.layout = sevenButton;
2807		- bigThree.remove(scenePanel);
2808		- bigThree.remove(centralPanel);
2809		- bigThree.remove(XYZPanel);
2810		- aWindowConstraints.gridx = 0;
2811		- aWindowConstraints.gridy = 0;
2812		- aWindowConstraints.gridwidth = 1;
2813		- // aWindowConstraints.gridheight = 3;
2814		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2815		- aWindowConstraints.weightx = 0;
2816		- aWindowConstraints.weighty = 1;
2817		- bigThree.add(scenePanel, aWindowConstraints);
2818		- aWindowConstraints.weightx = 1;
2819		- aWindowConstraints.gridwidth = 3;
2820		- // aWindowConstraints.gridheight = 3;
2821		- aWindowConstraints.gridx = 1;
2822		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2823		- bigThree.add(centralPanel, aWindowConstraints);
2824		- aWindowConstraints.weightx = 0;
2825		- aWindowConstraints.gridx = 4;
2826		- aWindowConstraints.gridwidth = 1;
2827		- // aConstraints.gridheight = 3;
2828		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2829		- bigThree.add(XYZPanel, aWindowConstraints);
2830		- bigThree.revalidate();
	2988	+
	2989	+// bigThree.remove(scenePanel);
	2990	+// bigThree.remove(centralPanel);
	2991	+// bigThree.remove(XYZPanel);
	2992	+// aWindowConstraints.gridx = 0;
	2993	+// aWindowConstraints.gridy = 0;
	2994	+// aWindowConstraints.gridwidth = 1;
	2995	+// // aWindowConstraints.gridheight = 3;
	2996	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2997	+// aWindowConstraints.weightx = 0;
	2998	+// aWindowConstraints.weighty = 1;
	2999	+// bigThree.add(scenePanel, aWindowConstraints);
	3000	+// aWindowConstraints.weightx = 1;
	3001	+// aWindowConstraints.gridwidth = 3;
	3002	+// // aWindowConstraints.gridheight = 3;
	3003	+// aWindowConstraints.gridx = 1;
	3004	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3005	+// bigThree.add(centralPanel, aWindowConstraints);
	3006	+// aWindowConstraints.weightx = 0;
	3007	+// aWindowConstraints.gridx = 4;
	3008	+// aWindowConstraints.gridwidth = 1;
	3009	+// // aConstraints.gridheight = 3;
	3010	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3011	+// bigThree.add(XYZPanel, aWindowConstraints);
	3012	+// bigThree.validate();
	3013	+// scenePanel.setVisible(true);
	3014	+// centralPanel.setVisible(true);
	3015	+// XYZPanel.setVisible(true);
	3016	+ bigThree.ClearUI();
	3017	+ bigThree.add(scenePanel);
	3018	+ bigThree.add(centralPanel);
	3019	+ bigThree.add(XYZPanel);
	3020	+ bigThree.FlushUI();
2831	3021	} else
2832		- if (event.getSource() == rootButton)
	3022	+ if (source == rootButton)
2833	3023	{
2834	3024	Object3D obj;
2835	3025	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2841,7 +3031,7 @@
2841	3031
2842	3032	refreshContents(true);
2843	3033	} else
2844		- if (event.getSource() == closeButton)
	3034	+ if (source == closeButton)
2845	3035	{
2846	3036	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2847	3037	cRadio ab;
..	..	@@ -2862,11 +3052,11 @@
2862	3052	}
2863	3053	refreshContents(true);
2864	3054	} else
2865		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3055	+ if (source == editItem \|\| source == editButton)
2866	3056	{
2867	3057	EditSelection(false);
2868	3058	} else
2869		- if (event.getSource() == uneditButton)
	3059	+ if (source == uneditButton)
2870	3060	{
2871	3061	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2872	3062	{
..	..	@@ -2876,14 +3066,14 @@
2876	3066	child.CloseUI();
2877	3067	listUI.remove(child);
2878	3068
2879		- child.editWindow = null; // ???????????
	3069	+ //child.editWindow = null; // ???????????
2880	3070	}
2881		- objEditor.ctrlPanel.revalidate();
	3071	+ objEditor.ctrlPanel.FlushUI();
2882	3072	//objEditor.jTree.clearSelection();
2883	3073	//objEditor.ResetSliders();
2884	3074	refreshContents(true);
2885	3075	} else
2886		- if (event.getSource() == clearPanelButton)
	3076	+ if (source == clearPanelButton)
2887	3077	{
2888	3078	assert(copy == group);
2889	3079	//copy.ClearUI();
..	..	@@ -2894,7 +3084,7 @@
2894	3084	listUI.clear();
2895	3085	refreshContents(true);
2896	3086	} else
2897		- if (event.getSource() == allParamsButton)
	3087	+ if (source == allParamsButton)
2898	3088	{
2899	3089	assert(copy == group);
2900	3090
..	..	@@ -2915,19 +3105,19 @@
2915	3105
2916	3106	refreshContents(true);
2917	3107	} else
2918		- if (event.getSource() == unselectButton)
	3108	+ if (source == unselectButton)
2919	3109	{
2920	3110	objEditor.jTree.clearSelection();
2921	3111	// ?? oct 2012 GrafreeD.clipboard.clear();
2922	3112	objEditor.ResetSliders();
2923	3113	refreshContents(true);
2924	3114	} else
2925		- if(event.getSource() instanceof cRadio)
	3115	+ if(source instanceof cRadio)
2926	3116	{
2927	3117	group.parent = keepparent;
2928	3118	group.attributes = 0;
2929	3119	//group.editWindow = null;
2930		- /cRadio/ radio = (cRadio)event.getSource();
	3120	+ /cRadio/ radio = (cRadio)source;
2931	3121	Object3D obj = radio.GetObject();
2932	3122	System.out.println("Edit " + obj);
2933	3123	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2962,7 +3152,10 @@
2962	3152	frontView.object = group;
2963	3153	sideView.object = group;
2964	3154	}
	3155	+
	3156	+// fix "+" issue
2965	3157	group.editWindow = this;
	3158	+
2966	3159	/*
2967	3160	currentLayout = radio.layout;
2968	3161	if (currentLayout == null)
..	..	@@ -2975,7 +3168,20 @@
2975	3168	//group.attributes = -1;
2976	3169	ResetModel();
2977	3170	refreshContents(true);
2978		- }
	3171	+ } else if (event.getSource() == editCameraItem)
	3172	+ {
	3173	+ cameraView.ProtectCamera();
	3174	+ cameraView.repaint();
	3175	+ return;
	3176	+ } else if (event.getSource() == revertCameraItem)
	3177	+ {
	3178	+ cameraView.RevertCamera();
	3179	+ cameraView.repaint();
	3180	+ return;
	3181	+ // } else if (event.getSource() == textureButton)
	3182	+ // {
	3183	+ // return; // true;
	3184	+ }
2979	3185	else
2980	3186	{
2981	3187	//return super.action(event, arg);
..	..	@@ -3036,6 +3242,28 @@
3036	3242	refreshContents();
3037	3243	}
3038	3244
	3245	+ void TransformChildren()
	3246	+ {
	3247	+ Object3D obj;
	3248	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3249	+ {
	3250	+ obj = (Object3D)e.nextElement();
	3251	+ obj.KeepTextureMatrices();
	3252	+ obj.TransformChildren();
	3253	+ obj.RestoreTextureMatrices();
	3254	+
	3255	+// if (obj.parent == null)
	3256	+// {
	3257	+// System.out.println("NULL PARENT!");
	3258	+// new Exception().printStackTrace();
	3259	+// }
	3260	+// else
	3261	+// TouchTransform(obj);
	3262	+// //obj.parent.Touch();
	3263	+ }
	3264	+
	3265	+ refreshContents();
	3266	+ }
3039	3267
3040	3268	void ResetTransform()
3041	3269	{
..	..	@@ -3148,7 +3376,7 @@
3148	3376	refreshContents();
3149	3377	}
3150	3378
3151		- void ResetCentroid()
	3379	+ void ResetCentroid(boolean full)
3152	3380	{
3153	3381	Object3D obj;
3154	3382	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3163,12 +3391,16 @@
3163	3391	LA.matIdentity(Object3D.mat);
3164	3392	obj.getBounds(minima, maxima, false);
3165	3393	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3166		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3394	+ if (full)
	3395	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3167	3396	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3168	3397	obj.TransformMesh(Object3D.mat);
	3398	+
3169	3399	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3170		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3400	+ if (full)
	3401	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3171	3402	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3403	+
3172	3404	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3173	3405	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3174	3406	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3197,7 +3429,8 @@
3197	3429
3198	3430	int size = obj.MemorySize();
3199	3431
3200		- System.err.println((size/1024) + " KB is the size of " + obj);
	3432	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3433	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3201	3434	}
3202	3435	}
3203	3436	catch (Exception e)
..	..	@@ -3234,9 +3467,9 @@
3234	3467	obj = (Object3D)e.nextElement();
3235	3468
3236	3469	System.out.println("Object is: " + obj);
3237		- GrafreeD.AnalyzeObject(obj);
	3470	+ Grafreed.AnalyzeObject(obj);
3238	3471	System.out.println("Boundary rep: " + obj.bRep);
3239		- GrafreeD.AnalyzeObject(obj.bRep);
	3472	+ Grafreed.AnalyzeObject(obj.bRep);
3240	3473
3241	3474	// System.err.println((size/1024) + " KB is the size of " + obj);
3242	3475	}
..	..	@@ -3278,6 +3511,13 @@
3278	3511	void GenNormals(boolean crease)
3279	3512	{
3280	3513	group.GenNormalsS(crease);
	3514	+
	3515	+ refreshContents();
	3516	+ }
	3517	+
	3518	+ void GenNormalsMESH()
	3519	+ {
	3520	+ group.GenNormalsMeshS();
3281	3521
3282	3522	refreshContents();
3283	3523	}
..	..	@@ -3450,8 +3690,8 @@
3450	3690
3451	3691	void ParseVertices()
3452	3692	{
3453		- boolean epsequal = GrafreeD.epsequal;
3454		- GrafreeD.epsequal = true;
	3693	+ boolean epsequal = Grafreed.epsequal;
	3694	+ Grafreed.epsequal = true;
3455	3695
3456	3696	for (int i=0; i<group.selection.size(); i++)
3457	3697	{
..	..	@@ -3476,7 +3716,7 @@
3476	3716	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3477	3717	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3478	3718
3479		- g.add(GrafreeD.clipboard);
	3719	+ g.add(Grafreed.clipboard);
3480	3720
3481	3721	buffer.add(g);
3482	3722	}
..	..	@@ -3491,7 +3731,7 @@
3491	3731	makeSomething(buffer, i==group.selection.size()-1);
3492	3732	}
3493	3733
3494		- GrafreeD.epsequal = epsequal;
	3734	+ Grafreed.epsequal = epsequal;
3495	3735
3496	3736	refreshContents();
3497	3737	}
..	..	@@ -3509,7 +3749,16 @@
3509	3749	String pigment = Object3D.GetPigment(tex);
3510	3750	//String bump = Object3D.GetBump(tex);
3511	3751
3512		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3752	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3753	+
	3754	+ try
	3755	+ {
	3756	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3757	+ }
	3758	+ catch (Exception e)
	3759	+ {
	3760	+ System.err.println("FAIL: " + node);
	3761	+ }
3513	3762
3514	3763	double s = v.s;
3515	3764
..	..	@@ -3597,11 +3846,11 @@
3597	3846
3598	3847	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3599	3848
3600		- boolean random = CameraPane.RANDOM;
3601		- CameraPane.RANDOM = false; // parse all random nodes
	3849	+ boolean random = CameraPane.SWITCH;
	3850	+ CameraPane.SWITCH = false; // parse all random nodes
3602	3851	lowres.linkVerticesThis(null);
3603	3852	lowres.linkVerticesThis(sn);
3604		- CameraPane.RANDOM = random;
	3853	+ CameraPane.SWITCH = random;
3605	3854
3606	3855	System.err.flush();
3607	3856
..	..	@@ -3641,7 +3890,7 @@
3641	3890	return;
3642	3891
3643	3892	Object3D poses = group.selection.get(0);
3644		- Object3D ref = GrafreeD.clipboard.get(0);
	3893	+ Object3D ref = Grafreed.clipboard.get(0);
3645	3894
3646	3895	Object3D newgroup = new Object3D("Po:" + poses.name);
3647	3896
..	..	@@ -3835,9 +4084,9 @@
3835	4084
3836	4085	void ClipMesh()
3837	4086	{
3838		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4087	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3839	4088	{
3840		- Object3D content = GrafreeD.clipboard.get(0);
	4089	+ Object3D content = Grafreed.clipboard.get(0);
3841	4090
3842	4091	if (content instanceof cGroup && ((cGroup)content).transientlink )
3843	4092	content = ((cGroup)content).get(0);
..	..	@@ -3846,7 +4095,7 @@
3846	4095	// {
3847	4096	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3848	4097	// }
3849		- group.selection.ClipMesh(GrafreeD.clipboard);
	4098	+ group.selection.ClipMesh(Grafreed.clipboard);
3850	4099	}
3851	4100	// group.selection.ClipMesh(GrafreeD.clipboard);
3852	4101	System.out.println("DONE.");
..	..	@@ -3981,7 +4230,7 @@
3981	4230	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3982	4231
3983	4232	Object3D elem = (Object3D)group.selection.elementAt(i);
3984		- if(elem != group)
	4233	+ if(elem != group \|\| !newWindow)
3985	4234	{
3986	4235	// if (!(elem instanceof Composite))
3987	4236	// newWindow = false;
..	..	@@ -4086,23 +4335,26 @@
4086	4335	System.err.println("info : " + child.GetPath());
4087	4336	}
4088	4337	}
4089		- else
4090		- {
4091		- objEditor.SetMaterial(group); // .GetMaterial());
4092		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4093		- System.err.println("info : " + group.GetPath());
4094		- }
	4338	+// else
	4339	+// {
	4340	+// objEditor.SetMaterial(group); // .GetMaterial());
	4341	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4342	+// System.err.println("info : " + group.GetPath());
	4343	+// }
4095	4344
4096	4345	objEditor.SetText(); // jan 2014
4097	4346
4098		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4347	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4099	4348	CameraPane.flash = true;
4100	4349
4101		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4350	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4102	4351	// a camera
4103	4352	{
4104		- CameraPane.camerachangeframe = 0; // don't refuse it
4105		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4353	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4354	+ {
	4355	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4356	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4357	+ }
4106	4358	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4107	4359	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4108	4360	}
..	..	@@ -4186,16 +4438,18 @@
4186	4438	{
4187	4439	if (group.selection.isEmpty())
4188	4440	return;
4189		- GrafreeD.clipboardIsTempGroup = false;
	4441	+
	4442	+ Grafreed.clipboardIsTempGroup = false;
4190	4443	Composite tGroup = null;
4191	4444	if (group.selection.size() > 0) // 1)
4192	4445	{
4193	4446	tGroup = new cGroup();
4194		- GrafreeD.clipboardIsTempGroup = true;
	4447	+ Grafreed.clipboardIsTempGroup = true;
4195	4448	}
4196	4449
4197	4450	if (cut)
4198	4451	{
	4452	+ Save();
4199	4453	//int indices[] = jList.getSelectedIndices();
4200	4454	//for (int i = indices.length - 1; i >= 0; i--)
4201	4455	//jList.remove(indices[i]);
..	..	@@ -4231,16 +4485,16 @@
4231	4485	//System.out.println("cut " + child);
4232	4486	//System.out.println("parent = " + child.parent);
4233	4487	// tmp.addChild(child);
4234		- if (GrafreeD.clipboardIsTempGroup)
	4488	+ if (Grafreed.clipboardIsTempGroup)
4235	4489	tGroup.add/Child/(tmp);
4236	4490	else
4237		- GrafreeD.clipboard = tmp;
	4491	+ Grafreed.clipboard = tmp;
4238	4492	}
4239	4493	else
4240		- if (GrafreeD.clipboardIsTempGroup)
	4494	+ if (Grafreed.clipboardIsTempGroup)
4241	4495	tGroup.add/Child/(child);
4242	4496	else
4243		- GrafreeD.clipboard = child;
	4497	+ Grafreed.clipboard = child;
4244	4498	}
4245	4499
4246	4500	//ResetModel();
..	..	@@ -4272,21 +4526,23 @@
4272	4526	//System.out.println("cut " + elem);
4273	4527	//System.out.println("parent = " + elem.parent);
4274	4528	// tmp.addChild(elem);
4275		- if (GrafreeD.clipboardIsTempGroup)
	4529	+ if (Grafreed.clipboardIsTempGroup)
4276	4530	tGroup.add/Child/(tmp);
4277	4531	else
4278		- GrafreeD.clipboard = tmp;
	4532	+ Grafreed.clipboard = tmp;
4279	4533	}
4280	4534	else
4281		- if (GrafreeD.clipboardIsTempGroup)
	4535	+ if (Grafreed.clipboardIsTempGroup)
4282	4536	tGroup.add/Child/(child);
4283	4537	else
4284		- GrafreeD.clipboard = child;
	4538	+ Grafreed.clipboard = child;
4285	4539	}
4286	4540
4287	4541	}
4288		- if (GrafreeD.clipboardIsTempGroup)
4289		- GrafreeD.clipboard = tGroup;
	4542	+
	4543	+ if (Grafreed.clipboardIsTempGroup)
	4544	+ Grafreed.clipboard = tGroup;
	4545	+
4290	4546	if (cut)
4291	4547	{
4292	4548	ResetModel();
..	..	@@ -4300,7 +4556,7 @@
4300	4556	// return;
4301	4557	boolean first = true;
4302	4558
4303		- if (GrafreeD.clipboardIsTempGroup)
	4559	+ if (Grafreed.clipboardIsTempGroup)
4304	4560	{
4305	4561	Composite temp;
4306	4562
..	..	@@ -4311,7 +4567,7 @@
4311	4567	temp = (Composite)Applet3D.clipboard.deepCopy();
4312	4568	*/
4313	4569	Object3D elem;
4314		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4570	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4315	4571	{
4316	4572	Object3D child = (Object3D)e.nextElement();
4317	4573
..	..	@@ -4345,21 +4601,21 @@
4345	4601	//Object3D cb = Applet3D.clipboard;
4346	4602	//temp.addChild(cb);
4347	4603	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4348		- assert(GrafreeD.clipboard.parent == null);
4349		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4350		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4351		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4352		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4604	+ assert(Grafreed.clipboard.parent == null);
	4605	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4606	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4607	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4608	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4353	4609	else
4354		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4355		- GrafreeD.clipboard.get(0).parent = keepparent;
	4610	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4611	+ Grafreed.clipboard.get(0).parent = keepparent;
4356	4612	}
4357	4613
4358	4614	ResetModel();
4359	4615	refreshContents();
4360	4616	}
4361	4617
4362		- void pasteInto(boolean copyit)
	4618	+ void pasteInto(boolean copyit, boolean clone)
4363	4619	{
4364	4620	// if (GrafreeD.clipboard == null)
4365	4621	// return;
..	..	@@ -4388,15 +4644,22 @@
4388	4644	if (copyit)
4389	4645	{
4390	4646	// paste(false);
4391		- CloneClipboard(false); // sept 2014
	4647	+ if (clone)
	4648	+ {
	4649	+ CloneClipboard(false); // sept 2014
	4650	+ }
	4651	+ else
	4652	+ {
	4653	+ paste(false);
	4654	+ }
4392	4655	}
4393	4656	else
4394	4657	{
4395	4658	boolean first = true;
4396	4659
4397		- if (GrafreeD.clipboardIsTempGroup)
	4660	+ if (Grafreed.clipboardIsTempGroup)
4398	4661	{
4399		- Composite temp = (Composite)GrafreeD.clipboard;
	4662	+ Composite temp = (Composite)Grafreed.clipboard;
4400	4663	Object3D copy;
4401	4664	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4402	4665	{
..	..	@@ -4406,7 +4669,7 @@
4406	4669	}
4407	4670	} else
4408	4671	{
4409		- linkSomething(GrafreeD.clipboard); //.get(0));
	4672	+ linkSomething(Grafreed.clipboard); //.get(0));
4410	4673	}
4411	4674	}
4412	4675	}
..	..	@@ -4811,21 +5074,6 @@
4811	5074	}
4812	5075	*/
4813	5076
4814		- void ImportGFD()
4815		- {
4816		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4817		- browser.show();
4818		- String filename = browser.getFile();
4819		- if (filename != null && filename.length() > 0)
4820		- {
4821		- String fullname = browser.getDirectory() + filename;
4822		-
4823		- //Object3D readobj =
4824		- objEditor.ReadGFD(fullname, objEditor);
4825		- //makeSomething(readobj);
4826		- }
4827		- }
4828		-
4829	5077	/*
4830	5078	public void Callback(Object obj)
4831	5079	{
..	..	@@ -4849,26 +5097,9 @@
4849	5097	}
4850	5098	*/
4851	5099
4852		- void ImportVRMLX3D()
4853		- {
4854		- if (GrafreeD.standAlone)
4855		- {
4856		- /**/
4857		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4858		- browser.show();
4859		- String filename = browser.getFile();
4860		- if (filename != null && filename.length() > 0)
4861		- {
4862		- String fullname = browser.getDirectory() + filename;
4863		- LoadVRMLX3D(fullname);
4864		- }
4865		- /**/
4866		- }
4867		- }
4868		-
4869	5100	String GetFile(String dialogName)
4870	5101	{
4871		- if (GrafreeD.standAlone)
	5102	+ if (Grafreed.standAlone)
4872	5103	{
4873	5104	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4874	5105	browser.show();
..	..	@@ -4932,10 +5163,15 @@
4932	5163	cButton flashSelectionButton;
4933	5164	cButton editButton;
4934	5165	cButton uneditButton;
	5166	+ JCheckBox allParamsButton;
4935	5167	cButton clearpanelButton;
4936		- cButton allParamsButton;
4937	5168	cButton unselectButton;
4938	5169
	5170	+ cButton saveButton;
	5171	+ cButton undoButton;
	5172	+ cButton redoButton;
	5173	+ cButton oneStepButton;
	5174	+
4939	5175	cButton screenfitButton;
4940	5176	cButton screenfitpointButton;
4941	5177	cButton snapobjectButton;
..	..	@@ -4966,6 +5202,8 @@
4966	5202	private MenuItem lookFromItem;
4967	5203	private MenuItem switchItem;
4968	5204	private MenuItem cutItem;
	5205	+ private MenuItem undoItem;
	5206	+ private MenuItem redoItem;
4969	5207	private MenuItem duplicateItem;
4970	5208	private MenuItem cloneItem;
4971	5209	private MenuItem cloneSupportItem;
..	..	@@ -4979,7 +5217,7 @@
4979	5217	private MenuItem linkverticesItem;
4980	5218	private MenuItem relinkverticesItem;
4981	5219	private MenuItem setMasterItem;
4982		- private MenuItem resetMeshItem;
	5220	+ private MenuItem resetAllItem;
4983	5221	private MenuItem stepAllItem;
4984	5222	private MenuItem revertMeshItem;
4985	5223	private MenuItem poseMeshItem;
..	..	@@ -4990,6 +5228,7 @@
4990	5228	private MenuItem mergeGeometriesItem;
4991	5229	private MenuItem copyItem;
4992	5230	private MenuItem pasteItem;
	5231	+ private MenuItem pasteIntoItem;
4993	5232	private MenuItem pasteLinkItem;
4994	5233	private MenuItem pasteCloneItem;
4995	5234	private MenuItem pasteExpandItem;
..	..	@@ -5039,8 +5278,10 @@
5039	5278	private MenuItem panoTexturesItem;
5040	5279
5041	5280	private MenuItem resetCentroidItem;
5042		- private MenuItem transformgeometryItem;
	5281	+ private MenuItem resetCentroidXZItem;
5043	5282	private MenuItem resetTransformItem;
	5283	+ private MenuItem transformGeometryItem;
	5284	+ private MenuItem transformChildrenItem;
5044	5285	private MenuItem hideItem;
5045	5286	private MenuItem grabItem;
5046	5287	private MenuItem backItem;
..	..	@@ -5087,7 +5328,7 @@
5087	5328	private MenuItem blobItem;
5088	5329	private MenuItem latheItem;
5089	5330	private MenuItem bezierItem;
5090		- private MenuItem checkerItem;
	5331	+ private MenuItem overlayItem;
5091	5332	private MenuItem meshItem;
5092	5333	// private MenuItem meshGroupItem;
5093	5334	private MenuItem springItem;
..	..	@@ -5109,11 +5350,6 @@
5109	5350	private MenuItem doubleItem;
5110	5351	private MenuItem tripleItem;
5111	5352
5112		- private MenuItem importGFDItem;
5113		- private MenuItem importVRMLX3DItem;
5114		- private MenuItem import3DSItem;
5115		- private MenuItem importOBJItem;
5116		-
5117	5353	private MenuItem computeAOItem;
5118	5354	private MenuItem recompileItem;
5119	5355	private MenuItem editScriptItem;
..	..	@@ -5123,4 +5359,8 @@
5123	5359	private MenuItem analyzeItem;
5124	5360	private MenuItem dumpItem;
5125	5361	//boolean freezemodel = false;
	5362	+
	5363	+ Menu cameraMenu;
	5364	+ MenuItem editCameraItem;
	5365	+ MenuItem revertCameraItem;
5126	5366	}