~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,110 +490,98 @@
433	490	oe.radioPanel.add(dummyButton);
434	491	oe.buttonGroup.add(dummyButton);
435	492	*/
436		- aConstraints.gridy += 1;
437		-
438	493	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	494
440		- oe.aConstraints.gridwidth = 1;
441		- oe.aConstraints.gridx = 0;
442		-
443		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
444		- liveCB.setToolTipText("Enabled animation");
	495	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	496	+ liveCB.setToolTipText("Enable animation");
445	497	liveCB.addItemListener(this);
446	498
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), 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");
	505	+ fastCB.addItemListener(this);
	506	+
	507	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
449	508	trackCB.setToolTipText("Enable tracking");
450	509	trackCB.addItemListener(this);
451	510
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	511	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
454	512	screenfitButton.setToolTipText("Screen fit");
455	513	screenfitButton.addActionListener(this);
456		- oe.aConstraints.gridx += 1;
	514	+
457	515	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
458	516	// screenfitpointButton.addActionListener(this);
459		-// oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
461		- snapobjectButton.addActionListener(this);
462		- snapobjectButton.setToolTipText("Snap Object");
463		- oe.aConstraints.gridx += 1;
464	517
465		- //aConstraints.gridx = 0;
466		- //aConstraints.gridy += 1;
467		- oe.aConstraints.weighty = 0;
468		- oe.aConstraints.gridwidth = 1;
469		-
470		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	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);
471	526	flashSelectionButton.setToolTipText("Show selection");
472	527	flashSelectionButton.addActionListener(this);
473	528
474		- oe.toolbarPanel.add(new cButton(" ", false));
	529	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
475	530
476		- oe.aConstraints.gridx += 1;
477		- oe.aConstraints.weighty = 0;
478		- oe.aConstraints.gridwidth = 1;
479		-
480		- //
481		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	531	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
482	532	twoButton.setToolTipText("Show center view only");
483	533	twoButton.addActionListener(this);
484		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	534	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	535	fourButton.addActionListener(this);
486	536	fourButton.setToolTipText("Show left panel only");
487		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	537	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
488	538	sixButton.setToolTipText("2-column layout left");
489	539	sixButton.addActionListener(this);
490		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	540	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
491	541	threeButton.setToolTipText("2-column layout right");
492	542	threeButton.addActionListener(this);
493		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	543	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
494	544	sevenButton.setToolTipText("3-column layout");
495	545	sevenButton.addActionListener(this);
496	546	//
497	547
498		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
499		- rootButton.setToolTipText("Edit object in new tab");
	548	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	549	+ rootButton.setToolTipText("Edit selection in new tab");
500	550	rootButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	551	+
	552	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
503	553	closeButton.setToolTipText("Close tab");
504	554	closeButton.addActionListener(this);
505	555	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
506	556	//clearButton.addActionListener(this);
507		- oe.aConstraints.gridx += 1;
508	557
509		- oe.aConstraints.gridx = 1; //
510		- 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");
511	562	editButton.addActionListener(this);
512		- oe.aConstraints.gridx += 1;
513		- oe.aConstraints.weighty = 0;
514		- oe.aConstraints.gridwidth = 1;
515	563
516		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	564	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	565	+ uneditButton.setToolTipText("Unedit selection");
517	566	uneditButton.addActionListener(this);
518	567
519		- oe.aConstraints.gridx += 1;
520		- oe.aConstraints.weighty = 0;
521		- oe.aConstraints.gridwidth = 1;
522		-
523		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
524		- clearPanelButton.addActionListener(this);
525		-
526		- oe.aConstraints.gridx += 1;
527		- oe.aConstraints.weighty = 0;
528		- oe.aConstraints.gridwidth = 1;
529		-
530		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	568	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	569	+ allParamsButton.setToolTipText("Edit all params");
531	570	allParamsButton.addActionListener(this);
532	571
533		- oe.aConstraints.gridx += 1;
534		- oe.aConstraints.weighty = 0;
535		- oe.aConstraints.gridwidth = 1;
536		-
537		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	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");
538	578	unselectButton.addActionListener(this);
539	579
	580	+ commandsPanel.preferredHeight = 1;
	581	+
	582	+ oe.treePanel.add(commandsPanel);
	583	+ oe.treePanel.Return();
	584	+
540	585	// oe.aConstraints.gridx += 1;
541	586	// oe.aConstraints.weighty = 0;
542	587	// oe.aConstraints.gridwidth = 1;
..	..	@@ -548,40 +593,37 @@
548	593	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
549	594	// gcButton.addActionListener(this);
550	595
551		- oe.aConstraints.gridx = 0;
552		- oe.aConstraints.gridy += 1;
553		-
554		- //ctrlPanel.add(objList = new List(5, true));
555		- oe.aConstraints.gridwidth = 100;
556		- // oe.aConstraints.gridheight = 100;
557		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
558		- oe.aConstraints.gridheight = 1;
559		- oe.aConstraints.weighty = 0.5;
560		- oe.aConstraints.gridx = 0;
561		- JScrollPane jSP;
	596	+ cGridBag jSPPanel = new cGridBag();
	597	+
	598	+ JScrollPane jSP;
562	599	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
563		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	600	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
564	601	ResetModel();
565		- oe.aConstraints.weighty = 0.5;
566		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
567		- oe.aConstraints.gridy += 1;
568		- oe.aConstraints.gridwidth = 1;
	602	+
	603	+ oe.treePanel.add(jSPPanel);
	604	+ oe.treePanel.Return();
569	605
570		- oe.aConstraints.weighty = 0;
571		- oe.aConstraints.gridwidth = 2;
572		-
573		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
	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");
574	610	colorCB.addItemListener(this);
575		- oe.aConstraints.gridx += 2;
576		- 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");
577	614	materialCB.addItemListener(this);
578		- oe.aConstraints.gridx += 2;
579		- 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");
580	618	textureCB.addItemListener(this);
581	619
582		- oe.aConstraints.gridx = 0;
583		- oe.aConstraints.gridy += 1;
	620	+ copyOptionsPanel.preferredHeight = 1;
	621	+ oe.treePanel.add(copyOptionsPanel);
	622	+ oe.treePanel.Return();
584	623
	624	+// mainPanel.setDividerLocation(0.5); //1.0);
	625	+// mainPanel.setResizeWeight(0.5);
	626	+
585	627	//jList.addListSelectionListener(this);
586	628	oe.jTree.addTreeSelectionListener(this);
587	629	//jTree.setRootVisible(false);
..	..	@@ -604,45 +646,37 @@
604	646	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
605	647	}
606	648
607		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	649	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
608	650	{
609		- constraints.gridx = 0;
610		- constraints.gridy = 0;
611		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), constraints);
612		- fastCB.setToolTipText("Fast mode");
613		- fastCB.addItemListener(this);
614		- constraints.gridy += 1;
615		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), constraints);
616		- supportCB.setToolTipText("Enabled rigging");
617		- supportCB.addItemListener(this);
618		-
619		- // constraints.gridy += 1;
620		- // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
621		- // localCB.addItemListener(this);
622		-
623		- constraints.gridy += 1;
624		- panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), constraints);
625		- crowdCB.setToolTipText("Used for crowds");
626		- crowdCB.addItemListener(this);
627		-
628		- constraints.gridy += 1;
629		- panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), constraints);
630		- smoothCB.setToolTipText("Snapping delay");
631		- smoothCB.addItemListener(this);
632		-
633		- constraints.gridy += 1;
634		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), constraints);
635		- slowCB.setToolTipText("Smooth interpolation");
636		- slowCB.addItemListener(this);
637		- constraints.gridy += 1;
638		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), constraints);
	651	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
639	652	boxCB.setToolTipText("Display bounding boxes");
640	653	boxCB.addItemListener(this);
641		- constraints.gridy += 1;
642		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), constraints);
	654	+
	655	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
643	656	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
644	657	zoomBoxCB.addItemListener(this);
645	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	+
646	680	// constraints.gridy += 1;
647	681	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
648	682	// speakerMocapCB.addItemListener(this);
..	..	@@ -650,16 +684,16 @@
650	684	if (false)
651	685	{
652	686	// handled in scripts
653		- constraints.gridy += 1;
654		- panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), constraints);
	687	+ //constraints.gridy += 1;
	688	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
655	689	speakerCameraCB.addItemListener(this);
656	690
657		- constraints.gridy += 1;
658		- panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), constraints);
	691	+ //constraints.gridy += 1;
	692	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
659	693	speakerFocusCB.addItemListener(this);
660	694
661		- constraints.gridy += 1;
662		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), constraints);
	695	+ //constraints.gridy += 1;
	696	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
663	697	smoothfocusCB.addItemListener(this);
664	698	}
665	699
..	..	@@ -667,14 +701,20 @@
667	701	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
668	702	// debugCB.addItemListener(this);
669	703
670		- constraints.gridy += 1;
671		- panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), constraints);
	704	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
672	705	oeilCB.addItemListener(this);
673	706
674		- constraints.gridy += 1;
675		- panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), constraints);
	707	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
676	708	lookAtCB.setToolTipText("Look-at target");
677	709	lookAtCB.addItemListener(this);
	710	+
	711	+ }
	712	+
	713	+ cGridBag fill = new cGridBag();
	714	+
	715	+ fill.preferredHeight = 200;
	716	+
	717	+ panel.add(fill);
678	718
679	719	}
680	720
..	..	@@ -689,6 +729,7 @@
689	729	buttonGroup.add(radioButton);
690	730	radioButton.doClick();
691	731	}
	732	+
692	733	void SetupViews(ObjEditor oe)
693	734	{
694	735	oe.SetupViews();
..	..	@@ -905,7 +946,9 @@
905	946	// objEditor.DropFile((java.io.File[]) object, true);
906	947	// return;
907	948	// }
908		- if (string.charAt(0) == '/')
	949	+
	950	+ // File path for Mac and Windows
	951	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
909	952	{
910	953	// file(s)
911	954	String[] names = string.split("\n");
..	..	@@ -932,7 +975,7 @@
932	975
933	976	flashIt = false;
934	977	CameraPane pane = (CameraPane) target;
935		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	978	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
936	979	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
937	980
938	981	if (group.selection.size() == 1)
..	..	@@ -959,11 +1002,11 @@
959	1002	{
960	1003	loadClipboard(true);
961	1004	objEditor.jTree.setSelectionPath(destinationPath);
962		- pasteInto(false);
	1005	+ pasteInto(false, false);
963	1006	} else {
964	1007	loadClipboard(false);
965	1008	objEditor.jTree.setSelectionPath(destinationPath);
966		- pasteInto(false); // true); // ???
	1009	+ pasteInto(false, false); // true); // ???
967	1010	}
968	1011	}
969	1012	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1085,27 +1128,33 @@
1085	1128	kleinItem.addActionListener(this);
1086	1129	particleItem = menu.add(new MenuItem("Particle system"));
1087	1130	particleItem.addActionListener(this);
	1131	+ if (Globals.ADVANCED)
	1132	+ {
1088	1133	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1089	1134	ragdollItem.addActionListener(this);
1090	1135	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1091	1136	ragdoll2Item.addActionListener(this);
	1137	+ }
1092	1138	menu.add("-");
1093		- meshItem = menu.add(new MenuItem("Mesh"));
	1139	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1094	1140	meshItem.addActionListener(this);
1095	1141	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1096	1142	// meshGroupItem.addActionListener(this);
	1143	+ if (Globals.ADVANCED)
	1144	+ {
1097	1145	springItem = menu.add(new MenuItem("Spring"));
1098	1146	springItem.addActionListener(this);
1099	1147	flagItem = menu.add(new MenuItem("Flag"));
1100	1148	flagItem.addActionListener(this);
1101		- bezierItem = menu.add(new MenuItem("Patch"));
1102		- bezierItem.addActionListener(this);
1103		- checkerItem = menu.add(new MenuItem("Checker"));
1104		- checkerItem.addActionListener(this);
1105	1149	blobItem = menu.add(new MenuItem("Blob"));
1106	1150	blobItem.addActionListener(this);
1107	1151	latheItem = menu.add(new MenuItem("Lathe"));
1108	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);
1109	1158	lightItem = menu.add(new MenuItem("Light"));
1110	1159	lightItem.addActionListener(this);
1111	1160	menu.add("-");
..	..	@@ -1115,34 +1164,39 @@
1115	1164	loopItem.addActionListener(this);
1116	1165	doubleItem = menu.add(new MenuItem("Fork"));
1117	1166	doubleItem.addActionListener(this);
	1167	+ if (Globals.ADVANCED)
	1168	+ {
1118	1169	tripleItem = menu.add(new MenuItem("Trident"));
1119	1170	tripleItem.addActionListener(this);
	1171	+ }
1120	1172	}
1121	1173
1122	1174	void buildToolsMenu(Menu menu)
1123	1175	{
1124	1176	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1125	1177	animationItem.addItemListener(this);
1126		- animationItem.setState(CameraPane.ANIMATION);
	1178	+ animationItem.setState(Globals.ANIMATION);
1127	1179
1128	1180	menu.add("-");
1129	1181	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1130	1182	parseverticesItem.addActionListener(this);
1131	1183	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1132	1184	textureFieldItem.addActionListener(this);
1133		- alignItem = menu.add(new MenuItem("Align"));
	1185	+ alignItem = menu.add(new MenuItem("Align Objects"));
1134	1186	alignItem.addActionListener(this);
1135		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1136		- mirrorItem.addActionListener(this);
1137	1187	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1138	1188	reduceMorphItem.addActionListener(this);
1139	1189	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1140	1190	reduce34MorphItem.addActionListener(this);
1141		-
	1191	+ menu.add("-");
1142	1192	menu.add(computeAOItem = new MenuItem("Compute AO"));
1143	1193	computeAOItem.addActionListener(this);
1144		- menu.add("-");
1145	1194
	1195	+ if (Globals.ADVANCED)
	1196	+ {
	1197	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1198	+ mirrorItem.addActionListener(this);
	1199	+ menu.add("-");
1146	1200	menu.add(memoryItem = new MenuItem("Memory Usage"));
1147	1201	memoryItem.addActionListener(this);
1148	1202	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1165,6 +1219,7 @@
1165	1219	menu.add("-");
1166	1220	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1167	1221	editScriptItem.addActionListener(this);
	1222	+ }
1168	1223	}
1169	1224
1170	1225	void ScreenFit()
..	..	@@ -1493,9 +1548,9 @@
1493	1548
1494	1549	void Overwrite(int mask)
1495	1550	{
1496		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1551	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1497	1552	{
1498		- Object3D content = GrafreeD.clipboard.get(0);
	1553	+ Object3D content = Grafreed.clipboard.get(0);
1499	1554
1500	1555	if (content instanceof cGroup && ((cGroup)content).transientlink )
1501	1556	content = ((cGroup)content).get(0);
..	..	@@ -1518,6 +1573,7 @@
1518	1573	//
1519	1574	public void actionPerformed(ActionEvent event) // , Object arg)
1520	1575	{
	1576	+ Object source = event.getSource();
1521	1577	/*
1522	1578	if (event.getSource() == nameField)
1523	1579	{
..	..	@@ -1529,11 +1585,11 @@
1529	1585	}
1530	1586	else
1531	1587	*/
1532		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1588	+ if (source == lookAtItem \|\| source == lookFromItem)
1533	1589	{
1534	1590	ScreenFit();
1535	1591	} else
1536		- if (event.getSource() == switchItem)
	1592	+ if (source == switchItem)
1537	1593	{
1538	1594	cVector v1 = new cVector();
1539	1595	cVector v2 = new cVector();
..	..	@@ -1542,11 +1598,11 @@
1542	1598	objEditor.cameraView.renderCamera.setAim(v2, v1);
1543	1599	objEditor.cameraView.repaint();
1544	1600	} else
1545		- if (event.getSource() == rectoidItem)
	1601	+ if (source == rectoidItem)
1546	1602	{
1547	1603	makeSomething(new Box());
1548	1604	} else
1549		- if (event.getSource() == particleItem)
	1605	+ if (source == particleItem)
1550	1606	{
1551	1607	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1552	1608	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1567,9 +1623,9 @@
1567	1623	applyExample(particleGeom, "SMOKE");
1568	1624	makeSomething(particleGeom);
1569	1625	} else
1570		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1626	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1571	1627	{
1572		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1628	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1573	1629
1574	1630	ragdoll.toParent = LA.newMatrix();
1575	1631	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1587,7 +1643,7 @@
1587	1643	} else
1588	1644	/*
1589	1645	*/
1590		- if (event.getSource() == heightFieldItem)
	1646	+ if (source == heightFieldItem)
1591	1647	{
1592	1648	Object3D obj = new Object3D();
1593	1649
..	..	@@ -1625,31 +1681,31 @@
1625	1681
1626	1682	makeSomething(obj);
1627	1683	} else
1628		- if (event.getSource() == gridItem)
	1684	+ if (source == gridItem)
1629	1685	{
1630	1686	makeSomething(new Grid());
1631	1687	} else
1632		- if (event.getSource() == ellipsoidItem)
	1688	+ if (source == ellipsoidItem)
1633	1689	{
1634	1690	makeSomething(new Sphere());
1635	1691	} else
1636		- if (event.getSource() == coneItem)
	1692	+ if (source == coneItem)
1637	1693	{
1638	1694	makeSomething(new Cone());
1639	1695	} else
1640		- if (event.getSource() == torusItem)
	1696	+ if (source == torusItem)
1641	1697	{
1642	1698	makeSomething(new Torus());
1643	1699	} else
1644		- if (event.getSource() == superItem)
	1700	+ if (source == superItem)
1645	1701	{
1646	1702	makeSomething(new Superellipsoid());
1647	1703	} else
1648		- if (event.getSource() == kleinItem)
	1704	+ if (source == kleinItem)
1649	1705	{
1650	1706	makeSomething(new Klein());
1651	1707	} else
1652		- if (event.getSource() == blobItem)
	1708	+ if (source == blobItem)
1653	1709	{
1654	1710	Blob blob = new Blob();
1655	1711	BlobComponent comp = new BlobComponent();
..	..	@@ -1657,15 +1713,15 @@
1657	1713	//blob.retile();
1658	1714	makeSomething(blob);
1659	1715	} else
1660		- if (event.getSource() == latheItem)
	1716	+ if (source == latheItem)
1661	1717	{
1662	1718	makeSomething(new Lathe());
1663	1719	} else
1664		- if (event.getSource() == bezierItem)
	1720	+ if (source == bezierItem)
1665	1721	{
1666	1722	makeSomething(new BezierSurface());
1667	1723	} else
1668		- if (event.getSource() == checkerItem)
	1724	+ if (source == overlayItem)
1669	1725	{
1670	1726	/*
1671	1727	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1680,7 +1736,7 @@
1680	1736	*/
1681	1737	makeSomething(new Checker());
1682	1738	} else
1683		- if (event.getSource() == meshItem)
	1739	+ if (source == meshItem)
1684	1740	{
1685	1741	Object3D itemtomake = new Object3D();
1686	1742	Object3D child;
..	..	@@ -1701,35 +1757,35 @@
1701	1757	makeSomething(child);
1702	1758	}
1703	1759	} else
1704		- if (event.getSource() == springItem)
	1760	+ if (source == springItem)
1705	1761	{
1706	1762	cSpring s = new cSpring();
1707	1763	s.setup();
1708	1764	makeSomething(s);
1709	1765	} else
1710		- if (event.getSource() == flagItem)
	1766	+ if (source == flagItem)
1711	1767	{
1712	1768	cSpring s = new cFlag();
1713	1769	s.setup();
1714	1770	makeSomething(s);
1715	1771	} else
1716		- if (event.getSource() == lightItem)
	1772	+ if (source == lightItem)
1717	1773	{
1718	1774	makeSomething(new Light());
1719	1775	} else
1720		- if (event.getSource() == csgItem)
	1776	+ if (source == csgItem)
1721	1777	{
1722	1778	group(new CSG());
1723	1779	} else
1724		- if (event.getSource() == templateItem)
	1780	+ if (source == templateItem)
1725	1781	{
1726	1782	group(new cTemplate());
1727	1783	} else
1728		- if (event.getSource() == attributeItem)
	1784	+ if (source == attributeItem)
1729	1785	{
1730	1786	makeSomething(new Attribute());
1731	1787	} else
1732		- if (event.getSource() == pointflowItem)
	1788	+ if (source == pointflowItem)
1733	1789	{
1734	1790	makeSomething(new PointFlow());
1735	1791	} else
..	..	@@ -1741,7 +1797,7 @@
1741	1797	} else
1742	1798	*/
1743	1799
1744		- if (event.getSource() == superLoopItem)
	1800	+ if (source == superLoopItem)
1745	1801	{
1746	1802	Composite g = new cGroup();
1747	1803	for (int i=0; i<15; i++)
..	..	@@ -1763,7 +1819,7 @@
1763	1819
1764	1820	group(g);
1765	1821	} else
1766		- if (event.getSource() == loopItem)
	1822	+ if (source == loopItem)
1767	1823	{
1768	1824	Composite csg = new GroupLeaf();
1769	1825	csg.count = 5;
..	..	@@ -1772,7 +1828,7 @@
1772	1828	csg.addChild(child);
1773	1829	child.addChild(csg);
1774	1830	} else
1775		- if (event.getSource() == doubleItem)
	1831	+ if (source == doubleItem)
1776	1832	{
1777	1833	Composite csg = new GroupLeaf();
1778	1834	csg.count = 5;
..	..	@@ -1784,7 +1840,7 @@
1784	1840	csg.addChild(child);
1785	1841	child.addChild(csg);
1786	1842	} else
1787		- if (event.getSource() == tripleItem)
	1843	+ if (source == tripleItem)
1788	1844	{
1789	1845	Composite csg = new GroupLeaf();
1790	1846	csg.count = 4;
..	..	@@ -1800,70 +1856,83 @@
1800	1856	child.addChild(csg);
1801	1857	} else
1802	1858
1803		- if (event.getSource() == importGFDItem)
	1859	+ if (source == importGFDItem)
1804	1860	{
1805	1861	ImportGFD();
1806	1862	} else
1807		- if (event.getSource() == importVRMLX3DItem)
	1863	+ if (source == importVRMLX3DItem)
1808	1864	{
1809	1865	ImportVRMLX3D();
1810	1866	} else
1811		- if (event.getSource() == import3DSItem)
	1867	+ if (source == import3DSItem)
1812	1868	{
1813	1869	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1814	1870	} else
1815		- if (event.getSource() == importOBJItem)
	1871	+ if (source == importOBJItem)
1816	1872	{
1817		- 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	+ }
1818	1882	} else
1819		- if (event.getSource() == computeAOItem)
	1883	+ if (source == computeAOItem)
1820	1884	{
1821	1885	Globals.drawMode = CameraPane.OCCLUSION;
1822	1886	Globals.theRenderer.repaint();
1823	1887	} else
1824		- if (event.getSource() == recompileItem)
	1888	+ if (source == recompileItem)
1825	1889	{
1826	1890	Recompile();
1827	1891	refreshContents();
1828	1892	} else
1829		- if (event.getSource() == editScriptItem)
	1893	+ if (source == editScriptItem)
1830	1894	{
1831	1895	OpenDialog();
1832	1896	refreshContents();
1833	1897	} else
1834		- if (event.getSource() == invariantsItem)
	1898	+ if (source == invariantsItem)
1835	1899	{
1836	1900	System.out.println("Invariants:");
1837		- GrafreeD.grafreeD.universe.invariants();
	1901	+ Grafreed.grafreeD.universe.invariants();
1838	1902	} else
1839		- if (event.getSource() == memoryItem)
	1903	+ if (source == memoryItem)
1840	1904	{
1841	1905	//System.out.println("Invariants:");
1842	1906	PrintMemory();
1843	1907	} else
1844		- if (event.getSource() == pathItem)
	1908	+ if (source == pathItem)
1845	1909	{
1846	1910	PrintPath();
1847	1911	} else
1848		- if (event.getSource() == analyzeItem)
	1912	+ if (source == analyzeItem)
1849	1913	{
1850	1914	AnalyzeObject();
1851	1915	} else
1852		- if (event.getSource() == dumpItem)
	1916	+ if (source == dumpItem)
1853	1917	{
1854	1918	DumpObject();
1855	1919	} else
1856		- if (event.getSource() == screenfitButton)
	1920	+ if (source == oneStepButton)
	1921	+ {
	1922	+ Globals.ONESTEP = true;
	1923	+ cameraView.repaint();
	1924	+ } else
	1925	+ if (source == screenfitButton)
1857	1926	{
1858	1927	//Reload(lastConverter, lastFilename, true);
1859	1928	ScreenFit();
1860	1929	} else
1861		- if (event.getSource() == screenfitpointButton)
	1930	+ if (source == screenfitpointButton)
1862	1931	{
1863	1932	//Reload(lastConverter, lastFilename, true);
1864	1933	ScreenFitPoint();
1865	1934	} else
1866		- if (event.getSource() == snapobjectButton)
	1935	+ if (source == snapobjectButton)
1867	1936	{
1868	1937	//Reload(lastConverter, lastFilename, true);
1869	1938	SnapObject();
..	..	@@ -1874,13 +1943,13 @@
1874	1943	// Recompile();
1875	1944	// refreshContents();
1876	1945	// } else
1877		- if (event.getSource() == gcButton)
	1946	+ if (source == gcButton)
1878	1947	{
1879	1948	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1880	1949	System.gc();
1881	1950	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1882	1951	} else
1883		- if (event.getSource() == editLeafItem)
	1952	+ if (source == editLeafItem)
1884	1953	{
1885	1954	Object3D obj;
1886	1955	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1894,62 +1963,66 @@
1894	1963	}
1895	1964	refreshContents(true);
1896	1965	} else
1897		- if (event.getSource() == openWindowItem)
	1966	+ if (source == openWindowItem)
1898	1967	{
1899	1968	EditSelection(true);
1900	1969	} else
1901		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1970	+ if (source == cutItem \|\| source == clearButton)
1902	1971	{
1903	1972	loadClipboard(true);
1904	1973	} else
1905		- if (event.getSource() == duplicateItem)
	1974	+ if (source == duplicateItem)
1906	1975	{
1907		- Object3D keep = GrafreeD.clipboard;
	1976	+ Object3D keep = Grafreed.clipboard;
1908	1977	loadClipboard(false);
1909	1978	paste(false);
1910		- GrafreeD.clipboard = keep;
	1979	+ Grafreed.clipboard = keep;
1911	1980	} else
1912		- if (event.getSource() == cloneItem)
	1981	+ if (source == cloneItem)
1913	1982	{
1914	1983	CloneSelection(false);
1915	1984	} else
1916		- if (event.getSource() == cloneSupportItem)
	1985	+ if (source == cloneSupportItem)
1917	1986	{
1918	1987	CloneSelection(true);
1919	1988	} else
1920		- if (event.getSource() == copyItem)
	1989	+ if (source == copyItem)
1921	1990	{
1922	1991	loadClipboard(false);
1923	1992	} else
1924		- if (event.getSource() == pasteItem)
	1993	+ if (source == pasteItem)
1925	1994	{
1926	1995	paste(false);
1927	1996	} else
1928		- if (event.getSource() == pasteLinkItem)
	1997	+ if (source == pasteIntoItem)
1929	1998	{
1930		- pasteInto(false);
	1999	+ pasteInto(true, false);
1931	2000	} else
1932		- if (event.getSource() == pasteCloneItem)
	2001	+ if (source == pasteLinkItem)
1933	2002	{
1934		- pasteInto(true);
	2003	+ pasteInto(false, false);
1935	2004	} else
1936		- if (event.getSource() == pasteExpandItem)
	2005	+ if (source == pasteCloneItem)
	2006	+ {
	2007	+ pasteInto(true, true);
	2008	+ } else
	2009	+ if (source == pasteExpandItem)
1937	2010	{
1938	2011	paste(true);
1939	2012	} else
1940		- if (event.getSource() == synchronizeItem)
	2013	+ if (source == synchronizeItem)
1941	2014	{
1942	2015	Overwrite(Object3D.TRANSFORM);
1943	2016	} else
1944		- if (event.getSource() == overwriteNameItem)
	2017	+ if (source == overwriteNameItem)
1945	2018	{
1946	2019	Overwrite(Object3D.NAME);
1947	2020	} else
1948		- if (event.getSource() == overwriteUVItem)
	2021	+ if (source == overwriteUVItem)
1949	2022	{
1950	2023	Overwrite(Object3D.UV);
1951	2024	} else
1952		- if (event.getSource() == overwriteMatItem)
	2025	+ if (source == overwriteMatItem)
1953	2026	{
1954	2027	/* july 2015
1955	2028	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1969,7 +2042,7 @@
1969	2042
1970	2043	Overwrite(dropAttributes);
1971	2044	}
1972		- if (event.getSource() == overwriteGeoItem)
	2045	+ if (source == overwriteGeoItem)
1973	2046	{
1974	2047	Overwrite(Object3D.GEOMETRY);
1975	2048	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1986,7 +2059,7 @@
1986	2059	// refreshContents();
1987	2060	// }
1988	2061	} else
1989		- if (event.getSource() == generateMeshItem)
	2062	+ if (source == generateMeshItem)
1990	2063	{
1991	2064	//if (group.selection.size() == 1)
1992	2065	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1997,7 +2070,7 @@
1997	2070	ResetModel();
1998	2071	refreshContents();
1999	2072	} else
2000		- if (event.getSource() == extractGeometriesItem)
	2073	+ if (source == extractGeometriesItem)
2001	2074	{
2002	2075	boolean one = false;
2003	2076
..	..	@@ -2024,7 +2097,7 @@
2024	2097	ResetModel();
2025	2098	refreshContents();
2026	2099	} else
2027		- if (event.getSource() == cloneGeometriesItem)
	2100	+ if (source == cloneGeometriesItem)
2028	2101	{
2029	2102	boolean one = false;
2030	2103
..	..	@@ -2050,7 +2123,7 @@
2050	2123	ResetModel();
2051	2124	refreshContents();
2052	2125	} else
2053		- if (event.getSource() == shareGeometriesItem)
	2126	+ if (source == shareGeometriesItem)
2054	2127	{
2055	2128	boolean one = false;
2056	2129
..	..	@@ -2080,7 +2153,7 @@
2080	2153	refreshContents();
2081	2154	}
2082	2155	} else
2083		- if (event.getSource() == mergeGeometriesItem)
	2156	+ if (source == mergeGeometriesItem)
2084	2157	{
2085	2158	boolean one = false;
2086	2159
..	..	@@ -2110,7 +2183,7 @@
2110	2183	ResetModel();
2111	2184	refreshContents();
2112	2185	} else
2113		- if (event.getSource() == linkverticesItem)
	2186	+ if (source == linkverticesItem)
2114	2187	{
2115	2188	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2116	2189	// {
..	..	@@ -2123,9 +2196,9 @@
2123	2196	// group.selection.get(0).setMasterThis(content); // should be identity
2124	2197	// refreshContents();
2125	2198	// }
2126		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2199	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2127	2200	{
2128		- Object3D content = GrafreeD.clipboard.get(0);
	2201	+ Object3D content = Grafreed.clipboard.get(0);
2129	2202
2130	2203	if (content instanceof cGroup && ((cGroup)content).transientlink )
2131	2204	content = ((cGroup)content).get(0);
..	..	@@ -2133,38 +2206,38 @@
2133	2206	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2134	2207	for (int i=0; i<group.selection.size(); i++)
2135	2208	{
2136		- boolean random = CameraPane.RANDOM;
2137		- CameraPane.RANDOM = false; // parse all random nodes
	2209	+ boolean random = CameraPane.SWITCH;
	2210	+ CameraPane.SWITCH = false; // parse all random nodes
2138	2211	group.selection.get(i).linkVerticesThis(content);
2139	2212	// group.selection.get(i).setMasterThis(content); // should be identity
2140		- CameraPane.RANDOM = random;
	2213	+ CameraPane.SWITCH = random;
2141	2214	}
2142	2215	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2143	2216	refreshContents();
2144	2217	}
2145	2218	} else
2146		- if (event.getSource() == resetsupportItem)
	2219	+ if (source == resetsupportItem)
2147	2220	{
2148	2221	for (int i=0; i<group.selection.size(); i++)
2149	2222	{
2150		- boolean random = CameraPane.RANDOM;
2151		- CameraPane.RANDOM = false; // parse all random nodes
	2223	+ boolean random = CameraPane.SWITCH;
	2224	+ CameraPane.SWITCH = false; // parse all random nodes
2152	2225	group.selection.get(i).linkVerticesThis(null);
2153		- CameraPane.RANDOM = random;
	2226	+ CameraPane.SWITCH = random;
2154	2227	}
2155	2228
2156	2229	refreshContents();
2157	2230	} else
2158		- if (event.getSource() == relinkverticesItem)
	2231	+ if (source == relinkverticesItem)
2159	2232	{
2160		- boolean random = CameraPane.RANDOM;
2161		- CameraPane.RANDOM = false; // parse all random nodes
	2233	+ boolean random = CameraPane.SWITCH;
	2234	+ CameraPane.SWITCH = false; // parse all random nodes
2162	2235	group.selection.RelinkToSupport();
2163		- CameraPane.RANDOM = random;
	2236	+ CameraPane.SWITCH = random;
2164	2237
2165	2238	refreshContents();
2166	2239	} else
2167		- if (event.getSource() == resetreferencesItem)
	2240	+ if (source == resetreferencesItem)
2168	2241	{
2169	2242	for (int i=0; i<group.selection.size(); i++)
2170	2243	{
..	..	@@ -2173,11 +2246,11 @@
2173	2246
2174	2247	refreshContents();
2175	2248	} else
2176		- if (event.getSource() == setMasterItem)
	2249	+ if (source == setMasterItem)
2177	2250	{
2178		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2251	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2179	2252	{
2180		- Object3D content = GrafreeD.clipboard.get(0);
	2253	+ Object3D content = Grafreed.clipboard.get(0);
2181	2254
2182	2255	if (content instanceof cGroup && ((cGroup)content).transientlink )
2183	2256	content = ((cGroup)content).get(0);
..	..	@@ -2186,13 +2259,13 @@
2186	2259	refreshContents();
2187	2260	}
2188	2261	} else
2189		- if (event.getSource() == poseMeshItem)
	2262	+ if (source == poseMeshItem)
2190	2263	{
2191	2264	if (group.selection.size() == 1)
2192	2265	{
2193		- if (GrafreeD.clipboard.size() == 1)
	2266	+ if (Grafreed.clipboard.size() == 1)
2194	2267	{
2195		- Object3D content = GrafreeD.clipboard.get(0);
	2268	+ Object3D content = Grafreed.clipboard.get(0);
2196	2269
2197	2270	if (content instanceof cGroup && ((cGroup)content).transientlink )
2198	2271	content = ((cGroup)content).get(0);
..	..	@@ -2205,19 +2278,19 @@
2205	2278	}
2206	2279
2207	2280	} else
2208		- if (event.getSource() == revertMeshItem)
	2281	+ if (source == revertMeshItem)
2209	2282	{
2210	2283	RevertMeshes();
2211	2284	} else
2212		- if (event.getSource() == resetMeshItem)
	2285	+ if (source == resetAllItem)
2213	2286	{
2214	2287	ResetAll();
2215	2288	} else
2216		- if (event.getSource() == stepAllItem)
	2289	+ if (source == stepAllItem)
2217	2290	{
2218	2291	StepAll();
2219	2292	} else
2220		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2293	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2221	2294	{
2222	2295	//int indices[] = jList.getSelectedIndices();
2223	2296	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2225,46 +2298,46 @@
2225	2298
2226	2299	ClearSelection(false);
2227	2300	} else
2228		- if (event.getSource() == clearAllItem)
	2301	+ if (source == clearAllItem)
2229	2302	{
2230	2303	ClearSelection(true);
2231	2304	} else
2232		- if (event.getSource() == grabItem)
	2305	+ if (source == grabItem)
2233	2306	{
2234	2307	group(new cGroup(), true);
2235	2308	} else
2236		- if (event.getSource() == hideItem)
	2309	+ if (source == hideItem)
2237	2310	{
2238	2311	group(new HiddenObject());
2239	2312	} else
2240		- if (event.getSource() == frontItem)
	2313	+ if (source == frontItem)
2241	2314	{
2242	2315	front();
2243	2316	} else
2244		- if (event.getSource() == backItem)
	2317	+ if (source == backItem)
2245	2318	{
2246	2319	back();
2247	2320	} else
2248		- if (event.getSource() == cameraItem)
	2321	+ if (source == cameraItem)
2249	2322	{
2250	2323	makeSomething(new Camera());
2251	2324	} else
2252		- if (event.getSource() == compositeItem)
	2325	+ if (source == compositeItem)
2253	2326	{
2254	2327	group(new Composite());
2255	2328	} else
2256		- if (event.getSource() == randomItem)
	2329	+ if (source == randomItem)
2257	2330	{
2258	2331	RandomNode random = new RandomNode();
2259	2332	group(random);
2260	2333	if (random.size() > 0)
2261		- random.name = random.get(0).name + "Rnd";
	2334	+ random.name = random.get(0).name + "Switch";
2262	2335	} else
2263		- if (event.getSource() == physicsItem)
	2336	+ if (source == physicsItem)
2264	2337	{
2265	2338	group(new PhysicsNode());
2266	2339	} else
2267		- if (event.getSource() == frameselectorItem)
	2340	+ if (source == frameselectorItem)
2268	2341	{
2269	2342	for (int i=0; i<group.selection.size(); i++)
2270	2343	{
..	..	@@ -2276,7 +2349,7 @@
2276	2349	ResetModel();
2277	2350	refreshContents();
2278	2351	} else
2279		- if (event.getSource() == switchGeoItem)
	2352	+ if (source == switchGeoItem)
2280	2353	{
2281	2354	for (int i=0; i<group.selection.size(); i++)
2282	2355	{
..	..	@@ -2288,7 +2361,7 @@
2288	2361	ResetModel();
2289	2362	refreshContents();
2290	2363	} else
2291		- if (event.getSource() == switchTransfoItem)
	2364	+ if (source == switchTransfoItem)
2292	2365	{
2293	2366	for (int i=0; i<group.selection.size(); i++)
2294	2367	{
..	..	@@ -2300,7 +2373,7 @@
2300	2373	ResetModel();
2301	2374	refreshContents();
2302	2375	} else
2303		- if (event.getSource() == morphItem)
	2376	+ if (source == morphItem)
2304	2377	{
2305	2378	for (int i=0; i<group.selection.size(); i++)
2306	2379	{
..	..	@@ -2312,7 +2385,7 @@
2312	2385	ResetModel();
2313	2386	refreshContents();
2314	2387	} else
2315		- if (event.getSource() == scriptNodeItem)
	2388	+ if (source == scriptNodeItem)
2316	2389	{
2317	2390	boolean atleastone = false;
2318	2391
..	..	@@ -2351,31 +2424,31 @@
2351	2424	}
2352	2425	}
2353	2426	} else
2354		- if (event.getSource() == linkerItem)
	2427	+ if (source == linkerItem)
2355	2428	{
2356	2429	group(new cLinker());
2357	2430	} else
2358		- if (event.getSource() == textureItem)
	2431	+ if (source == textureItem)
2359	2432	{
2360	2433	group(new TextureNode());
2361	2434	} else
2362		- if (event.getSource() == billboardItem)
	2435	+ if (source == billboardItem)
2363	2436	{
2364	2437	group(new BillboardNode());
2365	2438	} else
2366		- if (event.getSource() == shadowXItem)
	2439	+ if (source == shadowXItem)
2367	2440	{
2368	2441	CastShadow(0);
2369	2442	} else
2370		- if (event.getSource() == shadowYItem)
	2443	+ if (source == shadowYItem)
2371	2444	{
2372	2445	CastShadow(1);
2373	2446	} else
2374		- if (event.getSource() == shadowZItem)
	2447	+ if (source == shadowZItem)
2375	2448	{
2376	2449	CastShadow(2);
2377	2450	} else
2378		- if (event.getSource() == ungroupItem)
	2451	+ if (source == ungroupItem)
2379	2452	{
2380	2453	//ungroup();
2381	2454	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2387,179 +2460,187 @@
2387	2460
2388	2461	refreshContents();
2389	2462	} else
2390		- if (event.getSource() == genUVItem)
	2463	+ if (source == genUVItem)
2391	2464	{
2392	2465	GenUV();
2393	2466	} else
2394		- if (event.getSource() == genNormalsCADItem)
	2467	+ if (source == genNormalsCADItem)
2395	2468	{
2396	2469	GenNormals(true);
2397	2470	} else
2398		- if (event.getSource() == genNormalsMESHItem)
	2471	+ if (source == genNormalsMESHItem)
2399	2472	{
2400	2473	GenNormals(true); // TODO
2401	2474	} else
2402		- if (event.getSource() == genNormalsORGANItem)
	2475	+ if (source == genNormalsORGANItem)
2403	2476	{
2404	2477	GenNormals(false);
2405	2478	} else
2406		- if (event.getSource() == genNormalsMINEItem)
	2479	+ if (source == genNormalsMINEItem)
2407	2480	{
2408	2481	GenNormalsMINE();
2409	2482	} else
2410		- if (event.getSource() == stripifyItem)
	2483	+ if (source == stripifyItem)
2411	2484	{
2412	2485	Stripify();
2413	2486	} else
2414		- if (event.getSource() == unstripifyItem)
	2487	+ if (source == unstripifyItem)
2415	2488	{
2416	2489	Unstripify();
2417	2490	} else
2418		- if (event.getSource() == trimItem)
	2491	+ if (source == trimItem)
2419	2492	{
2420	2493	Trim();
2421	2494	} else
2422		- if (event.getSource() == untrimItem)
	2495	+ if (source == untrimItem)
2423	2496	{
2424	2497	Untrim();
2425	2498	} else
2426		- if (event.getSource() == clearColorsItem)
	2499	+ if (source == clearColorsItem)
2427	2500	{
2428	2501	ClearColors();
2429	2502	} else
2430		- if (event.getSource() == clearMaterialsItem)
	2503	+ if (source == clearMaterialsItem)
2431	2504	{
2432	2505	ClearMaterials();
2433	2506	} else
2434		- if (event.getSource() == liveleavesItem)
	2507	+ if (source == liveleavesItem)
2435	2508	{
2436	2509	LiveLeaves(true);
2437	2510	} else
2438		- if (event.getSource() == unliveleavesItem)
	2511	+ if (source == unliveleavesItem)
2439	2512	{
2440	2513	LiveLeaves(false);
2441	2514	} else
2442		- if (event.getSource() == supportleavesItem)
	2515	+ if (source == supportleavesItem)
2443	2516	{
2444	2517	SupportLeaves(true);
2445	2518	} else
2446		- if (event.getSource() == unsupportleavesItem)
	2519	+ if (source == unsupportleavesItem)
2447	2520	{
2448	2521	SupportLeaves(false);
2449	2522	} else
2450		- if (event.getSource() == hideleavesItem)
	2523	+ if (source == hideleavesItem)
2451	2524	{
2452	2525	HideLeaves(true);
2453	2526	} else
2454		- if (event.getSource() == showleavesItem)
	2527	+ if (source == showleavesItem)
2455	2528	{
2456	2529	HideLeaves(false);
2457	2530	} else
2458		- if (event.getSource() == markleavesItem)
	2531	+ if (source == markleavesItem)
2459	2532	{
2460	2533	MarkLeaves(true);
2461	2534	} else
2462		- if (event.getSource() == unmarkleavesItem)
	2535	+ if (source == unmarkleavesItem)
2463	2536	{
2464	2537	MarkLeaves(false);
2465	2538	} else
2466		- if (event.getSource() == flipVItem)
	2539	+ if (source == flipVItem)
2467	2540	{
2468	2541	FlipV(true);
2469	2542	} else
2470		- if (event.getSource() == unflipVItem)
	2543	+ if (source == unflipVItem)
2471	2544	{
2472	2545	FlipV(false);
2473	2546	} else
2474		- if (event.getSource() == lowTexturesItem)
	2547	+ if (source == lowTexturesItem)
2475	2548	{
2476	2549	SetTexRes(0);
2477	2550	} else
2478		- if (event.getSource() == normalTexturesItem)
	2551	+ if (source == normalTexturesItem)
2479	2552	{
2480	2553	SetTexRes(1);
2481	2554	} else
2482		- if (event.getSource() == highTexturesItem)
	2555	+ if (source == highTexturesItem)
2483	2556	{
2484	2557	SetTexRes(2);
2485	2558	} else
2486		- if (event.getSource() == veryhighTexturesItem)
	2559	+ if (source == veryhighTexturesItem)
2487	2560	{
2488	2561	SetTexRes(3);
2489	2562	} else
2490		- if (event.getSource() == maxTexturesItem)
	2563	+ if (source == maxTexturesItem)
2491	2564	{
2492	2565	SetTexRes(4);
2493	2566	} else
2494		- if (event.getSource() == panoTexturesItem)
	2567	+ if (source == panoTexturesItem)
2495	2568	{
2496	2569	SetTexRes(5);
2497	2570	} else
2498		- if (event.getSource() == reverseNormalsItem)
	2571	+ if (source == reverseNormalsItem)
2499	2572	{
2500	2573	ReverseNormals();
2501	2574	} else
2502		- if (event.getSource() == parseverticesItem)
	2575	+ if (source == parseverticesItem)
2503	2576	{
2504	2577	ParseVertices();
2505	2578	} else
2506		- if (event.getSource() == textureFieldItem)
	2579	+ if (source == textureFieldItem)
2507	2580	{
2508	2581	TextureVertices();
2509	2582	} else
2510		- if (event.getSource() == alignItem)
	2583	+ if (source == alignItem)
2511	2584	{
2512	2585	Align();
2513	2586	} else
2514		- if (event.getSource() == mirrorItem)
	2587	+ if (source == mirrorItem)
2515	2588	{
2516	2589	MirrorPoses();
2517	2590	} else
2518		- if (event.getSource() == reduceMorphItem)
	2591	+ if (source == reduceMorphItem)
2519	2592	{
2520	2593	MeshReduction(false);
2521	2594	} else
2522		- if (event.getSource() == reduce34MorphItem)
	2595	+ if (source == reduce34MorphItem)
2523	2596	{
2524	2597	MeshReduction(true);
2525	2598	} else
2526		- if (event.getSource() == reverseTrianglesItem)
	2599	+ if (source == reverseTrianglesItem)
2527	2600	{
2528	2601	ReverseTriangles();
2529	2602	} else
2530		- if (event.getSource() == reduceMeshItem)
	2603	+ if (source == reduceMeshItem)
2531	2604	{
2532	2605	ReduceMesh(false);
2533	2606	} else
2534		- if (event.getSource() == reduce34MeshItem)
	2607	+ if (source == reduce34MeshItem)
2535	2608	{
2536	2609	ReduceMesh(true);
2537	2610	} else
2538		- if (event.getSource() == increaseMeshItem)
	2611	+ if (source == increaseMeshItem)
2539	2612	{
2540	2613	IncreaseMesh();
2541	2614	} else
2542		- if (event.getSource() == clipMeshItem)
	2615	+ if (source == clipMeshItem)
2543	2616	{
2544	2617	ClipMesh();
2545	2618	} else
2546		- if (event.getSource() == smoothMeshItem)
	2619	+ if (source == smoothMeshItem)
2547	2620	{
2548	2621	SmoothMesh();
2549	2622	} else
2550		- if (event.getSource() == transformgeometryItem)
	2623	+ if (source == transformGeometryItem)
2551	2624	{
2552	2625	TransformGeometry();
2553	2626	} else
2554		- if (event.getSource() == resetTransformItem)
	2627	+ if (source == transformChildrenItem)
	2628	+ {
	2629	+ TransformChildren();
	2630	+ } else
	2631	+ if (source == resetTransformItem)
2555	2632	{
2556	2633	ResetTransform();
2557	2634	} else
2558		- if (event.getSource() == resetCentroidItem)
	2635	+ if (source == resetCentroidItem)
2559	2636	{
2560		- ResetCentroid();
	2637	+ ResetCentroid(true);
2561	2638	} else
2562		- if (event.getSource() == resetParentItem)
	2639	+ if (source == resetCentroidXZItem)
	2640	+ {
	2641	+ ResetCentroid(false);
	2642	+ } else
	2643	+ if (source == resetParentItem)
2563	2644	{
2564	2645	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2565	2646	{
..	..	@@ -2569,7 +2650,7 @@
2569	2650
2570	2651	refreshContents();
2571	2652	} else
2572		- if (event.getSource() == repairParentItem)
	2653	+ if (source == repairParentItem)
2573	2654	{
2574	2655	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2575	2656	{
..	..	@@ -2583,7 +2664,7 @@
2583	2664
2584	2665	refreshContents();
2585	2666	} else
2586		- if (event.getSource() == repairShadowItem)
	2667	+ if (source == repairShadowItem)
2587	2668	{
2588	2669	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2589	2670	{
..	..	@@ -2597,7 +2678,7 @@
2597	2678
2598	2679	refreshContents();
2599	2680	} else
2600		- if (event.getSource() == sortbysizeItem)
	2681	+ if (source == sortbysizeItem)
2601	2682	{
2602	2683	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2603	2684	{
..	..	@@ -2609,7 +2690,7 @@
2609	2690	ResetModel();
2610	2691	refreshContents();
2611	2692	} else
2612		- if (event.getSource() == sortbynameItem)
	2693	+ if (source == sortbynameItem)
2613	2694	{
2614	2695	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2615	2696	{
..	..	@@ -2621,7 +2702,7 @@
2621	2702	ResetModel();
2622	2703	refreshContents();
2623	2704	} else
2624		- if (event.getSource() == attachPigmentItem)
	2705	+ if (source == attachPigmentItem)
2625	2706	{
2626	2707	String texture = GetFile("Attach pigment");
2627	2708	Object3D obj;
..	..	@@ -2633,7 +2714,7 @@
2633	2714
2634	2715	refreshContents();
2635	2716	} else
2636		- if (event.getSource() == detachPigmentItem)
	2717	+ if (source == detachPigmentItem)
2637	2718	{
2638	2719	Object3D obj;
2639	2720	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2644,7 +2725,7 @@
2644	2725
2645	2726	refreshContents();
2646	2727	} else
2647		- if (event.getSource() == attachBumpItem)
	2728	+ if (source == attachBumpItem)
2648	2729	{
2649	2730	String texture = GetFile("Attach bump");
2650	2731	Object3D obj;
..	..	@@ -2656,7 +2737,7 @@
2656	2737
2657	2738	refreshContents();
2658	2739	} else
2659		- if (event.getSource() == detachBumpItem)
	2740	+ if (source == detachBumpItem)
2660	2741	{
2661	2742	Object3D obj;
2662	2743	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2667,7 +2748,7 @@
2667	2748
2668	2749	refreshContents();
2669	2750	} else
2670		- if (event.getSource() == pigmentBumpItem)
	2751	+ if (source == pigmentBumpItem)
2671	2752	{
2672	2753	Object3D obj;
2673	2754	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2678,158 +2759,195 @@
2678	2759
2679	2760	refreshContents();
2680	2761	} else
2681		- if (event.getSource() == flashSelectionButton)
	2762	+ if (source == flashSelectionButton)
2682	2763	{
2683	2764	CameraPane.flash = true;
2684	2765	refreshContents();
2685	2766	} else
2686		- if (event.getSource() == oneButton)
	2767	+ if (source == oneButton)
2687	2768	{
2688	2769	} else
2689		- if (event.getSource() == twoButton)
	2770	+ if (source == twoButton)
2690	2771	{
2691	2772	radio.layout = twoButton;
2692	2773	// bug
2693	2774	//gridPanel.setDividerLocation(1.0);
2694	2775	//bigPanel.setDividerLocation(0.0);
2695		- bigThree.remove(scenePanel);
2696		- bigThree.remove(centralPanel);
2697		- bigThree.remove(XYZPanel);
2698		- aWindowConstraints.gridx = 0;
2699		- aWindowConstraints.gridy = 0;
2700		- aWindowConstraints.gridwidth = 1;
2701		- // aConstraints.gridheight = 3;
2702		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2703		- aWindowConstraints.weightx = 0;
2704		- aWindowConstraints.weighty = 1;
2705		- //bigThree.add(jtp, aWindowConstraints);
2706		- aWindowConstraints.weightx = 1;
2707		- aWindowConstraints.gridwidth = 3;
2708		- // aConstraints.gridheight = 3;
2709		- aWindowConstraints.gridx = 1;
2710		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2711		- bigThree.add(centralPanel, aWindowConstraints);
2712		- aWindowConstraints.weightx = 0;
2713		- aWindowConstraints.gridx = 4;
2714		- aWindowConstraints.gridwidth = 1;
2715		- // aConstraints.gridheight = 3;
2716		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2717		- //bigThree.add(XYZPanel, aWindowConstraints);
2718		- bigThree.revalidate();
	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();
2719	2805	} else
2720		- if (event.getSource() == threeButton)
	2806	+ if (source == threeButton)
2721	2807	{
2722	2808	radio.layout = threeButton;
2723		- bigThree.remove(scenePanel);
2724		- bigThree.remove(centralPanel);
2725		- bigThree.remove(XYZPanel);
2726		- aWindowConstraints.gridx = 0;
2727		- aWindowConstraints.gridy = 0;
2728		- aWindowConstraints.gridwidth = 1;
2729		- // aConstraints.gridheight = 3;
2730		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2731		- aWindowConstraints.weightx = 0;
2732		- aWindowConstraints.weighty = 1;
2733		- //bigThree.add(jtp, aWindowConstraints);
2734		- aWindowConstraints.weightx = 1;
2735		- aWindowConstraints.gridwidth = 3;
2736		- // aConstraints.gridheight = 3;
2737		- aWindowConstraints.gridx = 1;
2738		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2739		- bigThree.add(centralPanel, aWindowConstraints);
2740		- aWindowConstraints.weightx = 0;
2741		- aWindowConstraints.gridx = 4;
2742		- aWindowConstraints.gridwidth = 1;
2743		- // aConstraints.gridheight = 3;
2744		- aConstraints.fill = GridBagConstraints.VERTICAL;
2745		- bigThree.add(XYZPanel, aWindowConstraints);
2746		- bigThree.revalidate();
	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();
2747	2841	} else
2748		- if (event.getSource() == fourButton)
	2842	+ if (source == fourButton)
2749	2843	{
2750	2844	radio.layout = fourButton;
2751		- bigThree.remove(scenePanel);
2752		- bigThree.remove(centralPanel);
2753		- bigThree.remove(XYZPanel);
2754		- aWindowConstraints.gridx = 0;
2755		- aWindowConstraints.gridy = 0;
2756		- aWindowConstraints.gridwidth = 1;
2757		- // aWindowConstraints.gridheight = 3;
2758		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2759		- aWindowConstraints.weightx = 1;
2760		- aWindowConstraints.weighty = 1;
2761		- bigThree.add(scenePanel, aWindowConstraints);
2762		- aWindowConstraints.weightx = 1;
2763		- aWindowConstraints.gridwidth = 3;
2764		- // aConstraints.gridheight = 3;
2765		- aWindowConstraints.gridx = 1;
2766		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2767		- //bigThree.add(cameraPanel, aWindowConstraints);
2768		- aWindowConstraints.weightx = 0;
2769		- aWindowConstraints.gridx = 4;
2770		- aWindowConstraints.gridwidth = 1;
2771		- // aWindowConstraints.gridheight = 3;
2772		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2773		- //bigThree.add(XYZPanel, aWindowConstraints);
2774		- bigThree.revalidate();
	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();
2775	2876	} else
2776		- if (event.getSource() == sixButton)
	2877	+ if (source == sixButton)
2777	2878	{
2778	2879	radio.layout = sixButton;
2779		- bigThree.remove(scenePanel);
2780		- bigThree.remove(centralPanel);
2781		- bigThree.remove(XYZPanel);
2782		- aWindowConstraints.gridx = 0;
2783		- aWindowConstraints.gridy = 0;
2784		- aWindowConstraints.gridwidth = 1;
2785		- // aConstraints.gridheight = 3;
2786		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2787		- aWindowConstraints.weightx = 0;
2788		- aWindowConstraints.weighty = 1;
2789		- bigThree.add(scenePanel, aWindowConstraints);
2790		- aWindowConstraints.weightx = 1;
2791		- aWindowConstraints.gridwidth = 3;
2792		- // aWindowConstraints.gridheight = 3;
2793		- aWindowConstraints.gridx = 1;
2794		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2795		- bigThree.add(centralPanel, aWindowConstraints);
2796		- aWindowConstraints.weightx = 0;
2797		- aWindowConstraints.gridx = 4;
2798		- aWindowConstraints.gridwidth = 1;
2799		- // aWindowConstraints.gridheight = 3;
2800		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2801		- //bigThree.add(XYZPanel, aConstraints);
2802		- bigThree.revalidate();
	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();
2803	2912	} else
2804		- if (event.getSource() == sevenButton)
	2913	+ if (source == sevenButton)
2805	2914	{
2806	2915	radio.layout = sevenButton;
2807		- bigThree.remove(scenePanel);
2808		- bigThree.remove(centralPanel);
2809		- bigThree.remove(XYZPanel);
2810		- aWindowConstraints.gridx = 0;
2811		- aWindowConstraints.gridy = 0;
2812		- aWindowConstraints.gridwidth = 1;
2813		- // aWindowConstraints.gridheight = 3;
2814		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2815		- aWindowConstraints.weightx = 0;
2816		- aWindowConstraints.weighty = 1;
2817		- bigThree.add(scenePanel, aWindowConstraints);
2818		- aWindowConstraints.weightx = 1;
2819		- aWindowConstraints.gridwidth = 3;
2820		- // aWindowConstraints.gridheight = 3;
2821		- aWindowConstraints.gridx = 1;
2822		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2823		- bigThree.add(centralPanel, aWindowConstraints);
2824		- aWindowConstraints.weightx = 0;
2825		- aWindowConstraints.gridx = 4;
2826		- aWindowConstraints.gridwidth = 1;
2827		- // aConstraints.gridheight = 3;
2828		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2829		- bigThree.add(XYZPanel, aWindowConstraints);
2830		- bigThree.revalidate();
	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();
2831	2949	} else
2832		- if (event.getSource() == rootButton)
	2950	+ if (source == rootButton)
2833	2951	{
2834	2952	Object3D obj;
2835	2953	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2841,7 +2959,7 @@
2841	2959
2842	2960	refreshContents(true);
2843	2961	} else
2844		- if (event.getSource() == closeButton)
	2962	+ if (source == closeButton)
2845	2963	{
2846	2964	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2847	2965	cRadio ab;
..	..	@@ -2862,11 +2980,11 @@
2862	2980	}
2863	2981	refreshContents(true);
2864	2982	} else
2865		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2983	+ if (source == editItem \|\| source == editButton)
2866	2984	{
2867	2985	EditSelection(false);
2868	2986	} else
2869		- if (event.getSource() == uneditButton)
	2987	+ if (source == uneditButton)
2870	2988	{
2871	2989	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2872	2990	{
..	..	@@ -2878,12 +2996,12 @@
2878	2996
2879	2997	child.editWindow = null; // ???????????
2880	2998	}
2881		- objEditor.ctrlPanel.revalidate();
	2999	+ objEditor.ctrlPanel.FlushUI();
2882	3000	//objEditor.jTree.clearSelection();
2883	3001	//objEditor.ResetSliders();
2884	3002	refreshContents(true);
2885	3003	} else
2886		- if (event.getSource() == clearPanelButton)
	3004	+ if (source == clearPanelButton)
2887	3005	{
2888	3006	assert(copy == group);
2889	3007	//copy.ClearUI();
..	..	@@ -2894,7 +3012,7 @@
2894	3012	listUI.clear();
2895	3013	refreshContents(true);
2896	3014	} else
2897		- if (event.getSource() == allParamsButton)
	3015	+ if (source == allParamsButton)
2898	3016	{
2899	3017	assert(copy == group);
2900	3018
..	..	@@ -2915,19 +3033,19 @@
2915	3033
2916	3034	refreshContents(true);
2917	3035	} else
2918		- if (event.getSource() == unselectButton)
	3036	+ if (source == unselectButton)
2919	3037	{
2920	3038	objEditor.jTree.clearSelection();
2921	3039	// ?? oct 2012 GrafreeD.clipboard.clear();
2922	3040	objEditor.ResetSliders();
2923	3041	refreshContents(true);
2924	3042	} else
2925		- if(event.getSource() instanceof cRadio)
	3043	+ if(source instanceof cRadio)
2926	3044	{
2927	3045	group.parent = keepparent;
2928	3046	group.attributes = 0;
2929	3047	//group.editWindow = null;
2930		- /cRadio/ radio = (cRadio)event.getSource();
	3048	+ /cRadio/ radio = (cRadio)source;
2931	3049	Object3D obj = radio.GetObject();
2932	3050	System.out.println("Edit " + obj);
2933	3051	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2962,7 +3080,9 @@
2962	3080	frontView.object = group;
2963	3081	sideView.object = group;
2964	3082	}
2965		- group.editWindow = this;
	3083	+
	3084	+// fix "+" issue group.editWindow = this;
	3085	+
2966	3086	/*
2967	3087	currentLayout = radio.layout;
2968	3088	if (currentLayout == null)
..	..	@@ -3036,6 +3156,28 @@
3036	3156	refreshContents();
3037	3157	}
3038	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	+ }
3039	3181
3040	3182	void ResetTransform()
3041	3183	{
..	..	@@ -3148,7 +3290,7 @@
3148	3290	refreshContents();
3149	3291	}
3150	3292
3151		- void ResetCentroid()
	3293	+ void ResetCentroid(boolean full)
3152	3294	{
3153	3295	Object3D obj;
3154	3296	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3163,12 +3305,16 @@
3163	3305	LA.matIdentity(Object3D.mat);
3164	3306	obj.getBounds(minima, maxima, false);
3165	3307	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3166		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3308	+ if (full)
	3309	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3167	3310	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3168	3311	obj.TransformMesh(Object3D.mat);
	3312	+
3169	3313	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3170		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3314	+ if (full)
	3315	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3171	3316	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3317	+
3172	3318	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3173	3319	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3174	3320	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3234,9 +3380,9 @@
3234	3380	obj = (Object3D)e.nextElement();
3235	3381
3236	3382	System.out.println("Object is: " + obj);
3237		- GrafreeD.AnalyzeObject(obj);
	3383	+ Grafreed.AnalyzeObject(obj);
3238	3384	System.out.println("Boundary rep: " + obj.bRep);
3239		- GrafreeD.AnalyzeObject(obj.bRep);
	3385	+ Grafreed.AnalyzeObject(obj.bRep);
3240	3386
3241	3387	// System.err.println((size/1024) + " KB is the size of " + obj);
3242	3388	}
..	..	@@ -3450,8 +3596,8 @@
3450	3596
3451	3597	void ParseVertices()
3452	3598	{
3453		- boolean epsequal = GrafreeD.epsequal;
3454		- GrafreeD.epsequal = true;
	3599	+ boolean epsequal = Grafreed.epsequal;
	3600	+ Grafreed.epsequal = true;
3455	3601
3456	3602	for (int i=0; i<group.selection.size(); i++)
3457	3603	{
..	..	@@ -3476,7 +3622,7 @@
3476	3622	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3477	3623	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3478	3624
3479		- g.add(GrafreeD.clipboard);
	3625	+ g.add(Grafreed.clipboard);
3480	3626
3481	3627	buffer.add(g);
3482	3628	}
..	..	@@ -3491,7 +3637,7 @@
3491	3637	makeSomething(buffer, i==group.selection.size()-1);
3492	3638	}
3493	3639
3494		- GrafreeD.epsequal = epsequal;
	3640	+ Grafreed.epsequal = epsequal;
3495	3641
3496	3642	refreshContents();
3497	3643	}
..	..	@@ -3509,7 +3655,16 @@
3509	3655	String pigment = Object3D.GetPigment(tex);
3510	3656	//String bump = Object3D.GetBump(tex);
3511	3657
3512		- com.sun.opengl.util.texture.TextureData texturedata = Globals.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	+ }
3513	3668
3514	3669	double s = v.s;
3515	3670
..	..	@@ -3597,11 +3752,11 @@
3597	3752
3598	3753	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3599	3754
3600		- boolean random = CameraPane.RANDOM;
3601		- CameraPane.RANDOM = false; // parse all random nodes
	3755	+ boolean random = CameraPane.SWITCH;
	3756	+ CameraPane.SWITCH = false; // parse all random nodes
3602	3757	lowres.linkVerticesThis(null);
3603	3758	lowres.linkVerticesThis(sn);
3604		- CameraPane.RANDOM = random;
	3759	+ CameraPane.SWITCH = random;
3605	3760
3606	3761	System.err.flush();
3607	3762
..	..	@@ -3641,7 +3796,7 @@
3641	3796	return;
3642	3797
3643	3798	Object3D poses = group.selection.get(0);
3644		- Object3D ref = GrafreeD.clipboard.get(0);
	3799	+ Object3D ref = Grafreed.clipboard.get(0);
3645	3800
3646	3801	Object3D newgroup = new Object3D("Po:" + poses.name);
3647	3802
..	..	@@ -3835,9 +3990,9 @@
3835	3990
3836	3991	void ClipMesh()
3837	3992	{
3838		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3993	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3839	3994	{
3840		- Object3D content = GrafreeD.clipboard.get(0);
	3995	+ Object3D content = Grafreed.clipboard.get(0);
3841	3996
3842	3997	if (content instanceof cGroup && ((cGroup)content).transientlink )
3843	3998	content = ((cGroup)content).get(0);
..	..	@@ -3846,7 +4001,7 @@
3846	4001	// {
3847	4002	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3848	4003	// }
3849		- group.selection.ClipMesh(GrafreeD.clipboard);
	4004	+ group.selection.ClipMesh(Grafreed.clipboard);
3850	4005	}
3851	4006	// group.selection.ClipMesh(GrafreeD.clipboard);
3852	4007	System.out.println("DONE.");
..	..	@@ -3981,7 +4136,7 @@
3981	4136	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3982	4137
3983	4138	Object3D elem = (Object3D)group.selection.elementAt(i);
3984		- if(elem != group)
	4139	+ if(elem != group \|\| !newWindow)
3985	4140	{
3986	4141	// if (!(elem instanceof Composite))
3987	4142	// newWindow = false;
..	..	@@ -4086,12 +4241,12 @@
4086	4241	System.err.println("info : " + child.GetPath());
4087	4242	}
4088	4243	}
4089		- else
4090		- {
4091		- objEditor.SetMaterial(group); // .GetMaterial());
4092		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4093		- System.err.println("info : " + group.GetPath());
4094		- }
	4244	+// else
	4245	+// {
	4246	+// objEditor.SetMaterial(group); // .GetMaterial());
	4247	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4248	+// System.err.println("info : " + group.GetPath());
	4249	+// }
4095	4250
4096	4251	objEditor.SetText(); // jan 2014
4097	4252
..	..	@@ -4186,12 +4341,12 @@
4186	4341	{
4187	4342	if (group.selection.isEmpty())
4188	4343	return;
4189		- GrafreeD.clipboardIsTempGroup = false;
	4344	+ Grafreed.clipboardIsTempGroup = false;
4190	4345	Composite tGroup = null;
4191	4346	if (group.selection.size() > 0) // 1)
4192	4347	{
4193	4348	tGroup = new cGroup();
4194		- GrafreeD.clipboardIsTempGroup = true;
	4349	+ Grafreed.clipboardIsTempGroup = true;
4195	4350	}
4196	4351
4197	4352	if (cut)
..	..	@@ -4231,16 +4386,16 @@
4231	4386	//System.out.println("cut " + child);
4232	4387	//System.out.println("parent = " + child.parent);
4233	4388	// tmp.addChild(child);
4234		- if (GrafreeD.clipboardIsTempGroup)
	4389	+ if (Grafreed.clipboardIsTempGroup)
4235	4390	tGroup.add/Child/(tmp);
4236	4391	else
4237		- GrafreeD.clipboard = tmp;
	4392	+ Grafreed.clipboard = tmp;
4238	4393	}
4239	4394	else
4240		- if (GrafreeD.clipboardIsTempGroup)
	4395	+ if (Grafreed.clipboardIsTempGroup)
4241	4396	tGroup.add/Child/(child);
4242	4397	else
4243		- GrafreeD.clipboard = child;
	4398	+ Grafreed.clipboard = child;
4244	4399	}
4245	4400
4246	4401	//ResetModel();
..	..	@@ -4272,21 +4427,21 @@
4272	4427	//System.out.println("cut " + elem);
4273	4428	//System.out.println("parent = " + elem.parent);
4274	4429	// tmp.addChild(elem);
4275		- if (GrafreeD.clipboardIsTempGroup)
	4430	+ if (Grafreed.clipboardIsTempGroup)
4276	4431	tGroup.add/Child/(tmp);
4277	4432	else
4278		- GrafreeD.clipboard = tmp;
	4433	+ Grafreed.clipboard = tmp;
4279	4434	}
4280	4435	else
4281		- if (GrafreeD.clipboardIsTempGroup)
	4436	+ if (Grafreed.clipboardIsTempGroup)
4282	4437	tGroup.add/Child/(child);
4283	4438	else
4284		- GrafreeD.clipboard = child;
	4439	+ Grafreed.clipboard = child;
4285	4440	}
4286	4441
4287	4442	}
4288		- if (GrafreeD.clipboardIsTempGroup)
4289		- GrafreeD.clipboard = tGroup;
	4443	+ if (Grafreed.clipboardIsTempGroup)
	4444	+ Grafreed.clipboard = tGroup;
4290	4445	if (cut)
4291	4446	{
4292	4447	ResetModel();
..	..	@@ -4300,7 +4455,7 @@
4300	4455	// return;
4301	4456	boolean first = true;
4302	4457
4303		- if (GrafreeD.clipboardIsTempGroup)
	4458	+ if (Grafreed.clipboardIsTempGroup)
4304	4459	{
4305	4460	Composite temp;
4306	4461
..	..	@@ -4311,7 +4466,7 @@
4311	4466	temp = (Composite)Applet3D.clipboard.deepCopy();
4312	4467	*/
4313	4468	Object3D elem;
4314		- 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))
4315	4470	{
4316	4471	Object3D child = (Object3D)e.nextElement();
4317	4472
..	..	@@ -4345,21 +4500,21 @@
4345	4500	//Object3D cb = Applet3D.clipboard;
4346	4501	//temp.addChild(cb);
4347	4502	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4348		- assert(GrafreeD.clipboard.parent == null);
4349		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4350		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4351		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4352		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	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());
4353	4508	else
4354		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4355		- GrafreeD.clipboard.get(0).parent = keepparent;
	4509	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4510	+ Grafreed.clipboard.get(0).parent = keepparent;
4356	4511	}
4357	4512
4358	4513	ResetModel();
4359	4514	refreshContents();
4360	4515	}
4361	4516
4362		- void pasteInto(boolean copyit)
	4517	+ void pasteInto(boolean copyit, boolean clone)
4363	4518	{
4364	4519	// if (GrafreeD.clipboard == null)
4365	4520	// return;
..	..	@@ -4388,15 +4543,22 @@
4388	4543	if (copyit)
4389	4544	{
4390	4545	// paste(false);
4391		- CloneClipboard(false); // sept 2014
	4546	+ if (clone)
	4547	+ {
	4548	+ CloneClipboard(false); // sept 2014
	4549	+ }
	4550	+ else
	4551	+ {
	4552	+ paste(false);
	4553	+ }
4392	4554	}
4393	4555	else
4394	4556	{
4395	4557	boolean first = true;
4396	4558
4397		- if (GrafreeD.clipboardIsTempGroup)
	4559	+ if (Grafreed.clipboardIsTempGroup)
4398	4560	{
4399		- Composite temp = (Composite)GrafreeD.clipboard;
	4561	+ Composite temp = (Composite)Grafreed.clipboard;
4400	4562	Object3D copy;
4401	4563	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4402	4564	{
..	..	@@ -4406,7 +4568,7 @@
4406	4568	}
4407	4569	} else
4408	4570	{
4409		- linkSomething(GrafreeD.clipboard); //.get(0));
	4571	+ linkSomething(Grafreed.clipboard); //.get(0));
4410	4572	}
4411	4573	}
4412	4574	}
..	..	@@ -4851,7 +5013,7 @@
4851	5013
4852	5014	void ImportVRMLX3D()
4853	5015	{
4854		- if (GrafreeD.standAlone)
	5016	+ if (Grafreed.standAlone)
4855	5017	{
4856	5018	/**/
4857	5019	FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
..	..	@@ -4868,7 +5030,7 @@
4868	5030
4869	5031	String GetFile(String dialogName)
4870	5032	{
4871		- if (GrafreeD.standAlone)
	5033	+ if (Grafreed.standAlone)
4872	5034	{
4873	5035	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4874	5036	browser.show();
..	..	@@ -4932,10 +5094,12 @@
4932	5094	cButton flashSelectionButton;
4933	5095	cButton editButton;
4934	5096	cButton uneditButton;
	5097	+ JCheckBox allParamsButton;
4935	5098	cButton clearpanelButton;
4936		- cButton allParamsButton;
4937	5099	cButton unselectButton;
4938	5100
	5101	+ cButton oneStepButton;
	5102	+
4939	5103	cButton screenfitButton;
4940	5104	cButton screenfitpointButton;
4941	5105	cButton snapobjectButton;
..	..	@@ -4979,7 +5143,7 @@
4979	5143	private MenuItem linkverticesItem;
4980	5144	private MenuItem relinkverticesItem;
4981	5145	private MenuItem setMasterItem;
4982		- private MenuItem resetMeshItem;
	5146	+ private MenuItem resetAllItem;
4983	5147	private MenuItem stepAllItem;
4984	5148	private MenuItem revertMeshItem;
4985	5149	private MenuItem poseMeshItem;
..	..	@@ -4990,6 +5154,7 @@
4990	5154	private MenuItem mergeGeometriesItem;
4991	5155	private MenuItem copyItem;
4992	5156	private MenuItem pasteItem;
	5157	+ private MenuItem pasteIntoItem;
4993	5158	private MenuItem pasteLinkItem;
4994	5159	private MenuItem pasteCloneItem;
4995	5160	private MenuItem pasteExpandItem;
..	..	@@ -5039,8 +5204,10 @@
5039	5204	private MenuItem panoTexturesItem;
5040	5205
5041	5206	private MenuItem resetCentroidItem;
5042		- private MenuItem transformgeometryItem;
	5207	+ private MenuItem resetCentroidXZItem;
5043	5208	private MenuItem resetTransformItem;
	5209	+ private MenuItem transformGeometryItem;
	5210	+ private MenuItem transformChildrenItem;
5044	5211	private MenuItem hideItem;
5045	5212	private MenuItem grabItem;
5046	5213	private MenuItem backItem;
..	..	@@ -5087,7 +5254,7 @@
5087	5254	private MenuItem blobItem;
5088	5255	private MenuItem latheItem;
5089	5256	private MenuItem bezierItem;
5090		- private MenuItem checkerItem;
	5257	+ private MenuItem overlayItem;
5091	5258	private MenuItem meshItem;
5092	5259	// private MenuItem meshGroupItem;
5093	5260	private MenuItem springItem;