~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,
..	..	@@ -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
..	..	@@ -149,6 +150,8 @@
149	150
150	151	void SetupMenu2(ObjEditor oe)
151	152	{
	153	+ if (Globals.ADVANCED)
	154	+ {
152	155	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153	156	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154	157	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -160,17 +163,21 @@
160	163	lookAtItem.addActionListener(this);
161	164	//lookFromItem.addActinoListener(this);
162	165	//switchItem.addActionListener(this);
	166	+ }
	167	+
163	168	Menu menu;
164	169	oe.menuBar.add(menu = new Menu("Edit"));
165	170	//editItem = menu.add(new MenuItem("Edit"));
166	171	//editItem.addActionListener(this);
167	172	duplicateItem = menu.add(new MenuItem("Duplicate"));
168	173	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	174	cloneItem = menu.add(new MenuItem("Clone"));
171	175	cloneItem.addActionListener(this);
	176	+ if (Globals.ADVANCED)
	177	+ {
172	178	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	179	cloneSupportItem.addActionListener(this);
	180	+ }
174	181	menu.add("-");
175	182	cutItem = menu.add(new MenuItem("Cut"));
176	183	cutItem.addActionListener(this);
..	..	@@ -178,27 +185,37 @@
178	185	copyItem.addActionListener(this);
179	186	pasteItem = menu.add(new MenuItem("Paste"));
180	187	pasteItem.addActionListener(this);
	188	+ menu.add("-");
	189	+
	190	+ menu.add("-");
	191	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	192	+ pasteIntoItem.addActionListener(this);
181	193	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	194	pasteLinkItem.addActionListener(this);
183	195	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	196	pasteCloneItem.addActionListener(this);
185	197	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	198	// pasteExpandItem.addActionListener(this);
	199	+ menu.add("-");
187	200	clearItem = menu.add(new MenuItem("Clear"));
188	201	clearItem.addActionListener(this);
	202	+
	203	+ if (Globals.ADVANCED)
	204	+ {
	205	+ // Deletes the cameras...
189	206	clearAllItem = menu.add(new MenuItem("Clear All"));
190	207	clearAllItem.addActionListener(this);
	208	+ }
191	209
192	210	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);
	211	+ if (Globals.ADVANCED)
	212	+ {
197	213	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	214	revertMeshItem.addActionListener(this);
199	215	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	216	resetreferencesItem.addActionListener(this);
201	217	menu.add("-");
	218	+ }
202	219	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	220	overwriteGeoItem.addActionListener(this);
204	221	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,19 +227,26 @@
210	227	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	228	overwriteUVItem.addActionListener(this);
212	229	menu.add("-");
	230	+ if (Globals.ADVANCED)
	231	+ {
213	232	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	233	generateMeshItem.addActionListener(this);
215	234	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	235	poseMeshItem.addActionListener(this);
217	236	menu.add("-");
	237	+ }
218	238	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	239	resetsupportItem.addActionListener(this);
220	240	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	241	linkverticesItem.addActionListener(this);
222	242	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	243	relinkverticesItem.addActionListener(this);
	244	+
	245	+ if (Globals.ADVANCED)
	246	+ {
224	247	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	248	setMasterItem.addActionListener(this);
	249	+ }
226	250
227	251	oe.menuBar.add(menu = new Menu("Group"));
228	252	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -233,27 +257,32 @@
233	257	frontItem.addActionListener(this);
234	258	compositeItem = menu.add(new MenuItem("Composite"));
235	259	compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	260	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	261	hideItem.addActionListener(this);
238	262	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	263	ungroupItem.addActionListener(this);
240	264	menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
	265	+ randomItem = menu.add(new MenuItem("Switch node"));
242	266	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	267	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	268	switchGeoItem.addActionListener(this);
249	269	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	270	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	271	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	272	morphItem.addActionListener(this);
	273	+
	274	+ if (Globals.ADVANCED)
	275	+ {
	276	+ menu.add("-");
	277	+ physicsItem = menu.add(new MenuItem("Physics"));
	278	+ physicsItem.addActionListener(this);
	279	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	280	+ frameselectorItem.addActionListener(this);
253	281	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	282	scriptNodeItem.addActionListener(this);
255	283	cameraItem = menu.add(new MenuItem("Camera"));
256	284	cameraItem.addActionListener(this);
	285	+ }
257	286
258	287	oe.menuBar.add(menu = new Menu("Object"));
259	288	textureItem = menu.add(new MenuItem("Texture"));
..	..	@@ -268,21 +297,29 @@
268	297	shadowYItem.addActionListener(this);
269	298	shadowZItem = menu.add(new MenuItem("Shadow Z"));
270	299	shadowZItem.addActionListener(this);
	300	+ if (Globals.ADVANCED)
	301	+ {
	302	+ menu.add("-");
271	303	linkerItem = menu.add(new MenuItem("Linker"));
272	304	linkerItem.addActionListener(this);
273		- templateItem = menu.add(new MenuItem("Template"));
274		- templateItem.addActionListener(this);
275	305	attributeItem = menu.add(new MenuItem("Attribute"));
276	306	attributeItem.addActionListener(this);
	307	+ templateItem = menu.add(new MenuItem("Template"));
	308	+ templateItem.addActionListener(this);
277	309	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	310	pointflowItem.addActionListener(this);
	311	+ }
279	312	menu.add("-");
280	313	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	314	resetTransformItem.addActionListener(this);
282	315	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	316	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	317	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	318	+ resetCentroidXZItem.addActionListener(this);
	319	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	320	+ transformGeometryItem.addActionListener(this);
	321	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	322	+ transformChildrenItem.addActionListener(this);
286	323
287	324	oe.menuBar.add(menu = new Menu("Geometry"));
288	325	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +330,11 @@
293	330	genNormalsCADItem.addActionListener(this);
294	331	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	332	genNormalsMESHItem.addActionListener(this);
	333	+ if (Globals.ADVANCED)
	334	+ {
296	335	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
297	336	genNormalsMINEItem.addActionListener(this);
	337	+ }
298	338	stripifyItem = menu.add(new MenuItem("Stripify"));
299	339	stripifyItem.addActionListener(this);
300	340	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +356,34 @@
316	356	reduce34MeshItem.addActionListener(this);
317	357	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	358	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	359	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	360	clipMeshItem.addActionListener(this);
	361	+
	362	+ if (Globals.ADVANCED)
	363	+ {
	364	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	365	+ smoothMeshItem.addActionListener(this);
	366	+ }
323	367
324	368	oe.menuBar.add(menu = new Menu("Attributes"));
325	369	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	370	clearMaterialsItem.addActionListener(this);
	371	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	372	+ resetAllItem.addActionListener(this);
	373	+ stepAllItem = menu.add(new MenuItem("Step All"));
	374	+ stepAllItem.addActionListener(this);
327	375	menu.add("-");
328	376	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	377	liveleavesItem.addActionListener(this);
330	378	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	379	unliveleavesItem.addActionListener(this);
	380	+ if (Globals.ADVANCED)
	381	+ {
332	382	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	383	supportleavesItem.addActionListener(this);
334	384	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	385	unsupportleavesItem.addActionListener(this);
	386	+ }
336	387	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	388	hideleavesItem.addActionListener(this);
338	389	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -376,28 +427,34 @@
376	427	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	428	sortbynameItem.addActionListener(this);
378	429	menu.add("-");
	430	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	431	+ shareGeometriesItem.addActionListener(this);
	432	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	433	+ mergeGeometriesItem.addActionListener(this);
	434	+ if (Globals.ADVANCED)
	435	+ {
	436	+ // Pretty much the same as duplicate and clone.
379	437	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	438	extractGeometriesItem.addActionListener(this);
381	439	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	440	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);
	441	+ }
387	442
388	443	oe.menuBar.add(menu = new Menu("Insert"));
389	444	buildCreateMenu(menu);
390	445
391		-
392	446	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..."));
	447	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
398	448	importOBJItem.addActionListener(this);
399		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
	449	+ menu.add("-");
	450	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
400	451	import3DSItem.addActionListener(this);
	452	+ menu.add("-");
	453	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	454	+ importVRMLX3DItem.addActionListener(this);
	455	+ menu.add("-");
	456	+ importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
	457	+ importGFDItem.addActionListener(this);
401	458
402	459	oe.menuBar.add(menu = new Menu("Tools"));
403	460	buildToolsMenu(menu);
..	..	@@ -433,153 +490,98 @@
433	490	oe.radioPanel.add(dummyButton);
434	491	oe.buttonGroup.add(dummyButton);
435	492	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	493	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	494
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	495	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	496	+ liveCB.setToolTipText("Enable animation");
441	497	liveCB.addItemListener(this);
442	498
443		- oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
445		- supportCB.addItemListener(this);
446		-
447		- // oe.aConstraints.gridx += 1;
448		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
449		- // localCB.addItemListener(this);
450		-
451		- oe.aConstraints.gridx += 1;
452		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
453		- crowdCB.addItemListener(this);
454		-
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
457		- smoothCB.addItemListener(this);
458		-
459		- oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	499	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	500	+ oneStepButton.setToolTipText("Animate one step forward");
	501	+ oneStepButton.addActionListener(this);
	502	+
	503	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	504	+ fastCB.setToolTipText("Fast mode");
461	505	fastCB.addItemListener(this);
462		- oe.aConstraints.gridx += 1;
463		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
464		- slowCB.addItemListener(this);
465		- oe.aConstraints.gridx += 1;
466		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
467		- boxCB.addItemListener(this);
468		-
469		-// oe.aConstraints.gridx += 1;
470		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
471		-// speakerMocapCB.addItemListener(this);
472		-
473		- if (false)
474		- {
475		- // handled in scripts
476		- oe.aConstraints.gridx += 1;
477		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
478		- speakerCameraCB.addItemListener(this);
479		-
480		- oe.aConstraints.gridx += 1;
481		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
482		- speakerFocusCB.addItemListener(this);
483		-
484		- oe.aConstraints.gridx += 1;
485		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
486		- smoothfocusCB.addItemListener(this);
487		- }
488		-
489		-//oe.aConstraints.gridx += 1;
490		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
491		-// debugCB.addItemListener(this);
492		-
493		- oe.aConstraints.gridx += 1;
494		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
495		- oeilCB.addItemListener(this);
496		-
497		- oe.aConstraints.gridx += 1;
498		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
499		- lookAtCB.addItemListener(this);
500		-
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	506	+
	507	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	508	+ trackCB.setToolTipText("Enable tracking");
503	509	trackCB.addItemListener(this);
504	510
505		- oe.aConstraints.gridx += 1;
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	511	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	512	+ screenfitButton.setToolTipText("Screen fit");
507	513	screenfitButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
	514	+
509	515	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
510	516	// screenfitpointButton.addActionListener(this);
511		-// oe.aConstraints.gridx += 1;
512		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
513		- snapobjectButton.addActionListener(this);
514		- oe.aConstraints.gridx += 1;
515	517
516		- //aConstraints.gridx = 0;
517		- //aConstraints.gridy += 1;
518		- oe.aConstraints.weighty = 0;
519		- oe.aConstraints.gridwidth = 1;
520		-
521		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	518	+ if (Globals.ADVANCED)
	519	+ {
	520	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	521	+ snapobjectButton.addActionListener(this);
	522	+ snapobjectButton.setToolTipText("Snap Object");
	523	+ }
	524	+
	525	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	526	+ flashSelectionButton.setToolTipText("Show selection");
522	527	flashSelectionButton.addActionListener(this);
523	528
524		- oe.toolbarPanel.add(new cButton(" ", false));
	529	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
525	530
526		- oe.aConstraints.gridx += 1;
527		- oe.aConstraints.weighty = 0;
528		- oe.aConstraints.gridwidth = 1;
529		-
530		- //
531		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	531	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	532	+ twoButton.setToolTipText("Show center view only");
532	533	twoButton.addActionListener(this);
533		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	534	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
534	535	fourButton.addActionListener(this);
535		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	536	+ fourButton.setToolTipText("Show left panel only");
	537	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	538	+ sixButton.setToolTipText("2-column layout left");
536	539	sixButton.addActionListener(this);
537		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	540	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	541	+ threeButton.setToolTipText("2-column layout right");
538	542	threeButton.addActionListener(this);
539		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	543	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	544	+ sevenButton.setToolTipText("3-column layout");
540	545	sevenButton.addActionListener(this);
541	546	//
542	547
543		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	548	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	549	+ rootButton.setToolTipText("Edit selection in new tab");
544	550	rootButton.addActionListener(this);
545		- oe.aConstraints.gridx += 1;
546		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	551	+
	552	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	553	+ closeButton.setToolTipText("Close tab");
547	554	closeButton.addActionListener(this);
548	555	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
549	556	//clearButton.addActionListener(this);
550		- oe.aConstraints.gridx += 1;
551	557
552		- oe.aConstraints.gridx = 1; //
553		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	558	+ cGridBag commandsPanel = new cGridBag();
	559	+
	560	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	561	+ editButton.setToolTipText("Edit selection");
554	562	editButton.addActionListener(this);
555		- oe.aConstraints.gridx += 1;
556		- oe.aConstraints.weighty = 0;
557		- oe.aConstraints.gridwidth = 1;
558	563
559		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	564	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	565	+ uneditButton.setToolTipText("Unedit selection");
560	566	uneditButton.addActionListener(this);
561	567
562		- oe.aConstraints.gridx += 1;
563		- oe.aConstraints.weighty = 0;
564		- oe.aConstraints.gridwidth = 1;
565		-
566		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
567		- clearPanelButton.addActionListener(this);
568		-
569		- oe.aConstraints.gridx += 1;
570		- oe.aConstraints.weighty = 0;
571		- oe.aConstraints.gridwidth = 1;
572		-
573		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	568	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	569	+ allParamsButton.setToolTipText("Edit all params");
574	570	allParamsButton.addActionListener(this);
575	571
576		- oe.aConstraints.gridx += 1;
577		- oe.aConstraints.weighty = 0;
578		- oe.aConstraints.gridwidth = 1;
579		-
580		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	572	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	573	+ clearPanelButton.setToolTipText("Clear edit panel");
	574	+ clearPanelButton.addActionListener(this);
	575	+
	576	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	577	+ unselectButton.setToolTipText("Unselect");
581	578	unselectButton.addActionListener(this);
582	579
	580	+ commandsPanel.preferredHeight = 1;
	581	+
	582	+ oe.treePanel.add(commandsPanel);
	583	+ oe.treePanel.Return();
	584	+
583	585	// oe.aConstraints.gridx += 1;
584	586	// oe.aConstraints.weighty = 0;
585	587	// oe.aConstraints.gridwidth = 1;
..	..	@@ -591,40 +593,37 @@
591	593	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
592	594	// gcButton.addActionListener(this);
593	595
594		- oe.aConstraints.gridx = 0;
595		- oe.aConstraints.gridy += 1;
596		-
597		- //ctrlPanel.add(objList = new List(5, true));
598		- oe.aConstraints.gridwidth = 100;
599		- // oe.aConstraints.gridheight = 100;
600		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
601		- oe.aConstraints.gridheight = 1;
602		- oe.aConstraints.weighty = 0.5;
603		- oe.aConstraints.gridx = 0;
604		- JScrollPane jSP;
	596	+ cGridBag jSPPanel = new cGridBag();
	597	+
	598	+ JScrollPane jSP;
605	599	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
606		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	600	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
607	601	ResetModel();
608		- oe.aConstraints.weighty = 0.5;
609		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
610		- oe.aConstraints.gridy += 1;
611		- oe.aConstraints.gridwidth = 1;
	602	+
	603	+ oe.treePanel.add(jSPPanel);
	604	+ oe.treePanel.Return();
612	605
613		- oe.aConstraints.weighty = 0;
614		- oe.aConstraints.gridwidth = 2;
615		-
616		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
	606	+ cGridBag copyOptionsPanel = new cGridBag();
	607	+
	608	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	609	+ colorCB.setToolTipText("Copy color when dropped");
617	610	colorCB.addItemListener(this);
618		- oe.aConstraints.gridx += 2;
619		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	611	+
	612	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	613	+ materialCB.setToolTipText("Copy material when dropped");
620	614	materialCB.addItemListener(this);
621		- oe.aConstraints.gridx += 2;
622		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	615	+
	616	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	617	+ textureCB.setToolTipText("Copy texture when dropped");
623	618	textureCB.addItemListener(this);
624	619
625		- oe.aConstraints.gridx = 0;
626		- oe.aConstraints.gridy += 1;
	620	+ copyOptionsPanel.preferredHeight = 1;
	621	+ oe.treePanel.add(copyOptionsPanel);
	622	+ oe.treePanel.Return();
627	623
	624	+// mainPanel.setDividerLocation(0.5); //1.0);
	625	+// mainPanel.setResizeWeight(0.5);
	626	+
628	627	//jList.addListSelectionListener(this);
629	628	oe.jTree.addTreeSelectionListener(this);
630	629	//jTree.setRootVisible(false);
..	..	@@ -646,6 +645,78 @@
646	645	radio.layout = sevenButton;
647	646	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
648	647	}
	648	+
	649	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	650	+ {
	651	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	652	+ boxCB.setToolTipText("Display bounding boxes");
	653	+ boxCB.addItemListener(this);
	654	+
	655	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	656	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	657	+ zoomBoxCB.addItemListener(this);
	658	+
	659	+ if (true) // Globals.ADVANCED)
	660	+ {
	661	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	662	+ supportCB.setToolTipText("Enable rigging");
	663	+ supportCB.addItemListener(this);
	664	+
	665	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	666	+ // localCB.addItemListener(this);
	667	+
	668	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	669	+ crowdCB.setToolTipText("Used for crowds");
	670	+ crowdCB.addItemListener(this);
	671	+
	672	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	673	+ smoothCB.setToolTipText("Snapping delay");
	674	+ smoothCB.addItemListener(this);
	675	+
	676	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	677	+ slowCB.setToolTipText("Smooth interpolation");
	678	+ slowCB.addItemListener(this);
	679	+
	680	+// constraints.gridy += 1;
	681	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	682	+// speakerMocapCB.addItemListener(this);
	683	+
	684	+ if (false)
	685	+ {
	686	+ // handled in scripts
	687	+ //constraints.gridy += 1;
	688	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	689	+ speakerCameraCB.addItemListener(this);
	690	+
	691	+ //constraints.gridy += 1;
	692	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	693	+ speakerFocusCB.addItemListener(this);
	694	+
	695	+ //constraints.gridy += 1;
	696	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	697	+ smoothfocusCB.addItemListener(this);
	698	+ }
	699	+
	700	+//constraints.gridx += 1;
	701	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	702	+// debugCB.addItemListener(this);
	703	+
	704	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	705	+ oeilCB.addItemListener(this);
	706	+
	707	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	708	+ lookAtCB.setToolTipText("Look-at target");
	709	+ lookAtCB.addItemListener(this);
	710	+
	711	+ }
	712	+
	713	+ cGridBag fill = new cGridBag();
	714	+
	715	+ fill.preferredHeight = 200;
	716	+
	717	+ panel.add(fill);
	718	+
	719	+ }
649	720
650	721	void EditObject(Object3D obj)
651	722	{
..	..	@@ -658,6 +729,7 @@
658	729	buttonGroup.add(radioButton);
659	730	radioButton.doClick();
660	731	}
	732	+
661	733	void SetupViews(ObjEditor oe)
662	734	{
663	735	oe.SetupViews();
..	..	@@ -676,6 +748,7 @@
676	748	JCheckBox fastCB;
677	749	JCheckBox slowCB;
678	750	JCheckBox boxCB;
	751	+ JCheckBox zoomBoxCB;
679	752	JCheckBox trackCB;
680	753	JCheckBox smoothfocusCB;
681	754	// JCheckBox speakerMocapCB;
..	..	@@ -755,6 +828,10 @@
755	828	Recompile();
756	829	cameraView.repaint();
757	830	// refreshContents();
	831	+ }
	832	+ else if(e.getSource() == zoomBoxCB)
	833	+ {
	834	+ cameraView.ToggleZoomBoxMode();
758	835	}
759	836	else if(e.getSource() == smoothfocusCB)
760	837	{
..	..	@@ -869,7 +946,9 @@
869	946	// objEditor.DropFile((java.io.File[]) object, true);
870	947	// return;
871	948	// }
872		- if (string.charAt(0) == '/')
	949	+
	950	+ // File path for Mac and Windows
	951	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
873	952	{
874	953	// file(s)
875	954	String[] names = string.split("\n");
..	..	@@ -896,7 +975,7 @@
896	975
897	976	flashIt = false;
898	977	CameraPane pane = (CameraPane) target;
899		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	978	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
900	979	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
901	980
902	981	if (group.selection.size() == 1)
..	..	@@ -923,11 +1002,11 @@
923	1002	{
924	1003	loadClipboard(true);
925	1004	objEditor.jTree.setSelectionPath(destinationPath);
926		- pasteInto(false);
	1005	+ pasteInto(false, false);
927	1006	} else {
928	1007	loadClipboard(false);
929	1008	objEditor.jTree.setSelectionPath(destinationPath);
930		- pasteInto(false); // true); // ???
	1009	+ pasteInto(false, false); // true); // ???
931	1010	}
932	1011	}
933	1012	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1049,27 +1128,33 @@
1049	1128	kleinItem.addActionListener(this);
1050	1129	particleItem = menu.add(new MenuItem("Particle system"));
1051	1130	particleItem.addActionListener(this);
	1131	+ if (Globals.ADVANCED)
	1132	+ {
1052	1133	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1053	1134	ragdollItem.addActionListener(this);
1054	1135	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1055	1136	ragdoll2Item.addActionListener(this);
	1137	+ }
1056	1138	menu.add("-");
1057		- meshItem = menu.add(new MenuItem("Mesh"));
	1139	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1058	1140	meshItem.addActionListener(this);
1059	1141	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1060	1142	// meshGroupItem.addActionListener(this);
	1143	+ if (Globals.ADVANCED)
	1144	+ {
1061	1145	springItem = menu.add(new MenuItem("Spring"));
1062	1146	springItem.addActionListener(this);
1063	1147	flagItem = menu.add(new MenuItem("Flag"));
1064	1148	flagItem.addActionListener(this);
1065		- bezierItem = menu.add(new MenuItem("Patch"));
1066		- bezierItem.addActionListener(this);
1067		- checkerItem = menu.add(new MenuItem("Checker"));
1068		- checkerItem.addActionListener(this);
1069	1149	blobItem = menu.add(new MenuItem("Blob"));
1070	1150	blobItem.addActionListener(this);
1071	1151	latheItem = menu.add(new MenuItem("Lathe"));
1072	1152	latheItem.addActionListener(this);
	1153	+ }
	1154	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1155	+ bezierItem.addActionListener(this);
	1156	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1157	+ overlayItem.addActionListener(this);
1073	1158	lightItem = menu.add(new MenuItem("Light"));
1074	1159	lightItem.addActionListener(this);
1075	1160	menu.add("-");
..	..	@@ -1079,34 +1164,39 @@
1079	1164	loopItem.addActionListener(this);
1080	1165	doubleItem = menu.add(new MenuItem("Fork"));
1081	1166	doubleItem.addActionListener(this);
	1167	+ if (Globals.ADVANCED)
	1168	+ {
1082	1169	tripleItem = menu.add(new MenuItem("Trident"));
1083	1170	tripleItem.addActionListener(this);
	1171	+ }
1084	1172	}
1085	1173
1086	1174	void buildToolsMenu(Menu menu)
1087	1175	{
1088	1176	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1089	1177	animationItem.addItemListener(this);
1090		- animationItem.setState(CameraPane.ANIMATION);
	1178	+ animationItem.setState(Globals.ANIMATION);
1091	1179
1092	1180	menu.add("-");
1093	1181	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1094	1182	parseverticesItem.addActionListener(this);
1095	1183	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1096	1184	textureFieldItem.addActionListener(this);
1097		- alignItem = menu.add(new MenuItem("Align"));
	1185	+ alignItem = menu.add(new MenuItem("Align Objects"));
1098	1186	alignItem.addActionListener(this);
1099		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1100		- mirrorItem.addActionListener(this);
1101	1187	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1102	1188	reduceMorphItem.addActionListener(this);
1103	1189	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1104	1190	reduce34MorphItem.addActionListener(this);
1105		-
	1191	+ menu.add("-");
1106	1192	menu.add(computeAOItem = new MenuItem("Compute AO"));
1107	1193	computeAOItem.addActionListener(this);
1108		- menu.add("-");
1109	1194
	1195	+ if (Globals.ADVANCED)
	1196	+ {
	1197	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1198	+ mirrorItem.addActionListener(this);
	1199	+ menu.add("-");
1110	1200	menu.add(memoryItem = new MenuItem("Memory Usage"));
1111	1201	memoryItem.addActionListener(this);
1112	1202	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1129,6 +1219,7 @@
1129	1219	menu.add("-");
1130	1220	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1131	1221	editScriptItem.addActionListener(this);
	1222	+ }
1132	1223	}
1133	1224
1134	1225	void ScreenFit()
..	..	@@ -1457,9 +1548,9 @@
1457	1548
1458	1549	void Overwrite(int mask)
1459	1550	{
1460		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1551	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1461	1552	{
1462		- Object3D content = GrafreeD.clipboard.get(0);
	1553	+ Object3D content = Grafreed.clipboard.get(0);
1463	1554
1464	1555	if (content instanceof cGroup && ((cGroup)content).transientlink )
1465	1556	content = ((cGroup)content).get(0);
..	..	@@ -1482,6 +1573,7 @@
1482	1573	//
1483	1574	public void actionPerformed(ActionEvent event) // , Object arg)
1484	1575	{
	1576	+ Object source = event.getSource();
1485	1577	/*
1486	1578	if (event.getSource() == nameField)
1487	1579	{
..	..	@@ -1493,11 +1585,11 @@
1493	1585	}
1494	1586	else
1495	1587	*/
1496		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1588	+ if (source == lookAtItem \|\| source == lookFromItem)
1497	1589	{
1498	1590	ScreenFit();
1499	1591	} else
1500		- if (event.getSource() == switchItem)
	1592	+ if (source == switchItem)
1501	1593	{
1502	1594	cVector v1 = new cVector();
1503	1595	cVector v2 = new cVector();
..	..	@@ -1506,11 +1598,11 @@
1506	1598	objEditor.cameraView.renderCamera.setAim(v2, v1);
1507	1599	objEditor.cameraView.repaint();
1508	1600	} else
1509		- if (event.getSource() == rectoidItem)
	1601	+ if (source == rectoidItem)
1510	1602	{
1511	1603	makeSomething(new Box());
1512	1604	} else
1513		- if (event.getSource() == particleItem)
	1605	+ if (source == particleItem)
1514	1606	{
1515	1607	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1516	1608	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1531,9 +1623,9 @@
1531	1623	applyExample(particleGeom, "SMOKE");
1532	1624	makeSomething(particleGeom);
1533	1625	} else
1534		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1626	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1535	1627	{
1536		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1628	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1537	1629
1538	1630	ragdoll.toParent = LA.newMatrix();
1539	1631	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1551,7 +1643,7 @@
1551	1643	} else
1552	1644	/*
1553	1645	*/
1554		- if (event.getSource() == heightFieldItem)
	1646	+ if (source == heightFieldItem)
1555	1647	{
1556	1648	Object3D obj = new Object3D();
1557	1649
..	..	@@ -1589,31 +1681,31 @@
1589	1681
1590	1682	makeSomething(obj);
1591	1683	} else
1592		- if (event.getSource() == gridItem)
	1684	+ if (source == gridItem)
1593	1685	{
1594	1686	makeSomething(new Grid());
1595	1687	} else
1596		- if (event.getSource() == ellipsoidItem)
	1688	+ if (source == ellipsoidItem)
1597	1689	{
1598	1690	makeSomething(new Sphere());
1599	1691	} else
1600		- if (event.getSource() == coneItem)
	1692	+ if (source == coneItem)
1601	1693	{
1602	1694	makeSomething(new Cone());
1603	1695	} else
1604		- if (event.getSource() == torusItem)
	1696	+ if (source == torusItem)
1605	1697	{
1606	1698	makeSomething(new Torus());
1607	1699	} else
1608		- if (event.getSource() == superItem)
	1700	+ if (source == superItem)
1609	1701	{
1610	1702	makeSomething(new Superellipsoid());
1611	1703	} else
1612		- if (event.getSource() == kleinItem)
	1704	+ if (source == kleinItem)
1613	1705	{
1614	1706	makeSomething(new Klein());
1615	1707	} else
1616		- if (event.getSource() == blobItem)
	1708	+ if (source == blobItem)
1617	1709	{
1618	1710	Blob blob = new Blob();
1619	1711	BlobComponent comp = new BlobComponent();
..	..	@@ -1621,15 +1713,15 @@
1621	1713	//blob.retile();
1622	1714	makeSomething(blob);
1623	1715	} else
1624		- if (event.getSource() == latheItem)
	1716	+ if (source == latheItem)
1625	1717	{
1626	1718	makeSomething(new Lathe());
1627	1719	} else
1628		- if (event.getSource() == bezierItem)
	1720	+ if (source == bezierItem)
1629	1721	{
1630	1722	makeSomething(new BezierSurface());
1631	1723	} else
1632		- if (event.getSource() == checkerItem)
	1724	+ if (source == overlayItem)
1633	1725	{
1634	1726	/*
1635	1727	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1644,7 +1736,7 @@
1644	1736	*/
1645	1737	makeSomething(new Checker());
1646	1738	} else
1647		- if (event.getSource() == meshItem)
	1739	+ if (source == meshItem)
1648	1740	{
1649	1741	Object3D itemtomake = new Object3D();
1650	1742	Object3D child;
..	..	@@ -1665,35 +1757,35 @@
1665	1757	makeSomething(child);
1666	1758	}
1667	1759	} else
1668		- if (event.getSource() == springItem)
	1760	+ if (source == springItem)
1669	1761	{
1670	1762	cSpring s = new cSpring();
1671	1763	s.setup();
1672	1764	makeSomething(s);
1673	1765	} else
1674		- if (event.getSource() == flagItem)
	1766	+ if (source == flagItem)
1675	1767	{
1676	1768	cSpring s = new cFlag();
1677	1769	s.setup();
1678	1770	makeSomething(s);
1679	1771	} else
1680		- if (event.getSource() == lightItem)
	1772	+ if (source == lightItem)
1681	1773	{
1682	1774	makeSomething(new Light());
1683	1775	} else
1684		- if (event.getSource() == csgItem)
	1776	+ if (source == csgItem)
1685	1777	{
1686	1778	group(new CSG());
1687	1779	} else
1688		- if (event.getSource() == templateItem)
	1780	+ if (source == templateItem)
1689	1781	{
1690	1782	group(new cTemplate());
1691	1783	} else
1692		- if (event.getSource() == attributeItem)
	1784	+ if (source == attributeItem)
1693	1785	{
1694	1786	makeSomething(new Attribute());
1695	1787	} else
1696		- if (event.getSource() == pointflowItem)
	1788	+ if (source == pointflowItem)
1697	1789	{
1698	1790	makeSomething(new PointFlow());
1699	1791	} else
..	..	@@ -1705,7 +1797,7 @@
1705	1797	} else
1706	1798	*/
1707	1799
1708		- if (event.getSource() == superLoopItem)
	1800	+ if (source == superLoopItem)
1709	1801	{
1710	1802	Composite g = new cGroup();
1711	1803	for (int i=0; i<15; i++)
..	..	@@ -1727,7 +1819,7 @@
1727	1819
1728	1820	group(g);
1729	1821	} else
1730		- if (event.getSource() == loopItem)
	1822	+ if (source == loopItem)
1731	1823	{
1732	1824	Composite csg = new GroupLeaf();
1733	1825	csg.count = 5;
..	..	@@ -1736,7 +1828,7 @@
1736	1828	csg.addChild(child);
1737	1829	child.addChild(csg);
1738	1830	} else
1739		- if (event.getSource() == doubleItem)
	1831	+ if (source == doubleItem)
1740	1832	{
1741	1833	Composite csg = new GroupLeaf();
1742	1834	csg.count = 5;
..	..	@@ -1748,7 +1840,7 @@
1748	1840	csg.addChild(child);
1749	1841	child.addChild(csg);
1750	1842	} else
1751		- if (event.getSource() == tripleItem)
	1843	+ if (source == tripleItem)
1752	1844	{
1753	1845	Composite csg = new GroupLeaf();
1754	1846	csg.count = 4;
..	..	@@ -1764,70 +1856,83 @@
1764	1856	child.addChild(csg);
1765	1857	} else
1766	1858
1767		- if (event.getSource() == importGFDItem)
	1859	+ if (source == importGFDItem)
1768	1860	{
1769	1861	ImportGFD();
1770	1862	} else
1771		- if (event.getSource() == importVRMLX3DItem)
	1863	+ if (source == importVRMLX3DItem)
1772	1864	{
1773	1865	ImportVRMLX3D();
1774	1866	} else
1775		- if (event.getSource() == import3DSItem)
	1867	+ if (source == import3DSItem)
1776	1868	{
1777	1869	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1778	1870	} else
1779		- if (event.getSource() == importOBJItem)
	1871	+ if (source == importOBJItem)
1780	1872	{
1781		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	1873	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	1874	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	1875	+ browser.setVisible(true);
	1876	+ String filename = browser.getFile();
	1877	+ if (filename != null && filename.length() > 0)
	1878	+ {
	1879	+ String fullname = browser.getDirectory() + filename;
	1880	+ makeSomething(ReadOBJ(fullname), true);
	1881	+ }
1782	1882	} else
1783		- if (event.getSource() == computeAOItem)
	1883	+ if (source == computeAOItem)
1784	1884	{
1785		- CameraPane.drawMode = CameraPane.OCCLUSION;
1786		- CameraPane.theRenderer.repaint();
	1885	+ Globals.drawMode = CameraPane.OCCLUSION;
	1886	+ Globals.theRenderer.repaint();
1787	1887	} else
1788		- if (event.getSource() == recompileItem)
	1888	+ if (source == recompileItem)
1789	1889	{
1790	1890	Recompile();
1791	1891	refreshContents();
1792	1892	} else
1793		- if (event.getSource() == editScriptItem)
	1893	+ if (source == editScriptItem)
1794	1894	{
1795	1895	OpenDialog();
1796	1896	refreshContents();
1797	1897	} else
1798		- if (event.getSource() == invariantsItem)
	1898	+ if (source == invariantsItem)
1799	1899	{
1800	1900	System.out.println("Invariants:");
1801		- GrafreeD.grafreeD.universe.invariants();
	1901	+ Grafreed.grafreeD.universe.invariants();
1802	1902	} else
1803		- if (event.getSource() == memoryItem)
	1903	+ if (source == memoryItem)
1804	1904	{
1805	1905	//System.out.println("Invariants:");
1806	1906	PrintMemory();
1807	1907	} else
1808		- if (event.getSource() == pathItem)
	1908	+ if (source == pathItem)
1809	1909	{
1810	1910	PrintPath();
1811	1911	} else
1812		- if (event.getSource() == analyzeItem)
	1912	+ if (source == analyzeItem)
1813	1913	{
1814	1914	AnalyzeObject();
1815	1915	} else
1816		- if (event.getSource() == dumpItem)
	1916	+ if (source == dumpItem)
1817	1917	{
1818	1918	DumpObject();
1819	1919	} else
1820		- if (event.getSource() == screenfitButton)
	1920	+ if (source == oneStepButton)
	1921	+ {
	1922	+ Globals.ONESTEP = true;
	1923	+ cameraView.repaint();
	1924	+ } else
	1925	+ if (source == screenfitButton)
1821	1926	{
1822	1927	//Reload(lastConverter, lastFilename, true);
1823	1928	ScreenFit();
1824	1929	} else
1825		- if (event.getSource() == screenfitpointButton)
	1930	+ if (source == screenfitpointButton)
1826	1931	{
1827	1932	//Reload(lastConverter, lastFilename, true);
1828	1933	ScreenFitPoint();
1829	1934	} else
1830		- if (event.getSource() == snapobjectButton)
	1935	+ if (source == snapobjectButton)
1831	1936	{
1832	1937	//Reload(lastConverter, lastFilename, true);
1833	1938	SnapObject();
..	..	@@ -1838,13 +1943,13 @@
1838	1943	// Recompile();
1839	1944	// refreshContents();
1840	1945	// } else
1841		- if (event.getSource() == gcButton)
	1946	+ if (source == gcButton)
1842	1947	{
1843	1948	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1844	1949	System.gc();
1845	1950	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1846	1951	} else
1847		- if (event.getSource() == editLeafItem)
	1952	+ if (source == editLeafItem)
1848	1953	{
1849	1954	Object3D obj;
1850	1955	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1858,62 +1963,66 @@
1858	1963	}
1859	1964	refreshContents(true);
1860	1965	} else
1861		- if (event.getSource() == openWindowItem)
	1966	+ if (source == openWindowItem)
1862	1967	{
1863	1968	EditSelection(true);
1864	1969	} else
1865		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1970	+ if (source == cutItem \|\| source == clearButton)
1866	1971	{
1867	1972	loadClipboard(true);
1868	1973	} else
1869		- if (event.getSource() == duplicateItem)
	1974	+ if (source == duplicateItem)
1870	1975	{
1871		- Object3D keep = GrafreeD.clipboard;
	1976	+ Object3D keep = Grafreed.clipboard;
1872	1977	loadClipboard(false);
1873	1978	paste(false);
1874		- GrafreeD.clipboard = keep;
	1979	+ Grafreed.clipboard = keep;
1875	1980	} else
1876		- if (event.getSource() == cloneItem)
	1981	+ if (source == cloneItem)
1877	1982	{
1878	1983	CloneSelection(false);
1879	1984	} else
1880		- if (event.getSource() == cloneSupportItem)
	1985	+ if (source == cloneSupportItem)
1881	1986	{
1882	1987	CloneSelection(true);
1883	1988	} else
1884		- if (event.getSource() == copyItem)
	1989	+ if (source == copyItem)
1885	1990	{
1886	1991	loadClipboard(false);
1887	1992	} else
1888		- if (event.getSource() == pasteItem)
	1993	+ if (source == pasteItem)
1889	1994	{
1890	1995	paste(false);
1891	1996	} else
1892		- if (event.getSource() == pasteLinkItem)
	1997	+ if (source == pasteIntoItem)
1893	1998	{
1894		- pasteInto(false);
	1999	+ pasteInto(true, false);
1895	2000	} else
1896		- if (event.getSource() == pasteCloneItem)
	2001	+ if (source == pasteLinkItem)
1897	2002	{
1898		- pasteInto(true);
	2003	+ pasteInto(false, false);
1899	2004	} else
1900		- if (event.getSource() == pasteExpandItem)
	2005	+ if (source == pasteCloneItem)
	2006	+ {
	2007	+ pasteInto(true, true);
	2008	+ } else
	2009	+ if (source == pasteExpandItem)
1901	2010	{
1902	2011	paste(true);
1903	2012	} else
1904		- if (event.getSource() == synchronizeItem)
	2013	+ if (source == synchronizeItem)
1905	2014	{
1906	2015	Overwrite(Object3D.TRANSFORM);
1907	2016	} else
1908		- if (event.getSource() == overwriteNameItem)
	2017	+ if (source == overwriteNameItem)
1909	2018	{
1910	2019	Overwrite(Object3D.NAME);
1911	2020	} else
1912		- if (event.getSource() == overwriteUVItem)
	2021	+ if (source == overwriteUVItem)
1913	2022	{
1914	2023	Overwrite(Object3D.UV);
1915	2024	} else
1916		- if (event.getSource() == overwriteMatItem)
	2025	+ if (source == overwriteMatItem)
1917	2026	{
1918	2027	/* july 2015
1919	2028	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1933,7 +2042,7 @@
1933	2042
1934	2043	Overwrite(dropAttributes);
1935	2044	}
1936		- if (event.getSource() == overwriteGeoItem)
	2045	+ if (source == overwriteGeoItem)
1937	2046	{
1938	2047	Overwrite(Object3D.GEOMETRY);
1939	2048	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1950,7 +2059,7 @@
1950	2059	// refreshContents();
1951	2060	// }
1952	2061	} else
1953		- if (event.getSource() == generateMeshItem)
	2062	+ if (source == generateMeshItem)
1954	2063	{
1955	2064	//if (group.selection.size() == 1)
1956	2065	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1961,7 +2070,7 @@
1961	2070	ResetModel();
1962	2071	refreshContents();
1963	2072	} else
1964		- if (event.getSource() == extractGeometriesItem)
	2073	+ if (source == extractGeometriesItem)
1965	2074	{
1966	2075	boolean one = false;
1967	2076
..	..	@@ -1988,7 +2097,7 @@
1988	2097	ResetModel();
1989	2098	refreshContents();
1990	2099	} else
1991		- if (event.getSource() == cloneGeometriesItem)
	2100	+ if (source == cloneGeometriesItem)
1992	2101	{
1993	2102	boolean one = false;
1994	2103
..	..	@@ -2014,7 +2123,7 @@
2014	2123	ResetModel();
2015	2124	refreshContents();
2016	2125	} else
2017		- if (event.getSource() == shareGeometriesItem)
	2126	+ if (source == shareGeometriesItem)
2018	2127	{
2019	2128	boolean one = false;
2020	2129
..	..	@@ -2044,7 +2153,7 @@
2044	2153	refreshContents();
2045	2154	}
2046	2155	} else
2047		- if (event.getSource() == mergeGeometriesItem)
	2156	+ if (source == mergeGeometriesItem)
2048	2157	{
2049	2158	boolean one = false;
2050	2159
..	..	@@ -2074,7 +2183,7 @@
2074	2183	ResetModel();
2075	2184	refreshContents();
2076	2185	} else
2077		- if (event.getSource() == linkverticesItem)
	2186	+ if (source == linkverticesItem)
2078	2187	{
2079	2188	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2080	2189	// {
..	..	@@ -2087,48 +2196,48 @@
2087	2196	// group.selection.get(0).setMasterThis(content); // should be identity
2088	2197	// refreshContents();
2089	2198	// }
2090		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2199	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2091	2200	{
2092		- Object3D content = GrafreeD.clipboard.get(0);
	2201	+ Object3D content = Grafreed.clipboard.get(0);
2093	2202
2094	2203	if (content instanceof cGroup && ((cGroup)content).transientlink )
2095	2204	content = ((cGroup)content).get(0);
2096	2205
2097		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2206	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2098	2207	for (int i=0; i<group.selection.size(); i++)
2099	2208	{
2100		- boolean random = CameraPane.RANDOM;
2101		- CameraPane.RANDOM = false; // parse all random nodes
	2209	+ boolean random = CameraPane.SWITCH;
	2210	+ CameraPane.SWITCH = false; // parse all random nodes
2102	2211	group.selection.get(i).linkVerticesThis(content);
2103	2212	// group.selection.get(i).setMasterThis(content); // should be identity
2104		- CameraPane.RANDOM = random;
	2213	+ CameraPane.SWITCH = random;
2105	2214	}
2106		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2215	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2107	2216	refreshContents();
2108	2217	}
2109	2218	} else
2110		- if (event.getSource() == resetsupportItem)
	2219	+ if (source == resetsupportItem)
2111	2220	{
2112	2221	for (int i=0; i<group.selection.size(); i++)
2113	2222	{
2114		- boolean random = CameraPane.RANDOM;
2115		- CameraPane.RANDOM = false; // parse all random nodes
	2223	+ boolean random = CameraPane.SWITCH;
	2224	+ CameraPane.SWITCH = false; // parse all random nodes
2116	2225	group.selection.get(i).linkVerticesThis(null);
2117		- CameraPane.RANDOM = random;
	2226	+ CameraPane.SWITCH = random;
2118	2227	}
2119	2228
2120	2229	refreshContents();
2121	2230	} else
2122		- if (event.getSource() == relinkverticesItem)
	2231	+ if (source == relinkverticesItem)
2123	2232	{
2124		- boolean random = CameraPane.RANDOM;
2125		- CameraPane.RANDOM = false; // parse all random nodes
	2233	+ boolean random = CameraPane.SWITCH;
	2234	+ CameraPane.SWITCH = false; // parse all random nodes
2126	2235	group.selection.RelinkToSupport();
2127		- CameraPane.RANDOM = random;
	2236	+ CameraPane.SWITCH = random;
2128	2237
2129	2238	refreshContents();
2130	2239	} else
2131		- if (event.getSource() == resetreferencesItem)
	2240	+ if (source == resetreferencesItem)
2132	2241	{
2133	2242	for (int i=0; i<group.selection.size(); i++)
2134	2243	{
..	..	@@ -2137,11 +2246,11 @@
2137	2246
2138	2247	refreshContents();
2139	2248	} else
2140		- if (event.getSource() == setMasterItem)
	2249	+ if (source == setMasterItem)
2141	2250	{
2142		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2251	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2143	2252	{
2144		- Object3D content = GrafreeD.clipboard.get(0);
	2253	+ Object3D content = Grafreed.clipboard.get(0);
2145	2254
2146	2255	if (content instanceof cGroup && ((cGroup)content).transientlink )
2147	2256	content = ((cGroup)content).get(0);
..	..	@@ -2150,13 +2259,13 @@
2150	2259	refreshContents();
2151	2260	}
2152	2261	} else
2153		- if (event.getSource() == poseMeshItem)
	2262	+ if (source == poseMeshItem)
2154	2263	{
2155	2264	if (group.selection.size() == 1)
2156	2265	{
2157		- if (GrafreeD.clipboard.size() == 1)
	2266	+ if (Grafreed.clipboard.size() == 1)
2158	2267	{
2159		- Object3D content = GrafreeD.clipboard.get(0);
	2268	+ Object3D content = Grafreed.clipboard.get(0);
2160	2269
2161	2270	if (content instanceof cGroup && ((cGroup)content).transientlink )
2162	2271	content = ((cGroup)content).get(0);
..	..	@@ -2169,19 +2278,19 @@
2169	2278	}
2170	2279
2171	2280	} else
2172		- if (event.getSource() == revertMeshItem)
	2281	+ if (source == revertMeshItem)
2173	2282	{
2174	2283	RevertMeshes();
2175	2284	} else
2176		- if (event.getSource() == resetMeshItem)
	2285	+ if (source == resetAllItem)
2177	2286	{
2178	2287	ResetAll();
2179	2288	} else
2180		- if (event.getSource() == stepAllItem)
	2289	+ if (source == stepAllItem)
2181	2290	{
2182	2291	StepAll();
2183	2292	} else
2184		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2293	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2185	2294	{
2186	2295	//int indices[] = jList.getSelectedIndices();
2187	2296	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2189,46 +2298,46 @@
2189	2298
2190	2299	ClearSelection(false);
2191	2300	} else
2192		- if (event.getSource() == clearAllItem)
	2301	+ if (source == clearAllItem)
2193	2302	{
2194	2303	ClearSelection(true);
2195	2304	} else
2196		- if (event.getSource() == grabItem)
	2305	+ if (source == grabItem)
2197	2306	{
2198	2307	group(new cGroup(), true);
2199	2308	} else
2200		- if (event.getSource() == hideItem)
	2309	+ if (source == hideItem)
2201	2310	{
2202	2311	group(new HiddenObject());
2203	2312	} else
2204		- if (event.getSource() == frontItem)
	2313	+ if (source == frontItem)
2205	2314	{
2206	2315	front();
2207	2316	} else
2208		- if (event.getSource() == backItem)
	2317	+ if (source == backItem)
2209	2318	{
2210	2319	back();
2211	2320	} else
2212		- if (event.getSource() == cameraItem)
	2321	+ if (source == cameraItem)
2213	2322	{
2214	2323	makeSomething(new Camera());
2215	2324	} else
2216		- if (event.getSource() == compositeItem)
	2325	+ if (source == compositeItem)
2217	2326	{
2218	2327	group(new Composite());
2219	2328	} else
2220		- if (event.getSource() == randomItem)
	2329	+ if (source == randomItem)
2221	2330	{
2222	2331	RandomNode random = new RandomNode();
2223	2332	group(random);
2224	2333	if (random.size() > 0)
2225		- random.name = random.get(0).name + "Rnd";
	2334	+ random.name = random.get(0).name + "Switch";
2226	2335	} else
2227		- if (event.getSource() == physicsItem)
	2336	+ if (source == physicsItem)
2228	2337	{
2229	2338	group(new PhysicsNode());
2230	2339	} else
2231		- if (event.getSource() == frameselectorItem)
	2340	+ if (source == frameselectorItem)
2232	2341	{
2233	2342	for (int i=0; i<group.selection.size(); i++)
2234	2343	{
..	..	@@ -2240,7 +2349,7 @@
2240	2349	ResetModel();
2241	2350	refreshContents();
2242	2351	} else
2243		- if (event.getSource() == switchGeoItem)
	2352	+ if (source == switchGeoItem)
2244	2353	{
2245	2354	for (int i=0; i<group.selection.size(); i++)
2246	2355	{
..	..	@@ -2252,7 +2361,7 @@
2252	2361	ResetModel();
2253	2362	refreshContents();
2254	2363	} else
2255		- if (event.getSource() == switchTransfoItem)
	2364	+ if (source == switchTransfoItem)
2256	2365	{
2257	2366	for (int i=0; i<group.selection.size(); i++)
2258	2367	{
..	..	@@ -2264,7 +2373,7 @@
2264	2373	ResetModel();
2265	2374	refreshContents();
2266	2375	} else
2267		- if (event.getSource() == morphItem)
	2376	+ if (source == morphItem)
2268	2377	{
2269	2378	for (int i=0; i<group.selection.size(); i++)
2270	2379	{
..	..	@@ -2276,7 +2385,7 @@
2276	2385	ResetModel();
2277	2386	refreshContents();
2278	2387	} else
2279		- if (event.getSource() == scriptNodeItem)
	2388	+ if (source == scriptNodeItem)
2280	2389	{
2281	2390	boolean atleastone = false;
2282	2391
..	..	@@ -2315,31 +2424,31 @@
2315	2424	}
2316	2425	}
2317	2426	} else
2318		- if (event.getSource() == linkerItem)
	2427	+ if (source == linkerItem)
2319	2428	{
2320	2429	group(new cLinker());
2321	2430	} else
2322		- if (event.getSource() == textureItem)
	2431	+ if (source == textureItem)
2323	2432	{
2324	2433	group(new TextureNode());
2325	2434	} else
2326		- if (event.getSource() == billboardItem)
	2435	+ if (source == billboardItem)
2327	2436	{
2328	2437	group(new BillboardNode());
2329	2438	} else
2330		- if (event.getSource() == shadowXItem)
	2439	+ if (source == shadowXItem)
2331	2440	{
2332	2441	CastShadow(0);
2333	2442	} else
2334		- if (event.getSource() == shadowYItem)
	2443	+ if (source == shadowYItem)
2335	2444	{
2336	2445	CastShadow(1);
2337	2446	} else
2338		- if (event.getSource() == shadowZItem)
	2447	+ if (source == shadowZItem)
2339	2448	{
2340	2449	CastShadow(2);
2341	2450	} else
2342		- if (event.getSource() == ungroupItem)
	2451	+ if (source == ungroupItem)
2343	2452	{
2344	2453	//ungroup();
2345	2454	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2351,179 +2460,187 @@
2351	2460
2352	2461	refreshContents();
2353	2462	} else
2354		- if (event.getSource() == genUVItem)
	2463	+ if (source == genUVItem)
2355	2464	{
2356	2465	GenUV();
2357	2466	} else
2358		- if (event.getSource() == genNormalsCADItem)
	2467	+ if (source == genNormalsCADItem)
2359	2468	{
2360	2469	GenNormals(true);
2361	2470	} else
2362		- if (event.getSource() == genNormalsMESHItem)
	2471	+ if (source == genNormalsMESHItem)
2363	2472	{
2364	2473	GenNormals(true); // TODO
2365	2474	} else
2366		- if (event.getSource() == genNormalsORGANItem)
	2475	+ if (source == genNormalsORGANItem)
2367	2476	{
2368	2477	GenNormals(false);
2369	2478	} else
2370		- if (event.getSource() == genNormalsMINEItem)
	2479	+ if (source == genNormalsMINEItem)
2371	2480	{
2372	2481	GenNormalsMINE();
2373	2482	} else
2374		- if (event.getSource() == stripifyItem)
	2483	+ if (source == stripifyItem)
2375	2484	{
2376	2485	Stripify();
2377	2486	} else
2378		- if (event.getSource() == unstripifyItem)
	2487	+ if (source == unstripifyItem)
2379	2488	{
2380	2489	Unstripify();
2381	2490	} else
2382		- if (event.getSource() == trimItem)
	2491	+ if (source == trimItem)
2383	2492	{
2384	2493	Trim();
2385	2494	} else
2386		- if (event.getSource() == untrimItem)
	2495	+ if (source == untrimItem)
2387	2496	{
2388	2497	Untrim();
2389	2498	} else
2390		- if (event.getSource() == clearColorsItem)
	2499	+ if (source == clearColorsItem)
2391	2500	{
2392	2501	ClearColors();
2393	2502	} else
2394		- if (event.getSource() == clearMaterialsItem)
	2503	+ if (source == clearMaterialsItem)
2395	2504	{
2396	2505	ClearMaterials();
2397	2506	} else
2398		- if (event.getSource() == liveleavesItem)
	2507	+ if (source == liveleavesItem)
2399	2508	{
2400	2509	LiveLeaves(true);
2401	2510	} else
2402		- if (event.getSource() == unliveleavesItem)
	2511	+ if (source == unliveleavesItem)
2403	2512	{
2404	2513	LiveLeaves(false);
2405	2514	} else
2406		- if (event.getSource() == supportleavesItem)
	2515	+ if (source == supportleavesItem)
2407	2516	{
2408	2517	SupportLeaves(true);
2409	2518	} else
2410		- if (event.getSource() == unsupportleavesItem)
	2519	+ if (source == unsupportleavesItem)
2411	2520	{
2412	2521	SupportLeaves(false);
2413	2522	} else
2414		- if (event.getSource() == hideleavesItem)
	2523	+ if (source == hideleavesItem)
2415	2524	{
2416	2525	HideLeaves(true);
2417	2526	} else
2418		- if (event.getSource() == showleavesItem)
	2527	+ if (source == showleavesItem)
2419	2528	{
2420	2529	HideLeaves(false);
2421	2530	} else
2422		- if (event.getSource() == markleavesItem)
	2531	+ if (source == markleavesItem)
2423	2532	{
2424	2533	MarkLeaves(true);
2425	2534	} else
2426		- if (event.getSource() == unmarkleavesItem)
	2535	+ if (source == unmarkleavesItem)
2427	2536	{
2428	2537	MarkLeaves(false);
2429	2538	} else
2430		- if (event.getSource() == flipVItem)
	2539	+ if (source == flipVItem)
2431	2540	{
2432	2541	FlipV(true);
2433	2542	} else
2434		- if (event.getSource() == unflipVItem)
	2543	+ if (source == unflipVItem)
2435	2544	{
2436	2545	FlipV(false);
2437	2546	} else
2438		- if (event.getSource() == lowTexturesItem)
	2547	+ if (source == lowTexturesItem)
2439	2548	{
2440	2549	SetTexRes(0);
2441	2550	} else
2442		- if (event.getSource() == normalTexturesItem)
	2551	+ if (source == normalTexturesItem)
2443	2552	{
2444	2553	SetTexRes(1);
2445	2554	} else
2446		- if (event.getSource() == highTexturesItem)
	2555	+ if (source == highTexturesItem)
2447	2556	{
2448	2557	SetTexRes(2);
2449	2558	} else
2450		- if (event.getSource() == veryhighTexturesItem)
	2559	+ if (source == veryhighTexturesItem)
2451	2560	{
2452	2561	SetTexRes(3);
2453	2562	} else
2454		- if (event.getSource() == maxTexturesItem)
	2563	+ if (source == maxTexturesItem)
2455	2564	{
2456	2565	SetTexRes(4);
2457	2566	} else
2458		- if (event.getSource() == panoTexturesItem)
	2567	+ if (source == panoTexturesItem)
2459	2568	{
2460	2569	SetTexRes(5);
2461	2570	} else
2462		- if (event.getSource() == reverseNormalsItem)
	2571	+ if (source == reverseNormalsItem)
2463	2572	{
2464	2573	ReverseNormals();
2465	2574	} else
2466		- if (event.getSource() == parseverticesItem)
	2575	+ if (source == parseverticesItem)
2467	2576	{
2468	2577	ParseVertices();
2469	2578	} else
2470		- if (event.getSource() == textureFieldItem)
	2579	+ if (source == textureFieldItem)
2471	2580	{
2472	2581	TextureVertices();
2473	2582	} else
2474		- if (event.getSource() == alignItem)
	2583	+ if (source == alignItem)
2475	2584	{
2476	2585	Align();
2477	2586	} else
2478		- if (event.getSource() == mirrorItem)
	2587	+ if (source == mirrorItem)
2479	2588	{
2480	2589	MirrorPoses();
2481	2590	} else
2482		- if (event.getSource() == reduceMorphItem)
	2591	+ if (source == reduceMorphItem)
2483	2592	{
2484	2593	MeshReduction(false);
2485	2594	} else
2486		- if (event.getSource() == reduce34MorphItem)
	2595	+ if (source == reduce34MorphItem)
2487	2596	{
2488	2597	MeshReduction(true);
2489	2598	} else
2490		- if (event.getSource() == reverseTrianglesItem)
	2599	+ if (source == reverseTrianglesItem)
2491	2600	{
2492	2601	ReverseTriangles();
2493	2602	} else
2494		- if (event.getSource() == reduceMeshItem)
	2603	+ if (source == reduceMeshItem)
2495	2604	{
2496	2605	ReduceMesh(false);
2497	2606	} else
2498		- if (event.getSource() == reduce34MeshItem)
	2607	+ if (source == reduce34MeshItem)
2499	2608	{
2500	2609	ReduceMesh(true);
2501	2610	} else
2502		- if (event.getSource() == increaseMeshItem)
	2611	+ if (source == increaseMeshItem)
2503	2612	{
2504	2613	IncreaseMesh();
2505	2614	} else
2506		- if (event.getSource() == clipMeshItem)
	2615	+ if (source == clipMeshItem)
2507	2616	{
2508	2617	ClipMesh();
2509	2618	} else
2510		- if (event.getSource() == smoothMeshItem)
	2619	+ if (source == smoothMeshItem)
2511	2620	{
2512	2621	SmoothMesh();
2513	2622	} else
2514		- if (event.getSource() == transformgeometryItem)
	2623	+ if (source == transformGeometryItem)
2515	2624	{
2516	2625	TransformGeometry();
2517	2626	} else
2518		- if (event.getSource() == resetTransformItem)
	2627	+ if (source == transformChildrenItem)
	2628	+ {
	2629	+ TransformChildren();
	2630	+ } else
	2631	+ if (source == resetTransformItem)
2519	2632	{
2520	2633	ResetTransform();
2521	2634	} else
2522		- if (event.getSource() == resetCentroidItem)
	2635	+ if (source == resetCentroidItem)
2523	2636	{
2524		- ResetCentroid();
	2637	+ ResetCentroid(true);
2525	2638	} else
2526		- if (event.getSource() == resetParentItem)
	2639	+ if (source == resetCentroidXZItem)
	2640	+ {
	2641	+ ResetCentroid(false);
	2642	+ } else
	2643	+ if (source == resetParentItem)
2527	2644	{
2528	2645	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2529	2646	{
..	..	@@ -2533,7 +2650,7 @@
2533	2650
2534	2651	refreshContents();
2535	2652	} else
2536		- if (event.getSource() == repairParentItem)
	2653	+ if (source == repairParentItem)
2537	2654	{
2538	2655	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2539	2656	{
..	..	@@ -2547,7 +2664,7 @@
2547	2664
2548	2665	refreshContents();
2549	2666	} else
2550		- if (event.getSource() == repairShadowItem)
	2667	+ if (source == repairShadowItem)
2551	2668	{
2552	2669	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2553	2670	{
..	..	@@ -2561,7 +2678,7 @@
2561	2678
2562	2679	refreshContents();
2563	2680	} else
2564		- if (event.getSource() == sortbysizeItem)
	2681	+ if (source == sortbysizeItem)
2565	2682	{
2566	2683	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2567	2684	{
..	..	@@ -2573,7 +2690,7 @@
2573	2690	ResetModel();
2574	2691	refreshContents();
2575	2692	} else
2576		- if (event.getSource() == sortbynameItem)
	2693	+ if (source == sortbynameItem)
2577	2694	{
2578	2695	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2579	2696	{
..	..	@@ -2585,7 +2702,7 @@
2585	2702	ResetModel();
2586	2703	refreshContents();
2587	2704	} else
2588		- if (event.getSource() == attachPigmentItem)
	2705	+ if (source == attachPigmentItem)
2589	2706	{
2590	2707	String texture = GetFile("Attach pigment");
2591	2708	Object3D obj;
..	..	@@ -2597,7 +2714,7 @@
2597	2714
2598	2715	refreshContents();
2599	2716	} else
2600		- if (event.getSource() == detachPigmentItem)
	2717	+ if (source == detachPigmentItem)
2601	2718	{
2602	2719	Object3D obj;
2603	2720	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2608,7 +2725,7 @@
2608	2725
2609	2726	refreshContents();
2610	2727	} else
2611		- if (event.getSource() == attachBumpItem)
	2728	+ if (source == attachBumpItem)
2612	2729	{
2613	2730	String texture = GetFile("Attach bump");
2614	2731	Object3D obj;
..	..	@@ -2620,7 +2737,7 @@
2620	2737
2621	2738	refreshContents();
2622	2739	} else
2623		- if (event.getSource() == detachBumpItem)
	2740	+ if (source == detachBumpItem)
2624	2741	{
2625	2742	Object3D obj;
2626	2743	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2631,7 +2748,7 @@
2631	2748
2632	2749	refreshContents();
2633	2750	} else
2634		- if (event.getSource() == pigmentBumpItem)
	2751	+ if (source == pigmentBumpItem)
2635	2752	{
2636	2753	Object3D obj;
2637	2754	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2642,158 +2759,195 @@
2642	2759
2643	2760	refreshContents();
2644	2761	} else
2645		- if (event.getSource() == flashSelectionButton)
	2762	+ if (source == flashSelectionButton)
2646	2763	{
2647	2764	CameraPane.flash = true;
2648	2765	refreshContents();
2649	2766	} else
2650		- if (event.getSource() == oneButton)
	2767	+ if (source == oneButton)
2651	2768	{
2652	2769	} else
2653		- if (event.getSource() == twoButton)
	2770	+ if (source == twoButton)
2654	2771	{
2655	2772	radio.layout = twoButton;
2656	2773	// bug
2657	2774	//gridPanel.setDividerLocation(1.0);
2658	2775	//bigPanel.setDividerLocation(0.0);
2659		- bigThree.remove(scenePanel);
2660		- bigThree.remove(centralPanel);
2661		- bigThree.remove(XYZPanel);
2662		- aWindowConstraints.gridx = 0;
2663		- aWindowConstraints.gridy = 0;
2664		- aWindowConstraints.gridwidth = 1;
2665		- // aConstraints.gridheight = 3;
2666		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2667		- aWindowConstraints.weightx = 0;
2668		- aWindowConstraints.weighty = 1;
2669		- //bigThree.add(jtp, aWindowConstraints);
2670		- aWindowConstraints.weightx = 1;
2671		- aWindowConstraints.gridwidth = 3;
2672		- // aConstraints.gridheight = 3;
2673		- aWindowConstraints.gridx = 1;
2674		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2675		- bigThree.add(centralPanel, aWindowConstraints);
2676		- aWindowConstraints.weightx = 0;
2677		- aWindowConstraints.gridx = 4;
2678		- aWindowConstraints.gridwidth = 1;
2679		- // aConstraints.gridheight = 3;
2680		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2681		- //bigThree.add(XYZPanel, aWindowConstraints);
2682		- bigThree.revalidate();
	2776	+// bigThree.remove(scenePanel);
	2777	+// bigThree.remove(centralPanel);
	2778	+// bigThree.remove(XYZPanel);
	2779	+// aWindowConstraints.gridx = 0;
	2780	+// aWindowConstraints.gridy = 0;
	2781	+// aWindowConstraints.gridwidth = 1;
	2782	+// // aConstraints.gridheight = 3;
	2783	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2784	+// aWindowConstraints.weightx = 0;
	2785	+// aWindowConstraints.weighty = 1;
	2786	+// //bigThree.add(jtp, aWindowConstraints);
	2787	+// aWindowConstraints.weightx = 1;
	2788	+// aWindowConstraints.gridwidth = 3;
	2789	+// // aConstraints.gridheight = 3;
	2790	+// aWindowConstraints.gridx = 1;
	2791	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2792	+// bigThree.add(centralPanel, aWindowConstraints);
	2793	+// aWindowConstraints.weightx = 0;
	2794	+// aWindowConstraints.gridx = 4;
	2795	+// aWindowConstraints.gridwidth = 1;
	2796	+// // aConstraints.gridheight = 3;
	2797	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2798	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2799	+// scenePanel.setVisible(false);
	2800	+// centralPanel.setVisible(true);
	2801	+// XYZPanel.setVisible(false);
	2802	+ bigThree.ClearUI();
	2803	+ bigThree.add(centralPanel);
	2804	+ bigThree.FlushUI();
2683	2805	} else
2684		- if (event.getSource() == threeButton)
	2806	+ if (source == threeButton)
2685	2807	{
2686	2808	radio.layout = threeButton;
2687		- bigThree.remove(scenePanel);
2688		- bigThree.remove(centralPanel);
2689		- bigThree.remove(XYZPanel);
2690		- aWindowConstraints.gridx = 0;
2691		- aWindowConstraints.gridy = 0;
2692		- aWindowConstraints.gridwidth = 1;
2693		- // aConstraints.gridheight = 3;
2694		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2695		- aWindowConstraints.weightx = 0;
2696		- aWindowConstraints.weighty = 1;
2697		- //bigThree.add(jtp, aWindowConstraints);
2698		- aWindowConstraints.weightx = 1;
2699		- aWindowConstraints.gridwidth = 3;
2700		- // aConstraints.gridheight = 3;
2701		- aWindowConstraints.gridx = 1;
2702		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2703		- bigThree.add(centralPanel, aWindowConstraints);
2704		- aWindowConstraints.weightx = 0;
2705		- aWindowConstraints.gridx = 4;
2706		- aWindowConstraints.gridwidth = 1;
2707		- // aConstraints.gridheight = 3;
2708		- aConstraints.fill = GridBagConstraints.VERTICAL;
2709		- bigThree.add(XYZPanel, aWindowConstraints);
2710		- bigThree.revalidate();
	2809	+
	2810	+// bigThree.remove(scenePanel);
	2811	+// bigThree.remove(centralPanel);
	2812	+// bigThree.remove(XYZPanel);
	2813	+// aWindowConstraints.gridx = 0;
	2814	+// aWindowConstraints.gridy = 0;
	2815	+// aWindowConstraints.gridwidth = 1;
	2816	+// // aConstraints.gridheight = 3;
	2817	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2818	+// aWindowConstraints.weightx = 0;
	2819	+// aWindowConstraints.weighty = 1;
	2820	+// //bigThree.add(jtp, aWindowConstraints);
	2821	+// aWindowConstraints.weightx = 1;
	2822	+// aWindowConstraints.gridwidth = 3;
	2823	+// // aConstraints.gridheight = 3;
	2824	+// aWindowConstraints.gridx = 1;
	2825	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2826	+// bigThree.add(centralPanel, aWindowConstraints);
	2827	+// aWindowConstraints.weightx = 0;
	2828	+// aWindowConstraints.gridx = 4;
	2829	+// aWindowConstraints.gridwidth = 1;
	2830	+// // aConstraints.gridheight = 3;
	2831	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2832	+// bigThree.add(XYZPanel, aWindowConstraints);
	2833	+// bigThree.validate();
	2834	+// scenePanel.setVisible(false);
	2835	+// centralPanel.setVisible(true);
	2836	+// XYZPanel.setVisible(true);
	2837	+ bigThree.ClearUI();
	2838	+ bigThree.add(centralPanel);
	2839	+ bigThree.add(XYZPanel);
	2840	+ bigThree.FlushUI();
2711	2841	} else
2712		- if (event.getSource() == fourButton)
	2842	+ if (source == fourButton)
2713	2843	{
2714	2844	radio.layout = fourButton;
2715		- bigThree.remove(scenePanel);
2716		- bigThree.remove(centralPanel);
2717		- bigThree.remove(XYZPanel);
2718		- aWindowConstraints.gridx = 0;
2719		- aWindowConstraints.gridy = 0;
2720		- aWindowConstraints.gridwidth = 1;
2721		- // aWindowConstraints.gridheight = 3;
2722		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2723		- aWindowConstraints.weightx = 1;
2724		- aWindowConstraints.weighty = 1;
2725		- bigThree.add(scenePanel, aWindowConstraints);
2726		- aWindowConstraints.weightx = 1;
2727		- aWindowConstraints.gridwidth = 3;
2728		- // aConstraints.gridheight = 3;
2729		- aWindowConstraints.gridx = 1;
2730		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2731		- //bigThree.add(cameraPanel, aWindowConstraints);
2732		- aWindowConstraints.weightx = 0;
2733		- aWindowConstraints.gridx = 4;
2734		- aWindowConstraints.gridwidth = 1;
2735		- // aWindowConstraints.gridheight = 3;
2736		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2737		- //bigThree.add(XYZPanel, aWindowConstraints);
2738		- bigThree.revalidate();
	2845	+
	2846	+// bigThree.remove(scenePanel);
	2847	+// bigThree.remove(centralPanel);
	2848	+// bigThree.remove(XYZPanel);
	2849	+// aWindowConstraints.gridx = 0;
	2850	+// aWindowConstraints.gridy = 0;
	2851	+// aWindowConstraints.gridwidth = 1;
	2852	+// // aWindowConstraints.gridheight = 3;
	2853	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2854	+// aWindowConstraints.weightx = 1;
	2855	+// aWindowConstraints.weighty = 1;
	2856	+// bigThree.add(scenePanel, aWindowConstraints);
	2857	+// aWindowConstraints.weightx = 1;
	2858	+// aWindowConstraints.gridwidth = 3;
	2859	+// // aConstraints.gridheight = 3;
	2860	+// aWindowConstraints.gridx = 1;
	2861	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2862	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2863	+// aWindowConstraints.weightx = 0;
	2864	+// aWindowConstraints.gridx = 4;
	2865	+// aWindowConstraints.gridwidth = 1;
	2866	+// // aWindowConstraints.gridheight = 3;
	2867	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2868	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2869	+// bigThree.validate();
	2870	+// scenePanel.setVisible(true);
	2871	+// centralPanel.setVisible(false);
	2872	+// XYZPanel.setVisible(false);
	2873	+ bigThree.ClearUI();
	2874	+ bigThree.add(scenePanel);
	2875	+ bigThree.FlushUI();
2739	2876	} else
2740		- if (event.getSource() == sixButton)
	2877	+ if (source == sixButton)
2741	2878	{
2742	2879	radio.layout = sixButton;
2743		- bigThree.remove(scenePanel);
2744		- bigThree.remove(centralPanel);
2745		- bigThree.remove(XYZPanel);
2746		- aWindowConstraints.gridx = 0;
2747		- aWindowConstraints.gridy = 0;
2748		- aWindowConstraints.gridwidth = 1;
2749		- // aConstraints.gridheight = 3;
2750		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2751		- aWindowConstraints.weightx = 0;
2752		- aWindowConstraints.weighty = 1;
2753		- bigThree.add(scenePanel, aWindowConstraints);
2754		- aWindowConstraints.weightx = 1;
2755		- aWindowConstraints.gridwidth = 3;
2756		- // aWindowConstraints.gridheight = 3;
2757		- aWindowConstraints.gridx = 1;
2758		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2759		- bigThree.add(centralPanel, aWindowConstraints);
2760		- aWindowConstraints.weightx = 0;
2761		- aWindowConstraints.gridx = 4;
2762		- aWindowConstraints.gridwidth = 1;
2763		- // aWindowConstraints.gridheight = 3;
2764		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2765		- //bigThree.add(XYZPanel, aConstraints);
2766		- bigThree.revalidate();
	2880	+
	2881	+// bigThree.remove(scenePanel);
	2882	+// bigThree.remove(centralPanel);
	2883	+// bigThree.remove(XYZPanel);
	2884	+// aWindowConstraints.gridx = 0;
	2885	+// aWindowConstraints.gridy = 0;
	2886	+// aWindowConstraints.gridwidth = 1;
	2887	+// // aConstraints.gridheight = 3;
	2888	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2889	+// aWindowConstraints.weightx = 0;
	2890	+// aWindowConstraints.weighty = 1;
	2891	+// bigThree.add(scenePanel, aWindowConstraints);
	2892	+// aWindowConstraints.weightx = 1;
	2893	+// aWindowConstraints.gridwidth = 3;
	2894	+// // aWindowConstraints.gridheight = 3;
	2895	+// aWindowConstraints.gridx = 1;
	2896	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2897	+// bigThree.add(centralPanel, aWindowConstraints);
	2898	+// aWindowConstraints.weightx = 0;
	2899	+// aWindowConstraints.gridx = 4;
	2900	+// aWindowConstraints.gridwidth = 1;
	2901	+// // aWindowConstraints.gridheight = 3;
	2902	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2903	+// //bigThree.add(XYZPanel, aConstraints);
	2904	+// bigThree.validate();
	2905	+// scenePanel.setVisible(true);
	2906	+// centralPanel.setVisible(true);
	2907	+// XYZPanel.setVisible(false);
	2908	+ bigThree.ClearUI();
	2909	+ bigThree.add(scenePanel);
	2910	+ bigThree.add(centralPanel);
	2911	+ bigThree.FlushUI();
2767	2912	} else
2768		- if (event.getSource() == sevenButton)
	2913	+ if (source == sevenButton)
2769	2914	{
2770	2915	radio.layout = sevenButton;
2771		- bigThree.remove(scenePanel);
2772		- bigThree.remove(centralPanel);
2773		- bigThree.remove(XYZPanel);
2774		- aWindowConstraints.gridx = 0;
2775		- aWindowConstraints.gridy = 0;
2776		- aWindowConstraints.gridwidth = 1;
2777		- // aWindowConstraints.gridheight = 3;
2778		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2779		- aWindowConstraints.weightx = 0;
2780		- aWindowConstraints.weighty = 1;
2781		- bigThree.add(scenePanel, aWindowConstraints);
2782		- aWindowConstraints.weightx = 1;
2783		- aWindowConstraints.gridwidth = 3;
2784		- // aWindowConstraints.gridheight = 3;
2785		- aWindowConstraints.gridx = 1;
2786		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2787		- bigThree.add(centralPanel, aWindowConstraints);
2788		- aWindowConstraints.weightx = 0;
2789		- aWindowConstraints.gridx = 4;
2790		- aWindowConstraints.gridwidth = 1;
2791		- // aConstraints.gridheight = 3;
2792		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2793		- bigThree.add(XYZPanel, aWindowConstraints);
2794		- bigThree.revalidate();
	2916	+
	2917	+// bigThree.remove(scenePanel);
	2918	+// bigThree.remove(centralPanel);
	2919	+// bigThree.remove(XYZPanel);
	2920	+// aWindowConstraints.gridx = 0;
	2921	+// aWindowConstraints.gridy = 0;
	2922	+// aWindowConstraints.gridwidth = 1;
	2923	+// // aWindowConstraints.gridheight = 3;
	2924	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2925	+// aWindowConstraints.weightx = 0;
	2926	+// aWindowConstraints.weighty = 1;
	2927	+// bigThree.add(scenePanel, aWindowConstraints);
	2928	+// aWindowConstraints.weightx = 1;
	2929	+// aWindowConstraints.gridwidth = 3;
	2930	+// // aWindowConstraints.gridheight = 3;
	2931	+// aWindowConstraints.gridx = 1;
	2932	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2933	+// bigThree.add(centralPanel, aWindowConstraints);
	2934	+// aWindowConstraints.weightx = 0;
	2935	+// aWindowConstraints.gridx = 4;
	2936	+// aWindowConstraints.gridwidth = 1;
	2937	+// // aConstraints.gridheight = 3;
	2938	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2939	+// bigThree.add(XYZPanel, aWindowConstraints);
	2940	+// bigThree.validate();
	2941	+// scenePanel.setVisible(true);
	2942	+// centralPanel.setVisible(true);
	2943	+// XYZPanel.setVisible(true);
	2944	+ bigThree.ClearUI();
	2945	+ bigThree.add(scenePanel);
	2946	+ bigThree.add(centralPanel);
	2947	+ bigThree.add(XYZPanel);
	2948	+ bigThree.FlushUI();
2795	2949	} else
2796		- if (event.getSource() == rootButton)
	2950	+ if (source == rootButton)
2797	2951	{
2798	2952	Object3D obj;
2799	2953	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2805,7 +2959,7 @@
2805	2959
2806	2960	refreshContents(true);
2807	2961	} else
2808		- if (event.getSource() == closeButton)
	2962	+ if (source == closeButton)
2809	2963	{
2810	2964	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2811	2965	cRadio ab;
..	..	@@ -2826,11 +2980,11 @@
2826	2980	}
2827	2981	refreshContents(true);
2828	2982	} else
2829		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2983	+ if (source == editItem \|\| source == editButton)
2830	2984	{
2831	2985	EditSelection(false);
2832	2986	} else
2833		- if (event.getSource() == uneditButton)
	2987	+ if (source == uneditButton)
2834	2988	{
2835	2989	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2836	2990	{
..	..	@@ -2842,12 +2996,12 @@
2842	2996
2843	2997	child.editWindow = null; // ???????????
2844	2998	}
2845		- objEditor.ctrlPanel.revalidate();
	2999	+ objEditor.ctrlPanel.FlushUI();
2846	3000	//objEditor.jTree.clearSelection();
2847	3001	//objEditor.ResetSliders();
2848	3002	refreshContents(true);
2849	3003	} else
2850		- if (event.getSource() == clearPanelButton)
	3004	+ if (source == clearPanelButton)
2851	3005	{
2852	3006	assert(copy == group);
2853	3007	//copy.ClearUI();
..	..	@@ -2858,7 +3012,7 @@
2858	3012	listUI.clear();
2859	3013	refreshContents(true);
2860	3014	} else
2861		- if (event.getSource() == allParamsButton)
	3015	+ if (source == allParamsButton)
2862	3016	{
2863	3017	assert(copy == group);
2864	3018
..	..	@@ -2879,19 +3033,19 @@
2879	3033
2880	3034	refreshContents(true);
2881	3035	} else
2882		- if (event.getSource() == unselectButton)
	3036	+ if (source == unselectButton)
2883	3037	{
2884	3038	objEditor.jTree.clearSelection();
2885	3039	// ?? oct 2012 GrafreeD.clipboard.clear();
2886	3040	objEditor.ResetSliders();
2887	3041	refreshContents(true);
2888	3042	} else
2889		- if(event.getSource() instanceof cRadio)
	3043	+ if(source instanceof cRadio)
2890	3044	{
2891	3045	group.parent = keepparent;
2892	3046	group.attributes = 0;
2893	3047	//group.editWindow = null;
2894		- /cRadio/ radio = (cRadio)event.getSource();
	3048	+ /cRadio/ radio = (cRadio)source;
2895	3049	Object3D obj = radio.GetObject();
2896	3050	System.out.println("Edit " + obj);
2897	3051	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2911,7 +3065,7 @@
2911	3065	}
2912	3066
2913	3067	copy = group;
2914		- //CameraPane.theRenderer.object = group;
	3068	+ //Globals.theRenderer.object = group;
2915	3069	if(!useclient)
2916	3070	{
2917	3071	cameraView.renderCamera = radio.camera;
..	..	@@ -2920,12 +3074,15 @@
2920	3074	cameraView.cameras[cameraView.cameracount] = radio.camera;
2921	3075	cameraView.targetLookAt.set(radio.camera.lookAt);
2922	3076	cameraView.object = group;
2923		- cameraView.lighttouched = true;
	3077	+ //cameraView.lighttouched = true;
	3078	+ Globals.lighttouched = true;
2924	3079	topView.object = group;
2925	3080	frontView.object = group;
2926	3081	sideView.object = group;
2927	3082	}
2928		- group.editWindow = this;
	3083	+
	3084	+// fix "+" issue group.editWindow = this;
	3085	+
2929	3086	/*
2930	3087	currentLayout = radio.layout;
2931	3088	if (currentLayout == null)
..	..	@@ -2956,7 +3113,7 @@
2956	3113	if (useclient)
2957	3114	{
2958	3115	cameraView.object = client;
2959		- cameraView.lighttouched = true;
	3116	+ Globals.lighttouched = true;
2960	3117	//topView.object = client;
2961	3118	//frontView.object = client;
2962	3119	//sideView.object = client;
..	..	@@ -2964,7 +3121,7 @@
2964	3121	else
2965	3122	{
2966	3123	cameraView.object = group;
2967		- cameraView.lighttouched = true;
	3124	+ Globals.lighttouched = true;
2968	3125	//topView.object = group;
2969	3126	//frontView.object = group;
2970	3127	//sideView.object = group;
..	..	@@ -2999,6 +3156,28 @@
2999	3156	refreshContents();
3000	3157	}
3001	3158
	3159	+ void TransformChildren()
	3160	+ {
	3161	+ Object3D obj;
	3162	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3163	+ {
	3164	+ obj = (Object3D)e.nextElement();
	3165	+ obj.KeepTextureMatrices();
	3166	+ obj.TransformChildren();
	3167	+ obj.RestoreTextureMatrices();
	3168	+
	3169	+// if (obj.parent == null)
	3170	+// {
	3171	+// System.out.println("NULL PARENT!");
	3172	+// new Exception().printStackTrace();
	3173	+// }
	3174	+// else
	3175	+// TouchTransform(obj);
	3176	+// //obj.parent.Touch();
	3177	+ }
	3178	+
	3179	+ refreshContents();
	3180	+ }
3002	3181
3003	3182	void ResetTransform()
3004	3183	{
..	..	@@ -3111,7 +3290,7 @@
3111	3290	refreshContents();
3112	3291	}
3113	3292
3114		- void ResetCentroid()
	3293	+ void ResetCentroid(boolean full)
3115	3294	{
3116	3295	Object3D obj;
3117	3296	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3126,12 +3305,16 @@
3126	3305	LA.matIdentity(Object3D.mat);
3127	3306	obj.getBounds(minima, maxima, false);
3128	3307	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3129		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3308	+ if (full)
	3309	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3130	3310	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3131	3311	obj.TransformMesh(Object3D.mat);
	3312	+
3132	3313	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3133		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3314	+ if (full)
	3315	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3134	3316	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3317	+
3135	3318	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3136	3319	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3137	3320	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3197,9 +3380,9 @@
3197	3380	obj = (Object3D)e.nextElement();
3198	3381
3199	3382	System.out.println("Object is: " + obj);
3200		- GrafreeD.AnalyzeObject(obj);
	3383	+ Grafreed.AnalyzeObject(obj);
3201	3384	System.out.println("Boundary rep: " + obj.bRep);
3202		- GrafreeD.AnalyzeObject(obj.bRep);
	3385	+ Grafreed.AnalyzeObject(obj.bRep);
3203	3386
3204	3387	// System.err.println((size/1024) + " KB is the size of " + obj);
3205	3388	}
..	..	@@ -3413,8 +3596,8 @@
3413	3596
3414	3597	void ParseVertices()
3415	3598	{
3416		- boolean epsequal = GrafreeD.epsequal;
3417		- GrafreeD.epsequal = true;
	3599	+ boolean epsequal = Grafreed.epsequal;
	3600	+ Grafreed.epsequal = true;
3418	3601
3419	3602	for (int i=0; i<group.selection.size(); i++)
3420	3603	{
..	..	@@ -3439,7 +3622,7 @@
3439	3622	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3440	3623	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3441	3624
3442		- g.add(GrafreeD.clipboard);
	3625	+ g.add(Grafreed.clipboard);
3443	3626
3444	3627	buffer.add(g);
3445	3628	}
..	..	@@ -3454,7 +3637,7 @@
3454	3637	makeSomething(buffer, i==group.selection.size()-1);
3455	3638	}
3456	3639
3457		- GrafreeD.epsequal = epsequal;
	3640	+ Grafreed.epsequal = epsequal;
3458	3641
3459	3642	refreshContents();
3460	3643	}
..	..	@@ -3472,7 +3655,16 @@
3472	3655	String pigment = Object3D.GetPigment(tex);
3473	3656	//String bump = Object3D.GetBump(tex);
3474	3657
3475		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3658	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3659	+
	3660	+ try
	3661	+ {
	3662	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3663	+ }
	3664	+ catch (Exception e)
	3665	+ {
	3666	+ System.err.println("FAIL: " + node);
	3667	+ }
3476	3668
3477	3669	double s = v.s;
3478	3670
..	..	@@ -3560,11 +3752,11 @@
3560	3752
3561	3753	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3562	3754
3563		- boolean random = CameraPane.RANDOM;
3564		- CameraPane.RANDOM = false; // parse all random nodes
	3755	+ boolean random = CameraPane.SWITCH;
	3756	+ CameraPane.SWITCH = false; // parse all random nodes
3565	3757	lowres.linkVerticesThis(null);
3566	3758	lowres.linkVerticesThis(sn);
3567		- CameraPane.RANDOM = random;
	3759	+ CameraPane.SWITCH = random;
3568	3760
3569	3761	System.err.flush();
3570	3762
..	..	@@ -3604,7 +3796,7 @@
3604	3796	return;
3605	3797
3606	3798	Object3D poses = group.selection.get(0);
3607		- Object3D ref = GrafreeD.clipboard.get(0);
	3799	+ Object3D ref = Grafreed.clipboard.get(0);
3608	3800
3609	3801	Object3D newgroup = new Object3D("Po:" + poses.name);
3610	3802
..	..	@@ -3773,7 +3965,7 @@
3773	3965	group.selection.RelinkToSupport(); // july 2014
3774	3966	System.out.println("DONE.");
3775	3967	refreshContents();
3776		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3968	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3777	3969	}
3778	3970
3779	3971	void ReduceMesh(boolean reduction34)
..	..	@@ -3798,9 +3990,9 @@
3798	3990
3799	3991	void ClipMesh()
3800	3992	{
3801		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3993	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3802	3994	{
3803		- Object3D content = GrafreeD.clipboard.get(0);
	3995	+ Object3D content = Grafreed.clipboard.get(0);
3804	3996
3805	3997	if (content instanceof cGroup && ((cGroup)content).transientlink )
3806	3998	content = ((cGroup)content).get(0);
..	..	@@ -3809,7 +4001,7 @@
3809	4001	// {
3810	4002	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3811	4003	// }
3812		- group.selection.ClipMesh(GrafreeD.clipboard);
	4004	+ group.selection.ClipMesh(Grafreed.clipboard);
3813	4005	}
3814	4006	// group.selection.ClipMesh(GrafreeD.clipboard);
3815	4007	System.out.println("DONE.");
..	..	@@ -3944,7 +4136,7 @@
3944	4136	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3945	4137
3946	4138	Object3D elem = (Object3D)group.selection.elementAt(i);
3947		- if(elem != group)
	4139	+ if(elem != group \|\| !newWindow)
3948	4140	{
3949	4141	// if (!(elem instanceof Composite))
3950	4142	// newWindow = false;
..	..	@@ -4049,25 +4241,25 @@
4049	4241	System.err.println("info : " + child.GetPath());
4050	4242	}
4051	4243	}
4052		- else
4053		- {
4054		- objEditor.SetMaterial(group); // .GetMaterial());
4055		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4056		- System.err.println("info : " + group.GetPath());
4057		- }
	4244	+// else
	4245	+// {
	4246	+// objEditor.SetMaterial(group); // .GetMaterial());
	4247	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4248	+// System.err.println("info : " + group.GetPath());
	4249	+// }
4058	4250
4059	4251	objEditor.SetText(); // jan 2014
4060	4252
4061		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4253	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
4062	4254	CameraPane.flash = true;
4063	4255
4064	4256	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
4065	4257	// a camera
4066	4258	{
4067	4259	CameraPane.camerachangeframe = 0; // don't refuse it
4068		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4069		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
4070		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4260	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4261	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4262	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4071	4263	}
4072	4264
4073	4265	refreshContents();
..	..	@@ -4149,12 +4341,12 @@
4149	4341	{
4150	4342	if (group.selection.isEmpty())
4151	4343	return;
4152		- GrafreeD.clipboardIsTempGroup = false;
	4344	+ Grafreed.clipboardIsTempGroup = false;
4153	4345	Composite tGroup = null;
4154	4346	if (group.selection.size() > 0) // 1)
4155	4347	{
4156	4348	tGroup = new cGroup();
4157		- GrafreeD.clipboardIsTempGroup = true;
	4349	+ Grafreed.clipboardIsTempGroup = true;
4158	4350	}
4159	4351
4160	4352	if (cut)
..	..	@@ -4194,16 +4386,16 @@
4194	4386	//System.out.println("cut " + child);
4195	4387	//System.out.println("parent = " + child.parent);
4196	4388	// tmp.addChild(child);
4197		- if (GrafreeD.clipboardIsTempGroup)
	4389	+ if (Grafreed.clipboardIsTempGroup)
4198	4390	tGroup.add/Child/(tmp);
4199	4391	else
4200		- GrafreeD.clipboard = tmp;
	4392	+ Grafreed.clipboard = tmp;
4201	4393	}
4202	4394	else
4203		- if (GrafreeD.clipboardIsTempGroup)
	4395	+ if (Grafreed.clipboardIsTempGroup)
4204	4396	tGroup.add/Child/(child);
4205	4397	else
4206		- GrafreeD.clipboard = child;
	4398	+ Grafreed.clipboard = child;
4207	4399	}
4208	4400
4209	4401	//ResetModel();
..	..	@@ -4235,21 +4427,21 @@
4235	4427	//System.out.println("cut " + elem);
4236	4428	//System.out.println("parent = " + elem.parent);
4237	4429	// tmp.addChild(elem);
4238		- if (GrafreeD.clipboardIsTempGroup)
	4430	+ if (Grafreed.clipboardIsTempGroup)
4239	4431	tGroup.add/Child/(tmp);
4240	4432	else
4241		- GrafreeD.clipboard = tmp;
	4433	+ Grafreed.clipboard = tmp;
4242	4434	}
4243	4435	else
4244		- if (GrafreeD.clipboardIsTempGroup)
	4436	+ if (Grafreed.clipboardIsTempGroup)
4245	4437	tGroup.add/Child/(child);
4246	4438	else
4247		- GrafreeD.clipboard = child;
	4439	+ Grafreed.clipboard = child;
4248	4440	}
4249	4441
4250	4442	}
4251		- if (GrafreeD.clipboardIsTempGroup)
4252		- GrafreeD.clipboard = tGroup;
	4443	+ if (Grafreed.clipboardIsTempGroup)
	4444	+ Grafreed.clipboard = tGroup;
4253	4445	if (cut)
4254	4446	{
4255	4447	ResetModel();
..	..	@@ -4263,7 +4455,7 @@
4263	4455	// return;
4264	4456	boolean first = true;
4265	4457
4266		- if (GrafreeD.clipboardIsTempGroup)
	4458	+ if (Grafreed.clipboardIsTempGroup)
4267	4459	{
4268	4460	Composite temp;
4269	4461
..	..	@@ -4274,7 +4466,7 @@
4274	4466	temp = (Composite)Applet3D.clipboard.deepCopy();
4275	4467	*/
4276	4468	Object3D elem;
4277		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4469	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4278	4470	{
4279	4471	Object3D child = (Object3D)e.nextElement();
4280	4472
..	..	@@ -4308,21 +4500,21 @@
4308	4500	//Object3D cb = Applet3D.clipboard;
4309	4501	//temp.addChild(cb);
4310	4502	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4311		- assert(GrafreeD.clipboard.parent == null);
4312		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4313		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4314		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4315		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4503	+ assert(Grafreed.clipboard.parent == null);
	4504	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4505	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4506	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4507	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4316	4508	else
4317		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4318		- GrafreeD.clipboard.get(0).parent = keepparent;
	4509	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4510	+ Grafreed.clipboard.get(0).parent = keepparent;
4319	4511	}
4320	4512
4321	4513	ResetModel();
4322	4514	refreshContents();
4323	4515	}
4324	4516
4325		- void pasteInto(boolean copyit)
	4517	+ void pasteInto(boolean copyit, boolean clone)
4326	4518	{
4327	4519	// if (GrafreeD.clipboard == null)
4328	4520	// return;
..	..	@@ -4351,15 +4543,22 @@
4351	4543	if (copyit)
4352	4544	{
4353	4545	// paste(false);
4354		- CloneClipboard(false); // sept 2014
	4546	+ if (clone)
	4547	+ {
	4548	+ CloneClipboard(false); // sept 2014
	4549	+ }
	4550	+ else
	4551	+ {
	4552	+ paste(false);
	4553	+ }
4355	4554	}
4356	4555	else
4357	4556	{
4358	4557	boolean first = true;
4359	4558
4360		- if (GrafreeD.clipboardIsTempGroup)
	4559	+ if (Grafreed.clipboardIsTempGroup)
4361	4560	{
4362		- Composite temp = (Composite)GrafreeD.clipboard;
	4561	+ Composite temp = (Composite)Grafreed.clipboard;
4363	4562	Object3D copy;
4364	4563	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4365	4564	{
..	..	@@ -4369,7 +4568,7 @@
4369	4568	}
4370	4569	} else
4371	4570	{
4372		- linkSomething(GrafreeD.clipboard); //.get(0));
	4571	+ linkSomething(Grafreed.clipboard); //.get(0));
4373	4572	}
4374	4573	}
4375	4574	}
..	..	@@ -4814,7 +5013,7 @@
4814	5013
4815	5014	void ImportVRMLX3D()
4816	5015	{
4817		- if (GrafreeD.standAlone)
	5016	+ if (Grafreed.standAlone)
4818	5017	{
4819	5018	/**/
4820	5019	FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
..	..	@@ -4831,7 +5030,7 @@
4831	5030
4832	5031	String GetFile(String dialogName)
4833	5032	{
4834		- if (GrafreeD.standAlone)
	5033	+ if (Grafreed.standAlone)
4835	5034	{
4836	5035	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4837	5036	browser.show();
..	..	@@ -4895,10 +5094,12 @@
4895	5094	cButton flashSelectionButton;
4896	5095	cButton editButton;
4897	5096	cButton uneditButton;
	5097	+ JCheckBox allParamsButton;
4898	5098	cButton clearpanelButton;
4899		- cButton allParamsButton;
4900	5099	cButton unselectButton;
4901	5100
	5101	+ cButton oneStepButton;
	5102	+
4902	5103	cButton screenfitButton;
4903	5104	cButton screenfitpointButton;
4904	5105	cButton snapobjectButton;
..	..	@@ -4942,7 +5143,7 @@
4942	5143	private MenuItem linkverticesItem;
4943	5144	private MenuItem relinkverticesItem;
4944	5145	private MenuItem setMasterItem;
4945		- private MenuItem resetMeshItem;
	5146	+ private MenuItem resetAllItem;
4946	5147	private MenuItem stepAllItem;
4947	5148	private MenuItem revertMeshItem;
4948	5149	private MenuItem poseMeshItem;
..	..	@@ -4953,6 +5154,7 @@
4953	5154	private MenuItem mergeGeometriesItem;
4954	5155	private MenuItem copyItem;
4955	5156	private MenuItem pasteItem;
	5157	+ private MenuItem pasteIntoItem;
4956	5158	private MenuItem pasteLinkItem;
4957	5159	private MenuItem pasteCloneItem;
4958	5160	private MenuItem pasteExpandItem;
..	..	@@ -5002,8 +5204,10 @@
5002	5204	private MenuItem panoTexturesItem;
5003	5205
5004	5206	private MenuItem resetCentroidItem;
5005		- private MenuItem transformgeometryItem;
	5207	+ private MenuItem resetCentroidXZItem;
5006	5208	private MenuItem resetTransformItem;
	5209	+ private MenuItem transformGeometryItem;
	5210	+ private MenuItem transformChildrenItem;
5007	5211	private MenuItem hideItem;
5008	5212	private MenuItem grabItem;
5009	5213	private MenuItem backItem;
..	..	@@ -5050,7 +5254,7 @@
5050	5254	private MenuItem blobItem;
5051	5255	private MenuItem latheItem;
5052	5256	private MenuItem bezierItem;
5053		- private MenuItem checkerItem;
	5257	+ private MenuItem overlayItem;
5054	5258	private MenuItem meshItem;
5055	5259	// private MenuItem meshGroupItem;
5056	5260	private MenuItem springItem;