~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,176 +490,98 @@
433	490	oe.radioPanel.add(dummyButton);
434	491	oe.buttonGroup.add(dummyButton);
435	492	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	493	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	494
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
441		- liveCB.setToolTipText("Enabled animation");
	495	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	496	+ liveCB.setToolTipText("Enable animation");
442	497	liveCB.addItemListener(this);
443	498
444		- oe.aConstraints.gridx += 1;
445		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	499	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	500	+ oneStepButton.setToolTipText("Animate one step forward");
	501	+ oneStepButton.addActionListener(this);
	502	+
	503	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
446	504	fastCB.setToolTipText("Fast mode");
447	505	fastCB.addItemListener(this);
448		- oe.aConstraints.gridx += 1;
449		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
450		- supportCB.setToolTipText("Enabled rigging");
451		- supportCB.addItemListener(this);
452		-
453		- // oe.aConstraints.gridx += 1;
454		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
455		- // localCB.addItemListener(this);
456		-
457		- oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), oe.aConstraints);
459		- crowdCB.setToolTipText("Used for crowds");
460		- crowdCB.addItemListener(this);
461		-
462		- oe.aConstraints.gridx += 1;
463		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
464		- smoothCB.setToolTipText("Snapping delay");
465		- smoothCB.addItemListener(this);
466		-
467		- oe.aConstraints.gridx += 1;
468		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
469		- slowCB.setToolTipText("Smooth interpolation");
470		- slowCB.addItemListener(this);
471		- oe.aConstraints.gridx += 1;
472		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), oe.aConstraints);
473		- boxCB.setToolTipText("Display bounding boxes");
474		- boxCB.addItemListener(this);
475		- oe.aConstraints.gridx += 1;
476		- oe.toolbarPanel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), oe.aConstraints);
477		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
478		- zoomBoxCB.addItemListener(this);
479		-
480		-// oe.aConstraints.gridx += 1;
481		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
482		-// speakerMocapCB.addItemListener(this);
483		-
484		- if (false)
485		- {
486		- // handled in scripts
487		- oe.aConstraints.gridx += 1;
488		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
489		- speakerCameraCB.addItemListener(this);
490		-
491		- oe.aConstraints.gridx += 1;
492		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
493		- speakerFocusCB.addItemListener(this);
494		-
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
497		- smoothfocusCB.addItemListener(this);
498		- }
499		-
500		-//oe.aConstraints.gridx += 1;
501		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
502		-// debugCB.addItemListener(this);
503		-
504		- oe.aConstraints.gridx += 1;
505		- oe.toolbarPanel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), oe.aConstraints);
506		- oeilCB.addItemListener(this);
507		-
508		- oe.aConstraints.gridx += 1;
509		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), oe.aConstraints);
510		- lookAtCB.setToolTipText("Look-at target");
511		- lookAtCB.addItemListener(this);
512		-
513		- oe.aConstraints.gridx += 1;
514		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	506	+
	507	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
515	508	trackCB.setToolTipText("Enable tracking");
516	509	trackCB.addItemListener(this);
517	510
518		- oe.aConstraints.gridx += 1;
519		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	511	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
520	512	screenfitButton.setToolTipText("Screen fit");
521	513	screenfitButton.addActionListener(this);
522		- oe.aConstraints.gridx += 1;
	514	+
523	515	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
524	516	// screenfitpointButton.addActionListener(this);
525		-// oe.aConstraints.gridx += 1;
526		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
527		- snapobjectButton.addActionListener(this);
528		- snapobjectButton.setToolTipText("Snap Object");
529		- oe.aConstraints.gridx += 1;
530	517
531		- //aConstraints.gridx = 0;
532		- //aConstraints.gridy += 1;
533		- oe.aConstraints.weighty = 0;
534		- oe.aConstraints.gridwidth = 1;
535		-
536		- 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);
537	526	flashSelectionButton.setToolTipText("Show selection");
538	527	flashSelectionButton.addActionListener(this);
539	528
540		- oe.toolbarPanel.add(new cButton(" ", false));
	529	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
541	530
542		- oe.aConstraints.gridx += 1;
543		- oe.aConstraints.weighty = 0;
544		- oe.aConstraints.gridwidth = 1;
545		-
546		- //
547		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	531	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
548	532	twoButton.setToolTipText("Show center view only");
549	533	twoButton.addActionListener(this);
550		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	534	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
551	535	fourButton.addActionListener(this);
552	536	fourButton.setToolTipText("Show left panel only");
553		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	537	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
554	538	sixButton.setToolTipText("2-column layout left");
555	539	sixButton.addActionListener(this);
556		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	540	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
557	541	threeButton.setToolTipText("2-column layout right");
558	542	threeButton.addActionListener(this);
559		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	543	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
560	544	sevenButton.setToolTipText("3-column layout");
561	545	sevenButton.addActionListener(this);
562	546	//
563	547
564		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
565		- 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");
566	550	rootButton.addActionListener(this);
567		- oe.aConstraints.gridx += 1;
568		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	551	+
	552	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569	553	closeButton.setToolTipText("Close tab");
570	554	closeButton.addActionListener(this);
571	555	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
572	556	//clearButton.addActionListener(this);
573		- oe.aConstraints.gridx += 1;
574	557
575		- oe.aConstraints.gridx = 1; //
576		- 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");
577	562	editButton.addActionListener(this);
578		- oe.aConstraints.gridx += 1;
579		- oe.aConstraints.weighty = 0;
580		- oe.aConstraints.gridwidth = 1;
581	563
582		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	564	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	565	+ uneditButton.setToolTipText("Unedit selection");
583	566	uneditButton.addActionListener(this);
584	567
585		- oe.aConstraints.gridx += 1;
586		- oe.aConstraints.weighty = 0;
587		- oe.aConstraints.gridwidth = 1;
588		-
589		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
590		- clearPanelButton.addActionListener(this);
591		-
592		- oe.aConstraints.gridx += 1;
593		- oe.aConstraints.weighty = 0;
594		- oe.aConstraints.gridwidth = 1;
595		-
596		- 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");
597	570	allParamsButton.addActionListener(this);
598	571
599		- oe.aConstraints.gridx += 1;
600		- oe.aConstraints.weighty = 0;
601		- oe.aConstraints.gridwidth = 1;
602		-
603		- 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");
604	578	unselectButton.addActionListener(this);
605	579
	580	+ commandsPanel.preferredHeight = 1;
	581	+
	582	+ oe.treePanel.add(commandsPanel);
	583	+ oe.treePanel.Return();
	584	+
606	585	// oe.aConstraints.gridx += 1;
607	586	// oe.aConstraints.weighty = 0;
608	587	// oe.aConstraints.gridwidth = 1;
..	..	@@ -614,40 +593,37 @@
614	593	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
615	594	// gcButton.addActionListener(this);
616	595
617		- oe.aConstraints.gridx = 0;
618		- oe.aConstraints.gridy += 1;
619		-
620		- //ctrlPanel.add(objList = new List(5, true));
621		- oe.aConstraints.gridwidth = 100;
622		- // oe.aConstraints.gridheight = 100;
623		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
624		- oe.aConstraints.gridheight = 1;
625		- oe.aConstraints.weighty = 0.5;
626		- oe.aConstraints.gridx = 0;
627		- JScrollPane jSP;
	596	+ cGridBag jSPPanel = new cGridBag();
	597	+
	598	+ JScrollPane jSP;
628	599	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
629		- 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);
630	601	ResetModel();
631		- oe.aConstraints.weighty = 0.5;
632		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
633		- oe.aConstraints.gridy += 1;
634		- oe.aConstraints.gridwidth = 1;
	602	+
	603	+ oe.treePanel.add(jSPPanel);
	604	+ oe.treePanel.Return();
635	605
636		- oe.aConstraints.weighty = 0;
637		- oe.aConstraints.gridwidth = 2;
638		-
639		- 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");
640	610	colorCB.addItemListener(this);
641		- oe.aConstraints.gridx += 2;
642		- 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");
643	614	materialCB.addItemListener(this);
644		- oe.aConstraints.gridx += 2;
645		- 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");
646	618	textureCB.addItemListener(this);
647	619
648		- oe.aConstraints.gridx = 0;
649		- oe.aConstraints.gridy += 1;
	620	+ copyOptionsPanel.preferredHeight = 1;
	621	+ oe.treePanel.add(copyOptionsPanel);
	622	+ oe.treePanel.Return();
650	623
	624	+// mainPanel.setDividerLocation(0.5); //1.0);
	625	+// mainPanel.setResizeWeight(0.5);
	626	+
651	627	//jList.addListSelectionListener(this);
652	628	oe.jTree.addTreeSelectionListener(this);
653	629	//jTree.setRootVisible(false);
..	..	@@ -669,6 +645,78 @@
669	645	radio.layout = sevenButton;
670	646	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
671	647	}
	648	+
	649	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	650	+ {
	651	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	652	+ boxCB.setToolTipText("Display bounding boxes");
	653	+ boxCB.addItemListener(this);
	654	+
	655	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	656	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	657	+ zoomBoxCB.addItemListener(this);
	658	+
	659	+ if (true) // Globals.ADVANCED)
	660	+ {
	661	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	662	+ supportCB.setToolTipText("Enable rigging");
	663	+ supportCB.addItemListener(this);
	664	+
	665	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	666	+ // localCB.addItemListener(this);
	667	+
	668	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	669	+ crowdCB.setToolTipText("Used for crowds");
	670	+ crowdCB.addItemListener(this);
	671	+
	672	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	673	+ smoothCB.setToolTipText("Snapping delay");
	674	+ smoothCB.addItemListener(this);
	675	+
	676	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	677	+ slowCB.setToolTipText("Smooth interpolation");
	678	+ slowCB.addItemListener(this);
	679	+
	680	+// constraints.gridy += 1;
	681	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	682	+// speakerMocapCB.addItemListener(this);
	683	+
	684	+ if (false)
	685	+ {
	686	+ // handled in scripts
	687	+ //constraints.gridy += 1;
	688	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	689	+ speakerCameraCB.addItemListener(this);
	690	+
	691	+ //constraints.gridy += 1;
	692	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	693	+ speakerFocusCB.addItemListener(this);
	694	+
	695	+ //constraints.gridy += 1;
	696	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	697	+ smoothfocusCB.addItemListener(this);
	698	+ }
	699	+
	700	+//constraints.gridx += 1;
	701	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	702	+// debugCB.addItemListener(this);
	703	+
	704	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	705	+ oeilCB.addItemListener(this);
	706	+
	707	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	708	+ lookAtCB.setToolTipText("Look-at target");
	709	+ lookAtCB.addItemListener(this);
	710	+
	711	+ }
	712	+
	713	+ cGridBag fill = new cGridBag();
	714	+
	715	+ fill.preferredHeight = 200;
	716	+
	717	+ panel.add(fill);
	718	+
	719	+ }
672	720
673	721	void EditObject(Object3D obj)
674	722	{
..	..	@@ -897,7 +945,9 @@
897	945	// objEditor.DropFile((java.io.File[]) object, true);
898	946	// return;
899	947	// }
900		- if (string.charAt(0) == '/')
	948	+
	949	+ // File path for Mac and Windows
	950	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
901	951	{
902	952	// file(s)
903	953	String[] names = string.split("\n");
..	..	@@ -924,7 +974,7 @@
924	974
925	975	flashIt = false;
926	976	CameraPane pane = (CameraPane) target;
927		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	977	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
928	978	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
929	979
930	980	if (group.selection.size() == 1)
..	..	@@ -951,11 +1001,11 @@
951	1001	{
952	1002	loadClipboard(true);
953	1003	objEditor.jTree.setSelectionPath(destinationPath);
954		- pasteInto(false);
	1004	+ pasteInto(false, false);
955	1005	} else {
956	1006	loadClipboard(false);
957	1007	objEditor.jTree.setSelectionPath(destinationPath);
958		- pasteInto(false); // true); // ???
	1008	+ pasteInto(false, false); // true); // ???
959	1009	}
960	1010	}
961	1011	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1077,27 +1127,33 @@
1077	1127	kleinItem.addActionListener(this);
1078	1128	particleItem = menu.add(new MenuItem("Particle system"));
1079	1129	particleItem.addActionListener(this);
	1130	+ if (Globals.ADVANCED)
	1131	+ {
1080	1132	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1081	1133	ragdollItem.addActionListener(this);
1082	1134	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1083	1135	ragdoll2Item.addActionListener(this);
	1136	+ }
1084	1137	menu.add("-");
1085		- meshItem = menu.add(new MenuItem("Mesh"));
	1138	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1086	1139	meshItem.addActionListener(this);
1087	1140	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1088	1141	// meshGroupItem.addActionListener(this);
	1142	+ if (Globals.ADVANCED)
	1143	+ {
1089	1144	springItem = menu.add(new MenuItem("Spring"));
1090	1145	springItem.addActionListener(this);
1091	1146	flagItem = menu.add(new MenuItem("Flag"));
1092	1147	flagItem.addActionListener(this);
1093		- bezierItem = menu.add(new MenuItem("Patch"));
1094		- bezierItem.addActionListener(this);
1095		- checkerItem = menu.add(new MenuItem("Checker"));
1096		- checkerItem.addActionListener(this);
1097	1148	blobItem = menu.add(new MenuItem("Blob"));
1098	1149	blobItem.addActionListener(this);
1099	1150	latheItem = menu.add(new MenuItem("Lathe"));
1100	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);
1101	1157	lightItem = menu.add(new MenuItem("Light"));
1102	1158	lightItem.addActionListener(this);
1103	1159	menu.add("-");
..	..	@@ -1107,34 +1163,39 @@
1107	1163	loopItem.addActionListener(this);
1108	1164	doubleItem = menu.add(new MenuItem("Fork"));
1109	1165	doubleItem.addActionListener(this);
	1166	+ if (Globals.ADVANCED)
	1167	+ {
1110	1168	tripleItem = menu.add(new MenuItem("Trident"));
1111	1169	tripleItem.addActionListener(this);
	1170	+ }
1112	1171	}
1113	1172
1114	1173	void buildToolsMenu(Menu menu)
1115	1174	{
1116	1175	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1117	1176	animationItem.addItemListener(this);
1118		- animationItem.setState(CameraPane.ANIMATION);
	1177	+ animationItem.setState(Globals.ANIMATION);
1119	1178
1120	1179	menu.add("-");
1121	1180	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1122	1181	parseverticesItem.addActionListener(this);
1123	1182	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1124	1183	textureFieldItem.addActionListener(this);
1125		- alignItem = menu.add(new MenuItem("Align"));
	1184	+ alignItem = menu.add(new MenuItem("Align Objects"));
1126	1185	alignItem.addActionListener(this);
1127		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1128		- mirrorItem.addActionListener(this);
1129	1186	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1130	1187	reduceMorphItem.addActionListener(this);
1131	1188	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1132	1189	reduce34MorphItem.addActionListener(this);
1133		-
	1190	+ menu.add("-");
1134	1191	menu.add(computeAOItem = new MenuItem("Compute AO"));
1135	1192	computeAOItem.addActionListener(this);
1136		- menu.add("-");
1137	1193
	1194	+ if (Globals.ADVANCED)
	1195	+ {
	1196	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1197	+ mirrorItem.addActionListener(this);
	1198	+ menu.add("-");
1138	1199	menu.add(memoryItem = new MenuItem("Memory Usage"));
1139	1200	memoryItem.addActionListener(this);
1140	1201	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1157,6 +1218,7 @@
1157	1218	menu.add("-");
1158	1219	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1159	1220	editScriptItem.addActionListener(this);
	1221	+ }
1160	1222	}
1161	1223
1162	1224	void ScreenFit()
..	..	@@ -1485,9 +1547,9 @@
1485	1547
1486	1548	void Overwrite(int mask)
1487	1549	{
1488		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1550	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1489	1551	{
1490		- Object3D content = GrafreeD.clipboard.get(0);
	1552	+ Object3D content = Grafreed.clipboard.get(0);
1491	1553
1492	1554	if (content instanceof cGroup && ((cGroup)content).transientlink )
1493	1555	content = ((cGroup)content).get(0);
..	..	@@ -1510,6 +1572,7 @@
1510	1572	//
1511	1573	public void actionPerformed(ActionEvent event) // , Object arg)
1512	1574	{
	1575	+ Object source = event.getSource();
1513	1576	/*
1514	1577	if (event.getSource() == nameField)
1515	1578	{
..	..	@@ -1521,11 +1584,11 @@
1521	1584	}
1522	1585	else
1523	1586	*/
1524		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1587	+ if (source == lookAtItem \|\| source == lookFromItem)
1525	1588	{
1526	1589	ScreenFit();
1527	1590	} else
1528		- if (event.getSource() == switchItem)
	1591	+ if (source == switchItem)
1529	1592	{
1530	1593	cVector v1 = new cVector();
1531	1594	cVector v2 = new cVector();
..	..	@@ -1534,11 +1597,11 @@
1534	1597	objEditor.cameraView.renderCamera.setAim(v2, v1);
1535	1598	objEditor.cameraView.repaint();
1536	1599	} else
1537		- if (event.getSource() == rectoidItem)
	1600	+ if (source == rectoidItem)
1538	1601	{
1539	1602	makeSomething(new Box());
1540	1603	} else
1541		- if (event.getSource() == particleItem)
	1604	+ if (source == particleItem)
1542	1605	{
1543	1606	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1544	1607	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1559,9 +1622,9 @@
1559	1622	applyExample(particleGeom, "SMOKE");
1560	1623	makeSomething(particleGeom);
1561	1624	} else
1562		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1625	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1563	1626	{
1564		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1627	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1565	1628
1566	1629	ragdoll.toParent = LA.newMatrix();
1567	1630	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1579,7 +1642,7 @@
1579	1642	} else
1580	1643	/*
1581	1644	*/
1582		- if (event.getSource() == heightFieldItem)
	1645	+ if (source == heightFieldItem)
1583	1646	{
1584	1647	Object3D obj = new Object3D();
1585	1648
..	..	@@ -1617,31 +1680,31 @@
1617	1680
1618	1681	makeSomething(obj);
1619	1682	} else
1620		- if (event.getSource() == gridItem)
	1683	+ if (source == gridItem)
1621	1684	{
1622	1685	makeSomething(new Grid());
1623	1686	} else
1624		- if (event.getSource() == ellipsoidItem)
	1687	+ if (source == ellipsoidItem)
1625	1688	{
1626	1689	makeSomething(new Sphere());
1627	1690	} else
1628		- if (event.getSource() == coneItem)
	1691	+ if (source == coneItem)
1629	1692	{
1630	1693	makeSomething(new Cone());
1631	1694	} else
1632		- if (event.getSource() == torusItem)
	1695	+ if (source == torusItem)
1633	1696	{
1634	1697	makeSomething(new Torus());
1635	1698	} else
1636		- if (event.getSource() == superItem)
	1699	+ if (source == superItem)
1637	1700	{
1638	1701	makeSomething(new Superellipsoid());
1639	1702	} else
1640		- if (event.getSource() == kleinItem)
	1703	+ if (source == kleinItem)
1641	1704	{
1642	1705	makeSomething(new Klein());
1643	1706	} else
1644		- if (event.getSource() == blobItem)
	1707	+ if (source == blobItem)
1645	1708	{
1646	1709	Blob blob = new Blob();
1647	1710	BlobComponent comp = new BlobComponent();
..	..	@@ -1649,15 +1712,15 @@
1649	1712	//blob.retile();
1650	1713	makeSomething(blob);
1651	1714	} else
1652		- if (event.getSource() == latheItem)
	1715	+ if (source == latheItem)
1653	1716	{
1654	1717	makeSomething(new Lathe());
1655	1718	} else
1656		- if (event.getSource() == bezierItem)
	1719	+ if (source == bezierItem)
1657	1720	{
1658	1721	makeSomething(new BezierSurface());
1659	1722	} else
1660		- if (event.getSource() == checkerItem)
	1723	+ if (source == overlayItem)
1661	1724	{
1662	1725	/*
1663	1726	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1672,7 +1735,7 @@
1672	1735	*/
1673	1736	makeSomething(new Checker());
1674	1737	} else
1675		- if (event.getSource() == meshItem)
	1738	+ if (source == meshItem)
1676	1739	{
1677	1740	Object3D itemtomake = new Object3D();
1678	1741	Object3D child;
..	..	@@ -1693,35 +1756,35 @@
1693	1756	makeSomething(child);
1694	1757	}
1695	1758	} else
1696		- if (event.getSource() == springItem)
	1759	+ if (source == springItem)
1697	1760	{
1698	1761	cSpring s = new cSpring();
1699	1762	s.setup();
1700	1763	makeSomething(s);
1701	1764	} else
1702		- if (event.getSource() == flagItem)
	1765	+ if (source == flagItem)
1703	1766	{
1704	1767	cSpring s = new cFlag();
1705	1768	s.setup();
1706	1769	makeSomething(s);
1707	1770	} else
1708		- if (event.getSource() == lightItem)
	1771	+ if (source == lightItem)
1709	1772	{
1710	1773	makeSomething(new Light());
1711	1774	} else
1712		- if (event.getSource() == csgItem)
	1775	+ if (source == csgItem)
1713	1776	{
1714	1777	group(new CSG());
1715	1778	} else
1716		- if (event.getSource() == templateItem)
	1779	+ if (source == templateItem)
1717	1780	{
1718	1781	group(new cTemplate());
1719	1782	} else
1720		- if (event.getSource() == attributeItem)
	1783	+ if (source == attributeItem)
1721	1784	{
1722	1785	makeSomething(new Attribute());
1723	1786	} else
1724		- if (event.getSource() == pointflowItem)
	1787	+ if (source == pointflowItem)
1725	1788	{
1726	1789	makeSomething(new PointFlow());
1727	1790	} else
..	..	@@ -1733,7 +1796,7 @@
1733	1796	} else
1734	1797	*/
1735	1798
1736		- if (event.getSource() == superLoopItem)
	1799	+ if (source == superLoopItem)
1737	1800	{
1738	1801	Composite g = new cGroup();
1739	1802	for (int i=0; i<15; i++)
..	..	@@ -1755,7 +1818,7 @@
1755	1818
1756	1819	group(g);
1757	1820	} else
1758		- if (event.getSource() == loopItem)
	1821	+ if (source == loopItem)
1759	1822	{
1760	1823	Composite csg = new GroupLeaf();
1761	1824	csg.count = 5;
..	..	@@ -1764,7 +1827,7 @@
1764	1827	csg.addChild(child);
1765	1828	child.addChild(csg);
1766	1829	} else
1767		- if (event.getSource() == doubleItem)
	1830	+ if (source == doubleItem)
1768	1831	{
1769	1832	Composite csg = new GroupLeaf();
1770	1833	csg.count = 5;
..	..	@@ -1776,7 +1839,7 @@
1776	1839	csg.addChild(child);
1777	1840	child.addChild(csg);
1778	1841	} else
1779		- if (event.getSource() == tripleItem)
	1842	+ if (source == tripleItem)
1780	1843	{
1781	1844	Composite csg = new GroupLeaf();
1782	1845	csg.count = 4;
..	..	@@ -1792,70 +1855,83 @@
1792	1855	child.addChild(csg);
1793	1856	} else
1794	1857
1795		- if (event.getSource() == importGFDItem)
	1858	+ if (source == importGFDItem)
1796	1859	{
1797	1860	ImportGFD();
1798	1861	} else
1799		- if (event.getSource() == importVRMLX3DItem)
	1862	+ if (source == importVRMLX3DItem)
1800	1863	{
1801	1864	ImportVRMLX3D();
1802	1865	} else
1803		- if (event.getSource() == import3DSItem)
	1866	+ if (source == import3DSItem)
1804	1867	{
1805	1868	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1806	1869	} else
1807		- if (event.getSource() == importOBJItem)
	1870	+ if (source == importOBJItem)
1808	1871	{
1809		- 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	+ }
1810	1881	} else
1811		- if (event.getSource() == computeAOItem)
	1882	+ if (source == computeAOItem)
1812	1883	{
1813	1884	Globals.drawMode = CameraPane.OCCLUSION;
1814	1885	Globals.theRenderer.repaint();
1815	1886	} else
1816		- if (event.getSource() == recompileItem)
	1887	+ if (source == recompileItem)
1817	1888	{
1818	1889	Recompile();
1819	1890	refreshContents();
1820	1891	} else
1821		- if (event.getSource() == editScriptItem)
	1892	+ if (source == editScriptItem)
1822	1893	{
1823	1894	OpenDialog();
1824	1895	refreshContents();
1825	1896	} else
1826		- if (event.getSource() == invariantsItem)
	1897	+ if (source == invariantsItem)
1827	1898	{
1828	1899	System.out.println("Invariants:");
1829		- GrafreeD.grafreeD.universe.invariants();
	1900	+ Grafreed.grafreeD.universe.invariants();
1830	1901	} else
1831		- if (event.getSource() == memoryItem)
	1902	+ if (source == memoryItem)
1832	1903	{
1833	1904	//System.out.println("Invariants:");
1834	1905	PrintMemory();
1835	1906	} else
1836		- if (event.getSource() == pathItem)
	1907	+ if (source == pathItem)
1837	1908	{
1838	1909	PrintPath();
1839	1910	} else
1840		- if (event.getSource() == analyzeItem)
	1911	+ if (source == analyzeItem)
1841	1912	{
1842	1913	AnalyzeObject();
1843	1914	} else
1844		- if (event.getSource() == dumpItem)
	1915	+ if (source == dumpItem)
1845	1916	{
1846	1917	DumpObject();
1847	1918	} else
1848		- if (event.getSource() == screenfitButton)
	1919	+ if (source == oneStepButton)
	1920	+ {
	1921	+ Globals.ONESTEP = true;
	1922	+ cameraView.repaint();
	1923	+ } else
	1924	+ if (source == screenfitButton)
1849	1925	{
1850	1926	//Reload(lastConverter, lastFilename, true);
1851	1927	ScreenFit();
1852	1928	} else
1853		- if (event.getSource() == screenfitpointButton)
	1929	+ if (source == screenfitpointButton)
1854	1930	{
1855	1931	//Reload(lastConverter, lastFilename, true);
1856	1932	ScreenFitPoint();
1857	1933	} else
1858		- if (event.getSource() == snapobjectButton)
	1934	+ if (source == snapobjectButton)
1859	1935	{
1860	1936	//Reload(lastConverter, lastFilename, true);
1861	1937	SnapObject();
..	..	@@ -1866,13 +1942,13 @@
1866	1942	// Recompile();
1867	1943	// refreshContents();
1868	1944	// } else
1869		- if (event.getSource() == gcButton)
	1945	+ if (source == gcButton)
1870	1946	{
1871	1947	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1872	1948	System.gc();
1873	1949	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1874	1950	} else
1875		- if (event.getSource() == editLeafItem)
	1951	+ if (source == editLeafItem)
1876	1952	{
1877	1953	Object3D obj;
1878	1954	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1886,62 +1962,66 @@
1886	1962	}
1887	1963	refreshContents(true);
1888	1964	} else
1889		- if (event.getSource() == openWindowItem)
	1965	+ if (source == openWindowItem)
1890	1966	{
1891	1967	EditSelection(true);
1892	1968	} else
1893		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1969	+ if (source == cutItem \|\| source == clearButton)
1894	1970	{
1895	1971	loadClipboard(true);
1896	1972	} else
1897		- if (event.getSource() == duplicateItem)
	1973	+ if (source == duplicateItem)
1898	1974	{
1899		- Object3D keep = GrafreeD.clipboard;
	1975	+ Object3D keep = Grafreed.clipboard;
1900	1976	loadClipboard(false);
1901	1977	paste(false);
1902		- GrafreeD.clipboard = keep;
	1978	+ Grafreed.clipboard = keep;
1903	1979	} else
1904		- if (event.getSource() == cloneItem)
	1980	+ if (source == cloneItem)
1905	1981	{
1906	1982	CloneSelection(false);
1907	1983	} else
1908		- if (event.getSource() == cloneSupportItem)
	1984	+ if (source == cloneSupportItem)
1909	1985	{
1910	1986	CloneSelection(true);
1911	1987	} else
1912		- if (event.getSource() == copyItem)
	1988	+ if (source == copyItem)
1913	1989	{
1914	1990	loadClipboard(false);
1915	1991	} else
1916		- if (event.getSource() == pasteItem)
	1992	+ if (source == pasteItem)
1917	1993	{
1918	1994	paste(false);
1919	1995	} else
1920		- if (event.getSource() == pasteLinkItem)
	1996	+ if (source == pasteIntoItem)
1921	1997	{
1922		- pasteInto(false);
	1998	+ pasteInto(true, false);
1923	1999	} else
1924		- if (event.getSource() == pasteCloneItem)
	2000	+ if (source == pasteLinkItem)
1925	2001	{
1926		- pasteInto(true);
	2002	+ pasteInto(false, false);
1927	2003	} else
1928		- if (event.getSource() == pasteExpandItem)
	2004	+ if (source == pasteCloneItem)
	2005	+ {
	2006	+ pasteInto(true, true);
	2007	+ } else
	2008	+ if (source == pasteExpandItem)
1929	2009	{
1930	2010	paste(true);
1931	2011	} else
1932		- if (event.getSource() == synchronizeItem)
	2012	+ if (source == synchronizeItem)
1933	2013	{
1934	2014	Overwrite(Object3D.TRANSFORM);
1935	2015	} else
1936		- if (event.getSource() == overwriteNameItem)
	2016	+ if (source == overwriteNameItem)
1937	2017	{
1938	2018	Overwrite(Object3D.NAME);
1939	2019	} else
1940		- if (event.getSource() == overwriteUVItem)
	2020	+ if (source == overwriteUVItem)
1941	2021	{
1942	2022	Overwrite(Object3D.UV);
1943	2023	} else
1944		- if (event.getSource() == overwriteMatItem)
	2024	+ if (source == overwriteMatItem)
1945	2025	{
1946	2026	/* july 2015
1947	2027	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1961,7 +2041,7 @@
1961	2041
1962	2042	Overwrite(dropAttributes);
1963	2043	}
1964		- if (event.getSource() == overwriteGeoItem)
	2044	+ if (source == overwriteGeoItem)
1965	2045	{
1966	2046	Overwrite(Object3D.GEOMETRY);
1967	2047	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1978,7 +2058,7 @@
1978	2058	// refreshContents();
1979	2059	// }
1980	2060	} else
1981		- if (event.getSource() == generateMeshItem)
	2061	+ if (source == generateMeshItem)
1982	2062	{
1983	2063	//if (group.selection.size() == 1)
1984	2064	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1989,7 +2069,7 @@
1989	2069	ResetModel();
1990	2070	refreshContents();
1991	2071	} else
1992		- if (event.getSource() == extractGeometriesItem)
	2072	+ if (source == extractGeometriesItem)
1993	2073	{
1994	2074	boolean one = false;
1995	2075
..	..	@@ -2016,7 +2096,7 @@
2016	2096	ResetModel();
2017	2097	refreshContents();
2018	2098	} else
2019		- if (event.getSource() == cloneGeometriesItem)
	2099	+ if (source == cloneGeometriesItem)
2020	2100	{
2021	2101	boolean one = false;
2022	2102
..	..	@@ -2042,7 +2122,7 @@
2042	2122	ResetModel();
2043	2123	refreshContents();
2044	2124	} else
2045		- if (event.getSource() == shareGeometriesItem)
	2125	+ if (source == shareGeometriesItem)
2046	2126	{
2047	2127	boolean one = false;
2048	2128
..	..	@@ -2072,7 +2152,7 @@
2072	2152	refreshContents();
2073	2153	}
2074	2154	} else
2075		- if (event.getSource() == mergeGeometriesItem)
	2155	+ if (source == mergeGeometriesItem)
2076	2156	{
2077	2157	boolean one = false;
2078	2158
..	..	@@ -2102,7 +2182,7 @@
2102	2182	ResetModel();
2103	2183	refreshContents();
2104	2184	} else
2105		- if (event.getSource() == linkverticesItem)
	2185	+ if (source == linkverticesItem)
2106	2186	{
2107	2187	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2108	2188	// {
..	..	@@ -2115,9 +2195,9 @@
2115	2195	// group.selection.get(0).setMasterThis(content); // should be identity
2116	2196	// refreshContents();
2117	2197	// }
2118		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2198	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2119	2199	{
2120		- Object3D content = GrafreeD.clipboard.get(0);
	2200	+ Object3D content = Grafreed.clipboard.get(0);
2121	2201
2122	2202	if (content instanceof cGroup && ((cGroup)content).transientlink )
2123	2203	content = ((cGroup)content).get(0);
..	..	@@ -2125,38 +2205,38 @@
2125	2205	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2126	2206	for (int i=0; i<group.selection.size(); i++)
2127	2207	{
2128		- boolean random = CameraPane.RANDOM;
2129		- CameraPane.RANDOM = false; // parse all random nodes
	2208	+ boolean random = CameraPane.SWITCH;
	2209	+ CameraPane.SWITCH = false; // parse all random nodes
2130	2210	group.selection.get(i).linkVerticesThis(content);
2131	2211	// group.selection.get(i).setMasterThis(content); // should be identity
2132		- CameraPane.RANDOM = random;
	2212	+ CameraPane.SWITCH = random;
2133	2213	}
2134	2214	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2135	2215	refreshContents();
2136	2216	}
2137	2217	} else
2138		- if (event.getSource() == resetsupportItem)
	2218	+ if (source == resetsupportItem)
2139	2219	{
2140	2220	for (int i=0; i<group.selection.size(); i++)
2141	2221	{
2142		- boolean random = CameraPane.RANDOM;
2143		- CameraPane.RANDOM = false; // parse all random nodes
	2222	+ boolean random = CameraPane.SWITCH;
	2223	+ CameraPane.SWITCH = false; // parse all random nodes
2144	2224	group.selection.get(i).linkVerticesThis(null);
2145		- CameraPane.RANDOM = random;
	2225	+ CameraPane.SWITCH = random;
2146	2226	}
2147	2227
2148	2228	refreshContents();
2149	2229	} else
2150		- if (event.getSource() == relinkverticesItem)
	2230	+ if (source == relinkverticesItem)
2151	2231	{
2152		- boolean random = CameraPane.RANDOM;
2153		- CameraPane.RANDOM = false; // parse all random nodes
	2232	+ boolean random = CameraPane.SWITCH;
	2233	+ CameraPane.SWITCH = false; // parse all random nodes
2154	2234	group.selection.RelinkToSupport();
2155		- CameraPane.RANDOM = random;
	2235	+ CameraPane.SWITCH = random;
2156	2236
2157	2237	refreshContents();
2158	2238	} else
2159		- if (event.getSource() == resetreferencesItem)
	2239	+ if (source == resetreferencesItem)
2160	2240	{
2161	2241	for (int i=0; i<group.selection.size(); i++)
2162	2242	{
..	..	@@ -2165,11 +2245,11 @@
2165	2245
2166	2246	refreshContents();
2167	2247	} else
2168		- if (event.getSource() == setMasterItem)
	2248	+ if (source == setMasterItem)
2169	2249	{
2170		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2250	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2171	2251	{
2172		- Object3D content = GrafreeD.clipboard.get(0);
	2252	+ Object3D content = Grafreed.clipboard.get(0);
2173	2253
2174	2254	if (content instanceof cGroup && ((cGroup)content).transientlink )
2175	2255	content = ((cGroup)content).get(0);
..	..	@@ -2178,13 +2258,13 @@
2178	2258	refreshContents();
2179	2259	}
2180	2260	} else
2181		- if (event.getSource() == poseMeshItem)
	2261	+ if (source == poseMeshItem)
2182	2262	{
2183	2263	if (group.selection.size() == 1)
2184	2264	{
2185		- if (GrafreeD.clipboard.size() == 1)
	2265	+ if (Grafreed.clipboard.size() == 1)
2186	2266	{
2187		- Object3D content = GrafreeD.clipboard.get(0);
	2267	+ Object3D content = Grafreed.clipboard.get(0);
2188	2268
2189	2269	if (content instanceof cGroup && ((cGroup)content).transientlink )
2190	2270	content = ((cGroup)content).get(0);
..	..	@@ -2197,19 +2277,19 @@
2197	2277	}
2198	2278
2199	2279	} else
2200		- if (event.getSource() == revertMeshItem)
	2280	+ if (source == revertMeshItem)
2201	2281	{
2202	2282	RevertMeshes();
2203	2283	} else
2204		- if (event.getSource() == resetMeshItem)
	2284	+ if (source == resetAllItem)
2205	2285	{
2206	2286	ResetAll();
2207	2287	} else
2208		- if (event.getSource() == stepAllItem)
	2288	+ if (source == stepAllItem)
2209	2289	{
2210	2290	StepAll();
2211	2291	} else
2212		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2292	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2213	2293	{
2214	2294	//int indices[] = jList.getSelectedIndices();
2215	2295	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2217,46 +2297,46 @@
2217	2297
2218	2298	ClearSelection(false);
2219	2299	} else
2220		- if (event.getSource() == clearAllItem)
	2300	+ if (source == clearAllItem)
2221	2301	{
2222	2302	ClearSelection(true);
2223	2303	} else
2224		- if (event.getSource() == grabItem)
	2304	+ if (source == grabItem)
2225	2305	{
2226	2306	group(new cGroup(), true);
2227	2307	} else
2228		- if (event.getSource() == hideItem)
	2308	+ if (source == hideItem)
2229	2309	{
2230	2310	group(new HiddenObject());
2231	2311	} else
2232		- if (event.getSource() == frontItem)
	2312	+ if (source == frontItem)
2233	2313	{
2234	2314	front();
2235	2315	} else
2236		- if (event.getSource() == backItem)
	2316	+ if (source == backItem)
2237	2317	{
2238	2318	back();
2239	2319	} else
2240		- if (event.getSource() == cameraItem)
	2320	+ if (source == cameraItem)
2241	2321	{
2242	2322	makeSomething(new Camera());
2243	2323	} else
2244		- if (event.getSource() == compositeItem)
	2324	+ if (source == compositeItem)
2245	2325	{
2246	2326	group(new Composite());
2247	2327	} else
2248		- if (event.getSource() == randomItem)
	2328	+ if (source == randomItem)
2249	2329	{
2250	2330	RandomNode random = new RandomNode();
2251	2331	group(random);
2252	2332	if (random.size() > 0)
2253		- random.name = random.get(0).name + "Rnd";
	2333	+ random.name = random.get(0).name + "Switch";
2254	2334	} else
2255		- if (event.getSource() == physicsItem)
	2335	+ if (source == physicsItem)
2256	2336	{
2257	2337	group(new PhysicsNode());
2258	2338	} else
2259		- if (event.getSource() == frameselectorItem)
	2339	+ if (source == frameselectorItem)
2260	2340	{
2261	2341	for (int i=0; i<group.selection.size(); i++)
2262	2342	{
..	..	@@ -2268,7 +2348,7 @@
2268	2348	ResetModel();
2269	2349	refreshContents();
2270	2350	} else
2271		- if (event.getSource() == switchGeoItem)
	2351	+ if (source == switchGeoItem)
2272	2352	{
2273	2353	for (int i=0; i<group.selection.size(); i++)
2274	2354	{
..	..	@@ -2280,7 +2360,7 @@
2280	2360	ResetModel();
2281	2361	refreshContents();
2282	2362	} else
2283		- if (event.getSource() == switchTransfoItem)
	2363	+ if (source == switchTransfoItem)
2284	2364	{
2285	2365	for (int i=0; i<group.selection.size(); i++)
2286	2366	{
..	..	@@ -2292,7 +2372,7 @@
2292	2372	ResetModel();
2293	2373	refreshContents();
2294	2374	} else
2295		- if (event.getSource() == morphItem)
	2375	+ if (source == morphItem)
2296	2376	{
2297	2377	for (int i=0; i<group.selection.size(); i++)
2298	2378	{
..	..	@@ -2304,7 +2384,7 @@
2304	2384	ResetModel();
2305	2385	refreshContents();
2306	2386	} else
2307		- if (event.getSource() == scriptNodeItem)
	2387	+ if (source == scriptNodeItem)
2308	2388	{
2309	2389	boolean atleastone = false;
2310	2390
..	..	@@ -2343,31 +2423,31 @@
2343	2423	}
2344	2424	}
2345	2425	} else
2346		- if (event.getSource() == linkerItem)
	2426	+ if (source == linkerItem)
2347	2427	{
2348	2428	group(new cLinker());
2349	2429	} else
2350		- if (event.getSource() == textureItem)
	2430	+ if (source == textureItem)
2351	2431	{
2352	2432	group(new TextureNode());
2353	2433	} else
2354		- if (event.getSource() == billboardItem)
	2434	+ if (source == billboardItem)
2355	2435	{
2356	2436	group(new BillboardNode());
2357	2437	} else
2358		- if (event.getSource() == shadowXItem)
	2438	+ if (source == shadowXItem)
2359	2439	{
2360	2440	CastShadow(0);
2361	2441	} else
2362		- if (event.getSource() == shadowYItem)
	2442	+ if (source == shadowYItem)
2363	2443	{
2364	2444	CastShadow(1);
2365	2445	} else
2366		- if (event.getSource() == shadowZItem)
	2446	+ if (source == shadowZItem)
2367	2447	{
2368	2448	CastShadow(2);
2369	2449	} else
2370		- if (event.getSource() == ungroupItem)
	2450	+ if (source == ungroupItem)
2371	2451	{
2372	2452	//ungroup();
2373	2453	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2379,179 +2459,187 @@
2379	2459
2380	2460	refreshContents();
2381	2461	} else
2382		- if (event.getSource() == genUVItem)
	2462	+ if (source == genUVItem)
2383	2463	{
2384	2464	GenUV();
2385	2465	} else
2386		- if (event.getSource() == genNormalsCADItem)
	2466	+ if (source == genNormalsCADItem)
2387	2467	{
2388	2468	GenNormals(true);
2389	2469	} else
2390		- if (event.getSource() == genNormalsMESHItem)
	2470	+ if (source == genNormalsMESHItem)
2391	2471	{
2392	2472	GenNormals(true); // TODO
2393	2473	} else
2394		- if (event.getSource() == genNormalsORGANItem)
	2474	+ if (source == genNormalsORGANItem)
2395	2475	{
2396	2476	GenNormals(false);
2397	2477	} else
2398		- if (event.getSource() == genNormalsMINEItem)
	2478	+ if (source == genNormalsMINEItem)
2399	2479	{
2400	2480	GenNormalsMINE();
2401	2481	} else
2402		- if (event.getSource() == stripifyItem)
	2482	+ if (source == stripifyItem)
2403	2483	{
2404	2484	Stripify();
2405	2485	} else
2406		- if (event.getSource() == unstripifyItem)
	2486	+ if (source == unstripifyItem)
2407	2487	{
2408	2488	Unstripify();
2409	2489	} else
2410		- if (event.getSource() == trimItem)
	2490	+ if (source == trimItem)
2411	2491	{
2412	2492	Trim();
2413	2493	} else
2414		- if (event.getSource() == untrimItem)
	2494	+ if (source == untrimItem)
2415	2495	{
2416	2496	Untrim();
2417	2497	} else
2418		- if (event.getSource() == clearColorsItem)
	2498	+ if (source == clearColorsItem)
2419	2499	{
2420	2500	ClearColors();
2421	2501	} else
2422		- if (event.getSource() == clearMaterialsItem)
	2502	+ if (source == clearMaterialsItem)
2423	2503	{
2424	2504	ClearMaterials();
2425	2505	} else
2426		- if (event.getSource() == liveleavesItem)
	2506	+ if (source == liveleavesItem)
2427	2507	{
2428	2508	LiveLeaves(true);
2429	2509	} else
2430		- if (event.getSource() == unliveleavesItem)
	2510	+ if (source == unliveleavesItem)
2431	2511	{
2432	2512	LiveLeaves(false);
2433	2513	} else
2434		- if (event.getSource() == supportleavesItem)
	2514	+ if (source == supportleavesItem)
2435	2515	{
2436	2516	SupportLeaves(true);
2437	2517	} else
2438		- if (event.getSource() == unsupportleavesItem)
	2518	+ if (source == unsupportleavesItem)
2439	2519	{
2440	2520	SupportLeaves(false);
2441	2521	} else
2442		- if (event.getSource() == hideleavesItem)
	2522	+ if (source == hideleavesItem)
2443	2523	{
2444	2524	HideLeaves(true);
2445	2525	} else
2446		- if (event.getSource() == showleavesItem)
	2526	+ if (source == showleavesItem)
2447	2527	{
2448	2528	HideLeaves(false);
2449	2529	} else
2450		- if (event.getSource() == markleavesItem)
	2530	+ if (source == markleavesItem)
2451	2531	{
2452	2532	MarkLeaves(true);
2453	2533	} else
2454		- if (event.getSource() == unmarkleavesItem)
	2534	+ if (source == unmarkleavesItem)
2455	2535	{
2456	2536	MarkLeaves(false);
2457	2537	} else
2458		- if (event.getSource() == flipVItem)
	2538	+ if (source == flipVItem)
2459	2539	{
2460	2540	FlipV(true);
2461	2541	} else
2462		- if (event.getSource() == unflipVItem)
	2542	+ if (source == unflipVItem)
2463	2543	{
2464	2544	FlipV(false);
2465	2545	} else
2466		- if (event.getSource() == lowTexturesItem)
	2546	+ if (source == lowTexturesItem)
2467	2547	{
2468	2548	SetTexRes(0);
2469	2549	} else
2470		- if (event.getSource() == normalTexturesItem)
	2550	+ if (source == normalTexturesItem)
2471	2551	{
2472	2552	SetTexRes(1);
2473	2553	} else
2474		- if (event.getSource() == highTexturesItem)
	2554	+ if (source == highTexturesItem)
2475	2555	{
2476	2556	SetTexRes(2);
2477	2557	} else
2478		- if (event.getSource() == veryhighTexturesItem)
	2558	+ if (source == veryhighTexturesItem)
2479	2559	{
2480	2560	SetTexRes(3);
2481	2561	} else
2482		- if (event.getSource() == maxTexturesItem)
	2562	+ if (source == maxTexturesItem)
2483	2563	{
2484	2564	SetTexRes(4);
2485	2565	} else
2486		- if (event.getSource() == panoTexturesItem)
	2566	+ if (source == panoTexturesItem)
2487	2567	{
2488	2568	SetTexRes(5);
2489	2569	} else
2490		- if (event.getSource() == reverseNormalsItem)
	2570	+ if (source == reverseNormalsItem)
2491	2571	{
2492	2572	ReverseNormals();
2493	2573	} else
2494		- if (event.getSource() == parseverticesItem)
	2574	+ if (source == parseverticesItem)
2495	2575	{
2496	2576	ParseVertices();
2497	2577	} else
2498		- if (event.getSource() == textureFieldItem)
	2578	+ if (source == textureFieldItem)
2499	2579	{
2500	2580	TextureVertices();
2501	2581	} else
2502		- if (event.getSource() == alignItem)
	2582	+ if (source == alignItem)
2503	2583	{
2504	2584	Align();
2505	2585	} else
2506		- if (event.getSource() == mirrorItem)
	2586	+ if (source == mirrorItem)
2507	2587	{
2508	2588	MirrorPoses();
2509	2589	} else
2510		- if (event.getSource() == reduceMorphItem)
	2590	+ if (source == reduceMorphItem)
2511	2591	{
2512	2592	MeshReduction(false);
2513	2593	} else
2514		- if (event.getSource() == reduce34MorphItem)
	2594	+ if (source == reduce34MorphItem)
2515	2595	{
2516	2596	MeshReduction(true);
2517	2597	} else
2518		- if (event.getSource() == reverseTrianglesItem)
	2598	+ if (source == reverseTrianglesItem)
2519	2599	{
2520	2600	ReverseTriangles();
2521	2601	} else
2522		- if (event.getSource() == reduceMeshItem)
	2602	+ if (source == reduceMeshItem)
2523	2603	{
2524	2604	ReduceMesh(false);
2525	2605	} else
2526		- if (event.getSource() == reduce34MeshItem)
	2606	+ if (source == reduce34MeshItem)
2527	2607	{
2528	2608	ReduceMesh(true);
2529	2609	} else
2530		- if (event.getSource() == increaseMeshItem)
	2610	+ if (source == increaseMeshItem)
2531	2611	{
2532	2612	IncreaseMesh();
2533	2613	} else
2534		- if (event.getSource() == clipMeshItem)
	2614	+ if (source == clipMeshItem)
2535	2615	{
2536	2616	ClipMesh();
2537	2617	} else
2538		- if (event.getSource() == smoothMeshItem)
	2618	+ if (source == smoothMeshItem)
2539	2619	{
2540	2620	SmoothMesh();
2541	2621	} else
2542		- if (event.getSource() == transformgeometryItem)
	2622	+ if (source == transformGeometryItem)
2543	2623	{
2544	2624	TransformGeometry();
2545	2625	} else
2546		- if (event.getSource() == resetTransformItem)
	2626	+ if (source == transformChildrenItem)
	2627	+ {
	2628	+ TransformChildren();
	2629	+ } else
	2630	+ if (source == resetTransformItem)
2547	2631	{
2548	2632	ResetTransform();
2549	2633	} else
2550		- if (event.getSource() == resetCentroidItem)
	2634	+ if (source == resetCentroidItem)
2551	2635	{
2552		- ResetCentroid();
	2636	+ ResetCentroid(true);
2553	2637	} else
2554		- if (event.getSource() == resetParentItem)
	2638	+ if (source == resetCentroidXZItem)
	2639	+ {
	2640	+ ResetCentroid(false);
	2641	+ } else
	2642	+ if (source == resetParentItem)
2555	2643	{
2556	2644	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2557	2645	{
..	..	@@ -2561,7 +2649,7 @@
2561	2649
2562	2650	refreshContents();
2563	2651	} else
2564		- if (event.getSource() == repairParentItem)
	2652	+ if (source == repairParentItem)
2565	2653	{
2566	2654	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2567	2655	{
..	..	@@ -2575,7 +2663,7 @@
2575	2663
2576	2664	refreshContents();
2577	2665	} else
2578		- if (event.getSource() == repairShadowItem)
	2666	+ if (source == repairShadowItem)
2579	2667	{
2580	2668	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2581	2669	{
..	..	@@ -2589,7 +2677,7 @@
2589	2677
2590	2678	refreshContents();
2591	2679	} else
2592		- if (event.getSource() == sortbysizeItem)
	2680	+ if (source == sortbysizeItem)
2593	2681	{
2594	2682	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2595	2683	{
..	..	@@ -2601,7 +2689,7 @@
2601	2689	ResetModel();
2602	2690	refreshContents();
2603	2691	} else
2604		- if (event.getSource() == sortbynameItem)
	2692	+ if (source == sortbynameItem)
2605	2693	{
2606	2694	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2607	2695	{
..	..	@@ -2613,7 +2701,7 @@
2613	2701	ResetModel();
2614	2702	refreshContents();
2615	2703	} else
2616		- if (event.getSource() == attachPigmentItem)
	2704	+ if (source == attachPigmentItem)
2617	2705	{
2618	2706	String texture = GetFile("Attach pigment");
2619	2707	Object3D obj;
..	..	@@ -2625,7 +2713,7 @@
2625	2713
2626	2714	refreshContents();
2627	2715	} else
2628		- if (event.getSource() == detachPigmentItem)
	2716	+ if (source == detachPigmentItem)
2629	2717	{
2630	2718	Object3D obj;
2631	2719	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2636,7 +2724,7 @@
2636	2724
2637	2725	refreshContents();
2638	2726	} else
2639		- if (event.getSource() == attachBumpItem)
	2727	+ if (source == attachBumpItem)
2640	2728	{
2641	2729	String texture = GetFile("Attach bump");
2642	2730	Object3D obj;
..	..	@@ -2648,7 +2736,7 @@
2648	2736
2649	2737	refreshContents();
2650	2738	} else
2651		- if (event.getSource() == detachBumpItem)
	2739	+ if (source == detachBumpItem)
2652	2740	{
2653	2741	Object3D obj;
2654	2742	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2659,7 +2747,7 @@
2659	2747
2660	2748	refreshContents();
2661	2749	} else
2662		- if (event.getSource() == pigmentBumpItem)
	2750	+ if (source == pigmentBumpItem)
2663	2751	{
2664	2752	Object3D obj;
2665	2753	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2670,158 +2758,195 @@
2670	2758
2671	2759	refreshContents();
2672	2760	} else
2673		- if (event.getSource() == flashSelectionButton)
	2761	+ if (source == flashSelectionButton)
2674	2762	{
2675	2763	CameraPane.flash = true;
2676	2764	refreshContents();
2677	2765	} else
2678		- if (event.getSource() == oneButton)
	2766	+ if (source == oneButton)
2679	2767	{
2680	2768	} else
2681		- if (event.getSource() == twoButton)
	2769	+ if (source == twoButton)
2682	2770	{
2683	2771	radio.layout = twoButton;
2684	2772	// bug
2685	2773	//gridPanel.setDividerLocation(1.0);
2686	2774	//bigPanel.setDividerLocation(0.0);
2687		- bigThree.remove(scenePanel);
2688		- bigThree.remove(centralPanel);
2689		- bigThree.remove(XYZPanel);
2690		- aWindowConstraints.gridx = 0;
2691		- aWindowConstraints.gridy = 0;
2692		- aWindowConstraints.gridwidth = 1;
2693		- // aConstraints.gridheight = 3;
2694		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2695		- aWindowConstraints.weightx = 0;
2696		- aWindowConstraints.weighty = 1;
2697		- //bigThree.add(jtp, aWindowConstraints);
2698		- aWindowConstraints.weightx = 1;
2699		- aWindowConstraints.gridwidth = 3;
2700		- // aConstraints.gridheight = 3;
2701		- aWindowConstraints.gridx = 1;
2702		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2703		- bigThree.add(centralPanel, aWindowConstraints);
2704		- aWindowConstraints.weightx = 0;
2705		- aWindowConstraints.gridx = 4;
2706		- aWindowConstraints.gridwidth = 1;
2707		- // aConstraints.gridheight = 3;
2708		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2709		- //bigThree.add(XYZPanel, aWindowConstraints);
2710		- 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();
2711	2804	} else
2712		- if (event.getSource() == threeButton)
	2805	+ if (source == threeButton)
2713	2806	{
2714	2807	radio.layout = threeButton;
2715		- bigThree.remove(scenePanel);
2716		- bigThree.remove(centralPanel);
2717		- bigThree.remove(XYZPanel);
2718		- aWindowConstraints.gridx = 0;
2719		- aWindowConstraints.gridy = 0;
2720		- aWindowConstraints.gridwidth = 1;
2721		- // aConstraints.gridheight = 3;
2722		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2723		- aWindowConstraints.weightx = 0;
2724		- aWindowConstraints.weighty = 1;
2725		- //bigThree.add(jtp, aWindowConstraints);
2726		- aWindowConstraints.weightx = 1;
2727		- aWindowConstraints.gridwidth = 3;
2728		- // aConstraints.gridheight = 3;
2729		- aWindowConstraints.gridx = 1;
2730		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2731		- bigThree.add(centralPanel, aWindowConstraints);
2732		- aWindowConstraints.weightx = 0;
2733		- aWindowConstraints.gridx = 4;
2734		- aWindowConstraints.gridwidth = 1;
2735		- // aConstraints.gridheight = 3;
2736		- aConstraints.fill = GridBagConstraints.VERTICAL;
2737		- bigThree.add(XYZPanel, aWindowConstraints);
2738		- 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();
2739	2840	} else
2740		- if (event.getSource() == fourButton)
	2841	+ if (source == fourButton)
2741	2842	{
2742	2843	radio.layout = fourButton;
2743		- bigThree.remove(scenePanel);
2744		- bigThree.remove(centralPanel);
2745		- bigThree.remove(XYZPanel);
2746		- aWindowConstraints.gridx = 0;
2747		- aWindowConstraints.gridy = 0;
2748		- aWindowConstraints.gridwidth = 1;
2749		- // aWindowConstraints.gridheight = 3;
2750		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2751		- aWindowConstraints.weightx = 1;
2752		- aWindowConstraints.weighty = 1;
2753		- bigThree.add(scenePanel, aWindowConstraints);
2754		- aWindowConstraints.weightx = 1;
2755		- aWindowConstraints.gridwidth = 3;
2756		- // aConstraints.gridheight = 3;
2757		- aWindowConstraints.gridx = 1;
2758		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2759		- //bigThree.add(cameraPanel, aWindowConstraints);
2760		- aWindowConstraints.weightx = 0;
2761		- aWindowConstraints.gridx = 4;
2762		- aWindowConstraints.gridwidth = 1;
2763		- // aWindowConstraints.gridheight = 3;
2764		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2765		- //bigThree.add(XYZPanel, aWindowConstraints);
2766		- 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();
2767	2875	} else
2768		- if (event.getSource() == sixButton)
	2876	+ if (source == sixButton)
2769	2877	{
2770	2878	radio.layout = sixButton;
2771		- bigThree.remove(scenePanel);
2772		- bigThree.remove(centralPanel);
2773		- bigThree.remove(XYZPanel);
2774		- aWindowConstraints.gridx = 0;
2775		- aWindowConstraints.gridy = 0;
2776		- aWindowConstraints.gridwidth = 1;
2777		- // aConstraints.gridheight = 3;
2778		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2779		- aWindowConstraints.weightx = 0;
2780		- aWindowConstraints.weighty = 1;
2781		- bigThree.add(scenePanel, aWindowConstraints);
2782		- aWindowConstraints.weightx = 1;
2783		- aWindowConstraints.gridwidth = 3;
2784		- // aWindowConstraints.gridheight = 3;
2785		- aWindowConstraints.gridx = 1;
2786		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2787		- bigThree.add(centralPanel, aWindowConstraints);
2788		- aWindowConstraints.weightx = 0;
2789		- aWindowConstraints.gridx = 4;
2790		- aWindowConstraints.gridwidth = 1;
2791		- // aWindowConstraints.gridheight = 3;
2792		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2793		- //bigThree.add(XYZPanel, aConstraints);
2794		- 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();
2795	2911	} else
2796		- if (event.getSource() == sevenButton)
	2912	+ if (source == sevenButton)
2797	2913	{
2798	2914	radio.layout = sevenButton;
2799		- bigThree.remove(scenePanel);
2800		- bigThree.remove(centralPanel);
2801		- bigThree.remove(XYZPanel);
2802		- aWindowConstraints.gridx = 0;
2803		- aWindowConstraints.gridy = 0;
2804		- aWindowConstraints.gridwidth = 1;
2805		- // aWindowConstraints.gridheight = 3;
2806		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2807		- aWindowConstraints.weightx = 0;
2808		- aWindowConstraints.weighty = 1;
2809		- bigThree.add(scenePanel, aWindowConstraints);
2810		- aWindowConstraints.weightx = 1;
2811		- aWindowConstraints.gridwidth = 3;
2812		- // aWindowConstraints.gridheight = 3;
2813		- aWindowConstraints.gridx = 1;
2814		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2815		- bigThree.add(centralPanel, aWindowConstraints);
2816		- aWindowConstraints.weightx = 0;
2817		- aWindowConstraints.gridx = 4;
2818		- aWindowConstraints.gridwidth = 1;
2819		- // aConstraints.gridheight = 3;
2820		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2821		- bigThree.add(XYZPanel, aWindowConstraints);
2822		- 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();
2823	2948	} else
2824		- if (event.getSource() == rootButton)
	2949	+ if (source == rootButton)
2825	2950	{
2826	2951	Object3D obj;
2827	2952	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2833,7 +2958,7 @@
2833	2958
2834	2959	refreshContents(true);
2835	2960	} else
2836		- if (event.getSource() == closeButton)
	2961	+ if (source == closeButton)
2837	2962	{
2838	2963	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2839	2964	cRadio ab;
..	..	@@ -2854,11 +2979,11 @@
2854	2979	}
2855	2980	refreshContents(true);
2856	2981	} else
2857		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2982	+ if (source == editItem \|\| source == editButton)
2858	2983	{
2859	2984	EditSelection(false);
2860	2985	} else
2861		- if (event.getSource() == uneditButton)
	2986	+ if (source == uneditButton)
2862	2987	{
2863	2988	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2864	2989	{
..	..	@@ -2870,12 +2995,12 @@
2870	2995
2871	2996	child.editWindow = null; // ???????????
2872	2997	}
2873		- objEditor.ctrlPanel.revalidate();
	2998	+ objEditor.ctrlPanel.FlushUI();
2874	2999	//objEditor.jTree.clearSelection();
2875	3000	//objEditor.ResetSliders();
2876	3001	refreshContents(true);
2877	3002	} else
2878		- if (event.getSource() == clearPanelButton)
	3003	+ if (source == clearPanelButton)
2879	3004	{
2880	3005	assert(copy == group);
2881	3006	//copy.ClearUI();
..	..	@@ -2886,7 +3011,7 @@
2886	3011	listUI.clear();
2887	3012	refreshContents(true);
2888	3013	} else
2889		- if (event.getSource() == allParamsButton)
	3014	+ if (source == allParamsButton)
2890	3015	{
2891	3016	assert(copy == group);
2892	3017
..	..	@@ -2907,19 +3032,19 @@
2907	3032
2908	3033	refreshContents(true);
2909	3034	} else
2910		- if (event.getSource() == unselectButton)
	3035	+ if (source == unselectButton)
2911	3036	{
2912	3037	objEditor.jTree.clearSelection();
2913	3038	// ?? oct 2012 GrafreeD.clipboard.clear();
2914	3039	objEditor.ResetSliders();
2915	3040	refreshContents(true);
2916	3041	} else
2917		- if(event.getSource() instanceof cRadio)
	3042	+ if(source instanceof cRadio)
2918	3043	{
2919	3044	group.parent = keepparent;
2920	3045	group.attributes = 0;
2921	3046	//group.editWindow = null;
2922		- /cRadio/ radio = (cRadio)event.getSource();
	3047	+ /cRadio/ radio = (cRadio)source;
2923	3048	Object3D obj = radio.GetObject();
2924	3049	System.out.println("Edit " + obj);
2925	3050	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -3028,6 +3153,28 @@
3028	3153	refreshContents();
3029	3154	}
3030	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	+ }
3031	3178
3032	3179	void ResetTransform()
3033	3180	{
..	..	@@ -3140,7 +3287,7 @@
3140	3287	refreshContents();
3141	3288	}
3142	3289
3143		- void ResetCentroid()
	3290	+ void ResetCentroid(boolean full)
3144	3291	{
3145	3292	Object3D obj;
3146	3293	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3155,12 +3302,16 @@
3155	3302	LA.matIdentity(Object3D.mat);
3156	3303	obj.getBounds(minima, maxima, false);
3157	3304	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3158		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3305	+ if (full)
	3306	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3159	3307	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3160	3308	obj.TransformMesh(Object3D.mat);
	3309	+
3161	3310	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3162		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3311	+ if (full)
	3312	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3163	3313	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3314	+
3164	3315	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3165	3316	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3166	3317	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3226,9 +3377,9 @@
3226	3377	obj = (Object3D)e.nextElement();
3227	3378
3228	3379	System.out.println("Object is: " + obj);
3229		- GrafreeD.AnalyzeObject(obj);
	3380	+ Grafreed.AnalyzeObject(obj);
3230	3381	System.out.println("Boundary rep: " + obj.bRep);
3231		- GrafreeD.AnalyzeObject(obj.bRep);
	3382	+ Grafreed.AnalyzeObject(obj.bRep);
3232	3383
3233	3384	// System.err.println((size/1024) + " KB is the size of " + obj);
3234	3385	}
..	..	@@ -3442,8 +3593,8 @@
3442	3593
3443	3594	void ParseVertices()
3444	3595	{
3445		- boolean epsequal = GrafreeD.epsequal;
3446		- GrafreeD.epsequal = true;
	3596	+ boolean epsequal = Grafreed.epsequal;
	3597	+ Grafreed.epsequal = true;
3447	3598
3448	3599	for (int i=0; i<group.selection.size(); i++)
3449	3600	{
..	..	@@ -3468,7 +3619,7 @@
3468	3619	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3469	3620	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3470	3621
3471		- g.add(GrafreeD.clipboard);
	3622	+ g.add(Grafreed.clipboard);
3472	3623
3473	3624	buffer.add(g);
3474	3625	}
..	..	@@ -3483,7 +3634,7 @@
3483	3634	makeSomething(buffer, i==group.selection.size()-1);
3484	3635	}
3485	3636
3486		- GrafreeD.epsequal = epsequal;
	3637	+ Grafreed.epsequal = epsequal;
3487	3638
3488	3639	refreshContents();
3489	3640	}
..	..	@@ -3501,7 +3652,16 @@
3501	3652	String pigment = Object3D.GetPigment(tex);
3502	3653	//String bump = Object3D.GetBump(tex);
3503	3654
3504		- 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	+ }
3505	3665
3506	3666	double s = v.s;
3507	3667
..	..	@@ -3589,11 +3749,11 @@
3589	3749
3590	3750	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3591	3751
3592		- boolean random = CameraPane.RANDOM;
3593		- CameraPane.RANDOM = false; // parse all random nodes
	3752	+ boolean random = CameraPane.SWITCH;
	3753	+ CameraPane.SWITCH = false; // parse all random nodes
3594	3754	lowres.linkVerticesThis(null);
3595	3755	lowres.linkVerticesThis(sn);
3596		- CameraPane.RANDOM = random;
	3756	+ CameraPane.SWITCH = random;
3597	3757
3598	3758	System.err.flush();
3599	3759
..	..	@@ -3633,7 +3793,7 @@
3633	3793	return;
3634	3794
3635	3795	Object3D poses = group.selection.get(0);
3636		- Object3D ref = GrafreeD.clipboard.get(0);
	3796	+ Object3D ref = Grafreed.clipboard.get(0);
3637	3797
3638	3798	Object3D newgroup = new Object3D("Po:" + poses.name);
3639	3799
..	..	@@ -3827,9 +3987,9 @@
3827	3987
3828	3988	void ClipMesh()
3829	3989	{
3830		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3990	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3831	3991	{
3832		- Object3D content = GrafreeD.clipboard.get(0);
	3992	+ Object3D content = Grafreed.clipboard.get(0);
3833	3993
3834	3994	if (content instanceof cGroup && ((cGroup)content).transientlink )
3835	3995	content = ((cGroup)content).get(0);
..	..	@@ -3838,7 +3998,7 @@
3838	3998	// {
3839	3999	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3840	4000	// }
3841		- group.selection.ClipMesh(GrafreeD.clipboard);
	4001	+ group.selection.ClipMesh(Grafreed.clipboard);
3842	4002	}
3843	4003	// group.selection.ClipMesh(GrafreeD.clipboard);
3844	4004	System.out.println("DONE.");
..	..	@@ -4078,12 +4238,12 @@
4078	4238	System.err.println("info : " + child.GetPath());
4079	4239	}
4080	4240	}
4081		- else
4082		- {
4083		- objEditor.SetMaterial(group); // .GetMaterial());
4084		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4085		- System.err.println("info : " + group.GetPath());
4086		- }
	4241	+// else
	4242	+// {
	4243	+// objEditor.SetMaterial(group); // .GetMaterial());
	4244	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4245	+// System.err.println("info : " + group.GetPath());
	4246	+// }
4087	4247
4088	4248	objEditor.SetText(); // jan 2014
4089	4249
..	..	@@ -4178,12 +4338,12 @@
4178	4338	{
4179	4339	if (group.selection.isEmpty())
4180	4340	return;
4181		- GrafreeD.clipboardIsTempGroup = false;
	4341	+ Grafreed.clipboardIsTempGroup = false;
4182	4342	Composite tGroup = null;
4183	4343	if (group.selection.size() > 0) // 1)
4184	4344	{
4185	4345	tGroup = new cGroup();
4186		- GrafreeD.clipboardIsTempGroup = true;
	4346	+ Grafreed.clipboardIsTempGroup = true;
4187	4347	}
4188	4348
4189	4349	if (cut)
..	..	@@ -4223,16 +4383,16 @@
4223	4383	//System.out.println("cut " + child);
4224	4384	//System.out.println("parent = " + child.parent);
4225	4385	// tmp.addChild(child);
4226		- if (GrafreeD.clipboardIsTempGroup)
	4386	+ if (Grafreed.clipboardIsTempGroup)
4227	4387	tGroup.add/Child/(tmp);
4228	4388	else
4229		- GrafreeD.clipboard = tmp;
	4389	+ Grafreed.clipboard = tmp;
4230	4390	}
4231	4391	else
4232		- if (GrafreeD.clipboardIsTempGroup)
	4392	+ if (Grafreed.clipboardIsTempGroup)
4233	4393	tGroup.add/Child/(child);
4234	4394	else
4235		- GrafreeD.clipboard = child;
	4395	+ Grafreed.clipboard = child;
4236	4396	}
4237	4397
4238	4398	//ResetModel();
..	..	@@ -4264,21 +4424,21 @@
4264	4424	//System.out.println("cut " + elem);
4265	4425	//System.out.println("parent = " + elem.parent);
4266	4426	// tmp.addChild(elem);
4267		- if (GrafreeD.clipboardIsTempGroup)
	4427	+ if (Grafreed.clipboardIsTempGroup)
4268	4428	tGroup.add/Child/(tmp);
4269	4429	else
4270		- GrafreeD.clipboard = tmp;
	4430	+ Grafreed.clipboard = tmp;
4271	4431	}
4272	4432	else
4273		- if (GrafreeD.clipboardIsTempGroup)
	4433	+ if (Grafreed.clipboardIsTempGroup)
4274	4434	tGroup.add/Child/(child);
4275	4435	else
4276		- GrafreeD.clipboard = child;
	4436	+ Grafreed.clipboard = child;
4277	4437	}
4278	4438
4279	4439	}
4280		- if (GrafreeD.clipboardIsTempGroup)
4281		- GrafreeD.clipboard = tGroup;
	4440	+ if (Grafreed.clipboardIsTempGroup)
	4441	+ Grafreed.clipboard = tGroup;
4282	4442	if (cut)
4283	4443	{
4284	4444	ResetModel();
..	..	@@ -4292,7 +4452,7 @@
4292	4452	// return;
4293	4453	boolean first = true;
4294	4454
4295		- if (GrafreeD.clipboardIsTempGroup)
	4455	+ if (Grafreed.clipboardIsTempGroup)
4296	4456	{
4297	4457	Composite temp;
4298	4458
..	..	@@ -4303,7 +4463,7 @@
4303	4463	temp = (Composite)Applet3D.clipboard.deepCopy();
4304	4464	*/
4305	4465	Object3D elem;
4306		- 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))
4307	4467	{
4308	4468	Object3D child = (Object3D)e.nextElement();
4309	4469
..	..	@@ -4337,21 +4497,21 @@
4337	4497	//Object3D cb = Applet3D.clipboard;
4338	4498	//temp.addChild(cb);
4339	4499	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4340		- assert(GrafreeD.clipboard.parent == null);
4341		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4342		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4343		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4344		- 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());
4345	4505	else
4346		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4347		- GrafreeD.clipboard.get(0).parent = keepparent;
	4506	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4507	+ Grafreed.clipboard.get(0).parent = keepparent;
4348	4508	}
4349	4509
4350	4510	ResetModel();
4351	4511	refreshContents();
4352	4512	}
4353	4513
4354		- void pasteInto(boolean copyit)
	4514	+ void pasteInto(boolean copyit, boolean clone)
4355	4515	{
4356	4516	// if (GrafreeD.clipboard == null)
4357	4517	// return;
..	..	@@ -4380,15 +4540,22 @@
4380	4540	if (copyit)
4381	4541	{
4382	4542	// paste(false);
4383		- CloneClipboard(false); // sept 2014
	4543	+ if (clone)
	4544	+ {
	4545	+ CloneClipboard(false); // sept 2014
	4546	+ }
	4547	+ else
	4548	+ {
	4549	+ paste(false);
	4550	+ }
4384	4551	}
4385	4552	else
4386	4553	{
4387	4554	boolean first = true;
4388	4555
4389		- if (GrafreeD.clipboardIsTempGroup)
	4556	+ if (Grafreed.clipboardIsTempGroup)
4390	4557	{
4391		- Composite temp = (Composite)GrafreeD.clipboard;
	4558	+ Composite temp = (Composite)Grafreed.clipboard;
4392	4559	Object3D copy;
4393	4560	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4394	4561	{
..	..	@@ -4398,7 +4565,7 @@
4398	4565	}
4399	4566	} else
4400	4567	{
4401		- linkSomething(GrafreeD.clipboard); //.get(0));
	4568	+ linkSomething(Grafreed.clipboard); //.get(0));
4402	4569	}
4403	4570	}
4404	4571	}
..	..	@@ -4843,7 +5010,7 @@
4843	5010
4844	5011	void ImportVRMLX3D()
4845	5012	{
4846		- if (GrafreeD.standAlone)
	5013	+ if (Grafreed.standAlone)
4847	5014	{
4848	5015	/**/
4849	5016	FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
..	..	@@ -4860,7 +5027,7 @@
4860	5027
4861	5028	String GetFile(String dialogName)
4862	5029	{
4863		- if (GrafreeD.standAlone)
	5030	+ if (Grafreed.standAlone)
4864	5031	{
4865	5032	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4866	5033	browser.show();
..	..	@@ -4924,10 +5091,12 @@
4924	5091	cButton flashSelectionButton;
4925	5092	cButton editButton;
4926	5093	cButton uneditButton;
	5094	+ JCheckBox allParamsButton;
4927	5095	cButton clearpanelButton;
4928		- cButton allParamsButton;
4929	5096	cButton unselectButton;
4930	5097
	5098	+ cButton oneStepButton;
	5099	+
4931	5100	cButton screenfitButton;
4932	5101	cButton screenfitpointButton;
4933	5102	cButton snapobjectButton;
..	..	@@ -4971,7 +5140,7 @@
4971	5140	private MenuItem linkverticesItem;
4972	5141	private MenuItem relinkverticesItem;
4973	5142	private MenuItem setMasterItem;
4974		- private MenuItem resetMeshItem;
	5143	+ private MenuItem resetAllItem;
4975	5144	private MenuItem stepAllItem;
4976	5145	private MenuItem revertMeshItem;
4977	5146	private MenuItem poseMeshItem;
..	..	@@ -4982,6 +5151,7 @@
4982	5151	private MenuItem mergeGeometriesItem;
4983	5152	private MenuItem copyItem;
4984	5153	private MenuItem pasteItem;
	5154	+ private MenuItem pasteIntoItem;
4985	5155	private MenuItem pasteLinkItem;
4986	5156	private MenuItem pasteCloneItem;
4987	5157	private MenuItem pasteExpandItem;
..	..	@@ -5031,8 +5201,10 @@
5031	5201	private MenuItem panoTexturesItem;
5032	5202
5033	5203	private MenuItem resetCentroidItem;
5034		- private MenuItem transformgeometryItem;
	5204	+ private MenuItem resetCentroidXZItem;
5035	5205	private MenuItem resetTransformItem;
	5206	+ private MenuItem transformGeometryItem;
	5207	+ private MenuItem transformChildrenItem;
5036	5208	private MenuItem hideItem;
5037	5209	private MenuItem grabItem;
5038	5210	private MenuItem backItem;
..	..	@@ -5079,7 +5251,7 @@
5079	5251	private MenuItem blobItem;
5080	5252	private MenuItem latheItem;
5081	5253	private MenuItem bezierItem;
5082		- private MenuItem checkerItem;
	5254	+ private MenuItem overlayItem;
5083	5255	private MenuItem meshItem;
5084	5256	// private MenuItem meshGroupItem;
5085	5257	private MenuItem springItem;