~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,18 +185,31 @@
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"));
	211	+ if (Globals.ADVANCED)
	212	+ {
193	213	resetMeshItem = menu.add(new MenuItem("Reset All"));
194	214	resetMeshItem.addActionListener(this);
195	215	stepAllItem = menu.add(new MenuItem("Step All"));
..	..	@@ -199,6 +219,7 @@
199	219	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	220	resetreferencesItem.addActionListener(this);
201	221	menu.add("-");
	222	+ }
202	223	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	224	overwriteGeoItem.addActionListener(this);
204	225	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,17 +231,26 @@
210	231	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	232	overwriteUVItem.addActionListener(this);
212	233	menu.add("-");
	234	+ if (Globals.ADVANCED)
	235	+ {
213	236	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	237	generateMeshItem.addActionListener(this);
215	238	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	239	poseMeshItem.addActionListener(this);
217	240	menu.add("-");
	241	+ }
218	242	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	243	resetsupportItem.addActionListener(this);
220	244	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	245	linkverticesItem.addActionListener(this);
	246	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	247	+ relinkverticesItem.addActionListener(this);
	248	+
	249	+ if (Globals.ADVANCED)
	250	+ {
222	251	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	252	setMasterItem.addActionListener(this);
	253	+ }
224	254
225	255	oe.menuBar.add(menu = new Menu("Group"));
226	256	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -231,27 +261,38 @@
231	261	frontItem.addActionListener(this);
232	262	compositeItem = menu.add(new MenuItem("Composite"));
233	263	compositeItem.addActionListener(this);
	264	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	265	+ hideItem.addActionListener(this);
	266	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	267	+ ungroupItem.addActionListener(this);
234	268	menu.add("-");
235		- randomItem = menu.add(new MenuItem("Random"));
	269	+ randomItem = menu.add(new MenuItem("Switch node"));
236	270	randomItem.addActionListener(this);
237		- physicsItem = menu.add(new MenuItem("Physics"));
238		- physicsItem.addActionListener(this);
239		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
240		- frameselectorItem.addActionListener(this);
241	271	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	272	switchGeoItem.addActionListener(this);
243	273	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	274	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	275	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	276	morphItem.addActionListener(this);
	277	+
	278	+ if (Globals.ADVANCED)
	279	+ {
	280	+ menu.add("-");
	281	+ physicsItem = menu.add(new MenuItem("Physics"));
	282	+ physicsItem.addActionListener(this);
	283	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	284	+ frameselectorItem.addActionListener(this);
247	285	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	286	scriptNodeItem.addActionListener(this);
249	287	cameraItem = menu.add(new MenuItem("Camera"));
250	288	cameraItem.addActionListener(this);
	289	+ }
251	290
252	291	oe.menuBar.add(menu = new Menu("Object"));
253	292	textureItem = menu.add(new MenuItem("Texture"));
254	293	textureItem.addActionListener(this);
	294	+ billboardItem = menu.add(new MenuItem("Billboard"));
	295	+ billboardItem.addActionListener(this);
255	296	csgItem = menu.add(new MenuItem("CSG"));
256	297	csgItem.addActionListener(this);
257	298	shadowXItem = menu.add(new MenuItem("Shadow X"));
..	..	@@ -260,23 +301,29 @@
260	301	shadowYItem.addActionListener(this);
261	302	shadowZItem = menu.add(new MenuItem("Shadow Z"));
262	303	shadowZItem.addActionListener(this);
	304	+ if (Globals.ADVANCED)
	305	+ {
	306	+ menu.add("-");
263	307	linkerItem = menu.add(new MenuItem("Linker"));
264	308	linkerItem.addActionListener(this);
265		- templateItem = menu.add(new MenuItem("Template"));
266		- templateItem.addActionListener(this);
267	309	attributeItem = menu.add(new MenuItem("Attribute"));
268	310	attributeItem.addActionListener(this);
	311	+ templateItem = menu.add(new MenuItem("Template"));
	312	+ templateItem.addActionListener(this);
269	313	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	314	pointflowItem.addActionListener(this);
	315	+ }
271	316	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	317	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	318	resetTransformItem.addActionListener(this);
276	319	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	320	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	321	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	322	+ resetCentroidXZItem.addActionListener(this);
	323	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	324	+ transformGeometryItem.addActionListener(this);
	325	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	326	+ transformChildrenItem.addActionListener(this);
280	327
281	328	oe.menuBar.add(menu = new Menu("Geometry"));
282	329	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -287,6 +334,11 @@
287	334	genNormalsCADItem.addActionListener(this);
288	335	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
289	336	genNormalsMESHItem.addActionListener(this);
	337	+ if (Globals.ADVANCED)
	338	+ {
	339	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	340	+ genNormalsMINEItem.addActionListener(this);
	341	+ }
290	342	stripifyItem = menu.add(new MenuItem("Stripify"));
291	343	stripifyItem.addActionListener(this);
292	344	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -308,10 +360,14 @@
308	360	reduce34MeshItem.addActionListener(this);
309	361	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
310	362	increaseMeshItem.addActionListener(this);
311		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
312		- smoothMeshItem.addActionListener(this);
313	363	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
314	364	clipMeshItem.addActionListener(this);
	365	+
	366	+ if (Globals.ADVANCED)
	367	+ {
	368	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	369	+ smoothMeshItem.addActionListener(this);
	370	+ }
315	371
316	372	oe.menuBar.add(menu = new Menu("Attributes"));
317	373	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
..	..	@@ -321,10 +377,13 @@
321	377	liveleavesItem.addActionListener(this);
322	378	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
323	379	unliveleavesItem.addActionListener(this);
	380	+ if (Globals.ADVANCED)
	381	+ {
324	382	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
325	383	supportleavesItem.addActionListener(this);
326	384	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
327	385	unsupportleavesItem.addActionListener(this);
	386	+ }
328	387	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
329	388	hideleavesItem.addActionListener(this);
330	389	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -368,28 +427,34 @@
368	427	sortbynameItem = menu.add(new MenuItem("Sort by name"));
369	428	sortbynameItem.addActionListener(this);
370	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.
371	437	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
372	438	extractGeometriesItem.addActionListener(this);
373	439	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
374	440	cloneGeometriesItem.addActionListener(this);
375		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
376		- shareGeometriesItem.addActionListener(this);
377		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
378		- mergeGeometriesItem.addActionListener(this);
	441	+ }
379	442
380	443	oe.menuBar.add(menu = new Menu("Insert"));
381	444	buildCreateMenu(menu);
382	445
383		-
384	446	oe.menuBar.add(menu = new Menu("Include"));
385		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
386		- importGFDItem.addActionListener(this);
387		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
388		- importVRMLX3DItem.addActionListener(this);
389		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
	447	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
390	448	importOBJItem.addActionListener(this);
391		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
	449	+ menu.add("-");
	450	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
392	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);
393	458
394	459	oe.menuBar.add(menu = new Menu("Tools"));
395	460	buildToolsMenu(menu);
..	..	@@ -425,150 +490,98 @@
425	490	oe.radioPanel.add(dummyButton);
426	491	oe.buttonGroup.add(dummyButton);
427	492	*/
428		- aConstraints.gridy += 1;
429		- oe.aConstraints.gridwidth = 1;
430		- oe.aConstraints.gridx = 0;
	493	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
431	494
432		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	495	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	496	+ liveCB.setToolTipText("Enabled animation");
433	497	liveCB.addItemListener(this);
434	498
435		- oe.aConstraints.gridx += 1;
436		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
437		- supportCB.addItemListener(this);
438		-
439		- // oe.aConstraints.gridx += 1;
440		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
441		- // localCB.addItemListener(this);
442		-
443		- oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
445		- crowdCB.addItemListener(this);
446		-
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
449		- smoothCB.addItemListener(this);
450		-
451		- oe.aConstraints.gridx += 1;
452		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	499	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	500	+ oneStepButton.setToolTipText("Animate one step forward");
	501	+ oneStepButton.addActionListener(this);
	502	+
	503	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	504	+ fastCB.setToolTipText("Fast mode");
453	505	fastCB.addItemListener(this);
454		- oe.aConstraints.gridx += 1;
455		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
456		- slowCB.addItemListener(this);
457		- oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
459		- boxCB.addItemListener(this);
460		-
461		-// oe.aConstraints.gridx += 1;
462		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
463		-// speakerMocapCB.addItemListener(this);
464		-
465		- if (false)
466		- {
467		- // handled in scripts
468		- oe.aConstraints.gridx += 1;
469		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
470		- speakerCameraCB.addItemListener(this);
471		-
472		- oe.aConstraints.gridx += 1;
473		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
474		- speakerFocusCB.addItemListener(this);
475		-
476		- oe.aConstraints.gridx += 1;
477		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
478		- smoothfocusCB.addItemListener(this);
479		- }
480		-
481		-//oe.aConstraints.gridx += 1;
482		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
483		-// debugCB.addItemListener(this);
484		-
485		- oe.aConstraints.gridx += 1;
486		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
487		- oeilCB.addItemListener(this);
488		-
489		- oe.aConstraints.gridx += 1;
490		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
491		- lookAtCB.addItemListener(this);
492		-
493		- oe.aConstraints.gridx += 1;
494		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	506	+
	507	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	508	+ trackCB.setToolTipText("Enable tracking");
495	509	trackCB.addItemListener(this);
496	510
497		- oe.aConstraints.gridx += 1;
498		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	511	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	512	+ screenfitButton.setToolTipText("Screen fit");
499	513	screenfitButton.addActionListener(this);
500		- oe.aConstraints.gridx += 1;
	514	+
501	515	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
502	516	// screenfitpointButton.addActionListener(this);
503		-// oe.aConstraints.gridx += 1;
504		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
505		- snapobjectButton.addActionListener(this);
506		- oe.aConstraints.gridx += 1;
507	517
508		- //aConstraints.gridx = 0;
509		- //aConstraints.gridy += 1;
510		- oe.aConstraints.weighty = 0;
511		- oe.aConstraints.gridwidth = 1;
512		-
513		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	518	+ if (Globals.ADVANCED)
	519	+ {
	520	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	521	+ snapobjectButton.addActionListener(this);
	522	+ snapobjectButton.setToolTipText("Snap Object");
	523	+ }
	524	+
	525	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	526	+ flashSelectionButton.setToolTipText("Show selection");
514	527	flashSelectionButton.addActionListener(this);
515		- oe.aConstraints.gridx += 1;
516		- oe.aConstraints.weighty = 0;
517		- oe.aConstraints.gridwidth = 1;
518	528
519		- //
520		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	529	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	530	+
	531	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	532	+ twoButton.setToolTipText("Show center view only");
521	533	twoButton.addActionListener(this);
522		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	534	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
523	535	fourButton.addActionListener(this);
524		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	536	+ fourButton.setToolTipText("Show left panel only");
	537	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	538	+ sixButton.setToolTipText("2-column layout left");
525	539	sixButton.addActionListener(this);
526		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	540	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	541	+ threeButton.setToolTipText("2-column layout right");
527	542	threeButton.addActionListener(this);
528		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	543	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	544	+ sevenButton.setToolTipText("3-column layout");
529	545	sevenButton.addActionListener(this);
530	546	//
531	547
532		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	548	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	549	+ rootButton.setToolTipText("Edit selection in new tab");
533	550	rootButton.addActionListener(this);
534		- oe.aConstraints.gridx += 1;
535		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	551	+
	552	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	553	+ closeButton.setToolTipText("Close tab");
536	554	closeButton.addActionListener(this);
537	555	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
538	556	//clearButton.addActionListener(this);
539		- oe.aConstraints.gridx += 1;
540	557
541		- oe.aConstraints.gridx = 1; //
542		- 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");
543	562	editButton.addActionListener(this);
544		- oe.aConstraints.gridx += 1;
545		- oe.aConstraints.weighty = 0;
546		- oe.aConstraints.gridwidth = 1;
547	563
548		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	564	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	565	+ uneditButton.setToolTipText("Unedit selection");
549	566	uneditButton.addActionListener(this);
550	567
551		- oe.aConstraints.gridx += 1;
552		- oe.aConstraints.weighty = 0;
553		- oe.aConstraints.gridwidth = 1;
554		-
555		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
556		- clearPanelButton.addActionListener(this);
557		-
558		- oe.aConstraints.gridx += 1;
559		- oe.aConstraints.weighty = 0;
560		- oe.aConstraints.gridwidth = 1;
561		-
562		- 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");
563	570	allParamsButton.addActionListener(this);
564	571
565		- oe.aConstraints.gridx += 1;
566		- oe.aConstraints.weighty = 0;
567		- oe.aConstraints.gridwidth = 1;
568		-
569		- 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");
570	578	unselectButton.addActionListener(this);
571	579
	580	+ commandsPanel.preferredHeight = 1;
	581	+
	582	+ oe.treePanel.add(commandsPanel);
	583	+ oe.treePanel.Return();
	584	+
572	585	// oe.aConstraints.gridx += 1;
573	586	// oe.aConstraints.weighty = 0;
574	587	// oe.aConstraints.gridwidth = 1;
..	..	@@ -580,40 +593,37 @@
580	593	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
581	594	// gcButton.addActionListener(this);
582	595
583		- oe.aConstraints.gridx = 0;
584		- oe.aConstraints.gridy += 1;
585		-
586		- //ctrlPanel.add(objList = new List(5, true));
587		- oe.aConstraints.gridwidth = 100;
588		- // oe.aConstraints.gridheight = 100;
589		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
590		- oe.aConstraints.gridheight = 1;
591		- oe.aConstraints.weighty = 0.5;
592		- oe.aConstraints.gridx = 0;
593		- JScrollPane jSP;
	596	+ cGridBag jSPPanel = new cGridBag();
	597	+
	598	+ JScrollPane jSP;
594	599	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
595		- 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);
596	601	ResetModel();
597		- oe.aConstraints.weighty = 0.5;
598		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
599		- oe.aConstraints.gridy += 1;
600		- oe.aConstraints.gridwidth = 1;
	602	+
	603	+ oe.treePanel.add(jSPPanel);
	604	+ oe.treePanel.Return();
601	605
602		- oe.aConstraints.weighty = 0;
603		- oe.aConstraints.gridwidth = 2;
604		-
605		- 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");
606	610	colorCB.addItemListener(this);
607		- oe.aConstraints.gridx += 2;
608		- 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");
609	614	materialCB.addItemListener(this);
610		- oe.aConstraints.gridx += 2;
611		- 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");
612	618	textureCB.addItemListener(this);
613	619
614		- oe.aConstraints.gridx = 0;
615		- oe.aConstraints.gridy += 1;
	620	+ copyOptionsPanel.preferredHeight = 1;
	621	+ oe.treePanel.add(copyOptionsPanel);
	622	+ oe.treePanel.Return();
616	623
	624	+// mainPanel.setDividerLocation(0.5); //1.0);
	625	+// mainPanel.setResizeWeight(0.5);
	626	+
617	627	//jList.addListSelectionListener(this);
618	628	oe.jTree.addTreeSelectionListener(this);
619	629	//jTree.setRootVisible(false);
..	..	@@ -635,17 +645,89 @@
635	645	radio.layout = sevenButton;
636	646	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
637	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	+ }
638	720
639	721	void EditObject(Object3D obj)
640	722	{
641		- cRadio dummyButton = new cRadio(obj.name);
642		- dummyButton.SetObject(obj);
643		- dummyButton.layout = sevenButton;
644		- dummyButton.SetCamera(cameraView.renderCamera, false);
645		- dummyButton.addActionListener(this);
646		- radioPanel.add(dummyButton);
647		- buttonGroup.add(dummyButton);
648		- dummyButton.doClick();
	723	+ cRadio radioButton = new cRadio(obj.name);
	724	+ radioButton.SetObject(obj);
	725	+ radioButton.layout = sevenButton;
	726	+ radioButton.SetCamera(cameraView.renderCamera, false);
	727	+ radioButton.addActionListener(this);
	728	+ radioPanel.add(radioButton);
	729	+ buttonGroup.add(radioButton);
	730	+ radioButton.doClick();
649	731	}
650	732	void SetupViews(ObjEditor oe)
651	733	{
..	..	@@ -665,6 +747,7 @@
665	747	JCheckBox fastCB;
666	748	JCheckBox slowCB;
667	749	JCheckBox boxCB;
	750	+ JCheckBox zoomBoxCB;
668	751	JCheckBox trackCB;
669	752	JCheckBox smoothfocusCB;
670	753	// JCheckBox speakerMocapCB;
..	..	@@ -707,8 +790,7 @@
707	790	dropAttributes \|= Object3D.TEXTURE;
708	791	else
709	792	dropAttributes &= ~Object3D.TEXTURE;
710		- }
711		- else if(e.getSource() == liveCB)
	793	+ } else if(e.getSource() == liveCB)
712	794	{
713	795	cameraView.ToggleLive();
714	796	}
..	..	@@ -745,6 +827,10 @@
745	827	Recompile();
746	828	cameraView.repaint();
747	829	// refreshContents();
	830	+ }
	831	+ else if(e.getSource() == zoomBoxCB)
	832	+ {
	833	+ cameraView.ToggleZoomBoxMode();
748	834	}
749	835	else if(e.getSource() == smoothfocusCB)
750	836	{
..	..	@@ -859,7 +945,9 @@
859	945	// objEditor.DropFile((java.io.File[]) object, true);
860	946	// return;
861	947	// }
862		- if (string.charAt(0) == '/')
	948	+
	949	+ // File path for Mac and Windows
	950	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
863	951	{
864	952	// file(s)
865	953	String[] names = string.split("\n");
..	..	@@ -886,7 +974,7 @@
886	974
887	975	flashIt = false;
888	976	CameraPane pane = (CameraPane) target;
889		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	977	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
890	978	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
891	979
892	980	if (group.selection.size() == 1)
..	..	@@ -913,11 +1001,11 @@
913	1001	{
914	1002	loadClipboard(true);
915	1003	objEditor.jTree.setSelectionPath(destinationPath);
916		- pasteInto(false);
	1004	+ pasteInto(false, false);
917	1005	} else {
918	1006	loadClipboard(false);
919	1007	objEditor.jTree.setSelectionPath(destinationPath);
920		- pasteInto(false); // true); // ???
	1008	+ pasteInto(false, false); // true); // ???
921	1009	}
922	1010	}
923	1011	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1035,29 +1123,37 @@
1035	1123	torusItem.addActionListener(this);
1036	1124	superItem = menu.add(new MenuItem("Superellipsoid"));
1037	1125	superItem.addActionListener(this);
	1126	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1127	+ kleinItem.addActionListener(this);
1038	1128	particleItem = menu.add(new MenuItem("Particle system"));
1039	1129	particleItem.addActionListener(this);
	1130	+ if (Globals.ADVANCED)
	1131	+ {
1040	1132	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1041	1133	ragdollItem.addActionListener(this);
1042	1134	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1043	1135	ragdoll2Item.addActionListener(this);
	1136	+ }
1044	1137	menu.add("-");
1045		- meshItem = menu.add(new MenuItem("Mesh"));
	1138	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1046	1139	meshItem.addActionListener(this);
1047	1140	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1048	1141	// meshGroupItem.addActionListener(this);
	1142	+ if (Globals.ADVANCED)
	1143	+ {
1049	1144	springItem = menu.add(new MenuItem("Spring"));
1050	1145	springItem.addActionListener(this);
1051	1146	flagItem = menu.add(new MenuItem("Flag"));
1052	1147	flagItem.addActionListener(this);
1053		- bezierItem = menu.add(new MenuItem("Patch"));
1054		- bezierItem.addActionListener(this);
1055		- checkerItem = menu.add(new MenuItem("Checker"));
1056		- checkerItem.addActionListener(this);
1057	1148	blobItem = menu.add(new MenuItem("Blob"));
1058	1149	blobItem.addActionListener(this);
1059	1150	latheItem = menu.add(new MenuItem("Lathe"));
1060	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);
1061	1157	lightItem = menu.add(new MenuItem("Light"));
1062	1158	lightItem.addActionListener(this);
1063	1159	menu.add("-");
..	..	@@ -1067,34 +1163,39 @@
1067	1163	loopItem.addActionListener(this);
1068	1164	doubleItem = menu.add(new MenuItem("Fork"));
1069	1165	doubleItem.addActionListener(this);
	1166	+ if (Globals.ADVANCED)
	1167	+ {
1070	1168	tripleItem = menu.add(new MenuItem("Trident"));
1071	1169	tripleItem.addActionListener(this);
	1170	+ }
1072	1171	}
1073	1172
1074	1173	void buildToolsMenu(Menu menu)
1075	1174	{
1076	1175	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1077	1176	animationItem.addItemListener(this);
1078		- animationItem.setState(CameraPane.ANIMATION);
	1177	+ animationItem.setState(Globals.ANIMATION);
1079	1178
1080	1179	menu.add("-");
1081	1180	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1082	1181	parseverticesItem.addActionListener(this);
1083	1182	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1084	1183	textureFieldItem.addActionListener(this);
1085		- alignItem = menu.add(new MenuItem("Align"));
	1184	+ alignItem = menu.add(new MenuItem("Align Objects"));
1086	1185	alignItem.addActionListener(this);
1087		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1088		- mirrorItem.addActionListener(this);
1089	1186	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1090	1187	reduceMorphItem.addActionListener(this);
1091	1188	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1092	1189	reduce34MorphItem.addActionListener(this);
1093		-
	1190	+ menu.add("-");
1094	1191	menu.add(computeAOItem = new MenuItem("Compute AO"));
1095	1192	computeAOItem.addActionListener(this);
1096		- menu.add("-");
1097	1193
	1194	+ if (Globals.ADVANCED)
	1195	+ {
	1196	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1197	+ mirrorItem.addActionListener(this);
	1198	+ menu.add("-");
1098	1199	menu.add(memoryItem = new MenuItem("Memory Usage"));
1099	1200	memoryItem.addActionListener(this);
1100	1201	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1108,6 +1209,8 @@
1108	1209	resetParentItem.addActionListener(this);
1109	1210	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1110	1211	repairParentItem.addActionListener(this);
	1212	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1213	+ repairShadowItem.addActionListener(this);
1111	1214	menu.add(invariantsItem = new MenuItem("Invariants"));
1112	1215	invariantsItem.addActionListener(this);
1113	1216	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1115,6 +1218,7 @@
1115	1218	menu.add("-");
1116	1219	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1117	1220	editScriptItem.addActionListener(this);
	1221	+ }
1118	1222	}
1119	1223
1120	1224	void ScreenFit()
..	..	@@ -1443,9 +1547,9 @@
1443	1547
1444	1548	void Overwrite(int mask)
1445	1549	{
1446		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1550	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1447	1551	{
1448		- Object3D content = GrafreeD.clipboard.get(0);
	1552	+ Object3D content = Grafreed.clipboard.get(0);
1449	1553
1450	1554	if (content instanceof cGroup && ((cGroup)content).transientlink )
1451	1555	content = ((cGroup)content).get(0);
..	..	@@ -1468,6 +1572,7 @@
1468	1572	//
1469	1573	public void actionPerformed(ActionEvent event) // , Object arg)
1470	1574	{
	1575	+ Object source = event.getSource();
1471	1576	/*
1472	1577	if (event.getSource() == nameField)
1473	1578	{
..	..	@@ -1479,11 +1584,11 @@
1479	1584	}
1480	1585	else
1481	1586	*/
1482		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1587	+ if (source == lookAtItem \|\| source == lookFromItem)
1483	1588	{
1484	1589	ScreenFit();
1485	1590	} else
1486		- if (event.getSource() == switchItem)
	1591	+ if (source == switchItem)
1487	1592	{
1488	1593	cVector v1 = new cVector();
1489	1594	cVector v2 = new cVector();
..	..	@@ -1492,11 +1597,11 @@
1492	1597	objEditor.cameraView.renderCamera.setAim(v2, v1);
1493	1598	objEditor.cameraView.repaint();
1494	1599	} else
1495		- if (event.getSource() == rectoidItem)
	1600	+ if (source == rectoidItem)
1496	1601	{
1497	1602	makeSomething(new Box());
1498	1603	} else
1499		- if (event.getSource() == particleItem)
	1604	+ if (source == particleItem)
1500	1605	{
1501	1606	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1502	1607	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1517,9 +1622,9 @@
1517	1622	applyExample(particleGeom, "SMOKE");
1518	1623	makeSomething(particleGeom);
1519	1624	} else
1520		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1625	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1521	1626	{
1522		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1627	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1523	1628
1524	1629	ragdoll.toParent = LA.newMatrix();
1525	1630	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1537,7 +1642,7 @@
1537	1642	} else
1538	1643	/*
1539	1644	*/
1540		- if (event.getSource() == heightFieldItem)
	1645	+ if (source == heightFieldItem)
1541	1646	{
1542	1647	Object3D obj = new Object3D();
1543	1648
..	..	@@ -1575,27 +1680,31 @@
1575	1680
1576	1681	makeSomething(obj);
1577	1682	} else
1578		- if (event.getSource() == gridItem)
	1683	+ if (source == gridItem)
1579	1684	{
1580	1685	makeSomething(new Grid());
1581	1686	} else
1582		- if (event.getSource() == ellipsoidItem)
	1687	+ if (source == ellipsoidItem)
1583	1688	{
1584	1689	makeSomething(new Sphere());
1585	1690	} else
1586		- if (event.getSource() == coneItem)
	1691	+ if (source == coneItem)
1587	1692	{
1588	1693	makeSomething(new Cone());
1589	1694	} else
1590		- if (event.getSource() == torusItem)
	1695	+ if (source == torusItem)
1591	1696	{
1592	1697	makeSomething(new Torus());
1593	1698	} else
1594		- if (event.getSource() == superItem)
	1699	+ if (source == superItem)
1595	1700	{
1596	1701	makeSomething(new Superellipsoid());
1597	1702	} else
1598		- if (event.getSource() == blobItem)
	1703	+ if (source == kleinItem)
	1704	+ {
	1705	+ makeSomething(new Klein());
	1706	+ } else
	1707	+ if (source == blobItem)
1599	1708	{
1600	1709	Blob blob = new Blob();
1601	1710	BlobComponent comp = new BlobComponent();
..	..	@@ -1603,15 +1712,15 @@
1603	1712	//blob.retile();
1604	1713	makeSomething(blob);
1605	1714	} else
1606		- if (event.getSource() == latheItem)
	1715	+ if (source == latheItem)
1607	1716	{
1608	1717	makeSomething(new Lathe());
1609	1718	} else
1610		- if (event.getSource() == bezierItem)
	1719	+ if (source == bezierItem)
1611	1720	{
1612	1721	makeSomething(new BezierSurface());
1613	1722	} else
1614		- if (event.getSource() == checkerItem)
	1723	+ if (source == overlayItem)
1615	1724	{
1616	1725	/*
1617	1726	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1626,7 +1735,7 @@
1626	1735	*/
1627	1736	makeSomething(new Checker());
1628	1737	} else
1629		- if (event.getSource() == meshItem)
	1738	+ if (source == meshItem)
1630	1739	{
1631	1740	Object3D itemtomake = new Object3D();
1632	1741	Object3D child;
..	..	@@ -1647,35 +1756,35 @@
1647	1756	makeSomething(child);
1648	1757	}
1649	1758	} else
1650		- if (event.getSource() == springItem)
	1759	+ if (source == springItem)
1651	1760	{
1652	1761	cSpring s = new cSpring();
1653	1762	s.setup();
1654	1763	makeSomething(s);
1655	1764	} else
1656		- if (event.getSource() == flagItem)
	1765	+ if (source == flagItem)
1657	1766	{
1658	1767	cSpring s = new cFlag();
1659	1768	s.setup();
1660	1769	makeSomething(s);
1661	1770	} else
1662		- if (event.getSource() == lightItem)
	1771	+ if (source == lightItem)
1663	1772	{
1664	1773	makeSomething(new Light());
1665	1774	} else
1666		- if (event.getSource() == csgItem)
	1775	+ if (source == csgItem)
1667	1776	{
1668	1777	group(new CSG());
1669	1778	} else
1670		- if (event.getSource() == templateItem)
	1779	+ if (source == templateItem)
1671	1780	{
1672	1781	group(new cTemplate());
1673	1782	} else
1674		- if (event.getSource() == attributeItem)
	1783	+ if (source == attributeItem)
1675	1784	{
1676	1785	makeSomething(new Attribute());
1677	1786	} else
1678		- if (event.getSource() == pointflowItem)
	1787	+ if (source == pointflowItem)
1679	1788	{
1680	1789	makeSomething(new PointFlow());
1681	1790	} else
..	..	@@ -1687,7 +1796,7 @@
1687	1796	} else
1688	1797	*/
1689	1798
1690		- if (event.getSource() == superLoopItem)
	1799	+ if (source == superLoopItem)
1691	1800	{
1692	1801	Composite g = new cGroup();
1693	1802	for (int i=0; i<15; i++)
..	..	@@ -1709,7 +1818,7 @@
1709	1818
1710	1819	group(g);
1711	1820	} else
1712		- if (event.getSource() == loopItem)
	1821	+ if (source == loopItem)
1713	1822	{
1714	1823	Composite csg = new GroupLeaf();
1715	1824	csg.count = 5;
..	..	@@ -1718,7 +1827,7 @@
1718	1827	csg.addChild(child);
1719	1828	child.addChild(csg);
1720	1829	} else
1721		- if (event.getSource() == doubleItem)
	1830	+ if (source == doubleItem)
1722	1831	{
1723	1832	Composite csg = new GroupLeaf();
1724	1833	csg.count = 5;
..	..	@@ -1730,7 +1839,7 @@
1730	1839	csg.addChild(child);
1731	1840	child.addChild(csg);
1732	1841	} else
1733		- if (event.getSource() == tripleItem)
	1842	+ if (source == tripleItem)
1734	1843	{
1735	1844	Composite csg = new GroupLeaf();
1736	1845	csg.count = 4;
..	..	@@ -1746,70 +1855,83 @@
1746	1855	child.addChild(csg);
1747	1856	} else
1748	1857
1749		- if (event.getSource() == importGFDItem)
	1858	+ if (source == importGFDItem)
1750	1859	{
1751	1860	ImportGFD();
1752	1861	} else
1753		- if (event.getSource() == importVRMLX3DItem)
	1862	+ if (source == importVRMLX3DItem)
1754	1863	{
1755	1864	ImportVRMLX3D();
1756	1865	} else
1757		- if (event.getSource() == import3DSItem)
	1866	+ if (source == import3DSItem)
1758	1867	{
1759	1868	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1760	1869	} else
1761		- if (event.getSource() == importOBJItem)
	1870	+ if (source == importOBJItem)
1762	1871	{
1763		- 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	+ }
1764	1881	} else
1765		- if (event.getSource() == computeAOItem)
	1882	+ if (source == computeAOItem)
1766	1883	{
1767		- CameraPane.drawMode = CameraPane.OCCLUSION;
1768		- CameraPane.theRenderer.repaint();
	1884	+ Globals.drawMode = CameraPane.OCCLUSION;
	1885	+ Globals.theRenderer.repaint();
1769	1886	} else
1770		- if (event.getSource() == recompileItem)
	1887	+ if (source == recompileItem)
1771	1888	{
1772	1889	Recompile();
1773	1890	refreshContents();
1774	1891	} else
1775		- if (event.getSource() == editScriptItem)
	1892	+ if (source == editScriptItem)
1776	1893	{
1777	1894	OpenDialog();
1778	1895	refreshContents();
1779	1896	} else
1780		- if (event.getSource() == invariantsItem)
	1897	+ if (source == invariantsItem)
1781	1898	{
1782	1899	System.out.println("Invariants:");
1783		- GrafreeD.theApplet3D.universe.invariants();
	1900	+ Grafreed.grafreeD.universe.invariants();
1784	1901	} else
1785		- if (event.getSource() == memoryItem)
	1902	+ if (source == memoryItem)
1786	1903	{
1787	1904	//System.out.println("Invariants:");
1788	1905	PrintMemory();
1789	1906	} else
1790		- if (event.getSource() == pathItem)
	1907	+ if (source == pathItem)
1791	1908	{
1792	1909	PrintPath();
1793	1910	} else
1794		- if (event.getSource() == analyzeItem)
	1911	+ if (source == analyzeItem)
1795	1912	{
1796	1913	AnalyzeObject();
1797	1914	} else
1798		- if (event.getSource() == dumpItem)
	1915	+ if (source == dumpItem)
1799	1916	{
1800	1917	DumpObject();
1801	1918	} else
1802		- if (event.getSource() == screenfitButton)
	1919	+ if (source == oneStepButton)
	1920	+ {
	1921	+ Globals.ONESTEP = true;
	1922	+ cameraView.repaint();
	1923	+ } else
	1924	+ if (source == screenfitButton)
1803	1925	{
1804	1926	//Reload(lastConverter, lastFilename, true);
1805	1927	ScreenFit();
1806	1928	} else
1807		- if (event.getSource() == screenfitpointButton)
	1929	+ if (source == screenfitpointButton)
1808	1930	{
1809	1931	//Reload(lastConverter, lastFilename, true);
1810	1932	ScreenFitPoint();
1811	1933	} else
1812		- if (event.getSource() == snapobjectButton)
	1934	+ if (source == snapobjectButton)
1813	1935	{
1814	1936	//Reload(lastConverter, lastFilename, true);
1815	1937	SnapObject();
..	..	@@ -1820,13 +1942,13 @@
1820	1942	// Recompile();
1821	1943	// refreshContents();
1822	1944	// } else
1823		- if (event.getSource() == gcButton)
	1945	+ if (source == gcButton)
1824	1946	{
1825	1947	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	1948	System.gc();
1827	1949	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1828	1950	} else
1829		- if (event.getSource() == editLeafItem)
	1951	+ if (source == editLeafItem)
1830	1952	{
1831	1953	Object3D obj;
1832	1954	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1840,62 +1962,66 @@
1840	1962	}
1841	1963	refreshContents(true);
1842	1964	} else
1843		- if (event.getSource() == openWindowItem)
	1965	+ if (source == openWindowItem)
1844	1966	{
1845	1967	EditSelection(true);
1846	1968	} else
1847		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1969	+ if (source == cutItem \|\| source == clearButton)
1848	1970	{
1849	1971	loadClipboard(true);
1850	1972	} else
1851		- if (event.getSource() == duplicateItem)
	1973	+ if (source == duplicateItem)
1852	1974	{
1853		- Object3D keep = GrafreeD.clipboard;
	1975	+ Object3D keep = Grafreed.clipboard;
1854	1976	loadClipboard(false);
1855	1977	paste(false);
1856		- GrafreeD.clipboard = keep;
	1978	+ Grafreed.clipboard = keep;
1857	1979	} else
1858		- if (event.getSource() == cloneItem)
	1980	+ if (source == cloneItem)
1859	1981	{
1860	1982	CloneSelection(false);
1861	1983	} else
1862		- if (event.getSource() == cloneSupportItem)
	1984	+ if (source == cloneSupportItem)
1863	1985	{
1864	1986	CloneSelection(true);
1865	1987	} else
1866		- if (event.getSource() == copyItem)
	1988	+ if (source == copyItem)
1867	1989	{
1868	1990	loadClipboard(false);
1869	1991	} else
1870		- if (event.getSource() == pasteItem)
	1992	+ if (source == pasteItem)
1871	1993	{
1872	1994	paste(false);
1873	1995	} else
1874		- if (event.getSource() == pasteLinkItem)
	1996	+ if (source == pasteIntoItem)
1875	1997	{
1876		- pasteInto(false);
	1998	+ pasteInto(true, false);
1877	1999	} else
1878		- if (event.getSource() == pasteCloneItem)
	2000	+ if (source == pasteLinkItem)
1879	2001	{
1880		- pasteInto(true);
	2002	+ pasteInto(false, false);
1881	2003	} else
1882		- if (event.getSource() == pasteExpandItem)
	2004	+ if (source == pasteCloneItem)
	2005	+ {
	2006	+ pasteInto(true, true);
	2007	+ } else
	2008	+ if (source == pasteExpandItem)
1883	2009	{
1884	2010	paste(true);
1885	2011	} else
1886		- if (event.getSource() == synchronizeItem)
	2012	+ if (source == synchronizeItem)
1887	2013	{
1888	2014	Overwrite(Object3D.TRANSFORM);
1889	2015	} else
1890		- if (event.getSource() == overwriteNameItem)
	2016	+ if (source == overwriteNameItem)
1891	2017	{
1892	2018	Overwrite(Object3D.NAME);
1893	2019	} else
1894		- if (event.getSource() == overwriteUVItem)
	2020	+ if (source == overwriteUVItem)
1895	2021	{
1896	2022	Overwrite(Object3D.UV);
1897	2023	} else
1898		- if (event.getSource() == overwriteMatItem)
	2024	+ if (source == overwriteMatItem)
1899	2025	{
1900	2026	/* july 2015
1901	2027	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1915,7 +2041,7 @@
1915	2041
1916	2042	Overwrite(dropAttributes);
1917	2043	}
1918		- if (event.getSource() == overwriteGeoItem)
	2044	+ if (source == overwriteGeoItem)
1919	2045	{
1920	2046	Overwrite(Object3D.GEOMETRY);
1921	2047	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1932,7 +2058,7 @@
1932	2058	// refreshContents();
1933	2059	// }
1934	2060	} else
1935		- if (event.getSource() == generateMeshItem)
	2061	+ if (source == generateMeshItem)
1936	2062	{
1937	2063	//if (group.selection.size() == 1)
1938	2064	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1943,7 +2069,7 @@
1943	2069	ResetModel();
1944	2070	refreshContents();
1945	2071	} else
1946		- if (event.getSource() == extractGeometriesItem)
	2072	+ if (source == extractGeometriesItem)
1947	2073	{
1948	2074	boolean one = false;
1949	2075
..	..	@@ -1970,7 +2096,7 @@
1970	2096	ResetModel();
1971	2097	refreshContents();
1972	2098	} else
1973		- if (event.getSource() == cloneGeometriesItem)
	2099	+ if (source == cloneGeometriesItem)
1974	2100	{
1975	2101	boolean one = false;
1976	2102
..	..	@@ -1996,32 +2122,37 @@
1996	2122	ResetModel();
1997	2123	refreshContents();
1998	2124	} else
1999		- if (event.getSource() == shareGeometriesItem)
	2125	+ if (source == shareGeometriesItem)
2000	2126	{
2001	2127	boolean one = false;
2002	2128
2003	2129	if (group.selection.size() == 1)
2004	2130	one = true;
2005	2131
	2132	+ Object3D merge = null;
	2133	+
2006	2134	Object3D content = new cGroup();
2007	2135
2008	2136	for (int i=0; i<group.selection.size(); i++)
2009	2137	{
2010		- Object3D sel = new Merge(group.selection.get(i));
	2138	+ merge = new Merge(group.selection.get(i));
2011	2139
2012	2140	if (one)
2013		- makeSomething(sel, false);
	2141	+ makeSomething(merge, false);
2014	2142	else
2015		- content.addChild(sel);
	2143	+ content.addChild(merge);
2016	2144	}
2017	2145
2018	2146	if (!one)
2019		- makeSomething(content, false);
2020		-
2021		- ResetModel();
2022		- refreshContents();
	2147	+ makeSomething(content, true);
	2148	+ else
	2149	+ {
	2150	+ ResetModel();
	2151	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2152	+ refreshContents();
	2153	+ }
2023	2154	} else
2024		- if (event.getSource() == mergeGeometriesItem)
	2155	+ if (source == mergeGeometriesItem)
2025	2156	{
2026	2157	boolean one = false;
2027	2158
..	..	@@ -2051,7 +2182,7 @@
2051	2182	ResetModel();
2052	2183	refreshContents();
2053	2184	} else
2054		- if (event.getSource() == linkverticesItem)
	2185	+ if (source == linkverticesItem)
2055	2186	{
2056	2187	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2057	2188	// {
..	..	@@ -2064,39 +2195,48 @@
2064	2195	// group.selection.get(0).setMasterThis(content); // should be identity
2065	2196	// refreshContents();
2066	2197	// }
2067		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2198	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2068	2199	{
2069		- Object3D content = GrafreeD.clipboard.get(0);
	2200	+ Object3D content = Grafreed.clipboard.get(0);
2070	2201
2071	2202	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	2203	content = ((cGroup)content).get(0);
2073	2204
2074		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2205	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2075	2206	for (int i=0; i<group.selection.size(); i++)
2076	2207	{
2077		- boolean random = CameraPane.RANDOM;
2078		- CameraPane.RANDOM = false; // parse all random nodes
	2208	+ boolean random = CameraPane.SWITCH;
	2209	+ CameraPane.SWITCH = false; // parse all random nodes
2079	2210	group.selection.get(i).linkVerticesThis(content);
2080	2211	// group.selection.get(i).setMasterThis(content); // should be identity
2081		- CameraPane.RANDOM = random;
	2212	+ CameraPane.SWITCH = random;
2082	2213	}
2083		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2214	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2084	2215	refreshContents();
2085	2216	}
2086	2217	} else
2087		- if (event.getSource() == resetsupportItem)
	2218	+ if (source == resetsupportItem)
2088	2219	{
2089	2220	for (int i=0; i<group.selection.size(); i++)
2090	2221	{
2091		- boolean random = CameraPane.RANDOM;
2092		- CameraPane.RANDOM = false; // parse all random nodes
	2222	+ boolean random = CameraPane.SWITCH;
	2223	+ CameraPane.SWITCH = false; // parse all random nodes
2093	2224	group.selection.get(i).linkVerticesThis(null);
2094		- CameraPane.RANDOM = random;
	2225	+ CameraPane.SWITCH = random;
2095	2226	}
2096	2227
2097	2228	refreshContents();
2098	2229	} else
2099		- if (event.getSource() == resetreferencesItem)
	2230	+ if (source == relinkverticesItem)
	2231	+ {
	2232	+ boolean random = CameraPane.SWITCH;
	2233	+ CameraPane.SWITCH = false; // parse all random nodes
	2234	+ group.selection.RelinkToSupport();
	2235	+ CameraPane.SWITCH = random;
	2236	+
	2237	+ refreshContents();
	2238	+ } else
	2239	+ if (source == resetreferencesItem)
2100	2240	{
2101	2241	for (int i=0; i<group.selection.size(); i++)
2102	2242	{
..	..	@@ -2105,11 +2245,11 @@
2105	2245
2106	2246	refreshContents();
2107	2247	} else
2108		- if (event.getSource() == setMasterItem)
	2248	+ if (source == setMasterItem)
2109	2249	{
2110		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2250	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2111	2251	{
2112		- Object3D content = GrafreeD.clipboard.get(0);
	2252	+ Object3D content = Grafreed.clipboard.get(0);
2113	2253
2114	2254	if (content instanceof cGroup && ((cGroup)content).transientlink )
2115	2255	content = ((cGroup)content).get(0);
..	..	@@ -2118,13 +2258,13 @@
2118	2258	refreshContents();
2119	2259	}
2120	2260	} else
2121		- if (event.getSource() == poseMeshItem)
	2261	+ if (source == poseMeshItem)
2122	2262	{
2123	2263	if (group.selection.size() == 1)
2124	2264	{
2125		- if (GrafreeD.clipboard.size() == 1)
	2265	+ if (Grafreed.clipboard.size() == 1)
2126	2266	{
2127		- Object3D content = GrafreeD.clipboard.get(0);
	2267	+ Object3D content = Grafreed.clipboard.get(0);
2128	2268
2129	2269	if (content instanceof cGroup && ((cGroup)content).transientlink )
2130	2270	content = ((cGroup)content).get(0);
..	..	@@ -2137,19 +2277,19 @@
2137	2277	}
2138	2278
2139	2279	} else
2140		- if (event.getSource() == revertMeshItem)
	2280	+ if (source == revertMeshItem)
2141	2281	{
2142	2282	RevertMeshes();
2143	2283	} else
2144		- if (event.getSource() == resetMeshItem)
	2284	+ if (source == resetMeshItem)
2145	2285	{
2146	2286	ResetAll();
2147	2287	} else
2148		- if (event.getSource() == stepAllItem)
	2288	+ if (source == stepAllItem)
2149	2289	{
2150	2290	StepAll();
2151	2291	} else
2152		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2292	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2153	2293	{
2154	2294	//int indices[] = jList.getSelectedIndices();
2155	2295	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2157,42 +2297,46 @@
2157	2297
2158	2298	ClearSelection(false);
2159	2299	} else
2160		- if (event.getSource() == clearAllItem)
	2300	+ if (source == clearAllItem)
2161	2301	{
2162	2302	ClearSelection(true);
2163	2303	} else
2164		- if (event.getSource() == grabItem)
	2304	+ if (source == grabItem)
2165	2305	{
2166	2306	group(new cGroup(), true);
2167	2307	} else
2168		- if (event.getSource() == frontItem)
	2308	+ if (source == hideItem)
	2309	+ {
	2310	+ group(new HiddenObject());
	2311	+ } else
	2312	+ if (source == frontItem)
2169	2313	{
2170	2314	front();
2171	2315	} else
2172		- if (event.getSource() == backItem)
	2316	+ if (source == backItem)
2173	2317	{
2174	2318	back();
2175	2319	} else
2176		- if (event.getSource() == cameraItem)
	2320	+ if (source == cameraItem)
2177	2321	{
2178	2322	makeSomething(new Camera());
2179	2323	} else
2180		- if (event.getSource() == compositeItem)
	2324	+ if (source == compositeItem)
2181	2325	{
2182	2326	group(new Composite());
2183	2327	} else
2184		- if (event.getSource() == randomItem)
	2328	+ if (source == randomItem)
2185	2329	{
2186	2330	RandomNode random = new RandomNode();
2187	2331	group(random);
2188	2332	if (random.size() > 0)
2189		- random.name = random.get(0).name + "Rnd";
	2333	+ random.name = random.get(0).name + "Switch";
2190	2334	} else
2191		- if (event.getSource() == physicsItem)
	2335	+ if (source == physicsItem)
2192	2336	{
2193	2337	group(new PhysicsNode());
2194	2338	} else
2195		- if (event.getSource() == frameselectorItem)
	2339	+ if (source == frameselectorItem)
2196	2340	{
2197	2341	for (int i=0; i<group.selection.size(); i++)
2198	2342	{
..	..	@@ -2204,7 +2348,7 @@
2204	2348	ResetModel();
2205	2349	refreshContents();
2206	2350	} else
2207		- if (event.getSource() == switchGeoItem)
	2351	+ if (source == switchGeoItem)
2208	2352	{
2209	2353	for (int i=0; i<group.selection.size(); i++)
2210	2354	{
..	..	@@ -2216,7 +2360,7 @@
2216	2360	ResetModel();
2217	2361	refreshContents();
2218	2362	} else
2219		- if (event.getSource() == switchTransfoItem)
	2363	+ if (source == switchTransfoItem)
2220	2364	{
2221	2365	for (int i=0; i<group.selection.size(); i++)
2222	2366	{
..	..	@@ -2228,7 +2372,7 @@
2228	2372	ResetModel();
2229	2373	refreshContents();
2230	2374	} else
2231		- if (event.getSource() == morphItem)
	2375	+ if (source == morphItem)
2232	2376	{
2233	2377	for (int i=0; i<group.selection.size(); i++)
2234	2378	{
..	..	@@ -2240,7 +2384,7 @@
2240	2384	ResetModel();
2241	2385	refreshContents();
2242	2386	} else
2243		- if (event.getSource() == scriptNodeItem)
	2387	+ if (source == scriptNodeItem)
2244	2388	{
2245	2389	boolean atleastone = false;
2246	2390
..	..	@@ -2279,199 +2423,223 @@
2279	2423	}
2280	2424	}
2281	2425	} else
2282		- if (event.getSource() == linkerItem)
	2426	+ if (source == linkerItem)
2283	2427	{
2284	2428	group(new cLinker());
2285	2429	} else
2286		- if (event.getSource() == textureItem)
	2430	+ if (source == textureItem)
2287	2431	{
2288	2432	group(new TextureNode());
2289	2433	} else
2290		- if (event.getSource() == shadowXItem)
	2434	+ if (source == billboardItem)
	2435	+ {
	2436	+ group(new BillboardNode());
	2437	+ } else
	2438	+ if (source == shadowXItem)
2291	2439	{
2292	2440	CastShadow(0);
2293	2441	} else
2294		- if (event.getSource() == shadowYItem)
	2442	+ if (source == shadowYItem)
2295	2443	{
2296	2444	CastShadow(1);
2297	2445	} else
2298		- if (event.getSource() == shadowZItem)
	2446	+ if (source == shadowZItem)
2299	2447	{
2300	2448	CastShadow(2);
2301	2449	} else
2302		- if (event.getSource() == ungroupItem)
	2450	+ if (source == ungroupItem)
2303	2451	{
2304		- ungroup();
	2452	+ //ungroup();
	2453	+ for (int i=0; i<group.selection.size(); i++)
	2454	+ {
	2455	+ Ungroup(group.selection.get(i));
	2456	+ }
	2457	+
	2458	+ ClearSelection(false);
	2459	+
	2460	+ refreshContents();
2305	2461	} else
2306		- if (event.getSource() == genUVItem)
	2462	+ if (source == genUVItem)
2307	2463	{
2308	2464	GenUV();
2309	2465	} else
2310		- if (event.getSource() == genNormalsCADItem)
	2466	+ if (source == genNormalsCADItem)
2311	2467	{
2312	2468	GenNormals(true);
2313	2469	} else
2314		- if (event.getSource() == genNormalsMESHItem)
	2470	+ if (source == genNormalsMESHItem)
2315	2471	{
2316	2472	GenNormals(true); // TODO
2317	2473	} else
2318		- if (event.getSource() == genNormalsORGANItem)
	2474	+ if (source == genNormalsORGANItem)
2319	2475	{
2320	2476	GenNormals(false);
2321	2477	} else
2322		- if (event.getSource() == stripifyItem)
	2478	+ if (source == genNormalsMINEItem)
	2479	+ {
	2480	+ GenNormalsMINE();
	2481	+ } else
	2482	+ if (source == stripifyItem)
2323	2483	{
2324	2484	Stripify();
2325	2485	} else
2326		- if (event.getSource() == unstripifyItem)
	2486	+ if (source == unstripifyItem)
2327	2487	{
2328	2488	Unstripify();
2329	2489	} else
2330		- if (event.getSource() == trimItem)
	2490	+ if (source == trimItem)
2331	2491	{
2332	2492	Trim();
2333	2493	} else
2334		- if (event.getSource() == untrimItem)
	2494	+ if (source == untrimItem)
2335	2495	{
2336	2496	Untrim();
2337	2497	} else
2338		- if (event.getSource() == clearColorsItem)
	2498	+ if (source == clearColorsItem)
2339	2499	{
2340	2500	ClearColors();
2341	2501	} else
2342		- if (event.getSource() == clearMaterialsItem)
	2502	+ if (source == clearMaterialsItem)
2343	2503	{
2344	2504	ClearMaterials();
2345	2505	} else
2346		- if (event.getSource() == liveleavesItem)
	2506	+ if (source == liveleavesItem)
2347	2507	{
2348	2508	LiveLeaves(true);
2349	2509	} else
2350		- if (event.getSource() == unliveleavesItem)
	2510	+ if (source == unliveleavesItem)
2351	2511	{
2352	2512	LiveLeaves(false);
2353	2513	} else
2354		- if (event.getSource() == supportleavesItem)
	2514	+ if (source == supportleavesItem)
2355	2515	{
2356	2516	SupportLeaves(true);
2357	2517	} else
2358		- if (event.getSource() == unsupportleavesItem)
	2518	+ if (source == unsupportleavesItem)
2359	2519	{
2360	2520	SupportLeaves(false);
2361	2521	} else
2362		- if (event.getSource() == hideleavesItem)
	2522	+ if (source == hideleavesItem)
2363	2523	{
2364	2524	HideLeaves(true);
2365	2525	} else
2366		- if (event.getSource() == showleavesItem)
	2526	+ if (source == showleavesItem)
2367	2527	{
2368	2528	HideLeaves(false);
2369	2529	} else
2370		- if (event.getSource() == markleavesItem)
	2530	+ if (source == markleavesItem)
2371	2531	{
2372	2532	MarkLeaves(true);
2373	2533	} else
2374		- if (event.getSource() == unmarkleavesItem)
	2534	+ if (source == unmarkleavesItem)
2375	2535	{
2376	2536	MarkLeaves(false);
2377	2537	} else
2378		- if (event.getSource() == flipVItem)
	2538	+ if (source == flipVItem)
2379	2539	{
2380	2540	FlipV(true);
2381	2541	} else
2382		- if (event.getSource() == unflipVItem)
	2542	+ if (source == unflipVItem)
2383	2543	{
2384	2544	FlipV(false);
2385	2545	} else
2386		- if (event.getSource() == lowTexturesItem)
	2546	+ if (source == lowTexturesItem)
2387	2547	{
2388	2548	SetTexRes(0);
2389	2549	} else
2390		- if (event.getSource() == normalTexturesItem)
	2550	+ if (source == normalTexturesItem)
2391	2551	{
2392	2552	SetTexRes(1);
2393	2553	} else
2394		- if (event.getSource() == highTexturesItem)
	2554	+ if (source == highTexturesItem)
2395	2555	{
2396	2556	SetTexRes(2);
2397	2557	} else
2398		- if (event.getSource() == veryhighTexturesItem)
	2558	+ if (source == veryhighTexturesItem)
2399	2559	{
2400	2560	SetTexRes(3);
2401	2561	} else
2402		- if (event.getSource() == maxTexturesItem)
	2562	+ if (source == maxTexturesItem)
2403	2563	{
2404	2564	SetTexRes(4);
2405	2565	} else
2406		- if (event.getSource() == panoTexturesItem)
	2566	+ if (source == panoTexturesItem)
2407	2567	{
2408	2568	SetTexRes(5);
2409	2569	} else
2410		- if (event.getSource() == reverseNormalsItem)
	2570	+ if (source == reverseNormalsItem)
2411	2571	{
2412	2572	ReverseNormals();
2413	2573	} else
2414		- if (event.getSource() == parseverticesItem)
	2574	+ if (source == parseverticesItem)
2415	2575	{
2416	2576	ParseVertices();
2417	2577	} else
2418		- if (event.getSource() == textureFieldItem)
	2578	+ if (source == textureFieldItem)
2419	2579	{
2420	2580	TextureVertices();
2421	2581	} else
2422		- if (event.getSource() == alignItem)
	2582	+ if (source == alignItem)
2423	2583	{
2424	2584	Align();
2425	2585	} else
2426		- if (event.getSource() == mirrorItem)
	2586	+ if (source == mirrorItem)
2427	2587	{
2428	2588	MirrorPoses();
2429	2589	} else
2430		- if (event.getSource() == reduceMorphItem)
	2590	+ if (source == reduceMorphItem)
2431	2591	{
2432	2592	MeshReduction(false);
2433	2593	} else
2434		- if (event.getSource() == reduce34MorphItem)
	2594	+ if (source == reduce34MorphItem)
2435	2595	{
2436	2596	MeshReduction(true);
2437	2597	} else
2438		- if (event.getSource() == reverseTrianglesItem)
	2598	+ if (source == reverseTrianglesItem)
2439	2599	{
2440	2600	ReverseTriangles();
2441	2601	} else
2442		- if (event.getSource() == reduceMeshItem)
	2602	+ if (source == reduceMeshItem)
2443	2603	{
2444	2604	ReduceMesh(false);
2445	2605	} else
2446		- if (event.getSource() == reduce34MeshItem)
	2606	+ if (source == reduce34MeshItem)
2447	2607	{
2448	2608	ReduceMesh(true);
2449	2609	} else
2450		- if (event.getSource() == increaseMeshItem)
	2610	+ if (source == increaseMeshItem)
2451	2611	{
2452	2612	IncreaseMesh();
2453	2613	} else
2454		- if (event.getSource() == clipMeshItem)
	2614	+ if (source == clipMeshItem)
2455	2615	{
2456	2616	ClipMesh();
2457	2617	} else
2458		- if (event.getSource() == smoothMeshItem)
	2618	+ if (source == smoothMeshItem)
2459	2619	{
2460	2620	SmoothMesh();
2461	2621	} else
2462		- if (event.getSource() == transformgeometryItem)
	2622	+ if (source == transformGeometryItem)
2463	2623	{
2464	2624	TransformGeometry();
2465	2625	} else
2466		- if (event.getSource() == resetTransformItem)
	2626	+ if (source == transformChildrenItem)
	2627	+ {
	2628	+ TransformChildren();
	2629	+ } else
	2630	+ if (source == resetTransformItem)
2467	2631	{
2468	2632	ResetTransform();
2469	2633	} else
2470		- if (event.getSource() == resetCentroidItem)
	2634	+ if (source == resetCentroidItem)
2471	2635	{
2472		- ResetCentroid();
	2636	+ ResetCentroid(true);
2473	2637	} else
2474		- if (event.getSource() == resetParentItem)
	2638	+ if (source == resetCentroidXZItem)
	2639	+ {
	2640	+ ResetCentroid(false);
	2641	+ } else
	2642	+ if (source == resetParentItem)
2475	2643	{
2476	2644	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	2645	{
..	..	@@ -2481,7 +2649,7 @@
2481	2649
2482	2650	refreshContents();
2483	2651	} else
2484		- if (event.getSource() == repairParentItem)
	2652	+ if (source == repairParentItem)
2485	2653	{
2486	2654	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2487	2655	{
..	..	@@ -2495,7 +2663,21 @@
2495	2663
2496	2664	refreshContents();
2497	2665	} else
2498		- if (event.getSource() == sortbysizeItem)
	2666	+ if (source == repairShadowItem)
	2667	+ {
	2668	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2669	+ {
	2670	+ Object3D obj = (Object3D)e.nextElement();
	2671	+ obj.RepairShadow();
	2672	+// for (int i=0; i<obj.size(); i++)
	2673	+// {
	2674	+// obj.get(i).parent = obj;
	2675	+// }
	2676	+ }
	2677	+
	2678	+ refreshContents();
	2679	+ } else
	2680	+ if (source == sortbysizeItem)
2499	2681	{
2500	2682	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2501	2683	{
..	..	@@ -2507,7 +2689,7 @@
2507	2689	ResetModel();
2508	2690	refreshContents();
2509	2691	} else
2510		- if (event.getSource() == sortbynameItem)
	2692	+ if (source == sortbynameItem)
2511	2693	{
2512	2694	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2513	2695	{
..	..	@@ -2519,7 +2701,7 @@
2519	2701	ResetModel();
2520	2702	refreshContents();
2521	2703	} else
2522		- if (event.getSource() == attachPigmentItem)
	2704	+ if (source == attachPigmentItem)
2523	2705	{
2524	2706	String texture = GetFile("Attach pigment");
2525	2707	Object3D obj;
..	..	@@ -2531,7 +2713,7 @@
2531	2713
2532	2714	refreshContents();
2533	2715	} else
2534		- if (event.getSource() == detachPigmentItem)
	2716	+ if (source == detachPigmentItem)
2535	2717	{
2536	2718	Object3D obj;
2537	2719	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2542,7 +2724,7 @@
2542	2724
2543	2725	refreshContents();
2544	2726	} else
2545		- if (event.getSource() == attachBumpItem)
	2727	+ if (source == attachBumpItem)
2546	2728	{
2547	2729	String texture = GetFile("Attach bump");
2548	2730	Object3D obj;
..	..	@@ -2554,7 +2736,7 @@
2554	2736
2555	2737	refreshContents();
2556	2738	} else
2557		- if (event.getSource() == detachBumpItem)
	2739	+ if (source == detachBumpItem)
2558	2740	{
2559	2741	Object3D obj;
2560	2742	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2565,7 +2747,7 @@
2565	2747
2566	2748	refreshContents();
2567	2749	} else
2568		- if (event.getSource() == pigmentBumpItem)
	2750	+ if (source == pigmentBumpItem)
2569	2751	{
2570	2752	Object3D obj;
2571	2753	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2576,158 +2758,195 @@
2576	2758
2577	2759	refreshContents();
2578	2760	} else
2579		- if (event.getSource() == flashSelectionButton)
	2761	+ if (source == flashSelectionButton)
2580	2762	{
2581	2763	CameraPane.flash = true;
2582	2764	refreshContents();
2583	2765	} else
2584		- if (event.getSource() == oneButton)
	2766	+ if (source == oneButton)
2585	2767	{
2586	2768	} else
2587		- if (event.getSource() == twoButton)
	2769	+ if (source == twoButton)
2588	2770	{
2589	2771	radio.layout = twoButton;
2590	2772	// bug
2591	2773	//gridPanel.setDividerLocation(1.0);
2592	2774	//bigPanel.setDividerLocation(0.0);
2593		- bigThree.remove(jtp);
2594		- bigThree.remove(cameraPanel);
2595		- bigThree.remove(XYZPanel);
2596		- aWindowConstraints.gridx = 0;
2597		- aWindowConstraints.gridy = 0;
2598		- aWindowConstraints.gridwidth = 1;
2599		- // aConstraints.gridheight = 3;
2600		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2601		- aWindowConstraints.weightx = 0;
2602		- aWindowConstraints.weighty = 1;
2603		- //bigThree.add(jtp, aWindowConstraints);
2604		- aWindowConstraints.weightx = 1;
2605		- aWindowConstraints.gridwidth = 3;
2606		- // aConstraints.gridheight = 3;
2607		- aWindowConstraints.gridx = 1;
2608		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2609		- bigThree.add(cameraPanel, aWindowConstraints);
2610		- aWindowConstraints.weightx = 0;
2611		- aWindowConstraints.gridx = 4;
2612		- aWindowConstraints.gridwidth = 1;
2613		- // aConstraints.gridheight = 3;
2614		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2615		- //bigThree.add(XYZPanel, aWindowConstraints);
2616		- 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();
2617	2804	} else
2618		- if (event.getSource() == threeButton)
	2805	+ if (source == threeButton)
2619	2806	{
2620	2807	radio.layout = threeButton;
2621		- bigThree.remove(jtp);
2622		- bigThree.remove(cameraPanel);
2623		- bigThree.remove(XYZPanel);
2624		- aWindowConstraints.gridx = 0;
2625		- aWindowConstraints.gridy = 0;
2626		- aWindowConstraints.gridwidth = 1;
2627		- // aConstraints.gridheight = 3;
2628		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2629		- aWindowConstraints.weightx = 0;
2630		- aWindowConstraints.weighty = 1;
2631		- //bigThree.add(jtp, aWindowConstraints);
2632		- aWindowConstraints.weightx = 1;
2633		- aWindowConstraints.gridwidth = 3;
2634		- // aConstraints.gridheight = 3;
2635		- aWindowConstraints.gridx = 1;
2636		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2637		- bigThree.add(cameraPanel, aWindowConstraints);
2638		- aWindowConstraints.weightx = 0;
2639		- aWindowConstraints.gridx = 4;
2640		- aWindowConstraints.gridwidth = 1;
2641		- // aConstraints.gridheight = 3;
2642		- aConstraints.fill = GridBagConstraints.VERTICAL;
2643		- bigThree.add(XYZPanel, aWindowConstraints);
2644		- 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();
2645	2840	} else
2646		- if (event.getSource() == fourButton)
	2841	+ if (source == fourButton)
2647	2842	{
2648	2843	radio.layout = fourButton;
2649		- bigThree.remove(jtp);
2650		- bigThree.remove(cameraPanel);
2651		- bigThree.remove(XYZPanel);
2652		- aWindowConstraints.gridx = 0;
2653		- aWindowConstraints.gridy = 0;
2654		- aWindowConstraints.gridwidth = 1;
2655		- // aWindowConstraints.gridheight = 3;
2656		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2657		- aWindowConstraints.weightx = 1;
2658		- aWindowConstraints.weighty = 1;
2659		- bigThree.add(jtp, aWindowConstraints);
2660		- aWindowConstraints.weightx = 1;
2661		- aWindowConstraints.gridwidth = 3;
2662		- // aConstraints.gridheight = 3;
2663		- aWindowConstraints.gridx = 1;
2664		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2665		- //bigThree.add(cameraPanel, aWindowConstraints);
2666		- aWindowConstraints.weightx = 0;
2667		- aWindowConstraints.gridx = 4;
2668		- aWindowConstraints.gridwidth = 1;
2669		- // aWindowConstraints.gridheight = 3;
2670		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2671		- //bigThree.add(XYZPanel, aWindowConstraints);
2672		- 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();
2673	2875	} else
2674		- if (event.getSource() == sixButton)
	2876	+ if (source == sixButton)
2675	2877	{
2676	2878	radio.layout = sixButton;
2677		- bigThree.remove(jtp);
2678		- bigThree.remove(cameraPanel);
2679		- bigThree.remove(XYZPanel);
2680		- aWindowConstraints.gridx = 0;
2681		- aWindowConstraints.gridy = 0;
2682		- aWindowConstraints.gridwidth = 1;
2683		- // aConstraints.gridheight = 3;
2684		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2685		- aWindowConstraints.weightx = 0;
2686		- aWindowConstraints.weighty = 1;
2687		- bigThree.add(jtp, aWindowConstraints);
2688		- aWindowConstraints.weightx = 1;
2689		- aWindowConstraints.gridwidth = 3;
2690		- // aWindowConstraints.gridheight = 3;
2691		- aWindowConstraints.gridx = 1;
2692		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2693		- bigThree.add(cameraPanel, aWindowConstraints);
2694		- aWindowConstraints.weightx = 0;
2695		- aWindowConstraints.gridx = 4;
2696		- aWindowConstraints.gridwidth = 1;
2697		- // aWindowConstraints.gridheight = 3;
2698		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2699		- //bigThree.add(XYZPanel, aConstraints);
2700		- 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();
2701	2911	} else
2702		- if (event.getSource() == sevenButton)
	2912	+ if (source == sevenButton)
2703	2913	{
2704	2914	radio.layout = sevenButton;
2705		- bigThree.remove(jtp);
2706		- bigThree.remove(cameraPanel);
2707		- bigThree.remove(XYZPanel);
2708		- aWindowConstraints.gridx = 0;
2709		- aWindowConstraints.gridy = 0;
2710		- aWindowConstraints.gridwidth = 1;
2711		- // aWindowConstraints.gridheight = 3;
2712		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2713		- aWindowConstraints.weightx = 0;
2714		- aWindowConstraints.weighty = 1;
2715		- bigThree.add(jtp, aWindowConstraints);
2716		- aWindowConstraints.weightx = 1;
2717		- aWindowConstraints.gridwidth = 3;
2718		- // aWindowConstraints.gridheight = 3;
2719		- aWindowConstraints.gridx = 1;
2720		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2721		- bigThree.add(cameraPanel, aWindowConstraints);
2722		- aWindowConstraints.weightx = 0;
2723		- aWindowConstraints.gridx = 4;
2724		- aWindowConstraints.gridwidth = 1;
2725		- // aConstraints.gridheight = 3;
2726		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2727		- bigThree.add(XYZPanel, aWindowConstraints);
2728		- 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();
2729	2948	} else
2730		- if (event.getSource() == rootButton)
	2949	+ if (source == rootButton)
2731	2950	{
2732	2951	Object3D obj;
2733	2952	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2739,7 +2958,7 @@
2739	2958
2740	2959	refreshContents(true);
2741	2960	} else
2742		- if (event.getSource() == closeButton)
	2961	+ if (source == closeButton)
2743	2962	{
2744	2963	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2745	2964	cRadio ab;
..	..	@@ -2760,11 +2979,11 @@
2760	2979	}
2761	2980	refreshContents(true);
2762	2981	} else
2763		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2982	+ if (source == editItem \|\| source == editButton)
2764	2983	{
2765	2984	EditSelection(false);
2766	2985	} else
2767		- if (event.getSource() == uneditButton)
	2986	+ if (source == uneditButton)
2768	2987	{
2769	2988	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2770	2989	{
..	..	@@ -2776,12 +2995,12 @@
2776	2995
2777	2996	child.editWindow = null; // ???????????
2778	2997	}
2779		- objEditor.ctrlPanel.revalidate();
	2998	+ objEditor.ctrlPanel.FlushUI();
2780	2999	//objEditor.jTree.clearSelection();
2781	3000	//objEditor.ResetSliders();
2782	3001	refreshContents(true);
2783	3002	} else
2784		- if (event.getSource() == clearPanelButton)
	3003	+ if (source == clearPanelButton)
2785	3004	{
2786	3005	assert(copy == group);
2787	3006	//copy.ClearUI();
..	..	@@ -2792,7 +3011,7 @@
2792	3011	listUI.clear();
2793	3012	refreshContents(true);
2794	3013	} else
2795		- if (event.getSource() == allParamsButton)
	3014	+ if (source == allParamsButton)
2796	3015	{
2797	3016	assert(copy == group);
2798	3017
..	..	@@ -2813,19 +3032,19 @@
2813	3032
2814	3033	refreshContents(true);
2815	3034	} else
2816		- if (event.getSource() == unselectButton)
	3035	+ if (source == unselectButton)
2817	3036	{
2818	3037	objEditor.jTree.clearSelection();
2819	3038	// ?? oct 2012 GrafreeD.clipboard.clear();
2820	3039	objEditor.ResetSliders();
2821	3040	refreshContents(true);
2822	3041	} else
2823		- if(event.getSource() instanceof cRadio)
	3042	+ if(source instanceof cRadio)
2824	3043	{
2825	3044	group.parent = keepparent;
2826	3045	group.attributes = 0;
2827	3046	//group.editWindow = null;
2828		- /cRadio/ radio = (cRadio)event.getSource();
	3047	+ /cRadio/ radio = (cRadio)source;
2829	3048	Object3D obj = radio.GetObject();
2830	3049	System.out.println("Edit " + obj);
2831	3050	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2845,7 +3064,7 @@
2845	3064	}
2846	3065
2847	3066	copy = group;
2848		- //CameraPane.theRenderer.object = group;
	3067	+ //Globals.theRenderer.object = group;
2849	3068	if(!useclient)
2850	3069	{
2851	3070	cameraView.renderCamera = radio.camera;
..	..	@@ -2854,7 +3073,8 @@
2854	3073	cameraView.cameras[cameraView.cameracount] = radio.camera;
2855	3074	cameraView.targetLookAt.set(radio.camera.lookAt);
2856	3075	cameraView.object = group;
2857		- cameraView.lighttouched = true;
	3076	+ //cameraView.lighttouched = true;
	3077	+ Globals.lighttouched = true;
2858	3078	topView.object = group;
2859	3079	frontView.object = group;
2860	3080	sideView.object = group;
..	..	@@ -2890,7 +3110,7 @@
2890	3110	if (useclient)
2891	3111	{
2892	3112	cameraView.object = client;
2893		- cameraView.lighttouched = true;
	3113	+ Globals.lighttouched = true;
2894	3114	//topView.object = client;
2895	3115	//frontView.object = client;
2896	3116	//sideView.object = client;
..	..	@@ -2898,7 +3118,7 @@
2898	3118	else
2899	3119	{
2900	3120	cameraView.object = group;
2901		- cameraView.lighttouched = true;
	3121	+ Globals.lighttouched = true;
2902	3122	//topView.object = group;
2903	3123	//frontView.object = group;
2904	3124	//sideView.object = group;
..	..	@@ -2933,6 +3153,28 @@
2933	3153	refreshContents();
2934	3154	}
2935	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	+ }
2936	3178
2937	3179	void ResetTransform()
2938	3180	{
..	..	@@ -3045,7 +3287,7 @@
3045	3287	refreshContents();
3046	3288	}
3047	3289
3048		- void ResetCentroid()
	3290	+ void ResetCentroid(boolean full)
3049	3291	{
3050	3292	Object3D obj;
3051	3293	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3060,12 +3302,16 @@
3060	3302	LA.matIdentity(Object3D.mat);
3061	3303	obj.getBounds(minima, maxima, false);
3062	3304	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3063		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3305	+ if (full)
	3306	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3064	3307	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3065	3308	obj.TransformMesh(Object3D.mat);
	3309	+
3066	3310	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3067		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3311	+ if (full)
	3312	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3068	3313	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3314	+
3069	3315	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3070	3316	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3071	3317	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3131,9 +3377,9 @@
3131	3377	obj = (Object3D)e.nextElement();
3132	3378
3133	3379	System.out.println("Object is: " + obj);
3134		- GrafreeD.AnalyzeObject(obj);
	3380	+ Grafreed.AnalyzeObject(obj);
3135	3381	System.out.println("Boundary rep: " + obj.bRep);
3136		- GrafreeD.AnalyzeObject(obj.bRep);
	3382	+ Grafreed.AnalyzeObject(obj.bRep);
3137	3383
3138	3384	// System.err.println((size/1024) + " KB is the size of " + obj);
3139	3385	}
..	..	@@ -3175,6 +3421,13 @@
3175	3421	void GenNormals(boolean crease)
3176	3422	{
3177	3423	group.GenNormalsS(crease);
	3424	+
	3425	+ refreshContents();
	3426	+ }
	3427	+
	3428	+ void GenNormalsMINE()
	3429	+ {
	3430	+ group.selection.GenNormalsMINE();
3178	3431
3179	3432	refreshContents();
3180	3433	}
..	..	@@ -3340,8 +3593,8 @@
3340	3593
3341	3594	void ParseVertices()
3342	3595	{
3343		- boolean epsequal = GrafreeD.epsequal;
3344		- GrafreeD.epsequal = true;
	3596	+ boolean epsequal = Grafreed.epsequal;
	3597	+ Grafreed.epsequal = true;
3345	3598
3346	3599	for (int i=0; i<group.selection.size(); i++)
3347	3600	{
..	..	@@ -3366,7 +3619,7 @@
3366	3619	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3367	3620	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3368	3621
3369		- g.add(GrafreeD.clipboard);
	3622	+ g.add(Grafreed.clipboard);
3370	3623
3371	3624	buffer.add(g);
3372	3625	}
..	..	@@ -3381,7 +3634,7 @@
3381	3634	makeSomething(buffer, i==group.selection.size()-1);
3382	3635	}
3383	3636
3384		- GrafreeD.epsequal = epsequal;
	3637	+ Grafreed.epsequal = epsequal;
3385	3638
3386	3639	refreshContents();
3387	3640	}
..	..	@@ -3399,7 +3652,7 @@
3399	3652	String pigment = Object3D.GetPigment(tex);
3400	3653	//String bump = Object3D.GetBump(tex);
3401	3654
3402		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3655	+ com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3403	3656
3404	3657	double s = v.s;
3405	3658
..	..	@@ -3447,12 +3700,26 @@
3447	3700
3448	3701	void Align()
3449	3702	{
	3703	+ if (group.selection.size() == 0)
	3704	+ return;
	3705	+
	3706	+ cVector bbmin = new cVector();
	3707	+ cVector bbmax = new cVector();
	3708	+
	3709	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3710	+
	3711	+ double dx = bbmax.x - bbmin.x;
	3712	+ double dy = bbmax.y - bbmin.y;
	3713	+ double dz = bbmax.z - bbmin.z;
	3714	+
	3715	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3716	+
3450	3717	for (int i=0; i<group.selection.size(); i++)
3451	3718	{
3452	3719	Object3D obj = group.selection.get(i);
3453	3720
3454		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3455		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3721	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3722	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3456	3723	}
3457	3724
3458	3725	refreshContents();
..	..	@@ -3473,11 +3740,11 @@
3473	3740
3474	3741	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3475	3742
3476		- boolean random = CameraPane.RANDOM;
3477		- CameraPane.RANDOM = false; // parse all random nodes
	3743	+ boolean random = CameraPane.SWITCH;
	3744	+ CameraPane.SWITCH = false; // parse all random nodes
3478	3745	lowres.linkVerticesThis(null);
3479	3746	lowres.linkVerticesThis(sn);
3480		- CameraPane.RANDOM = random;
	3747	+ CameraPane.SWITCH = random;
3481	3748
3482	3749	System.err.flush();
3483	3750
..	..	@@ -3517,7 +3784,7 @@
3517	3784	return;
3518	3785
3519	3786	Object3D poses = group.selection.get(0);
3520		- Object3D ref = GrafreeD.clipboard.get(0);
	3787	+ Object3D ref = Grafreed.clipboard.get(0);
3521	3788
3522	3789	Object3D newgroup = new Object3D("Po:" + poses.name);
3523	3790
..	..	@@ -3686,7 +3953,7 @@
3686	3953	group.selection.RelinkToSupport(); // july 2014
3687	3954	System.out.println("DONE.");
3688	3955	refreshContents();
3689		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3956	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3690	3957	}
3691	3958
3692	3959	void ReduceMesh(boolean reduction34)
..	..	@@ -3711,9 +3978,9 @@
3711	3978
3712	3979	void ClipMesh()
3713	3980	{
3714		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3981	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3715	3982	{
3716		- Object3D content = GrafreeD.clipboard.get(0);
	3983	+ Object3D content = Grafreed.clipboard.get(0);
3717	3984
3718	3985	if (content instanceof cGroup && ((cGroup)content).transientlink )
3719	3986	content = ((cGroup)content).get(0);
..	..	@@ -3722,7 +3989,7 @@
3722	3989	// {
3723	3990	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3724	3991	// }
3725		- group.selection.ClipMesh(GrafreeD.clipboard);
	3992	+ group.selection.ClipMesh(Grafreed.clipboard);
3726	3993	}
3727	3994	// group.selection.ClipMesh(GrafreeD.clipboard);
3728	3995	System.out.println("DONE.");
..	..	@@ -3962,25 +4229,25 @@
3962	4229	System.err.println("info : " + child.GetPath());
3963	4230	}
3964	4231	}
3965		- else
3966		- {
3967		- objEditor.SetMaterial(group); // .GetMaterial());
3968		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3969		- System.err.println("info : " + group.GetPath());
3970		- }
	4232	+// else
	4233	+// {
	4234	+// objEditor.SetMaterial(group); // .GetMaterial());
	4235	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4236	+// System.err.println("info : " + group.GetPath());
	4237	+// }
3971	4238
3972	4239	objEditor.SetText(); // jan 2014
3973	4240
3974		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4241	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
3975	4242	CameraPane.flash = true;
3976	4243
3977	4244	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
3978	4245	// a camera
3979	4246	{
3980	4247	CameraPane.camerachangeframe = 0; // don't refuse it
3981		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3982		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3983		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4248	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4249	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4250	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3984	4251	}
3985	4252
3986	4253	refreshContents();
..	..	@@ -4062,12 +4329,12 @@
4062	4329	{
4063	4330	if (group.selection.isEmpty())
4064	4331	return;
4065		- GrafreeD.clipboardIsTempGroup = false;
	4332	+ Grafreed.clipboardIsTempGroup = false;
4066	4333	Composite tGroup = null;
4067	4334	if (group.selection.size() > 0) // 1)
4068	4335	{
4069	4336	tGroup = new cGroup();
4070		- GrafreeD.clipboardIsTempGroup = true;
	4337	+ Grafreed.clipboardIsTempGroup = true;
4071	4338	}
4072	4339
4073	4340	if (cut)
..	..	@@ -4107,16 +4374,16 @@
4107	4374	//System.out.println("cut " + child);
4108	4375	//System.out.println("parent = " + child.parent);
4109	4376	// tmp.addChild(child);
4110		- if (GrafreeD.clipboardIsTempGroup)
	4377	+ if (Grafreed.clipboardIsTempGroup)
4111	4378	tGroup.add/Child/(tmp);
4112	4379	else
4113		- GrafreeD.clipboard = tmp;
	4380	+ Grafreed.clipboard = tmp;
4114	4381	}
4115	4382	else
4116		- if (GrafreeD.clipboardIsTempGroup)
	4383	+ if (Grafreed.clipboardIsTempGroup)
4117	4384	tGroup.add/Child/(child);
4118	4385	else
4119		- GrafreeD.clipboard = child;
	4386	+ Grafreed.clipboard = child;
4120	4387	}
4121	4388
4122	4389	//ResetModel();
..	..	@@ -4148,21 +4415,21 @@
4148	4415	//System.out.println("cut " + elem);
4149	4416	//System.out.println("parent = " + elem.parent);
4150	4417	// tmp.addChild(elem);
4151		- if (GrafreeD.clipboardIsTempGroup)
	4418	+ if (Grafreed.clipboardIsTempGroup)
4152	4419	tGroup.add/Child/(tmp);
4153	4420	else
4154		- GrafreeD.clipboard = tmp;
	4421	+ Grafreed.clipboard = tmp;
4155	4422	}
4156	4423	else
4157		- if (GrafreeD.clipboardIsTempGroup)
	4424	+ if (Grafreed.clipboardIsTempGroup)
4158	4425	tGroup.add/Child/(child);
4159	4426	else
4160		- GrafreeD.clipboard = child;
	4427	+ Grafreed.clipboard = child;
4161	4428	}
4162	4429
4163	4430	}
4164		- if (GrafreeD.clipboardIsTempGroup)
4165		- GrafreeD.clipboard = tGroup;
	4431	+ if (Grafreed.clipboardIsTempGroup)
	4432	+ Grafreed.clipboard = tGroup;
4166	4433	if (cut)
4167	4434	{
4168	4435	ResetModel();
..	..	@@ -4176,7 +4443,7 @@
4176	4443	// return;
4177	4444	boolean first = true;
4178	4445
4179		- if (GrafreeD.clipboardIsTempGroup)
	4446	+ if (Grafreed.clipboardIsTempGroup)
4180	4447	{
4181	4448	Composite temp;
4182	4449
..	..	@@ -4187,7 +4454,7 @@
4187	4454	temp = (Composite)Applet3D.clipboard.deepCopy();
4188	4455	*/
4189	4456	Object3D elem;
4190		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4457	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4191	4458	{
4192	4459	Object3D child = (Object3D)e.nextElement();
4193	4460
..	..	@@ -4221,21 +4488,21 @@
4221	4488	//Object3D cb = Applet3D.clipboard;
4222	4489	//temp.addChild(cb);
4223	4490	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4224		- assert(GrafreeD.clipboard.parent == null);
4225		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4226		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4227		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4228		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4491	+ assert(Grafreed.clipboard.parent == null);
	4492	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4493	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4494	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4495	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4229	4496	else
4230		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4231		- GrafreeD.clipboard.get(0).parent = keepparent;
	4497	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4498	+ Grafreed.clipboard.get(0).parent = keepparent;
4232	4499	}
4233	4500
4234	4501	ResetModel();
4235	4502	refreshContents();
4236	4503	}
4237	4504
4238		- void pasteInto(boolean copyit)
	4505	+ void pasteInto(boolean copyit, boolean clone)
4239	4506	{
4240	4507	// if (GrafreeD.clipboard == null)
4241	4508	// return;
..	..	@@ -4264,15 +4531,22 @@
4264	4531	if (copyit)
4265	4532	{
4266	4533	// paste(false);
4267		- CloneClipboard(false); // sept 2014
	4534	+ if (clone)
	4535	+ {
	4536	+ CloneClipboard(false); // sept 2014
	4537	+ }
	4538	+ else
	4539	+ {
	4540	+ paste(false);
	4541	+ }
4268	4542	}
4269	4543	else
4270	4544	{
4271	4545	boolean first = true;
4272	4546
4273		- if (GrafreeD.clipboardIsTempGroup)
	4547	+ if (Grafreed.clipboardIsTempGroup)
4274	4548	{
4275		- Composite temp = (Composite)GrafreeD.clipboard;
	4549	+ Composite temp = (Composite)Grafreed.clipboard;
4276	4550	Object3D copy;
4277	4551	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4278	4552	{
..	..	@@ -4282,7 +4556,7 @@
4282	4556	}
4283	4557	} else
4284	4558	{
4285		- linkSomething(GrafreeD.clipboard); //.get(0));
	4559	+ linkSomething(Grafreed.clipboard); //.get(0));
4286	4560	}
4287	4561	}
4288	4562	}
..	..	@@ -4474,6 +4748,26 @@
4474	4748	makeSomething(csg);
4475	4749	}
4476	4750
	4751	+ void Ungroup(Object3D g)
	4752	+ {
	4753	+ if (g instanceof HiddenObject)
	4754	+ {
	4755	+ HiddenObject h = (HiddenObject) g;
	4756	+
	4757	+ for (int i=0; i<h.ActualSize(); i++)
	4758	+ {
	4759	+ objEditor.makeSomething(h.get(i), false);
	4760	+ }
	4761	+ }
	4762	+ else
	4763	+ {
	4764	+ for (int i=0; i<g.Size(); i++)
	4765	+ {
	4766	+ objEditor.makeSomething(g.get(i), false);
	4767	+ }
	4768	+ }
	4769	+ }
	4770	+
4477	4771	void ungroup()
4478	4772	{
4479	4773	/*
..	..	@@ -4707,7 +5001,7 @@
4707	5001
4708	5002	void ImportVRMLX3D()
4709	5003	{
4710		- if (GrafreeD.standAlone)
	5004	+ if (Grafreed.standAlone)
4711	5005	{
4712	5006	/**/
4713	5007	FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
..	..	@@ -4724,7 +5018,7 @@
4724	5018
4725	5019	String GetFile(String dialogName)
4726	5020	{
4727		- if (GrafreeD.standAlone)
	5021	+ if (Grafreed.standAlone)
4728	5022	{
4729	5023	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4730	5024	browser.show();
..	..	@@ -4788,10 +5082,12 @@
4788	5082	cButton flashSelectionButton;
4789	5083	cButton editButton;
4790	5084	cButton uneditButton;
	5085	+ JCheckBox allParamsButton;
4791	5086	cButton clearpanelButton;
4792		- cButton allParamsButton;
4793	5087	cButton unselectButton;
4794	5088
	5089	+ cButton oneStepButton;
	5090	+
4795	5091	cButton screenfitButton;
4796	5092	cButton screenfitpointButton;
4797	5093	cButton snapobjectButton;
..	..	@@ -4833,6 +5129,7 @@
4833	5129	private MenuItem resetsupportItem;
4834	5130	private MenuItem resetreferencesItem;
4835	5131	private MenuItem linkverticesItem;
	5132	+ private MenuItem relinkverticesItem;
4836	5133	private MenuItem setMasterItem;
4837	5134	private MenuItem resetMeshItem;
4838	5135	private MenuItem stepAllItem;
..	..	@@ -4845,6 +5142,7 @@
4845	5142	private MenuItem mergeGeometriesItem;
4846	5143	private MenuItem copyItem;
4847	5144	private MenuItem pasteItem;
	5145	+ private MenuItem pasteIntoItem;
4848	5146	private MenuItem pasteLinkItem;
4849	5147	private MenuItem pasteCloneItem;
4850	5148	private MenuItem pasteExpandItem;
..	..	@@ -4854,6 +5152,7 @@
4854	5152	private MenuItem genNormalsMESHItem;
4855	5153	private MenuItem genNormalsCADItem;
4856	5154	private MenuItem genNormalsORGANItem;
	5155	+ private MenuItem genNormalsMINEItem;
4857	5156	private MenuItem stripifyItem;
4858	5157	private MenuItem unstripifyItem;
4859	5158	private MenuItem trimItem;
..	..	@@ -4893,8 +5192,11 @@
4893	5192	private MenuItem panoTexturesItem;
4894	5193
4895	5194	private MenuItem resetCentroidItem;
4896		- private MenuItem transformgeometryItem;
	5195	+ private MenuItem resetCentroidXZItem;
4897	5196	private MenuItem resetTransformItem;
	5197	+ private MenuItem transformGeometryItem;
	5198	+ private MenuItem transformChildrenItem;
	5199	+ private MenuItem hideItem;
4898	5200	private MenuItem grabItem;
4899	5201	private MenuItem backItem;
4900	5202	private MenuItem frontItem;
..	..	@@ -4915,6 +5217,7 @@
4915	5217
4916	5218	private MenuItem resetParentItem;
4917	5219	private MenuItem repairParentItem;
	5220	+ private MenuItem repairShadowItem;
4918	5221	private MenuItem sortbysizeItem;
4919	5222	private MenuItem sortbynameItem;
4920	5223
..	..	@@ -4935,10 +5238,11 @@
4935	5238	private MenuItem coneItem;
4936	5239	private MenuItem torusItem;
4937	5240	private MenuItem superItem;
	5241	+ private MenuItem kleinItem;
4938	5242	private MenuItem blobItem;
4939	5243	private MenuItem latheItem;
4940	5244	private MenuItem bezierItem;
4941		- private MenuItem checkerItem;
	5245	+ private MenuItem overlayItem;
4942	5246	private MenuItem meshItem;
4943	5247	// private MenuItem meshGroupItem;
4944	5248	private MenuItem springItem;
..	..	@@ -4947,6 +5251,7 @@
4947	5251	private MenuItem csgItem;
4948	5252	private MenuItem templateItem;
4949	5253	private MenuItem textureItem;
	5254	+ private MenuItem billboardItem;
4950	5255	private MenuItem shadowXItem;
4951	5256	private MenuItem shadowYItem;
4952	5257	private MenuItem shadowZItem;