~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
..	..	@@ -905,7 +945,9 @@
905	945	// objEditor.DropFile((java.io.File[]) object, true);
906	946	// return;
907	947	// }
908		- if (string.charAt(0) == '/')
	948	+
	949	+ // File path for Mac and Windows
	950	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
909	951	{
910	952	// file(s)
911	953	String[] names = string.split("\n");
..	..	@@ -932,7 +974,7 @@
932	974
933	975	flashIt = false;
934	976	CameraPane pane = (CameraPane) target;
935		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	977	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
936	978	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
937	979
938	980	if (group.selection.size() == 1)
..	..	@@ -959,11 +1001,11 @@
959	1001	{
960	1002	loadClipboard(true);
961	1003	objEditor.jTree.setSelectionPath(destinationPath);
962		- pasteInto(false);
	1004	+ pasteInto(false, false);
963	1005	} else {
964	1006	loadClipboard(false);
965	1007	objEditor.jTree.setSelectionPath(destinationPath);
966		- pasteInto(false); // true); // ???
	1008	+ pasteInto(false, false); // true); // ???
967	1009	}
968	1010	}
969	1011	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1085,27 +1127,33 @@
1085	1127	kleinItem.addActionListener(this);
1086	1128	particleItem = menu.add(new MenuItem("Particle system"));
1087	1129	particleItem.addActionListener(this);
	1130	+ if (Globals.ADVANCED)
	1131	+ {
1088	1132	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1089	1133	ragdollItem.addActionListener(this);
1090	1134	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1091	1135	ragdoll2Item.addActionListener(this);
	1136	+ }
1092	1137	menu.add("-");
1093		- meshItem = menu.add(new MenuItem("Mesh"));
	1138	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1094	1139	meshItem.addActionListener(this);
1095	1140	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1096	1141	// meshGroupItem.addActionListener(this);
	1142	+ if (Globals.ADVANCED)
	1143	+ {
1097	1144	springItem = menu.add(new MenuItem("Spring"));
1098	1145	springItem.addActionListener(this);
1099	1146	flagItem = menu.add(new MenuItem("Flag"));
1100	1147	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	1148	blobItem = menu.add(new MenuItem("Blob"));
1106	1149	blobItem.addActionListener(this);
1107	1150	latheItem = menu.add(new MenuItem("Lathe"));
1108	1151	latheItem.addActionListener(this);
	1152	+ }
	1153	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1154	+ bezierItem.addActionListener(this);
	1155	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1156	+ overlayItem.addActionListener(this);
1109	1157	lightItem = menu.add(new MenuItem("Light"));
1110	1158	lightItem.addActionListener(this);
1111	1159	menu.add("-");
..	..	@@ -1115,34 +1163,39 @@
1115	1163	loopItem.addActionListener(this);
1116	1164	doubleItem = menu.add(new MenuItem("Fork"));
1117	1165	doubleItem.addActionListener(this);
	1166	+ if (Globals.ADVANCED)
	1167	+ {
1118	1168	tripleItem = menu.add(new MenuItem("Trident"));
1119	1169	tripleItem.addActionListener(this);
	1170	+ }
1120	1171	}
1121	1172
1122	1173	void buildToolsMenu(Menu menu)
1123	1174	{
1124	1175	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1125	1176	animationItem.addItemListener(this);
1126		- animationItem.setState(CameraPane.ANIMATION);
	1177	+ animationItem.setState(Globals.ANIMATION);
1127	1178
1128	1179	menu.add("-");
1129	1180	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1130	1181	parseverticesItem.addActionListener(this);
1131	1182	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1132	1183	textureFieldItem.addActionListener(this);
1133		- alignItem = menu.add(new MenuItem("Align"));
	1184	+ alignItem = menu.add(new MenuItem("Align Objects"));
1134	1185	alignItem.addActionListener(this);
1135		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1136		- mirrorItem.addActionListener(this);
1137	1186	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1138	1187	reduceMorphItem.addActionListener(this);
1139	1188	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1140	1189	reduce34MorphItem.addActionListener(this);
1141		-
	1190	+ menu.add("-");
1142	1191	menu.add(computeAOItem = new MenuItem("Compute AO"));
1143	1192	computeAOItem.addActionListener(this);
1144		- menu.add("-");
1145	1193
	1194	+ if (Globals.ADVANCED)
	1195	+ {
	1196	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1197	+ mirrorItem.addActionListener(this);
	1198	+ menu.add("-");
1146	1199	menu.add(memoryItem = new MenuItem("Memory Usage"));
1147	1200	memoryItem.addActionListener(this);
1148	1201	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1165,6 +1218,7 @@
1165	1218	menu.add("-");
1166	1219	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1167	1220	editScriptItem.addActionListener(this);
	1221	+ }
1168	1222	}
1169	1223
1170	1224	void ScreenFit()
..	..	@@ -1493,9 +1547,9 @@
1493	1547
1494	1548	void Overwrite(int mask)
1495	1549	{
1496		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1550	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1497	1551	{
1498		- Object3D content = GrafreeD.clipboard.get(0);
	1552	+ Object3D content = Grafreed.clipboard.get(0);
1499	1553
1500	1554	if (content instanceof cGroup && ((cGroup)content).transientlink )
1501	1555	content = ((cGroup)content).get(0);
..	..	@@ -1518,6 +1572,7 @@
1518	1572	//
1519	1573	public void actionPerformed(ActionEvent event) // , Object arg)
1520	1574	{
	1575	+ Object source = event.getSource();
1521	1576	/*
1522	1577	if (event.getSource() == nameField)
1523	1578	{
..	..	@@ -1529,11 +1584,11 @@
1529	1584	}
1530	1585	else
1531	1586	*/
1532		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1587	+ if (source == lookAtItem \|\| source == lookFromItem)
1533	1588	{
1534	1589	ScreenFit();
1535	1590	} else
1536		- if (event.getSource() == switchItem)
	1591	+ if (source == switchItem)
1537	1592	{
1538	1593	cVector v1 = new cVector();
1539	1594	cVector v2 = new cVector();
..	..	@@ -1542,11 +1597,11 @@
1542	1597	objEditor.cameraView.renderCamera.setAim(v2, v1);
1543	1598	objEditor.cameraView.repaint();
1544	1599	} else
1545		- if (event.getSource() == rectoidItem)
	1600	+ if (source == rectoidItem)
1546	1601	{
1547	1602	makeSomething(new Box());
1548	1603	} else
1549		- if (event.getSource() == particleItem)
	1604	+ if (source == particleItem)
1550	1605	{
1551	1606	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1552	1607	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1567,9 +1622,9 @@
1567	1622	applyExample(particleGeom, "SMOKE");
1568	1623	makeSomething(particleGeom);
1569	1624	} else
1570		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1625	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1571	1626	{
1572		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1627	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1573	1628
1574	1629	ragdoll.toParent = LA.newMatrix();
1575	1630	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1587,7 +1642,7 @@
1587	1642	} else
1588	1643	/*
1589	1644	*/
1590		- if (event.getSource() == heightFieldItem)
	1645	+ if (source == heightFieldItem)
1591	1646	{
1592	1647	Object3D obj = new Object3D();
1593	1648
..	..	@@ -1625,31 +1680,31 @@
1625	1680
1626	1681	makeSomething(obj);
1627	1682	} else
1628		- if (event.getSource() == gridItem)
	1683	+ if (source == gridItem)
1629	1684	{
1630	1685	makeSomething(new Grid());
1631	1686	} else
1632		- if (event.getSource() == ellipsoidItem)
	1687	+ if (source == ellipsoidItem)
1633	1688	{
1634	1689	makeSomething(new Sphere());
1635	1690	} else
1636		- if (event.getSource() == coneItem)
	1691	+ if (source == coneItem)
1637	1692	{
1638	1693	makeSomething(new Cone());
1639	1694	} else
1640		- if (event.getSource() == torusItem)
	1695	+ if (source == torusItem)
1641	1696	{
1642	1697	makeSomething(new Torus());
1643	1698	} else
1644		- if (event.getSource() == superItem)
	1699	+ if (source == superItem)
1645	1700	{
1646	1701	makeSomething(new Superellipsoid());
1647	1702	} else
1648		- if (event.getSource() == kleinItem)
	1703	+ if (source == kleinItem)
1649	1704	{
1650	1705	makeSomething(new Klein());
1651	1706	} else
1652		- if (event.getSource() == blobItem)
	1707	+ if (source == blobItem)
1653	1708	{
1654	1709	Blob blob = new Blob();
1655	1710	BlobComponent comp = new BlobComponent();
..	..	@@ -1657,15 +1712,15 @@
1657	1712	//blob.retile();
1658	1713	makeSomething(blob);
1659	1714	} else
1660		- if (event.getSource() == latheItem)
	1715	+ if (source == latheItem)
1661	1716	{
1662	1717	makeSomething(new Lathe());
1663	1718	} else
1664		- if (event.getSource() == bezierItem)
	1719	+ if (source == bezierItem)
1665	1720	{
1666	1721	makeSomething(new BezierSurface());
1667	1722	} else
1668		- if (event.getSource() == checkerItem)
	1723	+ if (source == overlayItem)
1669	1724	{
1670	1725	/*
1671	1726	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1680,7 +1735,7 @@
1680	1735	*/
1681	1736	makeSomething(new Checker());
1682	1737	} else
1683		- if (event.getSource() == meshItem)
	1738	+ if (source == meshItem)
1684	1739	{
1685	1740	Object3D itemtomake = new Object3D();
1686	1741	Object3D child;
..	..	@@ -1701,35 +1756,35 @@
1701	1756	makeSomething(child);
1702	1757	}
1703	1758	} else
1704		- if (event.getSource() == springItem)
	1759	+ if (source == springItem)
1705	1760	{
1706	1761	cSpring s = new cSpring();
1707	1762	s.setup();
1708	1763	makeSomething(s);
1709	1764	} else
1710		- if (event.getSource() == flagItem)
	1765	+ if (source == flagItem)
1711	1766	{
1712	1767	cSpring s = new cFlag();
1713	1768	s.setup();
1714	1769	makeSomething(s);
1715	1770	} else
1716		- if (event.getSource() == lightItem)
	1771	+ if (source == lightItem)
1717	1772	{
1718	1773	makeSomething(new Light());
1719	1774	} else
1720		- if (event.getSource() == csgItem)
	1775	+ if (source == csgItem)
1721	1776	{
1722	1777	group(new CSG());
1723	1778	} else
1724		- if (event.getSource() == templateItem)
	1779	+ if (source == templateItem)
1725	1780	{
1726	1781	group(new cTemplate());
1727	1782	} else
1728		- if (event.getSource() == attributeItem)
	1783	+ if (source == attributeItem)
1729	1784	{
1730	1785	makeSomething(new Attribute());
1731	1786	} else
1732		- if (event.getSource() == pointflowItem)
	1787	+ if (source == pointflowItem)
1733	1788	{
1734	1789	makeSomething(new PointFlow());
1735	1790	} else
..	..	@@ -1741,7 +1796,7 @@
1741	1796	} else
1742	1797	*/
1743	1798
1744		- if (event.getSource() == superLoopItem)
	1799	+ if (source == superLoopItem)
1745	1800	{
1746	1801	Composite g = new cGroup();
1747	1802	for (int i=0; i<15; i++)
..	..	@@ -1763,7 +1818,7 @@
1763	1818
1764	1819	group(g);
1765	1820	} else
1766		- if (event.getSource() == loopItem)
	1821	+ if (source == loopItem)
1767	1822	{
1768	1823	Composite csg = new GroupLeaf();
1769	1824	csg.count = 5;
..	..	@@ -1772,7 +1827,7 @@
1772	1827	csg.addChild(child);
1773	1828	child.addChild(csg);
1774	1829	} else
1775		- if (event.getSource() == doubleItem)
	1830	+ if (source == doubleItem)
1776	1831	{
1777	1832	Composite csg = new GroupLeaf();
1778	1833	csg.count = 5;
..	..	@@ -1784,7 +1839,7 @@
1784	1839	csg.addChild(child);
1785	1840	child.addChild(csg);
1786	1841	} else
1787		- if (event.getSource() == tripleItem)
	1842	+ if (source == tripleItem)
1788	1843	{
1789	1844	Composite csg = new GroupLeaf();
1790	1845	csg.count = 4;
..	..	@@ -1800,70 +1855,83 @@
1800	1855	child.addChild(csg);
1801	1856	} else
1802	1857
1803		- if (event.getSource() == importGFDItem)
	1858	+ if (source == importGFDItem)
1804	1859	{
1805	1860	ImportGFD();
1806	1861	} else
1807		- if (event.getSource() == importVRMLX3DItem)
	1862	+ if (source == importVRMLX3DItem)
1808	1863	{
1809	1864	ImportVRMLX3D();
1810	1865	} else
1811		- if (event.getSource() == import3DSItem)
	1866	+ if (source == import3DSItem)
1812	1867	{
1813	1868	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1814	1869	} else
1815		- if (event.getSource() == importOBJItem)
	1870	+ if (source == importOBJItem)
1816	1871	{
1817		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	1872	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	1873	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	1874	+ browser.setVisible(true);
	1875	+ String filename = browser.getFile();
	1876	+ if (filename != null && filename.length() > 0)
	1877	+ {
	1878	+ String fullname = browser.getDirectory() + filename;
	1879	+ makeSomething(ReadOBJ(fullname), true);
	1880	+ }
1818	1881	} else
1819		- if (event.getSource() == computeAOItem)
	1882	+ if (source == computeAOItem)
1820	1883	{
1821	1884	Globals.drawMode = CameraPane.OCCLUSION;
1822	1885	Globals.theRenderer.repaint();
1823	1886	} else
1824		- if (event.getSource() == recompileItem)
	1887	+ if (source == recompileItem)
1825	1888	{
1826	1889	Recompile();
1827	1890	refreshContents();
1828	1891	} else
1829		- if (event.getSource() == editScriptItem)
	1892	+ if (source == editScriptItem)
1830	1893	{
1831	1894	OpenDialog();
1832	1895	refreshContents();
1833	1896	} else
1834		- if (event.getSource() == invariantsItem)
	1897	+ if (source == invariantsItem)
1835	1898	{
1836	1899	System.out.println("Invariants:");
1837		- GrafreeD.grafreeD.universe.invariants();
	1900	+ Grafreed.grafreeD.universe.invariants();
1838	1901	} else
1839		- if (event.getSource() == memoryItem)
	1902	+ if (source == memoryItem)
1840	1903	{
1841	1904	//System.out.println("Invariants:");
1842	1905	PrintMemory();
1843	1906	} else
1844		- if (event.getSource() == pathItem)
	1907	+ if (source == pathItem)
1845	1908	{
1846	1909	PrintPath();
1847	1910	} else
1848		- if (event.getSource() == analyzeItem)
	1911	+ if (source == analyzeItem)
1849	1912	{
1850	1913	AnalyzeObject();
1851	1914	} else
1852		- if (event.getSource() == dumpItem)
	1915	+ if (source == dumpItem)
1853	1916	{
1854	1917	DumpObject();
1855	1918	} else
1856		- if (event.getSource() == screenfitButton)
	1919	+ if (source == oneStepButton)
	1920	+ {
	1921	+ Globals.ONESTEP = true;
	1922	+ cameraView.repaint();
	1923	+ } else
	1924	+ if (source == screenfitButton)
1857	1925	{
1858	1926	//Reload(lastConverter, lastFilename, true);
1859	1927	ScreenFit();
1860	1928	} else
1861		- if (event.getSource() == screenfitpointButton)
	1929	+ if (source == screenfitpointButton)
1862	1930	{
1863	1931	//Reload(lastConverter, lastFilename, true);
1864	1932	ScreenFitPoint();
1865	1933	} else
1866		- if (event.getSource() == snapobjectButton)
	1934	+ if (source == snapobjectButton)
1867	1935	{
1868	1936	//Reload(lastConverter, lastFilename, true);
1869	1937	SnapObject();
..	..	@@ -1874,13 +1942,13 @@
1874	1942	// Recompile();
1875	1943	// refreshContents();
1876	1944	// } else
1877		- if (event.getSource() == gcButton)
	1945	+ if (source == gcButton)
1878	1946	{
1879	1947	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1880	1948	System.gc();
1881	1949	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1882	1950	} else
1883		- if (event.getSource() == editLeafItem)
	1951	+ if (source == editLeafItem)
1884	1952	{
1885	1953	Object3D obj;
1886	1954	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1894,62 +1962,66 @@
1894	1962	}
1895	1963	refreshContents(true);
1896	1964	} else
1897		- if (event.getSource() == openWindowItem)
	1965	+ if (source == openWindowItem)
1898	1966	{
1899	1967	EditSelection(true);
1900	1968	} else
1901		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1969	+ if (source == cutItem \|\| source == clearButton)
1902	1970	{
1903	1971	loadClipboard(true);
1904	1972	} else
1905		- if (event.getSource() == duplicateItem)
	1973	+ if (source == duplicateItem)
1906	1974	{
1907		- Object3D keep = GrafreeD.clipboard;
	1975	+ Object3D keep = Grafreed.clipboard;
1908	1976	loadClipboard(false);
1909	1977	paste(false);
1910		- GrafreeD.clipboard = keep;
	1978	+ Grafreed.clipboard = keep;
1911	1979	} else
1912		- if (event.getSource() == cloneItem)
	1980	+ if (source == cloneItem)
1913	1981	{
1914	1982	CloneSelection(false);
1915	1983	} else
1916		- if (event.getSource() == cloneSupportItem)
	1984	+ if (source == cloneSupportItem)
1917	1985	{
1918	1986	CloneSelection(true);
1919	1987	} else
1920		- if (event.getSource() == copyItem)
	1988	+ if (source == copyItem)
1921	1989	{
1922	1990	loadClipboard(false);
1923	1991	} else
1924		- if (event.getSource() == pasteItem)
	1992	+ if (source == pasteItem)
1925	1993	{
1926	1994	paste(false);
1927	1995	} else
1928		- if (event.getSource() == pasteLinkItem)
	1996	+ if (source == pasteIntoItem)
1929	1997	{
1930		- pasteInto(false);
	1998	+ pasteInto(true, false);
1931	1999	} else
1932		- if (event.getSource() == pasteCloneItem)
	2000	+ if (source == pasteLinkItem)
1933	2001	{
1934		- pasteInto(true);
	2002	+ pasteInto(false, false);
1935	2003	} else
1936		- if (event.getSource() == pasteExpandItem)
	2004	+ if (source == pasteCloneItem)
	2005	+ {
	2006	+ pasteInto(true, true);
	2007	+ } else
	2008	+ if (source == pasteExpandItem)
1937	2009	{
1938	2010	paste(true);
1939	2011	} else
1940		- if (event.getSource() == synchronizeItem)
	2012	+ if (source == synchronizeItem)
1941	2013	{
1942	2014	Overwrite(Object3D.TRANSFORM);
1943	2015	} else
1944		- if (event.getSource() == overwriteNameItem)
	2016	+ if (source == overwriteNameItem)
1945	2017	{
1946	2018	Overwrite(Object3D.NAME);
1947	2019	} else
1948		- if (event.getSource() == overwriteUVItem)
	2020	+ if (source == overwriteUVItem)
1949	2021	{
1950	2022	Overwrite(Object3D.UV);
1951	2023	} else
1952		- if (event.getSource() == overwriteMatItem)
	2024	+ if (source == overwriteMatItem)
1953	2025	{
1954	2026	/* july 2015
1955	2027	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1969,7 +2041,7 @@
1969	2041
1970	2042	Overwrite(dropAttributes);
1971	2043	}
1972		- if (event.getSource() == overwriteGeoItem)
	2044	+ if (source == overwriteGeoItem)
1973	2045	{
1974	2046	Overwrite(Object3D.GEOMETRY);
1975	2047	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1986,7 +2058,7 @@
1986	2058	// refreshContents();
1987	2059	// }
1988	2060	} else
1989		- if (event.getSource() == generateMeshItem)
	2061	+ if (source == generateMeshItem)
1990	2062	{
1991	2063	//if (group.selection.size() == 1)
1992	2064	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1997,7 +2069,7 @@
1997	2069	ResetModel();
1998	2070	refreshContents();
1999	2071	} else
2000		- if (event.getSource() == extractGeometriesItem)
	2072	+ if (source == extractGeometriesItem)
2001	2073	{
2002	2074	boolean one = false;
2003	2075
..	..	@@ -2024,7 +2096,7 @@
2024	2096	ResetModel();
2025	2097	refreshContents();
2026	2098	} else
2027		- if (event.getSource() == cloneGeometriesItem)
	2099	+ if (source == cloneGeometriesItem)
2028	2100	{
2029	2101	boolean one = false;
2030	2102
..	..	@@ -2050,7 +2122,7 @@
2050	2122	ResetModel();
2051	2123	refreshContents();
2052	2124	} else
2053		- if (event.getSource() == shareGeometriesItem)
	2125	+ if (source == shareGeometriesItem)
2054	2126	{
2055	2127	boolean one = false;
2056	2128
..	..	@@ -2080,7 +2152,7 @@
2080	2152	refreshContents();
2081	2153	}
2082	2154	} else
2083		- if (event.getSource() == mergeGeometriesItem)
	2155	+ if (source == mergeGeometriesItem)
2084	2156	{
2085	2157	boolean one = false;
2086	2158
..	..	@@ -2110,7 +2182,7 @@
2110	2182	ResetModel();
2111	2183	refreshContents();
2112	2184	} else
2113		- if (event.getSource() == linkverticesItem)
	2185	+ if (source == linkverticesItem)
2114	2186	{
2115	2187	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2116	2188	// {
..	..	@@ -2123,9 +2195,9 @@
2123	2195	// group.selection.get(0).setMasterThis(content); // should be identity
2124	2196	// refreshContents();
2125	2197	// }
2126		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2198	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2127	2199	{
2128		- Object3D content = GrafreeD.clipboard.get(0);
	2200	+ Object3D content = Grafreed.clipboard.get(0);
2129	2201
2130	2202	if (content instanceof cGroup && ((cGroup)content).transientlink )
2131	2203	content = ((cGroup)content).get(0);
..	..	@@ -2133,38 +2205,38 @@
2133	2205	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2134	2206	for (int i=0; i<group.selection.size(); i++)
2135	2207	{
2136		- boolean random = CameraPane.RANDOM;
2137		- CameraPane.RANDOM = false; // parse all random nodes
	2208	+ boolean random = CameraPane.SWITCH;
	2209	+ CameraPane.SWITCH = false; // parse all random nodes
2138	2210	group.selection.get(i).linkVerticesThis(content);
2139	2211	// group.selection.get(i).setMasterThis(content); // should be identity
2140		- CameraPane.RANDOM = random;
	2212	+ CameraPane.SWITCH = random;
2141	2213	}
2142	2214	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2143	2215	refreshContents();
2144	2216	}
2145	2217	} else
2146		- if (event.getSource() == resetsupportItem)
	2218	+ if (source == resetsupportItem)
2147	2219	{
2148	2220	for (int i=0; i<group.selection.size(); i++)
2149	2221	{
2150		- boolean random = CameraPane.RANDOM;
2151		- CameraPane.RANDOM = false; // parse all random nodes
	2222	+ boolean random = CameraPane.SWITCH;
	2223	+ CameraPane.SWITCH = false; // parse all random nodes
2152	2224	group.selection.get(i).linkVerticesThis(null);
2153		- CameraPane.RANDOM = random;
	2225	+ CameraPane.SWITCH = random;
2154	2226	}
2155	2227
2156	2228	refreshContents();
2157	2229	} else
2158		- if (event.getSource() == relinkverticesItem)
	2230	+ if (source == relinkverticesItem)
2159	2231	{
2160		- boolean random = CameraPane.RANDOM;
2161		- CameraPane.RANDOM = false; // parse all random nodes
	2232	+ boolean random = CameraPane.SWITCH;
	2233	+ CameraPane.SWITCH = false; // parse all random nodes
2162	2234	group.selection.RelinkToSupport();
2163		- CameraPane.RANDOM = random;
	2235	+ CameraPane.SWITCH = random;
2164	2236
2165	2237	refreshContents();
2166	2238	} else
2167		- if (event.getSource() == resetreferencesItem)
	2239	+ if (source == resetreferencesItem)
2168	2240	{
2169	2241	for (int i=0; i<group.selection.size(); i++)
2170	2242	{
..	..	@@ -2173,11 +2245,11 @@
2173	2245
2174	2246	refreshContents();
2175	2247	} else
2176		- if (event.getSource() == setMasterItem)
	2248	+ if (source == setMasterItem)
2177	2249	{
2178		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2250	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2179	2251	{
2180		- Object3D content = GrafreeD.clipboard.get(0);
	2252	+ Object3D content = Grafreed.clipboard.get(0);
2181	2253
2182	2254	if (content instanceof cGroup && ((cGroup)content).transientlink )
2183	2255	content = ((cGroup)content).get(0);
..	..	@@ -2186,13 +2258,13 @@
2186	2258	refreshContents();
2187	2259	}
2188	2260	} else
2189		- if (event.getSource() == poseMeshItem)
	2261	+ if (source == poseMeshItem)
2190	2262	{
2191	2263	if (group.selection.size() == 1)
2192	2264	{
2193		- if (GrafreeD.clipboard.size() == 1)
	2265	+ if (Grafreed.clipboard.size() == 1)
2194	2266	{
2195		- Object3D content = GrafreeD.clipboard.get(0);
	2267	+ Object3D content = Grafreed.clipboard.get(0);
2196	2268
2197	2269	if (content instanceof cGroup && ((cGroup)content).transientlink )
2198	2270	content = ((cGroup)content).get(0);
..	..	@@ -2205,19 +2277,19 @@
2205	2277	}
2206	2278
2207	2279	} else
2208		- if (event.getSource() == revertMeshItem)
	2280	+ if (source == revertMeshItem)
2209	2281	{
2210	2282	RevertMeshes();
2211	2283	} else
2212		- if (event.getSource() == resetMeshItem)
	2284	+ if (source == resetAllItem)
2213	2285	{
2214	2286	ResetAll();
2215	2287	} else
2216		- if (event.getSource() == stepAllItem)
	2288	+ if (source == stepAllItem)
2217	2289	{
2218	2290	StepAll();
2219	2291	} else
2220		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2292	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2221	2293	{
2222	2294	//int indices[] = jList.getSelectedIndices();
2223	2295	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2225,46 +2297,46 @@
2225	2297
2226	2298	ClearSelection(false);
2227	2299	} else
2228		- if (event.getSource() == clearAllItem)
	2300	+ if (source == clearAllItem)
2229	2301	{
2230	2302	ClearSelection(true);
2231	2303	} else
2232		- if (event.getSource() == grabItem)
	2304	+ if (source == grabItem)
2233	2305	{
2234	2306	group(new cGroup(), true);
2235	2307	} else
2236		- if (event.getSource() == hideItem)
	2308	+ if (source == hideItem)
2237	2309	{
2238	2310	group(new HiddenObject());
2239	2311	} else
2240		- if (event.getSource() == frontItem)
	2312	+ if (source == frontItem)
2241	2313	{
2242	2314	front();
2243	2315	} else
2244		- if (event.getSource() == backItem)
	2316	+ if (source == backItem)
2245	2317	{
2246	2318	back();
2247	2319	} else
2248		- if (event.getSource() == cameraItem)
	2320	+ if (source == cameraItem)
2249	2321	{
2250	2322	makeSomething(new Camera());
2251	2323	} else
2252		- if (event.getSource() == compositeItem)
	2324	+ if (source == compositeItem)
2253	2325	{
2254	2326	group(new Composite());
2255	2327	} else
2256		- if (event.getSource() == randomItem)
	2328	+ if (source == randomItem)
2257	2329	{
2258	2330	RandomNode random = new RandomNode();
2259	2331	group(random);
2260	2332	if (random.size() > 0)
2261		- random.name = random.get(0).name + "Rnd";
	2333	+ random.name = random.get(0).name + "Switch";
2262	2334	} else
2263		- if (event.getSource() == physicsItem)
	2335	+ if (source == physicsItem)
2264	2336	{
2265	2337	group(new PhysicsNode());
2266	2338	} else
2267		- if (event.getSource() == frameselectorItem)
	2339	+ if (source == frameselectorItem)
2268	2340	{
2269	2341	for (int i=0; i<group.selection.size(); i++)
2270	2342	{
..	..	@@ -2276,7 +2348,7 @@
2276	2348	ResetModel();
2277	2349	refreshContents();
2278	2350	} else
2279		- if (event.getSource() == switchGeoItem)
	2351	+ if (source == switchGeoItem)
2280	2352	{
2281	2353	for (int i=0; i<group.selection.size(); i++)
2282	2354	{
..	..	@@ -2288,7 +2360,7 @@
2288	2360	ResetModel();
2289	2361	refreshContents();
2290	2362	} else
2291		- if (event.getSource() == switchTransfoItem)
	2363	+ if (source == switchTransfoItem)
2292	2364	{
2293	2365	for (int i=0; i<group.selection.size(); i++)
2294	2366	{
..	..	@@ -2300,7 +2372,7 @@
2300	2372	ResetModel();
2301	2373	refreshContents();
2302	2374	} else
2303		- if (event.getSource() == morphItem)
	2375	+ if (source == morphItem)
2304	2376	{
2305	2377	for (int i=0; i<group.selection.size(); i++)
2306	2378	{
..	..	@@ -2312,7 +2384,7 @@
2312	2384	ResetModel();
2313	2385	refreshContents();
2314	2386	} else
2315		- if (event.getSource() == scriptNodeItem)
	2387	+ if (source == scriptNodeItem)
2316	2388	{
2317	2389	boolean atleastone = false;
2318	2390
..	..	@@ -2351,31 +2423,31 @@
2351	2423	}
2352	2424	}
2353	2425	} else
2354		- if (event.getSource() == linkerItem)
	2426	+ if (source == linkerItem)
2355	2427	{
2356	2428	group(new cLinker());
2357	2429	} else
2358		- if (event.getSource() == textureItem)
	2430	+ if (source == textureItem)
2359	2431	{
2360	2432	group(new TextureNode());
2361	2433	} else
2362		- if (event.getSource() == billboardItem)
	2434	+ if (source == billboardItem)
2363	2435	{
2364	2436	group(new BillboardNode());
2365	2437	} else
2366		- if (event.getSource() == shadowXItem)
	2438	+ if (source == shadowXItem)
2367	2439	{
2368	2440	CastShadow(0);
2369	2441	} else
2370		- if (event.getSource() == shadowYItem)
	2442	+ if (source == shadowYItem)
2371	2443	{
2372	2444	CastShadow(1);
2373	2445	} else
2374		- if (event.getSource() == shadowZItem)
	2446	+ if (source == shadowZItem)
2375	2447	{
2376	2448	CastShadow(2);
2377	2449	} else
2378		- if (event.getSource() == ungroupItem)
	2450	+ if (source == ungroupItem)
2379	2451	{
2380	2452	//ungroup();
2381	2453	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2387,179 +2459,187 @@
2387	2459
2388	2460	refreshContents();
2389	2461	} else
2390		- if (event.getSource() == genUVItem)
	2462	+ if (source == genUVItem)
2391	2463	{
2392	2464	GenUV();
2393	2465	} else
2394		- if (event.getSource() == genNormalsCADItem)
	2466	+ if (source == genNormalsCADItem)
2395	2467	{
2396	2468	GenNormals(true);
2397	2469	} else
2398		- if (event.getSource() == genNormalsMESHItem)
	2470	+ if (source == genNormalsMESHItem)
2399	2471	{
2400	2472	GenNormals(true); // TODO
2401	2473	} else
2402		- if (event.getSource() == genNormalsORGANItem)
	2474	+ if (source == genNormalsORGANItem)
2403	2475	{
2404	2476	GenNormals(false);
2405	2477	} else
2406		- if (event.getSource() == genNormalsMINEItem)
	2478	+ if (source == genNormalsMINEItem)
2407	2479	{
2408	2480	GenNormalsMINE();
2409	2481	} else
2410		- if (event.getSource() == stripifyItem)
	2482	+ if (source == stripifyItem)
2411	2483	{
2412	2484	Stripify();
2413	2485	} else
2414		- if (event.getSource() == unstripifyItem)
	2486	+ if (source == unstripifyItem)
2415	2487	{
2416	2488	Unstripify();
2417	2489	} else
2418		- if (event.getSource() == trimItem)
	2490	+ if (source == trimItem)
2419	2491	{
2420	2492	Trim();
2421	2493	} else
2422		- if (event.getSource() == untrimItem)
	2494	+ if (source == untrimItem)
2423	2495	{
2424	2496	Untrim();
2425	2497	} else
2426		- if (event.getSource() == clearColorsItem)
	2498	+ if (source == clearColorsItem)
2427	2499	{
2428	2500	ClearColors();
2429	2501	} else
2430		- if (event.getSource() == clearMaterialsItem)
	2502	+ if (source == clearMaterialsItem)
2431	2503	{
2432	2504	ClearMaterials();
2433	2505	} else
2434		- if (event.getSource() == liveleavesItem)
	2506	+ if (source == liveleavesItem)
2435	2507	{
2436	2508	LiveLeaves(true);
2437	2509	} else
2438		- if (event.getSource() == unliveleavesItem)
	2510	+ if (source == unliveleavesItem)
2439	2511	{
2440	2512	LiveLeaves(false);
2441	2513	} else
2442		- if (event.getSource() == supportleavesItem)
	2514	+ if (source == supportleavesItem)
2443	2515	{
2444	2516	SupportLeaves(true);
2445	2517	} else
2446		- if (event.getSource() == unsupportleavesItem)
	2518	+ if (source == unsupportleavesItem)
2447	2519	{
2448	2520	SupportLeaves(false);
2449	2521	} else
2450		- if (event.getSource() == hideleavesItem)
	2522	+ if (source == hideleavesItem)
2451	2523	{
2452	2524	HideLeaves(true);
2453	2525	} else
2454		- if (event.getSource() == showleavesItem)
	2526	+ if (source == showleavesItem)
2455	2527	{
2456	2528	HideLeaves(false);
2457	2529	} else
2458		- if (event.getSource() == markleavesItem)
	2530	+ if (source == markleavesItem)
2459	2531	{
2460	2532	MarkLeaves(true);
2461	2533	} else
2462		- if (event.getSource() == unmarkleavesItem)
	2534	+ if (source == unmarkleavesItem)
2463	2535	{
2464	2536	MarkLeaves(false);
2465	2537	} else
2466		- if (event.getSource() == flipVItem)
	2538	+ if (source == flipVItem)
2467	2539	{
2468	2540	FlipV(true);
2469	2541	} else
2470		- if (event.getSource() == unflipVItem)
	2542	+ if (source == unflipVItem)
2471	2543	{
2472	2544	FlipV(false);
2473	2545	} else
2474		- if (event.getSource() == lowTexturesItem)
	2546	+ if (source == lowTexturesItem)
2475	2547	{
2476	2548	SetTexRes(0);
2477	2549	} else
2478		- if (event.getSource() == normalTexturesItem)
	2550	+ if (source == normalTexturesItem)
2479	2551	{
2480	2552	SetTexRes(1);
2481	2553	} else
2482		- if (event.getSource() == highTexturesItem)
	2554	+ if (source == highTexturesItem)
2483	2555	{
2484	2556	SetTexRes(2);
2485	2557	} else
2486		- if (event.getSource() == veryhighTexturesItem)
	2558	+ if (source == veryhighTexturesItem)
2487	2559	{
2488	2560	SetTexRes(3);
2489	2561	} else
2490		- if (event.getSource() == maxTexturesItem)
	2562	+ if (source == maxTexturesItem)
2491	2563	{
2492	2564	SetTexRes(4);
2493	2565	} else
2494		- if (event.getSource() == panoTexturesItem)
	2566	+ if (source == panoTexturesItem)
2495	2567	{
2496	2568	SetTexRes(5);
2497	2569	} else
2498		- if (event.getSource() == reverseNormalsItem)
	2570	+ if (source == reverseNormalsItem)
2499	2571	{
2500	2572	ReverseNormals();
2501	2573	} else
2502		- if (event.getSource() == parseverticesItem)
	2574	+ if (source == parseverticesItem)
2503	2575	{
2504	2576	ParseVertices();
2505	2577	} else
2506		- if (event.getSource() == textureFieldItem)
	2578	+ if (source == textureFieldItem)
2507	2579	{
2508	2580	TextureVertices();
2509	2581	} else
2510		- if (event.getSource() == alignItem)
	2582	+ if (source == alignItem)
2511	2583	{
2512	2584	Align();
2513	2585	} else
2514		- if (event.getSource() == mirrorItem)
	2586	+ if (source == mirrorItem)
2515	2587	{
2516	2588	MirrorPoses();
2517	2589	} else
2518		- if (event.getSource() == reduceMorphItem)
	2590	+ if (source == reduceMorphItem)
2519	2591	{
2520	2592	MeshReduction(false);
2521	2593	} else
2522		- if (event.getSource() == reduce34MorphItem)
	2594	+ if (source == reduce34MorphItem)
2523	2595	{
2524	2596	MeshReduction(true);
2525	2597	} else
2526		- if (event.getSource() == reverseTrianglesItem)
	2598	+ if (source == reverseTrianglesItem)
2527	2599	{
2528	2600	ReverseTriangles();
2529	2601	} else
2530		- if (event.getSource() == reduceMeshItem)
	2602	+ if (source == reduceMeshItem)
2531	2603	{
2532	2604	ReduceMesh(false);
2533	2605	} else
2534		- if (event.getSource() == reduce34MeshItem)
	2606	+ if (source == reduce34MeshItem)
2535	2607	{
2536	2608	ReduceMesh(true);
2537	2609	} else
2538		- if (event.getSource() == increaseMeshItem)
	2610	+ if (source == increaseMeshItem)
2539	2611	{
2540	2612	IncreaseMesh();
2541	2613	} else
2542		- if (event.getSource() == clipMeshItem)
	2614	+ if (source == clipMeshItem)
2543	2615	{
2544	2616	ClipMesh();
2545	2617	} else
2546		- if (event.getSource() == smoothMeshItem)
	2618	+ if (source == smoothMeshItem)
2547	2619	{
2548	2620	SmoothMesh();
2549	2621	} else
2550		- if (event.getSource() == transformgeometryItem)
	2622	+ if (source == transformGeometryItem)
2551	2623	{
2552	2624	TransformGeometry();
2553	2625	} else
2554		- if (event.getSource() == resetTransformItem)
	2626	+ if (source == transformChildrenItem)
	2627	+ {
	2628	+ TransformChildren();
	2629	+ } else
	2630	+ if (source == resetTransformItem)
2555	2631	{
2556	2632	ResetTransform();
2557	2633	} else
2558		- if (event.getSource() == resetCentroidItem)
	2634	+ if (source == resetCentroidItem)
2559	2635	{
2560		- ResetCentroid();
	2636	+ ResetCentroid(true);
2561	2637	} else
2562		- if (event.getSource() == resetParentItem)
	2638	+ if (source == resetCentroidXZItem)
	2639	+ {
	2640	+ ResetCentroid(false);
	2641	+ } else
	2642	+ if (source == resetParentItem)
2563	2643	{
2564	2644	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2565	2645	{
..	..	@@ -2569,7 +2649,7 @@
2569	2649
2570	2650	refreshContents();
2571	2651	} else
2572		- if (event.getSource() == repairParentItem)
	2652	+ if (source == repairParentItem)
2573	2653	{
2574	2654	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2575	2655	{
..	..	@@ -2583,7 +2663,7 @@
2583	2663
2584	2664	refreshContents();
2585	2665	} else
2586		- if (event.getSource() == repairShadowItem)
	2666	+ if (source == repairShadowItem)
2587	2667	{
2588	2668	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2589	2669	{
..	..	@@ -2597,7 +2677,7 @@
2597	2677
2598	2678	refreshContents();
2599	2679	} else
2600		- if (event.getSource() == sortbysizeItem)
	2680	+ if (source == sortbysizeItem)
2601	2681	{
2602	2682	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2603	2683	{
..	..	@@ -2609,7 +2689,7 @@
2609	2689	ResetModel();
2610	2690	refreshContents();
2611	2691	} else
2612		- if (event.getSource() == sortbynameItem)
	2692	+ if (source == sortbynameItem)
2613	2693	{
2614	2694	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2615	2695	{
..	..	@@ -2621,7 +2701,7 @@
2621	2701	ResetModel();
2622	2702	refreshContents();
2623	2703	} else
2624		- if (event.getSource() == attachPigmentItem)
	2704	+ if (source == attachPigmentItem)
2625	2705	{
2626	2706	String texture = GetFile("Attach pigment");
2627	2707	Object3D obj;
..	..	@@ -2633,7 +2713,7 @@
2633	2713
2634	2714	refreshContents();
2635	2715	} else
2636		- if (event.getSource() == detachPigmentItem)
	2716	+ if (source == detachPigmentItem)
2637	2717	{
2638	2718	Object3D obj;
2639	2719	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2644,7 +2724,7 @@
2644	2724
2645	2725	refreshContents();
2646	2726	} else
2647		- if (event.getSource() == attachBumpItem)
	2727	+ if (source == attachBumpItem)
2648	2728	{
2649	2729	String texture = GetFile("Attach bump");
2650	2730	Object3D obj;
..	..	@@ -2656,7 +2736,7 @@
2656	2736
2657	2737	refreshContents();
2658	2738	} else
2659		- if (event.getSource() == detachBumpItem)
	2739	+ if (source == detachBumpItem)
2660	2740	{
2661	2741	Object3D obj;
2662	2742	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2667,7 +2747,7 @@
2667	2747
2668	2748	refreshContents();
2669	2749	} else
2670		- if (event.getSource() == pigmentBumpItem)
	2750	+ if (source == pigmentBumpItem)
2671	2751	{
2672	2752	Object3D obj;
2673	2753	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2678,158 +2758,195 @@
2678	2758
2679	2759	refreshContents();
2680	2760	} else
2681		- if (event.getSource() == flashSelectionButton)
	2761	+ if (source == flashSelectionButton)
2682	2762	{
2683	2763	CameraPane.flash = true;
2684	2764	refreshContents();
2685	2765	} else
2686		- if (event.getSource() == oneButton)
	2766	+ if (source == oneButton)
2687	2767	{
2688	2768	} else
2689		- if (event.getSource() == twoButton)
	2769	+ if (source == twoButton)
2690	2770	{
2691	2771	radio.layout = twoButton;
2692	2772	// bug
2693	2773	//gridPanel.setDividerLocation(1.0);
2694	2774	//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();
	2775	+// bigThree.remove(scenePanel);
	2776	+// bigThree.remove(centralPanel);
	2777	+// bigThree.remove(XYZPanel);
	2778	+// aWindowConstraints.gridx = 0;
	2779	+// aWindowConstraints.gridy = 0;
	2780	+// aWindowConstraints.gridwidth = 1;
	2781	+// // aConstraints.gridheight = 3;
	2782	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2783	+// aWindowConstraints.weightx = 0;
	2784	+// aWindowConstraints.weighty = 1;
	2785	+// //bigThree.add(jtp, aWindowConstraints);
	2786	+// aWindowConstraints.weightx = 1;
	2787	+// aWindowConstraints.gridwidth = 3;
	2788	+// // aConstraints.gridheight = 3;
	2789	+// aWindowConstraints.gridx = 1;
	2790	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2791	+// bigThree.add(centralPanel, aWindowConstraints);
	2792	+// aWindowConstraints.weightx = 0;
	2793	+// aWindowConstraints.gridx = 4;
	2794	+// aWindowConstraints.gridwidth = 1;
	2795	+// // aConstraints.gridheight = 3;
	2796	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2797	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2798	+// scenePanel.setVisible(false);
	2799	+// centralPanel.setVisible(true);
	2800	+// XYZPanel.setVisible(false);
	2801	+ bigThree.ClearUI();
	2802	+ bigThree.add(centralPanel);
	2803	+ bigThree.FlushUI();
2719	2804	} else
2720		- if (event.getSource() == threeButton)
	2805	+ if (source == threeButton)
2721	2806	{
2722	2807	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();
	2808	+
	2809	+// bigThree.remove(scenePanel);
	2810	+// bigThree.remove(centralPanel);
	2811	+// bigThree.remove(XYZPanel);
	2812	+// aWindowConstraints.gridx = 0;
	2813	+// aWindowConstraints.gridy = 0;
	2814	+// aWindowConstraints.gridwidth = 1;
	2815	+// // aConstraints.gridheight = 3;
	2816	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2817	+// aWindowConstraints.weightx = 0;
	2818	+// aWindowConstraints.weighty = 1;
	2819	+// //bigThree.add(jtp, aWindowConstraints);
	2820	+// aWindowConstraints.weightx = 1;
	2821	+// aWindowConstraints.gridwidth = 3;
	2822	+// // aConstraints.gridheight = 3;
	2823	+// aWindowConstraints.gridx = 1;
	2824	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2825	+// bigThree.add(centralPanel, aWindowConstraints);
	2826	+// aWindowConstraints.weightx = 0;
	2827	+// aWindowConstraints.gridx = 4;
	2828	+// aWindowConstraints.gridwidth = 1;
	2829	+// // aConstraints.gridheight = 3;
	2830	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2831	+// bigThree.add(XYZPanel, aWindowConstraints);
	2832	+// bigThree.validate();
	2833	+// scenePanel.setVisible(false);
	2834	+// centralPanel.setVisible(true);
	2835	+// XYZPanel.setVisible(true);
	2836	+ bigThree.ClearUI();
	2837	+ bigThree.add(centralPanel);
	2838	+ bigThree.add(XYZPanel);
	2839	+ bigThree.FlushUI();
2747	2840	} else
2748		- if (event.getSource() == fourButton)
	2841	+ if (source == fourButton)
2749	2842	{
2750	2843	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();
	2844	+
	2845	+// bigThree.remove(scenePanel);
	2846	+// bigThree.remove(centralPanel);
	2847	+// bigThree.remove(XYZPanel);
	2848	+// aWindowConstraints.gridx = 0;
	2849	+// aWindowConstraints.gridy = 0;
	2850	+// aWindowConstraints.gridwidth = 1;
	2851	+// // aWindowConstraints.gridheight = 3;
	2852	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2853	+// aWindowConstraints.weightx = 1;
	2854	+// aWindowConstraints.weighty = 1;
	2855	+// bigThree.add(scenePanel, aWindowConstraints);
	2856	+// aWindowConstraints.weightx = 1;
	2857	+// aWindowConstraints.gridwidth = 3;
	2858	+// // aConstraints.gridheight = 3;
	2859	+// aWindowConstraints.gridx = 1;
	2860	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2861	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2862	+// aWindowConstraints.weightx = 0;
	2863	+// aWindowConstraints.gridx = 4;
	2864	+// aWindowConstraints.gridwidth = 1;
	2865	+// // aWindowConstraints.gridheight = 3;
	2866	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2867	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2868	+// bigThree.validate();
	2869	+// scenePanel.setVisible(true);
	2870	+// centralPanel.setVisible(false);
	2871	+// XYZPanel.setVisible(false);
	2872	+ bigThree.ClearUI();
	2873	+ bigThree.add(scenePanel);
	2874	+ bigThree.FlushUI();
2775	2875	} else
2776		- if (event.getSource() == sixButton)
	2876	+ if (source == sixButton)
2777	2877	{
2778	2878	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();
	2879	+
	2880	+// bigThree.remove(scenePanel);
	2881	+// bigThree.remove(centralPanel);
	2882	+// bigThree.remove(XYZPanel);
	2883	+// aWindowConstraints.gridx = 0;
	2884	+// aWindowConstraints.gridy = 0;
	2885	+// aWindowConstraints.gridwidth = 1;
	2886	+// // aConstraints.gridheight = 3;
	2887	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2888	+// aWindowConstraints.weightx = 0;
	2889	+// aWindowConstraints.weighty = 1;
	2890	+// bigThree.add(scenePanel, aWindowConstraints);
	2891	+// aWindowConstraints.weightx = 1;
	2892	+// aWindowConstraints.gridwidth = 3;
	2893	+// // aWindowConstraints.gridheight = 3;
	2894	+// aWindowConstraints.gridx = 1;
	2895	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2896	+// bigThree.add(centralPanel, aWindowConstraints);
	2897	+// aWindowConstraints.weightx = 0;
	2898	+// aWindowConstraints.gridx = 4;
	2899	+// aWindowConstraints.gridwidth = 1;
	2900	+// // aWindowConstraints.gridheight = 3;
	2901	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2902	+// //bigThree.add(XYZPanel, aConstraints);
	2903	+// bigThree.validate();
	2904	+// scenePanel.setVisible(true);
	2905	+// centralPanel.setVisible(true);
	2906	+// XYZPanel.setVisible(false);
	2907	+ bigThree.ClearUI();
	2908	+ bigThree.add(scenePanel);
	2909	+ bigThree.add(centralPanel);
	2910	+ bigThree.FlushUI();
2803	2911	} else
2804		- if (event.getSource() == sevenButton)
	2912	+ if (source == sevenButton)
2805	2913	{
2806	2914	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();
	2915	+
	2916	+// bigThree.remove(scenePanel);
	2917	+// bigThree.remove(centralPanel);
	2918	+// bigThree.remove(XYZPanel);
	2919	+// aWindowConstraints.gridx = 0;
	2920	+// aWindowConstraints.gridy = 0;
	2921	+// aWindowConstraints.gridwidth = 1;
	2922	+// // aWindowConstraints.gridheight = 3;
	2923	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2924	+// aWindowConstraints.weightx = 0;
	2925	+// aWindowConstraints.weighty = 1;
	2926	+// bigThree.add(scenePanel, aWindowConstraints);
	2927	+// aWindowConstraints.weightx = 1;
	2928	+// aWindowConstraints.gridwidth = 3;
	2929	+// // aWindowConstraints.gridheight = 3;
	2930	+// aWindowConstraints.gridx = 1;
	2931	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2932	+// bigThree.add(centralPanel, aWindowConstraints);
	2933	+// aWindowConstraints.weightx = 0;
	2934	+// aWindowConstraints.gridx = 4;
	2935	+// aWindowConstraints.gridwidth = 1;
	2936	+// // aConstraints.gridheight = 3;
	2937	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2938	+// bigThree.add(XYZPanel, aWindowConstraints);
	2939	+// bigThree.validate();
	2940	+// scenePanel.setVisible(true);
	2941	+// centralPanel.setVisible(true);
	2942	+// XYZPanel.setVisible(true);
	2943	+ bigThree.ClearUI();
	2944	+ bigThree.add(scenePanel);
	2945	+ bigThree.add(centralPanel);
	2946	+ bigThree.add(XYZPanel);
	2947	+ bigThree.FlushUI();
2831	2948	} else
2832		- if (event.getSource() == rootButton)
	2949	+ if (source == rootButton)
2833	2950	{
2834	2951	Object3D obj;
2835	2952	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2841,7 +2958,7 @@
2841	2958
2842	2959	refreshContents(true);
2843	2960	} else
2844		- if (event.getSource() == closeButton)
	2961	+ if (source == closeButton)
2845	2962	{
2846	2963	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2847	2964	cRadio ab;
..	..	@@ -2862,11 +2979,11 @@
2862	2979	}
2863	2980	refreshContents(true);
2864	2981	} else
2865		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2982	+ if (source == editItem \|\| source == editButton)
2866	2983	{
2867	2984	EditSelection(false);
2868	2985	} else
2869		- if (event.getSource() == uneditButton)
	2986	+ if (source == uneditButton)
2870	2987	{
2871	2988	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2872	2989	{
..	..	@@ -2878,12 +2995,12 @@
2878	2995
2879	2996	child.editWindow = null; // ???????????
2880	2997	}
2881		- objEditor.ctrlPanel.revalidate();
	2998	+ objEditor.ctrlPanel.FlushUI();
2882	2999	//objEditor.jTree.clearSelection();
2883	3000	//objEditor.ResetSliders();
2884	3001	refreshContents(true);
2885	3002	} else
2886		- if (event.getSource() == clearPanelButton)
	3003	+ if (source == clearPanelButton)
2887	3004	{
2888	3005	assert(copy == group);
2889	3006	//copy.ClearUI();
..	..	@@ -2894,7 +3011,7 @@
2894	3011	listUI.clear();
2895	3012	refreshContents(true);
2896	3013	} else
2897		- if (event.getSource() == allParamsButton)
	3014	+ if (source == allParamsButton)
2898	3015	{
2899	3016	assert(copy == group);
2900	3017
..	..	@@ -2915,19 +3032,19 @@
2915	3032
2916	3033	refreshContents(true);
2917	3034	} else
2918		- if (event.getSource() == unselectButton)
	3035	+ if (source == unselectButton)
2919	3036	{
2920	3037	objEditor.jTree.clearSelection();
2921	3038	// ?? oct 2012 GrafreeD.clipboard.clear();
2922	3039	objEditor.ResetSliders();
2923	3040	refreshContents(true);
2924	3041	} else
2925		- if(event.getSource() instanceof cRadio)
	3042	+ if(source instanceof cRadio)
2926	3043	{
2927	3044	group.parent = keepparent;
2928	3045	group.attributes = 0;
2929	3046	//group.editWindow = null;
2930		- /cRadio/ radio = (cRadio)event.getSource();
	3047	+ /cRadio/ radio = (cRadio)source;
2931	3048	Object3D obj = radio.GetObject();
2932	3049	System.out.println("Edit " + obj);
2933	3050	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -3036,6 +3153,28 @@
3036	3153	refreshContents();
3037	3154	}
3038	3155
	3156	+ void TransformChildren()
	3157	+ {
	3158	+ Object3D obj;
	3159	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3160	+ {
	3161	+ obj = (Object3D)e.nextElement();
	3162	+ obj.KeepTextureMatrices();
	3163	+ obj.TransformChildren();
	3164	+ obj.RestoreTextureMatrices();
	3165	+
	3166	+// if (obj.parent == null)
	3167	+// {
	3168	+// System.out.println("NULL PARENT!");
	3169	+// new Exception().printStackTrace();
	3170	+// }
	3171	+// else
	3172	+// TouchTransform(obj);
	3173	+// //obj.parent.Touch();
	3174	+ }
	3175	+
	3176	+ refreshContents();
	3177	+ }
3039	3178
3040	3179	void ResetTransform()
3041	3180	{
..	..	@@ -3148,7 +3287,7 @@
3148	3287	refreshContents();
3149	3288	}
3150	3289
3151		- void ResetCentroid()
	3290	+ void ResetCentroid(boolean full)
3152	3291	{
3153	3292	Object3D obj;
3154	3293	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3163,12 +3302,16 @@
3163	3302	LA.matIdentity(Object3D.mat);
3164	3303	obj.getBounds(minima, maxima, false);
3165	3304	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3166		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3305	+ if (full)
	3306	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3167	3307	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3168	3308	obj.TransformMesh(Object3D.mat);
	3309	+
3169	3310	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3170		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3311	+ if (full)
	3312	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3171	3313	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3314	+
3172	3315	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3173	3316	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3174	3317	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3234,9 +3377,9 @@
3234	3377	obj = (Object3D)e.nextElement();
3235	3378
3236	3379	System.out.println("Object is: " + obj);
3237		- GrafreeD.AnalyzeObject(obj);
	3380	+ Grafreed.AnalyzeObject(obj);
3238	3381	System.out.println("Boundary rep: " + obj.bRep);
3239		- GrafreeD.AnalyzeObject(obj.bRep);
	3382	+ Grafreed.AnalyzeObject(obj.bRep);
3240	3383
3241	3384	// System.err.println((size/1024) + " KB is the size of " + obj);
3242	3385	}
..	..	@@ -3450,8 +3593,8 @@
3450	3593
3451	3594	void ParseVertices()
3452	3595	{
3453		- boolean epsequal = GrafreeD.epsequal;
3454		- GrafreeD.epsequal = true;
	3596	+ boolean epsequal = Grafreed.epsequal;
	3597	+ Grafreed.epsequal = true;
3455	3598
3456	3599	for (int i=0; i<group.selection.size(); i++)
3457	3600	{
..	..	@@ -3476,7 +3619,7 @@
3476	3619	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3477	3620	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3478	3621
3479		- g.add(GrafreeD.clipboard);
	3622	+ g.add(Grafreed.clipboard);
3480	3623
3481	3624	buffer.add(g);
3482	3625	}
..	..	@@ -3491,7 +3634,7 @@
3491	3634	makeSomething(buffer, i==group.selection.size()-1);
3492	3635	}
3493	3636
3494		- GrafreeD.epsequal = epsequal;
	3637	+ Grafreed.epsequal = epsequal;
3495	3638
3496	3639	refreshContents();
3497	3640	}
..	..	@@ -3509,7 +3652,16 @@
3509	3652	String pigment = Object3D.GetPigment(tex);
3510	3653	//String bump = Object3D.GetBump(tex);
3511	3654
3512		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3655	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3656	+
	3657	+ try
	3658	+ {
	3659	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3660	+ }
	3661	+ catch (Exception e)
	3662	+ {
	3663	+ System.err.println("FAIL: " + node);
	3664	+ }
3513	3665
3514	3666	double s = v.s;
3515	3667
..	..	@@ -3597,11 +3749,11 @@
3597	3749
3598	3750	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3599	3751
3600		- boolean random = CameraPane.RANDOM;
3601		- CameraPane.RANDOM = false; // parse all random nodes
	3752	+ boolean random = CameraPane.SWITCH;
	3753	+ CameraPane.SWITCH = false; // parse all random nodes
3602	3754	lowres.linkVerticesThis(null);
3603	3755	lowres.linkVerticesThis(sn);
3604		- CameraPane.RANDOM = random;
	3756	+ CameraPane.SWITCH = random;
3605	3757
3606	3758	System.err.flush();
3607	3759
..	..	@@ -3641,7 +3793,7 @@
3641	3793	return;
3642	3794
3643	3795	Object3D poses = group.selection.get(0);
3644		- Object3D ref = GrafreeD.clipboard.get(0);
	3796	+ Object3D ref = Grafreed.clipboard.get(0);
3645	3797
3646	3798	Object3D newgroup = new Object3D("Po:" + poses.name);
3647	3799
..	..	@@ -3835,9 +3987,9 @@
3835	3987
3836	3988	void ClipMesh()
3837	3989	{
3838		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3990	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3839	3991	{
3840		- Object3D content = GrafreeD.clipboard.get(0);
	3992	+ Object3D content = Grafreed.clipboard.get(0);
3841	3993
3842	3994	if (content instanceof cGroup && ((cGroup)content).transientlink )
3843	3995	content = ((cGroup)content).get(0);
..	..	@@ -3846,7 +3998,7 @@
3846	3998	// {
3847	3999	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3848	4000	// }
3849		- group.selection.ClipMesh(GrafreeD.clipboard);
	4001	+ group.selection.ClipMesh(Grafreed.clipboard);
3850	4002	}
3851	4003	// group.selection.ClipMesh(GrafreeD.clipboard);
3852	4004	System.out.println("DONE.");
..	..	@@ -4086,12 +4238,12 @@
4086	4238	System.err.println("info : " + child.GetPath());
4087	4239	}
4088	4240	}
4089		- else
4090		- {
4091		- objEditor.SetMaterial(group); // .GetMaterial());
4092		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4093		- System.err.println("info : " + group.GetPath());
4094		- }
	4241	+// else
	4242	+// {
	4243	+// objEditor.SetMaterial(group); // .GetMaterial());
	4244	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4245	+// System.err.println("info : " + group.GetPath());
	4246	+// }
4095	4247
4096	4248	objEditor.SetText(); // jan 2014
4097	4249
..	..	@@ -4186,12 +4338,12 @@
4186	4338	{
4187	4339	if (group.selection.isEmpty())
4188	4340	return;
4189		- GrafreeD.clipboardIsTempGroup = false;
	4341	+ Grafreed.clipboardIsTempGroup = false;
4190	4342	Composite tGroup = null;
4191	4343	if (group.selection.size() > 0) // 1)
4192	4344	{
4193	4345	tGroup = new cGroup();
4194		- GrafreeD.clipboardIsTempGroup = true;
	4346	+ Grafreed.clipboardIsTempGroup = true;
4195	4347	}
4196	4348
4197	4349	if (cut)
..	..	@@ -4231,16 +4383,16 @@
4231	4383	//System.out.println("cut " + child);
4232	4384	//System.out.println("parent = " + child.parent);
4233	4385	// tmp.addChild(child);
4234		- if (GrafreeD.clipboardIsTempGroup)
	4386	+ if (Grafreed.clipboardIsTempGroup)
4235	4387	tGroup.add/Child/(tmp);
4236	4388	else
4237		- GrafreeD.clipboard = tmp;
	4389	+ Grafreed.clipboard = tmp;
4238	4390	}
4239	4391	else
4240		- if (GrafreeD.clipboardIsTempGroup)
	4392	+ if (Grafreed.clipboardIsTempGroup)
4241	4393	tGroup.add/Child/(child);
4242	4394	else
4243		- GrafreeD.clipboard = child;
	4395	+ Grafreed.clipboard = child;
4244	4396	}
4245	4397
4246	4398	//ResetModel();
..	..	@@ -4272,21 +4424,21 @@
4272	4424	//System.out.println("cut " + elem);
4273	4425	//System.out.println("parent = " + elem.parent);
4274	4426	// tmp.addChild(elem);
4275		- if (GrafreeD.clipboardIsTempGroup)
	4427	+ if (Grafreed.clipboardIsTempGroup)
4276	4428	tGroup.add/Child/(tmp);
4277	4429	else
4278		- GrafreeD.clipboard = tmp;
	4430	+ Grafreed.clipboard = tmp;
4279	4431	}
4280	4432	else
4281		- if (GrafreeD.clipboardIsTempGroup)
	4433	+ if (Grafreed.clipboardIsTempGroup)
4282	4434	tGroup.add/Child/(child);
4283	4435	else
4284		- GrafreeD.clipboard = child;
	4436	+ Grafreed.clipboard = child;
4285	4437	}
4286	4438
4287	4439	}
4288		- if (GrafreeD.clipboardIsTempGroup)
4289		- GrafreeD.clipboard = tGroup;
	4440	+ if (Grafreed.clipboardIsTempGroup)
	4441	+ Grafreed.clipboard = tGroup;
4290	4442	if (cut)
4291	4443	{
4292	4444	ResetModel();
..	..	@@ -4300,7 +4452,7 @@
4300	4452	// return;
4301	4453	boolean first = true;
4302	4454
4303		- if (GrafreeD.clipboardIsTempGroup)
	4455	+ if (Grafreed.clipboardIsTempGroup)
4304	4456	{
4305	4457	Composite temp;
4306	4458
..	..	@@ -4311,7 +4463,7 @@
4311	4463	temp = (Composite)Applet3D.clipboard.deepCopy();
4312	4464	*/
4313	4465	Object3D elem;
4314		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4466	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4315	4467	{
4316	4468	Object3D child = (Object3D)e.nextElement();
4317	4469
..	..	@@ -4345,21 +4497,21 @@
4345	4497	//Object3D cb = Applet3D.clipboard;
4346	4498	//temp.addChild(cb);
4347	4499	//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());
	4500	+ assert(Grafreed.clipboard.parent == null);
	4501	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4502	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4503	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4504	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4353	4505	else
4354		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4355		- GrafreeD.clipboard.get(0).parent = keepparent;
	4506	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4507	+ Grafreed.clipboard.get(0).parent = keepparent;
4356	4508	}
4357	4509
4358	4510	ResetModel();
4359	4511	refreshContents();
4360	4512	}
4361	4513
4362		- void pasteInto(boolean copyit)
	4514	+ void pasteInto(boolean copyit, boolean clone)
4363	4515	{
4364	4516	// if (GrafreeD.clipboard == null)
4365	4517	// return;
..	..	@@ -4388,15 +4540,22 @@
4388	4540	if (copyit)
4389	4541	{
4390	4542	// paste(false);
4391		- CloneClipboard(false); // sept 2014
	4543	+ if (clone)
	4544	+ {
	4545	+ CloneClipboard(false); // sept 2014
	4546	+ }
	4547	+ else
	4548	+ {
	4549	+ paste(false);
	4550	+ }
4392	4551	}
4393	4552	else
4394	4553	{
4395	4554	boolean first = true;
4396	4555
4397		- if (GrafreeD.clipboardIsTempGroup)
	4556	+ if (Grafreed.clipboardIsTempGroup)
4398	4557	{
4399		- Composite temp = (Composite)GrafreeD.clipboard;
	4558	+ Composite temp = (Composite)Grafreed.clipboard;
4400	4559	Object3D copy;
4401	4560	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4402	4561	{
..	..	@@ -4406,7 +4565,7 @@
4406	4565	}
4407	4566	} else
4408	4567	{
4409		- linkSomething(GrafreeD.clipboard); //.get(0));
	4568	+ linkSomething(Grafreed.clipboard); //.get(0));
4410	4569	}
4411	4570	}
4412	4571	}
..	..	@@ -4851,7 +5010,7 @@
4851	5010
4852	5011	void ImportVRMLX3D()
4853	5012	{
4854		- if (GrafreeD.standAlone)
	5013	+ if (Grafreed.standAlone)
4855	5014	{
4856	5015	/**/
4857	5016	FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
..	..	@@ -4868,7 +5027,7 @@
4868	5027
4869	5028	String GetFile(String dialogName)
4870	5029	{
4871		- if (GrafreeD.standAlone)
	5030	+ if (Grafreed.standAlone)
4872	5031	{
4873	5032	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4874	5033	browser.show();
..	..	@@ -4932,10 +5091,12 @@
4932	5091	cButton flashSelectionButton;
4933	5092	cButton editButton;
4934	5093	cButton uneditButton;
	5094	+ JCheckBox allParamsButton;
4935	5095	cButton clearpanelButton;
4936		- cButton allParamsButton;
4937	5096	cButton unselectButton;
4938	5097
	5098	+ cButton oneStepButton;
	5099	+
4939	5100	cButton screenfitButton;
4940	5101	cButton screenfitpointButton;
4941	5102	cButton snapobjectButton;
..	..	@@ -4979,7 +5140,7 @@
4979	5140	private MenuItem linkverticesItem;
4980	5141	private MenuItem relinkverticesItem;
4981	5142	private MenuItem setMasterItem;
4982		- private MenuItem resetMeshItem;
	5143	+ private MenuItem resetAllItem;
4983	5144	private MenuItem stepAllItem;
4984	5145	private MenuItem revertMeshItem;
4985	5146	private MenuItem poseMeshItem;
..	..	@@ -4990,6 +5151,7 @@
4990	5151	private MenuItem mergeGeometriesItem;
4991	5152	private MenuItem copyItem;
4992	5153	private MenuItem pasteItem;
	5154	+ private MenuItem pasteIntoItem;
4993	5155	private MenuItem pasteLinkItem;
4994	5156	private MenuItem pasteCloneItem;
4995	5157	private MenuItem pasteExpandItem;
..	..	@@ -5039,8 +5201,10 @@
5039	5201	private MenuItem panoTexturesItem;
5040	5202
5041	5203	private MenuItem resetCentroidItem;
5042		- private MenuItem transformgeometryItem;
	5204	+ private MenuItem resetCentroidXZItem;
5043	5205	private MenuItem resetTransformItem;
	5206	+ private MenuItem transformGeometryItem;
	5207	+ private MenuItem transformChildrenItem;
5044	5208	private MenuItem hideItem;
5045	5209	private MenuItem grabItem;
5046	5210	private MenuItem backItem;
..	..	@@ -5087,7 +5251,7 @@
5087	5251	private MenuItem blobItem;
5088	5252	private MenuItem latheItem;
5089	5253	private MenuItem bezierItem;
5090		- private MenuItem checkerItem;
	5254	+ private MenuItem overlayItem;
5091	5255	private MenuItem meshItem;
5092	5256	// private MenuItem meshGroupItem;
5093	5257	private MenuItem springItem;