~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,6 +12,7 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
..	..	@@ -97,14 +98,14 @@
97	98
98	99	void CloneClipboard(boolean supports)
99	100	{
100		- assert(GrafreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
102		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	101	+ assert(Grafreed.clipboard.parent == null);
	102	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	103	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	104	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	105	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	106	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	108	+ Grafreed.clipboard.get(0).parent = keepparent;
108	109	}
109	110
110	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +119,7 @@
118	119	// obj.support = null;
119	120	if (!supports)
120	121	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	122	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	123	obj.parent = parent;
123	124	// obj.support = support;
124	125	// clone.support = support; // aout 2013
..	..	@@ -149,6 +150,8 @@
149	150
150	151	void SetupMenu2(ObjEditor oe)
151	152	{
	153	+ if (Globals.ADVANCED)
	154	+ {
152	155	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153	156	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154	157	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -160,17 +163,21 @@
160	163	lookAtItem.addActionListener(this);
161	164	//lookFromItem.addActinoListener(this);
162	165	//switchItem.addActionListener(this);
	166	+ }
	167	+
163	168	Menu menu;
164	169	oe.menuBar.add(menu = new Menu("Edit"));
165	170	//editItem = menu.add(new MenuItem("Edit"));
166	171	//editItem.addActionListener(this);
167	172	duplicateItem = menu.add(new MenuItem("Duplicate"));
168	173	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	174	cloneItem = menu.add(new MenuItem("Clone"));
171	175	cloneItem.addActionListener(this);
	176	+ if (Globals.ADVANCED)
	177	+ {
172	178	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	179	cloneSupportItem.addActionListener(this);
	180	+ }
174	181	menu.add("-");
175	182	cutItem = menu.add(new MenuItem("Cut"));
176	183	cutItem.addActionListener(this);
..	..	@@ -178,27 +185,37 @@
178	185	copyItem.addActionListener(this);
179	186	pasteItem = menu.add(new MenuItem("Paste"));
180	187	pasteItem.addActionListener(this);
	188	+ menu.add("-");
	189	+
	190	+ menu.add("-");
	191	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	192	+ pasteIntoItem.addActionListener(this);
181	193	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	194	pasteLinkItem.addActionListener(this);
183	195	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	196	pasteCloneItem.addActionListener(this);
185	197	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	198	// pasteExpandItem.addActionListener(this);
	199	+ menu.add("-");
187	200	clearItem = menu.add(new MenuItem("Clear"));
188	201	clearItem.addActionListener(this);
	202	+
	203	+ if (Globals.ADVANCED)
	204	+ {
	205	+ // Deletes the cameras...
189	206	clearAllItem = menu.add(new MenuItem("Clear All"));
190	207	clearAllItem.addActionListener(this);
	208	+ }
191	209
192	210	oe.menuBar.add(menu = new Menu("Setting"));
193		- resetMeshItem = menu.add(new MenuItem("Reset All"));
194		- resetMeshItem.addActionListener(this);
195		- stepAllItem = menu.add(new MenuItem("Step All"));
196		- stepAllItem.addActionListener(this);
	211	+ if (Globals.ADVANCED)
	212	+ {
197	213	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	214	revertMeshItem.addActionListener(this);
199	215	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	216	resetreferencesItem.addActionListener(this);
201	217	menu.add("-");
	218	+ }
202	219	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	220	overwriteGeoItem.addActionListener(this);
204	221	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,19 +227,26 @@
210	227	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	228	overwriteUVItem.addActionListener(this);
212	229	menu.add("-");
	230	+ if (Globals.ADVANCED)
	231	+ {
213	232	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	233	generateMeshItem.addActionListener(this);
215	234	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	235	poseMeshItem.addActionListener(this);
217	236	menu.add("-");
	237	+ }
218	238	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	239	resetsupportItem.addActionListener(this);
220	240	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	241	linkverticesItem.addActionListener(this);
222	242	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	243	relinkverticesItem.addActionListener(this);
	244	+
	245	+ if (Globals.ADVANCED)
	246	+ {
224	247	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	248	setMasterItem.addActionListener(this);
	249	+ }
226	250
227	251	oe.menuBar.add(menu = new Menu("Group"));
228	252	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -233,27 +257,32 @@
233	257	frontItem.addActionListener(this);
234	258	compositeItem = menu.add(new MenuItem("Composite"));
235	259	compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	260	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	261	hideItem.addActionListener(this);
238	262	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	263	ungroupItem.addActionListener(this);
240	264	menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
	265	+ randomItem = menu.add(new MenuItem("Switch node"));
242	266	randomItem.addActionListener(this);
243		- physicsItem = menu.add(new MenuItem("Physics"));
244		- physicsItem.addActionListener(this);
245		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
246		- frameselectorItem.addActionListener(this);
247	267	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	268	switchGeoItem.addActionListener(this);
249	269	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	270	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	271	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	272	morphItem.addActionListener(this);
	273	+
	274	+ if (Globals.ADVANCED)
	275	+ {
	276	+ menu.add("-");
	277	+ physicsItem = menu.add(new MenuItem("Physics"));
	278	+ physicsItem.addActionListener(this);
	279	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	280	+ frameselectorItem.addActionListener(this);
253	281	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	282	scriptNodeItem.addActionListener(this);
255	283	cameraItem = menu.add(new MenuItem("Camera"));
256	284	cameraItem.addActionListener(this);
	285	+ }
257	286
258	287	oe.menuBar.add(menu = new Menu("Object"));
259	288	textureItem = menu.add(new MenuItem("Texture"));
..	..	@@ -268,21 +297,29 @@
268	297	shadowYItem.addActionListener(this);
269	298	shadowZItem = menu.add(new MenuItem("Shadow Z"));
270	299	shadowZItem.addActionListener(this);
	300	+ if (Globals.ADVANCED)
	301	+ {
	302	+ menu.add("-");
271	303	linkerItem = menu.add(new MenuItem("Linker"));
272	304	linkerItem.addActionListener(this);
273		- templateItem = menu.add(new MenuItem("Template"));
274		- templateItem.addActionListener(this);
275	305	attributeItem = menu.add(new MenuItem("Attribute"));
276	306	attributeItem.addActionListener(this);
	307	+ templateItem = menu.add(new MenuItem("Template"));
	308	+ templateItem.addActionListener(this);
277	309	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	310	pointflowItem.addActionListener(this);
	311	+ }
279	312	menu.add("-");
280	313	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	314	resetTransformItem.addActionListener(this);
282	315	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	316	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	317	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	318	+ resetCentroidXZItem.addActionListener(this);
	319	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	320	+ transformGeometryItem.addActionListener(this);
	321	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	322	+ transformChildrenItem.addActionListener(this);
286	323
287	324	oe.menuBar.add(menu = new Menu("Geometry"));
288	325	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +330,11 @@
293	330	genNormalsCADItem.addActionListener(this);
294	331	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	332	genNormalsMESHItem.addActionListener(this);
	333	+ if (Globals.ADVANCED)
	334	+ {
296	335	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
297	336	genNormalsMINEItem.addActionListener(this);
	337	+ }
298	338	stripifyItem = menu.add(new MenuItem("Stripify"));
299	339	stripifyItem.addActionListener(this);
300	340	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +356,34 @@
316	356	reduce34MeshItem.addActionListener(this);
317	357	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	358	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	359	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	360	clipMeshItem.addActionListener(this);
	361	+
	362	+ if (Globals.ADVANCED)
	363	+ {
	364	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	365	+ smoothMeshItem.addActionListener(this);
	366	+ }
323	367
324	368	oe.menuBar.add(menu = new Menu("Attributes"));
325	369	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	370	clearMaterialsItem.addActionListener(this);
	371	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	372	+ resetAllItem.addActionListener(this);
	373	+ stepAllItem = menu.add(new MenuItem("Step All"));
	374	+ stepAllItem.addActionListener(this);
327	375	menu.add("-");
328	376	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	377	liveleavesItem.addActionListener(this);
330	378	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	379	unliveleavesItem.addActionListener(this);
	380	+ if (Globals.ADVANCED)
	381	+ {
332	382	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	383	supportleavesItem.addActionListener(this);
334	384	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	385	unsupportleavesItem.addActionListener(this);
	386	+ }
336	387	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	388	hideleavesItem.addActionListener(this);
338	389	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -376,28 +427,34 @@
376	427	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	428	sortbynameItem.addActionListener(this);
378	429	menu.add("-");
	430	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	431	+ shareGeometriesItem.addActionListener(this);
	432	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	433	+ mergeGeometriesItem.addActionListener(this);
	434	+ if (Globals.ADVANCED)
	435	+ {
	436	+ // Pretty much the same as duplicate and clone.
379	437	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	438	extractGeometriesItem.addActionListener(this);
381	439	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	440	cloneGeometriesItem.addActionListener(this);
383		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
384		- shareGeometriesItem.addActionListener(this);
385		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
386		- mergeGeometriesItem.addActionListener(this);
	441	+ }
387	442
388	443	oe.menuBar.add(menu = new Menu("Insert"));
389	444	buildCreateMenu(menu);
390	445
391		-
392	446	oe.menuBar.add(menu = new Menu("Include"));
393		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
394		- importGFDItem.addActionListener(this);
395		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
396		- importVRMLX3DItem.addActionListener(this);
397		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
	447	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
398	448	importOBJItem.addActionListener(this);
399		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
	449	+ menu.add("-");
	450	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
400	451	import3DSItem.addActionListener(this);
	452	+ menu.add("-");
	453	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	454	+ importVRMLX3DItem.addActionListener(this);
	455	+ menu.add("-");
	456	+ importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
	457	+ importGFDItem.addActionListener(this);
401	458
402	459	oe.menuBar.add(menu = new Menu("Tools"));
403	460	buildToolsMenu(menu);
..	..	@@ -433,150 +490,98 @@
433	490	oe.radioPanel.add(dummyButton);
434	491	oe.buttonGroup.add(dummyButton);
435	492	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	493	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	494
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	495	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	496	+ liveCB.setToolTipText("Enable animation");
441	497	liveCB.addItemListener(this);
442	498
443		- oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
445		- supportCB.addItemListener(this);
446		-
447		- // oe.aConstraints.gridx += 1;
448		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
449		- // localCB.addItemListener(this);
450		-
451		- oe.aConstraints.gridx += 1;
452		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
453		- crowdCB.addItemListener(this);
454		-
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
457		- smoothCB.addItemListener(this);
458		-
459		- oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	499	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	500	+ oneStepButton.setToolTipText("Animate one step forward");
	501	+ oneStepButton.addActionListener(this);
	502	+
	503	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	504	+ fastCB.setToolTipText("Fast mode");
461	505	fastCB.addItemListener(this);
462		- oe.aConstraints.gridx += 1;
463		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
464		- slowCB.addItemListener(this);
465		- oe.aConstraints.gridx += 1;
466		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
467		- boxCB.addItemListener(this);
468		-
469		-// oe.aConstraints.gridx += 1;
470		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
471		-// speakerMocapCB.addItemListener(this);
472		-
473		- if (false)
474		- {
475		- // handled in scripts
476		- oe.aConstraints.gridx += 1;
477		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
478		- speakerCameraCB.addItemListener(this);
479		-
480		- oe.aConstraints.gridx += 1;
481		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
482		- speakerFocusCB.addItemListener(this);
483		-
484		- oe.aConstraints.gridx += 1;
485		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
486		- smoothfocusCB.addItemListener(this);
487		- }
488		-
489		-//oe.aConstraints.gridx += 1;
490		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
491		-// debugCB.addItemListener(this);
492		-
493		- oe.aConstraints.gridx += 1;
494		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
495		- oeilCB.addItemListener(this);
496		-
497		- oe.aConstraints.gridx += 1;
498		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
499		- lookAtCB.addItemListener(this);
500		-
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	506	+
	507	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	508	+ trackCB.setToolTipText("Enable tracking");
503	509	trackCB.addItemListener(this);
504	510
505		- oe.aConstraints.gridx += 1;
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	511	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	512	+ screenfitButton.setToolTipText("Screen fit");
507	513	screenfitButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
	514	+
509	515	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
510	516	// screenfitpointButton.addActionListener(this);
511		-// oe.aConstraints.gridx += 1;
512		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
513		- snapobjectButton.addActionListener(this);
514		- oe.aConstraints.gridx += 1;
515	517
516		- //aConstraints.gridx = 0;
517		- //aConstraints.gridy += 1;
518		- oe.aConstraints.weighty = 0;
519		- oe.aConstraints.gridwidth = 1;
520		-
521		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	518	+ if (Globals.ADVANCED)
	519	+ {
	520	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	521	+ snapobjectButton.addActionListener(this);
	522	+ snapobjectButton.setToolTipText("Snap Object");
	523	+ }
	524	+
	525	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	526	+ flashSelectionButton.setToolTipText("Show selection");
522	527	flashSelectionButton.addActionListener(this);
523		- oe.aConstraints.gridx += 1;
524		- oe.aConstraints.weighty = 0;
525		- oe.aConstraints.gridwidth = 1;
526	528
527		- //
528		- 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");
529	533	twoButton.addActionListener(this);
530		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	534	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
531	535	fourButton.addActionListener(this);
532		- 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");
533	539	sixButton.addActionListener(this);
534		- 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");
535	542	threeButton.addActionListener(this);
536		- 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");
537	545	sevenButton.addActionListener(this);
538	546	//
539	547
540		- 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");
541	550	rootButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- 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");
544	554	closeButton.addActionListener(this);
545	555	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
546	556	//clearButton.addActionListener(this);
547		- oe.aConstraints.gridx += 1;
548	557
549		- oe.aConstraints.gridx = 1; //
550		- 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");
551	562	editButton.addActionListener(this);
552		- oe.aConstraints.gridx += 1;
553		- oe.aConstraints.weighty = 0;
554		- oe.aConstraints.gridwidth = 1;
555	563
556		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	564	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	565	+ uneditButton.setToolTipText("Unedit selection");
557	566	uneditButton.addActionListener(this);
558	567
559		- oe.aConstraints.gridx += 1;
560		- oe.aConstraints.weighty = 0;
561		- oe.aConstraints.gridwidth = 1;
562		-
563		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
564		- clearPanelButton.addActionListener(this);
565		-
566		- oe.aConstraints.gridx += 1;
567		- oe.aConstraints.weighty = 0;
568		- oe.aConstraints.gridwidth = 1;
569		-
570		- 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");
571	570	allParamsButton.addActionListener(this);
572	571
573		- oe.aConstraints.gridx += 1;
574		- oe.aConstraints.weighty = 0;
575		- oe.aConstraints.gridwidth = 1;
576		-
577		- 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");
578	578	unselectButton.addActionListener(this);
579	579
	580	+ commandsPanel.preferredHeight = 1;
	581	+
	582	+ oe.treePanel.add(commandsPanel);
	583	+ oe.treePanel.Return();
	584	+
580	585	// oe.aConstraints.gridx += 1;
581	586	// oe.aConstraints.weighty = 0;
582	587	// oe.aConstraints.gridwidth = 1;
..	..	@@ -588,40 +593,37 @@
588	593	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
589	594	// gcButton.addActionListener(this);
590	595
591		- oe.aConstraints.gridx = 0;
592		- oe.aConstraints.gridy += 1;
593		-
594		- //ctrlPanel.add(objList = new List(5, true));
595		- oe.aConstraints.gridwidth = 100;
596		- // oe.aConstraints.gridheight = 100;
597		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
598		- oe.aConstraints.gridheight = 1;
599		- oe.aConstraints.weighty = 0.5;
600		- oe.aConstraints.gridx = 0;
601		- JScrollPane jSP;
	596	+ cGridBag jSPPanel = new cGridBag();
	597	+
	598	+ JScrollPane jSP;
602	599	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
603		- 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);
604	601	ResetModel();
605		- oe.aConstraints.weighty = 0.5;
606		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
607		- oe.aConstraints.gridy += 1;
608		- oe.aConstraints.gridwidth = 1;
	602	+
	603	+ oe.treePanel.add(jSPPanel);
	604	+ oe.treePanel.Return();
609	605
610		- oe.aConstraints.weighty = 0;
611		- oe.aConstraints.gridwidth = 2;
612		-
613		- 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");
614	610	colorCB.addItemListener(this);
615		- oe.aConstraints.gridx += 2;
616		- 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");
617	614	materialCB.addItemListener(this);
618		- oe.aConstraints.gridx += 2;
619		- 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");
620	618	textureCB.addItemListener(this);
621	619
622		- oe.aConstraints.gridx = 0;
623		- oe.aConstraints.gridy += 1;
	620	+ copyOptionsPanel.preferredHeight = 1;
	621	+ oe.treePanel.add(copyOptionsPanel);
	622	+ oe.treePanel.Return();
624	623
	624	+// mainPanel.setDividerLocation(0.5); //1.0);
	625	+// mainPanel.setResizeWeight(0.5);
	626	+
625	627	//jList.addListSelectionListener(this);
626	628	oe.jTree.addTreeSelectionListener(this);
627	629	//jTree.setRootVisible(false);
..	..	@@ -643,17 +645,89 @@
643	645	radio.layout = sevenButton;
644	646	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
645	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	+ }
646	720
647	721	void EditObject(Object3D obj)
648	722	{
649		- cRadio dummyButton = new cRadio(obj.name);
650		- dummyButton.SetObject(obj);
651		- dummyButton.layout = sevenButton;
652		- dummyButton.SetCamera(cameraView.renderCamera, false);
653		- dummyButton.addActionListener(this);
654		- radioPanel.add(dummyButton);
655		- buttonGroup.add(dummyButton);
656		- 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();
657	731	}
658	732	void SetupViews(ObjEditor oe)
659	733	{
..	..	@@ -673,6 +747,7 @@
673	747	JCheckBox fastCB;
674	748	JCheckBox slowCB;
675	749	JCheckBox boxCB;
	750	+ JCheckBox zoomBoxCB;
676	751	JCheckBox trackCB;
677	752	JCheckBox smoothfocusCB;
678	753	// JCheckBox speakerMocapCB;
..	..	@@ -715,8 +790,7 @@
715	790	dropAttributes \|= Object3D.TEXTURE;
716	791	else
717	792	dropAttributes &= ~Object3D.TEXTURE;
718		- }
719		- else if(e.getSource() == liveCB)
	793	+ } else if(e.getSource() == liveCB)
720	794	{
721	795	cameraView.ToggleLive();
722	796	}
..	..	@@ -753,6 +827,10 @@
753	827	Recompile();
754	828	cameraView.repaint();
755	829	// refreshContents();
	830	+ }
	831	+ else if(e.getSource() == zoomBoxCB)
	832	+ {
	833	+ cameraView.ToggleZoomBoxMode();
756	834	}
757	835	else if(e.getSource() == smoothfocusCB)
758	836	{
..	..	@@ -867,7 +945,9 @@
867	945	// objEditor.DropFile((java.io.File[]) object, true);
868	946	// return;
869	947	// }
870		- if (string.charAt(0) == '/')
	948	+
	949	+ // File path for Mac and Windows
	950	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
871	951	{
872	952	// file(s)
873	953	String[] names = string.split("\n");
..	..	@@ -894,7 +974,7 @@
894	974
895	975	flashIt = false;
896	976	CameraPane pane = (CameraPane) target;
897		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	977	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
898	978	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
899	979
900	980	if (group.selection.size() == 1)
..	..	@@ -921,11 +1001,11 @@
921	1001	{
922	1002	loadClipboard(true);
923	1003	objEditor.jTree.setSelectionPath(destinationPath);
924		- pasteInto(false);
	1004	+ pasteInto(false, false);
925	1005	} else {
926	1006	loadClipboard(false);
927	1007	objEditor.jTree.setSelectionPath(destinationPath);
928		- pasteInto(false); // true); // ???
	1008	+ pasteInto(false, false); // true); // ???
929	1009	}
930	1010	}
931	1011	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1047,27 +1127,33 @@
1047	1127	kleinItem.addActionListener(this);
1048	1128	particleItem = menu.add(new MenuItem("Particle system"));
1049	1129	particleItem.addActionListener(this);
	1130	+ if (Globals.ADVANCED)
	1131	+ {
1050	1132	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1051	1133	ragdollItem.addActionListener(this);
1052	1134	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1053	1135	ragdoll2Item.addActionListener(this);
	1136	+ }
1054	1137	menu.add("-");
1055		- meshItem = menu.add(new MenuItem("Mesh"));
	1138	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1056	1139	meshItem.addActionListener(this);
1057	1140	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1058	1141	// meshGroupItem.addActionListener(this);
	1142	+ if (Globals.ADVANCED)
	1143	+ {
1059	1144	springItem = menu.add(new MenuItem("Spring"));
1060	1145	springItem.addActionListener(this);
1061	1146	flagItem = menu.add(new MenuItem("Flag"));
1062	1147	flagItem.addActionListener(this);
1063		- bezierItem = menu.add(new MenuItem("Patch"));
1064		- bezierItem.addActionListener(this);
1065		- checkerItem = menu.add(new MenuItem("Checker"));
1066		- checkerItem.addActionListener(this);
1067	1148	blobItem = menu.add(new MenuItem("Blob"));
1068	1149	blobItem.addActionListener(this);
1069	1150	latheItem = menu.add(new MenuItem("Lathe"));
1070	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);
1071	1157	lightItem = menu.add(new MenuItem("Light"));
1072	1158	lightItem.addActionListener(this);
1073	1159	menu.add("-");
..	..	@@ -1077,34 +1163,39 @@
1077	1163	loopItem.addActionListener(this);
1078	1164	doubleItem = menu.add(new MenuItem("Fork"));
1079	1165	doubleItem.addActionListener(this);
	1166	+ if (Globals.ADVANCED)
	1167	+ {
1080	1168	tripleItem = menu.add(new MenuItem("Trident"));
1081	1169	tripleItem.addActionListener(this);
	1170	+ }
1082	1171	}
1083	1172
1084	1173	void buildToolsMenu(Menu menu)
1085	1174	{
1086	1175	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1087	1176	animationItem.addItemListener(this);
1088		- animationItem.setState(CameraPane.ANIMATION);
	1177	+ animationItem.setState(Globals.ANIMATION);
1089	1178
1090	1179	menu.add("-");
1091	1180	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1092	1181	parseverticesItem.addActionListener(this);
1093	1182	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1094	1183	textureFieldItem.addActionListener(this);
1095		- alignItem = menu.add(new MenuItem("Align"));
	1184	+ alignItem = menu.add(new MenuItem("Align Objects"));
1096	1185	alignItem.addActionListener(this);
1097		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1098		- mirrorItem.addActionListener(this);
1099	1186	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1100	1187	reduceMorphItem.addActionListener(this);
1101	1188	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1102	1189	reduce34MorphItem.addActionListener(this);
1103		-
	1190	+ menu.add("-");
1104	1191	menu.add(computeAOItem = new MenuItem("Compute AO"));
1105	1192	computeAOItem.addActionListener(this);
1106		- menu.add("-");
1107	1193
	1194	+ if (Globals.ADVANCED)
	1195	+ {
	1196	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1197	+ mirrorItem.addActionListener(this);
	1198	+ menu.add("-");
1108	1199	menu.add(memoryItem = new MenuItem("Memory Usage"));
1109	1200	memoryItem.addActionListener(this);
1110	1201	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1118,6 +1209,8 @@
1118	1209	resetParentItem.addActionListener(this);
1119	1210	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1120	1211	repairParentItem.addActionListener(this);
	1212	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1213	+ repairShadowItem.addActionListener(this);
1121	1214	menu.add(invariantsItem = new MenuItem("Invariants"));
1122	1215	invariantsItem.addActionListener(this);
1123	1216	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1125,6 +1218,7 @@
1125	1218	menu.add("-");
1126	1219	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1127	1220	editScriptItem.addActionListener(this);
	1221	+ }
1128	1222	}
1129	1223
1130	1224	void ScreenFit()
..	..	@@ -1453,9 +1547,9 @@
1453	1547
1454	1548	void Overwrite(int mask)
1455	1549	{
1456		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1550	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1457	1551	{
1458		- Object3D content = GrafreeD.clipboard.get(0);
	1552	+ Object3D content = Grafreed.clipboard.get(0);
1459	1553
1460	1554	if (content instanceof cGroup && ((cGroup)content).transientlink )
1461	1555	content = ((cGroup)content).get(0);
..	..	@@ -1478,6 +1572,7 @@
1478	1572	//
1479	1573	public void actionPerformed(ActionEvent event) // , Object arg)
1480	1574	{
	1575	+ Object source = event.getSource();
1481	1576	/*
1482	1577	if (event.getSource() == nameField)
1483	1578	{
..	..	@@ -1489,11 +1584,11 @@
1489	1584	}
1490	1585	else
1491	1586	*/
1492		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1587	+ if (source == lookAtItem \|\| source == lookFromItem)
1493	1588	{
1494	1589	ScreenFit();
1495	1590	} else
1496		- if (event.getSource() == switchItem)
	1591	+ if (source == switchItem)
1497	1592	{
1498	1593	cVector v1 = new cVector();
1499	1594	cVector v2 = new cVector();
..	..	@@ -1502,11 +1597,11 @@
1502	1597	objEditor.cameraView.renderCamera.setAim(v2, v1);
1503	1598	objEditor.cameraView.repaint();
1504	1599	} else
1505		- if (event.getSource() == rectoidItem)
	1600	+ if (source == rectoidItem)
1506	1601	{
1507	1602	makeSomething(new Box());
1508	1603	} else
1509		- if (event.getSource() == particleItem)
	1604	+ if (source == particleItem)
1510	1605	{
1511	1606	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1512	1607	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1527,9 +1622,9 @@
1527	1622	applyExample(particleGeom, "SMOKE");
1528	1623	makeSomething(particleGeom);
1529	1624	} else
1530		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1625	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1531	1626	{
1532		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1627	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1533	1628
1534	1629	ragdoll.toParent = LA.newMatrix();
1535	1630	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1547,7 +1642,7 @@
1547	1642	} else
1548	1643	/*
1549	1644	*/
1550		- if (event.getSource() == heightFieldItem)
	1645	+ if (source == heightFieldItem)
1551	1646	{
1552	1647	Object3D obj = new Object3D();
1553	1648
..	..	@@ -1585,31 +1680,31 @@
1585	1680
1586	1681	makeSomething(obj);
1587	1682	} else
1588		- if (event.getSource() == gridItem)
	1683	+ if (source == gridItem)
1589	1684	{
1590	1685	makeSomething(new Grid());
1591	1686	} else
1592		- if (event.getSource() == ellipsoidItem)
	1687	+ if (source == ellipsoidItem)
1593	1688	{
1594	1689	makeSomething(new Sphere());
1595	1690	} else
1596		- if (event.getSource() == coneItem)
	1691	+ if (source == coneItem)
1597	1692	{
1598	1693	makeSomething(new Cone());
1599	1694	} else
1600		- if (event.getSource() == torusItem)
	1695	+ if (source == torusItem)
1601	1696	{
1602	1697	makeSomething(new Torus());
1603	1698	} else
1604		- if (event.getSource() == superItem)
	1699	+ if (source == superItem)
1605	1700	{
1606	1701	makeSomething(new Superellipsoid());
1607	1702	} else
1608		- if (event.getSource() == kleinItem)
	1703	+ if (source == kleinItem)
1609	1704	{
1610	1705	makeSomething(new Klein());
1611	1706	} else
1612		- if (event.getSource() == blobItem)
	1707	+ if (source == blobItem)
1613	1708	{
1614	1709	Blob blob = new Blob();
1615	1710	BlobComponent comp = new BlobComponent();
..	..	@@ -1617,15 +1712,15 @@
1617	1712	//blob.retile();
1618	1713	makeSomething(blob);
1619	1714	} else
1620		- if (event.getSource() == latheItem)
	1715	+ if (source == latheItem)
1621	1716	{
1622	1717	makeSomething(new Lathe());
1623	1718	} else
1624		- if (event.getSource() == bezierItem)
	1719	+ if (source == bezierItem)
1625	1720	{
1626	1721	makeSomething(new BezierSurface());
1627	1722	} else
1628		- if (event.getSource() == checkerItem)
	1723	+ if (source == overlayItem)
1629	1724	{
1630	1725	/*
1631	1726	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1640,7 +1735,7 @@
1640	1735	*/
1641	1736	makeSomething(new Checker());
1642	1737	} else
1643		- if (event.getSource() == meshItem)
	1738	+ if (source == meshItem)
1644	1739	{
1645	1740	Object3D itemtomake = new Object3D();
1646	1741	Object3D child;
..	..	@@ -1661,35 +1756,35 @@
1661	1756	makeSomething(child);
1662	1757	}
1663	1758	} else
1664		- if (event.getSource() == springItem)
	1759	+ if (source == springItem)
1665	1760	{
1666	1761	cSpring s = new cSpring();
1667	1762	s.setup();
1668	1763	makeSomething(s);
1669	1764	} else
1670		- if (event.getSource() == flagItem)
	1765	+ if (source == flagItem)
1671	1766	{
1672	1767	cSpring s = new cFlag();
1673	1768	s.setup();
1674	1769	makeSomething(s);
1675	1770	} else
1676		- if (event.getSource() == lightItem)
	1771	+ if (source == lightItem)
1677	1772	{
1678	1773	makeSomething(new Light());
1679	1774	} else
1680		- if (event.getSource() == csgItem)
	1775	+ if (source == csgItem)
1681	1776	{
1682	1777	group(new CSG());
1683	1778	} else
1684		- if (event.getSource() == templateItem)
	1779	+ if (source == templateItem)
1685	1780	{
1686	1781	group(new cTemplate());
1687	1782	} else
1688		- if (event.getSource() == attributeItem)
	1783	+ if (source == attributeItem)
1689	1784	{
1690	1785	makeSomething(new Attribute());
1691	1786	} else
1692		- if (event.getSource() == pointflowItem)
	1787	+ if (source == pointflowItem)
1693	1788	{
1694	1789	makeSomething(new PointFlow());
1695	1790	} else
..	..	@@ -1701,7 +1796,7 @@
1701	1796	} else
1702	1797	*/
1703	1798
1704		- if (event.getSource() == superLoopItem)
	1799	+ if (source == superLoopItem)
1705	1800	{
1706	1801	Composite g = new cGroup();
1707	1802	for (int i=0; i<15; i++)
..	..	@@ -1723,7 +1818,7 @@
1723	1818
1724	1819	group(g);
1725	1820	} else
1726		- if (event.getSource() == loopItem)
	1821	+ if (source == loopItem)
1727	1822	{
1728	1823	Composite csg = new GroupLeaf();
1729	1824	csg.count = 5;
..	..	@@ -1732,7 +1827,7 @@
1732	1827	csg.addChild(child);
1733	1828	child.addChild(csg);
1734	1829	} else
1735		- if (event.getSource() == doubleItem)
	1830	+ if (source == doubleItem)
1736	1831	{
1737	1832	Composite csg = new GroupLeaf();
1738	1833	csg.count = 5;
..	..	@@ -1744,7 +1839,7 @@
1744	1839	csg.addChild(child);
1745	1840	child.addChild(csg);
1746	1841	} else
1747		- if (event.getSource() == tripleItem)
	1842	+ if (source == tripleItem)
1748	1843	{
1749	1844	Composite csg = new GroupLeaf();
1750	1845	csg.count = 4;
..	..	@@ -1760,70 +1855,83 @@
1760	1855	child.addChild(csg);
1761	1856	} else
1762	1857
1763		- if (event.getSource() == importGFDItem)
	1858	+ if (source == importGFDItem)
1764	1859	{
1765	1860	ImportGFD();
1766	1861	} else
1767		- if (event.getSource() == importVRMLX3DItem)
	1862	+ if (source == importVRMLX3DItem)
1768	1863	{
1769	1864	ImportVRMLX3D();
1770	1865	} else
1771		- if (event.getSource() == import3DSItem)
	1866	+ if (source == import3DSItem)
1772	1867	{
1773	1868	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1774	1869	} else
1775		- if (event.getSource() == importOBJItem)
	1870	+ if (source == importOBJItem)
1776	1871	{
1777		- 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	+ }
1778	1881	} else
1779		- if (event.getSource() == computeAOItem)
	1882	+ if (source == computeAOItem)
1780	1883	{
1781		- CameraPane.drawMode = CameraPane.OCCLUSION;
1782		- CameraPane.theRenderer.repaint();
	1884	+ Globals.drawMode = CameraPane.OCCLUSION;
	1885	+ Globals.theRenderer.repaint();
1783	1886	} else
1784		- if (event.getSource() == recompileItem)
	1887	+ if (source == recompileItem)
1785	1888	{
1786	1889	Recompile();
1787	1890	refreshContents();
1788	1891	} else
1789		- if (event.getSource() == editScriptItem)
	1892	+ if (source == editScriptItem)
1790	1893	{
1791	1894	OpenDialog();
1792	1895	refreshContents();
1793	1896	} else
1794		- if (event.getSource() == invariantsItem)
	1897	+ if (source == invariantsItem)
1795	1898	{
1796	1899	System.out.println("Invariants:");
1797		- GrafreeD.theApplet3D.universe.invariants();
	1900	+ Grafreed.grafreeD.universe.invariants();
1798	1901	} else
1799		- if (event.getSource() == memoryItem)
	1902	+ if (source == memoryItem)
1800	1903	{
1801	1904	//System.out.println("Invariants:");
1802	1905	PrintMemory();
1803	1906	} else
1804		- if (event.getSource() == pathItem)
	1907	+ if (source == pathItem)
1805	1908	{
1806	1909	PrintPath();
1807	1910	} else
1808		- if (event.getSource() == analyzeItem)
	1911	+ if (source == analyzeItem)
1809	1912	{
1810	1913	AnalyzeObject();
1811	1914	} else
1812		- if (event.getSource() == dumpItem)
	1915	+ if (source == dumpItem)
1813	1916	{
1814	1917	DumpObject();
1815	1918	} else
1816		- if (event.getSource() == screenfitButton)
	1919	+ if (source == oneStepButton)
	1920	+ {
	1921	+ Globals.ONESTEP = true;
	1922	+ cameraView.repaint();
	1923	+ } else
	1924	+ if (source == screenfitButton)
1817	1925	{
1818	1926	//Reload(lastConverter, lastFilename, true);
1819	1927	ScreenFit();
1820	1928	} else
1821		- if (event.getSource() == screenfitpointButton)
	1929	+ if (source == screenfitpointButton)
1822	1930	{
1823	1931	//Reload(lastConverter, lastFilename, true);
1824	1932	ScreenFitPoint();
1825	1933	} else
1826		- if (event.getSource() == snapobjectButton)
	1934	+ if (source == snapobjectButton)
1827	1935	{
1828	1936	//Reload(lastConverter, lastFilename, true);
1829	1937	SnapObject();
..	..	@@ -1834,13 +1942,13 @@
1834	1942	// Recompile();
1835	1943	// refreshContents();
1836	1944	// } else
1837		- if (event.getSource() == gcButton)
	1945	+ if (source == gcButton)
1838	1946	{
1839	1947	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1840	1948	System.gc();
1841	1949	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1842	1950	} else
1843		- if (event.getSource() == editLeafItem)
	1951	+ if (source == editLeafItem)
1844	1952	{
1845	1953	Object3D obj;
1846	1954	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1854,62 +1962,66 @@
1854	1962	}
1855	1963	refreshContents(true);
1856	1964	} else
1857		- if (event.getSource() == openWindowItem)
	1965	+ if (source == openWindowItem)
1858	1966	{
1859	1967	EditSelection(true);
1860	1968	} else
1861		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1969	+ if (source == cutItem \|\| source == clearButton)
1862	1970	{
1863	1971	loadClipboard(true);
1864	1972	} else
1865		- if (event.getSource() == duplicateItem)
	1973	+ if (source == duplicateItem)
1866	1974	{
1867		- Object3D keep = GrafreeD.clipboard;
	1975	+ Object3D keep = Grafreed.clipboard;
1868	1976	loadClipboard(false);
1869	1977	paste(false);
1870		- GrafreeD.clipboard = keep;
	1978	+ Grafreed.clipboard = keep;
1871	1979	} else
1872		- if (event.getSource() == cloneItem)
	1980	+ if (source == cloneItem)
1873	1981	{
1874	1982	CloneSelection(false);
1875	1983	} else
1876		- if (event.getSource() == cloneSupportItem)
	1984	+ if (source == cloneSupportItem)
1877	1985	{
1878	1986	CloneSelection(true);
1879	1987	} else
1880		- if (event.getSource() == copyItem)
	1988	+ if (source == copyItem)
1881	1989	{
1882	1990	loadClipboard(false);
1883	1991	} else
1884		- if (event.getSource() == pasteItem)
	1992	+ if (source == pasteItem)
1885	1993	{
1886	1994	paste(false);
1887	1995	} else
1888		- if (event.getSource() == pasteLinkItem)
	1996	+ if (source == pasteIntoItem)
1889	1997	{
1890		- pasteInto(false);
	1998	+ pasteInto(true, false);
1891	1999	} else
1892		- if (event.getSource() == pasteCloneItem)
	2000	+ if (source == pasteLinkItem)
1893	2001	{
1894		- pasteInto(true);
	2002	+ pasteInto(false, false);
1895	2003	} else
1896		- if (event.getSource() == pasteExpandItem)
	2004	+ if (source == pasteCloneItem)
	2005	+ {
	2006	+ pasteInto(true, true);
	2007	+ } else
	2008	+ if (source == pasteExpandItem)
1897	2009	{
1898	2010	paste(true);
1899	2011	} else
1900		- if (event.getSource() == synchronizeItem)
	2012	+ if (source == synchronizeItem)
1901	2013	{
1902	2014	Overwrite(Object3D.TRANSFORM);
1903	2015	} else
1904		- if (event.getSource() == overwriteNameItem)
	2016	+ if (source == overwriteNameItem)
1905	2017	{
1906	2018	Overwrite(Object3D.NAME);
1907	2019	} else
1908		- if (event.getSource() == overwriteUVItem)
	2020	+ if (source == overwriteUVItem)
1909	2021	{
1910	2022	Overwrite(Object3D.UV);
1911	2023	} else
1912		- if (event.getSource() == overwriteMatItem)
	2024	+ if (source == overwriteMatItem)
1913	2025	{
1914	2026	/* july 2015
1915	2027	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1929,7 +2041,7 @@
1929	2041
1930	2042	Overwrite(dropAttributes);
1931	2043	}
1932		- if (event.getSource() == overwriteGeoItem)
	2044	+ if (source == overwriteGeoItem)
1933	2045	{
1934	2046	Overwrite(Object3D.GEOMETRY);
1935	2047	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1946,7 +2058,7 @@
1946	2058	// refreshContents();
1947	2059	// }
1948	2060	} else
1949		- if (event.getSource() == generateMeshItem)
	2061	+ if (source == generateMeshItem)
1950	2062	{
1951	2063	//if (group.selection.size() == 1)
1952	2064	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1957,7 +2069,7 @@
1957	2069	ResetModel();
1958	2070	refreshContents();
1959	2071	} else
1960		- if (event.getSource() == extractGeometriesItem)
	2072	+ if (source == extractGeometriesItem)
1961	2073	{
1962	2074	boolean one = false;
1963	2075
..	..	@@ -1984,7 +2096,7 @@
1984	2096	ResetModel();
1985	2097	refreshContents();
1986	2098	} else
1987		- if (event.getSource() == cloneGeometriesItem)
	2099	+ if (source == cloneGeometriesItem)
1988	2100	{
1989	2101	boolean one = false;
1990	2102
..	..	@@ -2010,7 +2122,7 @@
2010	2122	ResetModel();
2011	2123	refreshContents();
2012	2124	} else
2013		- if (event.getSource() == shareGeometriesItem)
	2125	+ if (source == shareGeometriesItem)
2014	2126	{
2015	2127	boolean one = false;
2016	2128
..	..	@@ -2040,7 +2152,7 @@
2040	2152	refreshContents();
2041	2153	}
2042	2154	} else
2043		- if (event.getSource() == mergeGeometriesItem)
	2155	+ if (source == mergeGeometriesItem)
2044	2156	{
2045	2157	boolean one = false;
2046	2158
..	..	@@ -2070,7 +2182,7 @@
2070	2182	ResetModel();
2071	2183	refreshContents();
2072	2184	} else
2073		- if (event.getSource() == linkverticesItem)
	2185	+ if (source == linkverticesItem)
2074	2186	{
2075	2187	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2076	2188	// {
..	..	@@ -2083,48 +2195,48 @@
2083	2195	// group.selection.get(0).setMasterThis(content); // should be identity
2084	2196	// refreshContents();
2085	2197	// }
2086		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2198	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2087	2199	{
2088		- Object3D content = GrafreeD.clipboard.get(0);
	2200	+ Object3D content = Grafreed.clipboard.get(0);
2089	2201
2090	2202	if (content instanceof cGroup && ((cGroup)content).transientlink )
2091	2203	content = ((cGroup)content).get(0);
2092	2204
2093		- 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));
2094	2206	for (int i=0; i<group.selection.size(); i++)
2095	2207	{
2096		- boolean random = CameraPane.RANDOM;
2097		- CameraPane.RANDOM = false; // parse all random nodes
	2208	+ boolean random = CameraPane.SWITCH;
	2209	+ CameraPane.SWITCH = false; // parse all random nodes
2098	2210	group.selection.get(i).linkVerticesThis(content);
2099	2211	// group.selection.get(i).setMasterThis(content); // should be identity
2100		- CameraPane.RANDOM = random;
	2212	+ CameraPane.SWITCH = random;
2101	2213	}
2102		- 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));
2103	2215	refreshContents();
2104	2216	}
2105	2217	} else
2106		- if (event.getSource() == resetsupportItem)
	2218	+ if (source == resetsupportItem)
2107	2219	{
2108	2220	for (int i=0; i<group.selection.size(); i++)
2109	2221	{
2110		- boolean random = CameraPane.RANDOM;
2111		- CameraPane.RANDOM = false; // parse all random nodes
	2222	+ boolean random = CameraPane.SWITCH;
	2223	+ CameraPane.SWITCH = false; // parse all random nodes
2112	2224	group.selection.get(i).linkVerticesThis(null);
2113		- CameraPane.RANDOM = random;
	2225	+ CameraPane.SWITCH = random;
2114	2226	}
2115	2227
2116	2228	refreshContents();
2117	2229	} else
2118		- if (event.getSource() == relinkverticesItem)
	2230	+ if (source == relinkverticesItem)
2119	2231	{
2120		- boolean random = CameraPane.RANDOM;
2121		- CameraPane.RANDOM = false; // parse all random nodes
	2232	+ boolean random = CameraPane.SWITCH;
	2233	+ CameraPane.SWITCH = false; // parse all random nodes
2122	2234	group.selection.RelinkToSupport();
2123		- CameraPane.RANDOM = random;
	2235	+ CameraPane.SWITCH = random;
2124	2236
2125	2237	refreshContents();
2126	2238	} else
2127		- if (event.getSource() == resetreferencesItem)
	2239	+ if (source == resetreferencesItem)
2128	2240	{
2129	2241	for (int i=0; i<group.selection.size(); i++)
2130	2242	{
..	..	@@ -2133,11 +2245,11 @@
2133	2245
2134	2246	refreshContents();
2135	2247	} else
2136		- if (event.getSource() == setMasterItem)
	2248	+ if (source == setMasterItem)
2137	2249	{
2138		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2250	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2139	2251	{
2140		- Object3D content = GrafreeD.clipboard.get(0);
	2252	+ Object3D content = Grafreed.clipboard.get(0);
2141	2253
2142	2254	if (content instanceof cGroup && ((cGroup)content).transientlink )
2143	2255	content = ((cGroup)content).get(0);
..	..	@@ -2146,13 +2258,13 @@
2146	2258	refreshContents();
2147	2259	}
2148	2260	} else
2149		- if (event.getSource() == poseMeshItem)
	2261	+ if (source == poseMeshItem)
2150	2262	{
2151	2263	if (group.selection.size() == 1)
2152	2264	{
2153		- if (GrafreeD.clipboard.size() == 1)
	2265	+ if (Grafreed.clipboard.size() == 1)
2154	2266	{
2155		- Object3D content = GrafreeD.clipboard.get(0);
	2267	+ Object3D content = Grafreed.clipboard.get(0);
2156	2268
2157	2269	if (content instanceof cGroup && ((cGroup)content).transientlink )
2158	2270	content = ((cGroup)content).get(0);
..	..	@@ -2165,19 +2277,19 @@
2165	2277	}
2166	2278
2167	2279	} else
2168		- if (event.getSource() == revertMeshItem)
	2280	+ if (source == revertMeshItem)
2169	2281	{
2170	2282	RevertMeshes();
2171	2283	} else
2172		- if (event.getSource() == resetMeshItem)
	2284	+ if (source == resetAllItem)
2173	2285	{
2174	2286	ResetAll();
2175	2287	} else
2176		- if (event.getSource() == stepAllItem)
	2288	+ if (source == stepAllItem)
2177	2289	{
2178	2290	StepAll();
2179	2291	} else
2180		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2292	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2181	2293	{
2182	2294	//int indices[] = jList.getSelectedIndices();
2183	2295	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2185,46 +2297,46 @@
2185	2297
2186	2298	ClearSelection(false);
2187	2299	} else
2188		- if (event.getSource() == clearAllItem)
	2300	+ if (source == clearAllItem)
2189	2301	{
2190	2302	ClearSelection(true);
2191	2303	} else
2192		- if (event.getSource() == grabItem)
	2304	+ if (source == grabItem)
2193	2305	{
2194	2306	group(new cGroup(), true);
2195	2307	} else
2196		- if (event.getSource() == hideItem)
	2308	+ if (source == hideItem)
2197	2309	{
2198	2310	group(new HiddenObject());
2199	2311	} else
2200		- if (event.getSource() == frontItem)
	2312	+ if (source == frontItem)
2201	2313	{
2202	2314	front();
2203	2315	} else
2204		- if (event.getSource() == backItem)
	2316	+ if (source == backItem)
2205	2317	{
2206	2318	back();
2207	2319	} else
2208		- if (event.getSource() == cameraItem)
	2320	+ if (source == cameraItem)
2209	2321	{
2210	2322	makeSomething(new Camera());
2211	2323	} else
2212		- if (event.getSource() == compositeItem)
	2324	+ if (source == compositeItem)
2213	2325	{
2214	2326	group(new Composite());
2215	2327	} else
2216		- if (event.getSource() == randomItem)
	2328	+ if (source == randomItem)
2217	2329	{
2218	2330	RandomNode random = new RandomNode();
2219	2331	group(random);
2220	2332	if (random.size() > 0)
2221		- random.name = random.get(0).name + "Rnd";
	2333	+ random.name = random.get(0).name + "Switch";
2222	2334	} else
2223		- if (event.getSource() == physicsItem)
	2335	+ if (source == physicsItem)
2224	2336	{
2225	2337	group(new PhysicsNode());
2226	2338	} else
2227		- if (event.getSource() == frameselectorItem)
	2339	+ if (source == frameselectorItem)
2228	2340	{
2229	2341	for (int i=0; i<group.selection.size(); i++)
2230	2342	{
..	..	@@ -2236,7 +2348,7 @@
2236	2348	ResetModel();
2237	2349	refreshContents();
2238	2350	} else
2239		- if (event.getSource() == switchGeoItem)
	2351	+ if (source == switchGeoItem)
2240	2352	{
2241	2353	for (int i=0; i<group.selection.size(); i++)
2242	2354	{
..	..	@@ -2248,7 +2360,7 @@
2248	2360	ResetModel();
2249	2361	refreshContents();
2250	2362	} else
2251		- if (event.getSource() == switchTransfoItem)
	2363	+ if (source == switchTransfoItem)
2252	2364	{
2253	2365	for (int i=0; i<group.selection.size(); i++)
2254	2366	{
..	..	@@ -2260,7 +2372,7 @@
2260	2372	ResetModel();
2261	2373	refreshContents();
2262	2374	} else
2263		- if (event.getSource() == morphItem)
	2375	+ if (source == morphItem)
2264	2376	{
2265	2377	for (int i=0; i<group.selection.size(); i++)
2266	2378	{
..	..	@@ -2272,7 +2384,7 @@
2272	2384	ResetModel();
2273	2385	refreshContents();
2274	2386	} else
2275		- if (event.getSource() == scriptNodeItem)
	2387	+ if (source == scriptNodeItem)
2276	2388	{
2277	2389	boolean atleastone = false;
2278	2390
..	..	@@ -2311,31 +2423,31 @@
2311	2423	}
2312	2424	}
2313	2425	} else
2314		- if (event.getSource() == linkerItem)
	2426	+ if (source == linkerItem)
2315	2427	{
2316	2428	group(new cLinker());
2317	2429	} else
2318		- if (event.getSource() == textureItem)
	2430	+ if (source == textureItem)
2319	2431	{
2320	2432	group(new TextureNode());
2321	2433	} else
2322		- if (event.getSource() == billboardItem)
	2434	+ if (source == billboardItem)
2323	2435	{
2324	2436	group(new BillboardNode());
2325	2437	} else
2326		- if (event.getSource() == shadowXItem)
	2438	+ if (source == shadowXItem)
2327	2439	{
2328	2440	CastShadow(0);
2329	2441	} else
2330		- if (event.getSource() == shadowYItem)
	2442	+ if (source == shadowYItem)
2331	2443	{
2332	2444	CastShadow(1);
2333	2445	} else
2334		- if (event.getSource() == shadowZItem)
	2446	+ if (source == shadowZItem)
2335	2447	{
2336	2448	CastShadow(2);
2337	2449	} else
2338		- if (event.getSource() == ungroupItem)
	2450	+ if (source == ungroupItem)
2339	2451	{
2340	2452	//ungroup();
2341	2453	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2347,179 +2459,187 @@
2347	2459
2348	2460	refreshContents();
2349	2461	} else
2350		- if (event.getSource() == genUVItem)
	2462	+ if (source == genUVItem)
2351	2463	{
2352	2464	GenUV();
2353	2465	} else
2354		- if (event.getSource() == genNormalsCADItem)
	2466	+ if (source == genNormalsCADItem)
2355	2467	{
2356	2468	GenNormals(true);
2357	2469	} else
2358		- if (event.getSource() == genNormalsMESHItem)
	2470	+ if (source == genNormalsMESHItem)
2359	2471	{
2360	2472	GenNormals(true); // TODO
2361	2473	} else
2362		- if (event.getSource() == genNormalsORGANItem)
	2474	+ if (source == genNormalsORGANItem)
2363	2475	{
2364	2476	GenNormals(false);
2365	2477	} else
2366		- if (event.getSource() == genNormalsMINEItem)
	2478	+ if (source == genNormalsMINEItem)
2367	2479	{
2368	2480	GenNormalsMINE();
2369	2481	} else
2370		- if (event.getSource() == stripifyItem)
	2482	+ if (source == stripifyItem)
2371	2483	{
2372	2484	Stripify();
2373	2485	} else
2374		- if (event.getSource() == unstripifyItem)
	2486	+ if (source == unstripifyItem)
2375	2487	{
2376	2488	Unstripify();
2377	2489	} else
2378		- if (event.getSource() == trimItem)
	2490	+ if (source == trimItem)
2379	2491	{
2380	2492	Trim();
2381	2493	} else
2382		- if (event.getSource() == untrimItem)
	2494	+ if (source == untrimItem)
2383	2495	{
2384	2496	Untrim();
2385	2497	} else
2386		- if (event.getSource() == clearColorsItem)
	2498	+ if (source == clearColorsItem)
2387	2499	{
2388	2500	ClearColors();
2389	2501	} else
2390		- if (event.getSource() == clearMaterialsItem)
	2502	+ if (source == clearMaterialsItem)
2391	2503	{
2392	2504	ClearMaterials();
2393	2505	} else
2394		- if (event.getSource() == liveleavesItem)
	2506	+ if (source == liveleavesItem)
2395	2507	{
2396	2508	LiveLeaves(true);
2397	2509	} else
2398		- if (event.getSource() == unliveleavesItem)
	2510	+ if (source == unliveleavesItem)
2399	2511	{
2400	2512	LiveLeaves(false);
2401	2513	} else
2402		- if (event.getSource() == supportleavesItem)
	2514	+ if (source == supportleavesItem)
2403	2515	{
2404	2516	SupportLeaves(true);
2405	2517	} else
2406		- if (event.getSource() == unsupportleavesItem)
	2518	+ if (source == unsupportleavesItem)
2407	2519	{
2408	2520	SupportLeaves(false);
2409	2521	} else
2410		- if (event.getSource() == hideleavesItem)
	2522	+ if (source == hideleavesItem)
2411	2523	{
2412	2524	HideLeaves(true);
2413	2525	} else
2414		- if (event.getSource() == showleavesItem)
	2526	+ if (source == showleavesItem)
2415	2527	{
2416	2528	HideLeaves(false);
2417	2529	} else
2418		- if (event.getSource() == markleavesItem)
	2530	+ if (source == markleavesItem)
2419	2531	{
2420	2532	MarkLeaves(true);
2421	2533	} else
2422		- if (event.getSource() == unmarkleavesItem)
	2534	+ if (source == unmarkleavesItem)
2423	2535	{
2424	2536	MarkLeaves(false);
2425	2537	} else
2426		- if (event.getSource() == flipVItem)
	2538	+ if (source == flipVItem)
2427	2539	{
2428	2540	FlipV(true);
2429	2541	} else
2430		- if (event.getSource() == unflipVItem)
	2542	+ if (source == unflipVItem)
2431	2543	{
2432	2544	FlipV(false);
2433	2545	} else
2434		- if (event.getSource() == lowTexturesItem)
	2546	+ if (source == lowTexturesItem)
2435	2547	{
2436	2548	SetTexRes(0);
2437	2549	} else
2438		- if (event.getSource() == normalTexturesItem)
	2550	+ if (source == normalTexturesItem)
2439	2551	{
2440	2552	SetTexRes(1);
2441	2553	} else
2442		- if (event.getSource() == highTexturesItem)
	2554	+ if (source == highTexturesItem)
2443	2555	{
2444	2556	SetTexRes(2);
2445	2557	} else
2446		- if (event.getSource() == veryhighTexturesItem)
	2558	+ if (source == veryhighTexturesItem)
2447	2559	{
2448	2560	SetTexRes(3);
2449	2561	} else
2450		- if (event.getSource() == maxTexturesItem)
	2562	+ if (source == maxTexturesItem)
2451	2563	{
2452	2564	SetTexRes(4);
2453	2565	} else
2454		- if (event.getSource() == panoTexturesItem)
	2566	+ if (source == panoTexturesItem)
2455	2567	{
2456	2568	SetTexRes(5);
2457	2569	} else
2458		- if (event.getSource() == reverseNormalsItem)
	2570	+ if (source == reverseNormalsItem)
2459	2571	{
2460	2572	ReverseNormals();
2461	2573	} else
2462		- if (event.getSource() == parseverticesItem)
	2574	+ if (source == parseverticesItem)
2463	2575	{
2464	2576	ParseVertices();
2465	2577	} else
2466		- if (event.getSource() == textureFieldItem)
	2578	+ if (source == textureFieldItem)
2467	2579	{
2468	2580	TextureVertices();
2469	2581	} else
2470		- if (event.getSource() == alignItem)
	2582	+ if (source == alignItem)
2471	2583	{
2472	2584	Align();
2473	2585	} else
2474		- if (event.getSource() == mirrorItem)
	2586	+ if (source == mirrorItem)
2475	2587	{
2476	2588	MirrorPoses();
2477	2589	} else
2478		- if (event.getSource() == reduceMorphItem)
	2590	+ if (source == reduceMorphItem)
2479	2591	{
2480	2592	MeshReduction(false);
2481	2593	} else
2482		- if (event.getSource() == reduce34MorphItem)
	2594	+ if (source == reduce34MorphItem)
2483	2595	{
2484	2596	MeshReduction(true);
2485	2597	} else
2486		- if (event.getSource() == reverseTrianglesItem)
	2598	+ if (source == reverseTrianglesItem)
2487	2599	{
2488	2600	ReverseTriangles();
2489	2601	} else
2490		- if (event.getSource() == reduceMeshItem)
	2602	+ if (source == reduceMeshItem)
2491	2603	{
2492	2604	ReduceMesh(false);
2493	2605	} else
2494		- if (event.getSource() == reduce34MeshItem)
	2606	+ if (source == reduce34MeshItem)
2495	2607	{
2496	2608	ReduceMesh(true);
2497	2609	} else
2498		- if (event.getSource() == increaseMeshItem)
	2610	+ if (source == increaseMeshItem)
2499	2611	{
2500	2612	IncreaseMesh();
2501	2613	} else
2502		- if (event.getSource() == clipMeshItem)
	2614	+ if (source == clipMeshItem)
2503	2615	{
2504	2616	ClipMesh();
2505	2617	} else
2506		- if (event.getSource() == smoothMeshItem)
	2618	+ if (source == smoothMeshItem)
2507	2619	{
2508	2620	SmoothMesh();
2509	2621	} else
2510		- if (event.getSource() == transformgeometryItem)
	2622	+ if (source == transformGeometryItem)
2511	2623	{
2512	2624	TransformGeometry();
2513	2625	} else
2514		- if (event.getSource() == resetTransformItem)
	2626	+ if (source == transformChildrenItem)
	2627	+ {
	2628	+ TransformChildren();
	2629	+ } else
	2630	+ if (source == resetTransformItem)
2515	2631	{
2516	2632	ResetTransform();
2517	2633	} else
2518		- if (event.getSource() == resetCentroidItem)
	2634	+ if (source == resetCentroidItem)
2519	2635	{
2520		- ResetCentroid();
	2636	+ ResetCentroid(true);
2521	2637	} else
2522		- if (event.getSource() == resetParentItem)
	2638	+ if (source == resetCentroidXZItem)
	2639	+ {
	2640	+ ResetCentroid(false);
	2641	+ } else
	2642	+ if (source == resetParentItem)
2523	2643	{
2524	2644	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2525	2645	{
..	..	@@ -2529,7 +2649,7 @@
2529	2649
2530	2650	refreshContents();
2531	2651	} else
2532		- if (event.getSource() == repairParentItem)
	2652	+ if (source == repairParentItem)
2533	2653	{
2534	2654	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2535	2655	{
..	..	@@ -2543,7 +2663,21 @@
2543	2663
2544	2664	refreshContents();
2545	2665	} else
2546		- 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)
2547	2681	{
2548	2682	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2549	2683	{
..	..	@@ -2555,7 +2689,7 @@
2555	2689	ResetModel();
2556	2690	refreshContents();
2557	2691	} else
2558		- if (event.getSource() == sortbynameItem)
	2692	+ if (source == sortbynameItem)
2559	2693	{
2560	2694	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2561	2695	{
..	..	@@ -2567,7 +2701,7 @@
2567	2701	ResetModel();
2568	2702	refreshContents();
2569	2703	} else
2570		- if (event.getSource() == attachPigmentItem)
	2704	+ if (source == attachPigmentItem)
2571	2705	{
2572	2706	String texture = GetFile("Attach pigment");
2573	2707	Object3D obj;
..	..	@@ -2579,7 +2713,7 @@
2579	2713
2580	2714	refreshContents();
2581	2715	} else
2582		- if (event.getSource() == detachPigmentItem)
	2716	+ if (source == detachPigmentItem)
2583	2717	{
2584	2718	Object3D obj;
2585	2719	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2590,7 +2724,7 @@
2590	2724
2591	2725	refreshContents();
2592	2726	} else
2593		- if (event.getSource() == attachBumpItem)
	2727	+ if (source == attachBumpItem)
2594	2728	{
2595	2729	String texture = GetFile("Attach bump");
2596	2730	Object3D obj;
..	..	@@ -2602,7 +2736,7 @@
2602	2736
2603	2737	refreshContents();
2604	2738	} else
2605		- if (event.getSource() == detachBumpItem)
	2739	+ if (source == detachBumpItem)
2606	2740	{
2607	2741	Object3D obj;
2608	2742	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2613,7 +2747,7 @@
2613	2747
2614	2748	refreshContents();
2615	2749	} else
2616		- if (event.getSource() == pigmentBumpItem)
	2750	+ if (source == pigmentBumpItem)
2617	2751	{
2618	2752	Object3D obj;
2619	2753	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2624,158 +2758,195 @@
2624	2758
2625	2759	refreshContents();
2626	2760	} else
2627		- if (event.getSource() == flashSelectionButton)
	2761	+ if (source == flashSelectionButton)
2628	2762	{
2629	2763	CameraPane.flash = true;
2630	2764	refreshContents();
2631	2765	} else
2632		- if (event.getSource() == oneButton)
	2766	+ if (source == oneButton)
2633	2767	{
2634	2768	} else
2635		- if (event.getSource() == twoButton)
	2769	+ if (source == twoButton)
2636	2770	{
2637	2771	radio.layout = twoButton;
2638	2772	// bug
2639	2773	//gridPanel.setDividerLocation(1.0);
2640	2774	//bigPanel.setDividerLocation(0.0);
2641		- bigThree.remove(jtp);
2642		- bigThree.remove(cameraPanel);
2643		- bigThree.remove(XYZPanel);
2644		- aWindowConstraints.gridx = 0;
2645		- aWindowConstraints.gridy = 0;
2646		- aWindowConstraints.gridwidth = 1;
2647		- // aConstraints.gridheight = 3;
2648		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2649		- aWindowConstraints.weightx = 0;
2650		- aWindowConstraints.weighty = 1;
2651		- //bigThree.add(jtp, aWindowConstraints);
2652		- aWindowConstraints.weightx = 1;
2653		- aWindowConstraints.gridwidth = 3;
2654		- // aConstraints.gridheight = 3;
2655		- aWindowConstraints.gridx = 1;
2656		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2657		- bigThree.add(cameraPanel, aWindowConstraints);
2658		- aWindowConstraints.weightx = 0;
2659		- aWindowConstraints.gridx = 4;
2660		- aWindowConstraints.gridwidth = 1;
2661		- // aConstraints.gridheight = 3;
2662		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2663		- //bigThree.add(XYZPanel, aWindowConstraints);
2664		- 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();
2665	2804	} else
2666		- if (event.getSource() == threeButton)
	2805	+ if (source == threeButton)
2667	2806	{
2668	2807	radio.layout = threeButton;
2669		- bigThree.remove(jtp);
2670		- bigThree.remove(cameraPanel);
2671		- bigThree.remove(XYZPanel);
2672		- aWindowConstraints.gridx = 0;
2673		- aWindowConstraints.gridy = 0;
2674		- aWindowConstraints.gridwidth = 1;
2675		- // aConstraints.gridheight = 3;
2676		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2677		- aWindowConstraints.weightx = 0;
2678		- aWindowConstraints.weighty = 1;
2679		- //bigThree.add(jtp, aWindowConstraints);
2680		- aWindowConstraints.weightx = 1;
2681		- aWindowConstraints.gridwidth = 3;
2682		- // aConstraints.gridheight = 3;
2683		- aWindowConstraints.gridx = 1;
2684		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2685		- bigThree.add(cameraPanel, aWindowConstraints);
2686		- aWindowConstraints.weightx = 0;
2687		- aWindowConstraints.gridx = 4;
2688		- aWindowConstraints.gridwidth = 1;
2689		- // aConstraints.gridheight = 3;
2690		- aConstraints.fill = GridBagConstraints.VERTICAL;
2691		- bigThree.add(XYZPanel, aWindowConstraints);
2692		- 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();
2693	2840	} else
2694		- if (event.getSource() == fourButton)
	2841	+ if (source == fourButton)
2695	2842	{
2696	2843	radio.layout = fourButton;
2697		- bigThree.remove(jtp);
2698		- bigThree.remove(cameraPanel);
2699		- bigThree.remove(XYZPanel);
2700		- aWindowConstraints.gridx = 0;
2701		- aWindowConstraints.gridy = 0;
2702		- aWindowConstraints.gridwidth = 1;
2703		- // aWindowConstraints.gridheight = 3;
2704		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2705		- aWindowConstraints.weightx = 1;
2706		- aWindowConstraints.weighty = 1;
2707		- bigThree.add(jtp, aWindowConstraints);
2708		- aWindowConstraints.weightx = 1;
2709		- aWindowConstraints.gridwidth = 3;
2710		- // aConstraints.gridheight = 3;
2711		- aWindowConstraints.gridx = 1;
2712		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2713		- //bigThree.add(cameraPanel, aWindowConstraints);
2714		- aWindowConstraints.weightx = 0;
2715		- aWindowConstraints.gridx = 4;
2716		- aWindowConstraints.gridwidth = 1;
2717		- // aWindowConstraints.gridheight = 3;
2718		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2719		- //bigThree.add(XYZPanel, aWindowConstraints);
2720		- 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();
2721	2875	} else
2722		- if (event.getSource() == sixButton)
	2876	+ if (source == sixButton)
2723	2877	{
2724	2878	radio.layout = sixButton;
2725		- bigThree.remove(jtp);
2726		- bigThree.remove(cameraPanel);
2727		- bigThree.remove(XYZPanel);
2728		- aWindowConstraints.gridx = 0;
2729		- aWindowConstraints.gridy = 0;
2730		- aWindowConstraints.gridwidth = 1;
2731		- // aConstraints.gridheight = 3;
2732		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2733		- aWindowConstraints.weightx = 0;
2734		- aWindowConstraints.weighty = 1;
2735		- bigThree.add(jtp, aWindowConstraints);
2736		- aWindowConstraints.weightx = 1;
2737		- aWindowConstraints.gridwidth = 3;
2738		- // aWindowConstraints.gridheight = 3;
2739		- aWindowConstraints.gridx = 1;
2740		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2741		- bigThree.add(cameraPanel, aWindowConstraints);
2742		- aWindowConstraints.weightx = 0;
2743		- aWindowConstraints.gridx = 4;
2744		- aWindowConstraints.gridwidth = 1;
2745		- // aWindowConstraints.gridheight = 3;
2746		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2747		- //bigThree.add(XYZPanel, aConstraints);
2748		- 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();
2749	2911	} else
2750		- if (event.getSource() == sevenButton)
	2912	+ if (source == sevenButton)
2751	2913	{
2752	2914	radio.layout = sevenButton;
2753		- bigThree.remove(jtp);
2754		- bigThree.remove(cameraPanel);
2755		- bigThree.remove(XYZPanel);
2756		- aWindowConstraints.gridx = 0;
2757		- aWindowConstraints.gridy = 0;
2758		- aWindowConstraints.gridwidth = 1;
2759		- // aWindowConstraints.gridheight = 3;
2760		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2761		- aWindowConstraints.weightx = 0;
2762		- aWindowConstraints.weighty = 1;
2763		- bigThree.add(jtp, aWindowConstraints);
2764		- aWindowConstraints.weightx = 1;
2765		- aWindowConstraints.gridwidth = 3;
2766		- // aWindowConstraints.gridheight = 3;
2767		- aWindowConstraints.gridx = 1;
2768		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2769		- bigThree.add(cameraPanel, aWindowConstraints);
2770		- aWindowConstraints.weightx = 0;
2771		- aWindowConstraints.gridx = 4;
2772		- aWindowConstraints.gridwidth = 1;
2773		- // aConstraints.gridheight = 3;
2774		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2775		- bigThree.add(XYZPanel, aWindowConstraints);
2776		- 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();
2777	2948	} else
2778		- if (event.getSource() == rootButton)
	2949	+ if (source == rootButton)
2779	2950	{
2780	2951	Object3D obj;
2781	2952	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2787,7 +2958,7 @@
2787	2958
2788	2959	refreshContents(true);
2789	2960	} else
2790		- if (event.getSource() == closeButton)
	2961	+ if (source == closeButton)
2791	2962	{
2792	2963	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2793	2964	cRadio ab;
..	..	@@ -2808,11 +2979,11 @@
2808	2979	}
2809	2980	refreshContents(true);
2810	2981	} else
2811		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2982	+ if (source == editItem \|\| source == editButton)
2812	2983	{
2813	2984	EditSelection(false);
2814	2985	} else
2815		- if (event.getSource() == uneditButton)
	2986	+ if (source == uneditButton)
2816	2987	{
2817	2988	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2818	2989	{
..	..	@@ -2824,12 +2995,12 @@
2824	2995
2825	2996	child.editWindow = null; // ???????????
2826	2997	}
2827		- objEditor.ctrlPanel.revalidate();
	2998	+ objEditor.ctrlPanel.FlushUI();
2828	2999	//objEditor.jTree.clearSelection();
2829	3000	//objEditor.ResetSliders();
2830	3001	refreshContents(true);
2831	3002	} else
2832		- if (event.getSource() == clearPanelButton)
	3003	+ if (source == clearPanelButton)
2833	3004	{
2834	3005	assert(copy == group);
2835	3006	//copy.ClearUI();
..	..	@@ -2840,7 +3011,7 @@
2840	3011	listUI.clear();
2841	3012	refreshContents(true);
2842	3013	} else
2843		- if (event.getSource() == allParamsButton)
	3014	+ if (source == allParamsButton)
2844	3015	{
2845	3016	assert(copy == group);
2846	3017
..	..	@@ -2861,19 +3032,19 @@
2861	3032
2862	3033	refreshContents(true);
2863	3034	} else
2864		- if (event.getSource() == unselectButton)
	3035	+ if (source == unselectButton)
2865	3036	{
2866	3037	objEditor.jTree.clearSelection();
2867	3038	// ?? oct 2012 GrafreeD.clipboard.clear();
2868	3039	objEditor.ResetSliders();
2869	3040	refreshContents(true);
2870	3041	} else
2871		- if(event.getSource() instanceof cRadio)
	3042	+ if(source instanceof cRadio)
2872	3043	{
2873	3044	group.parent = keepparent;
2874	3045	group.attributes = 0;
2875	3046	//group.editWindow = null;
2876		- /cRadio/ radio = (cRadio)event.getSource();
	3047	+ /cRadio/ radio = (cRadio)source;
2877	3048	Object3D obj = radio.GetObject();
2878	3049	System.out.println("Edit " + obj);
2879	3050	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2893,7 +3064,7 @@
2893	3064	}
2894	3065
2895	3066	copy = group;
2896		- //CameraPane.theRenderer.object = group;
	3067	+ //Globals.theRenderer.object = group;
2897	3068	if(!useclient)
2898	3069	{
2899	3070	cameraView.renderCamera = radio.camera;
..	..	@@ -2902,7 +3073,8 @@
2902	3073	cameraView.cameras[cameraView.cameracount] = radio.camera;
2903	3074	cameraView.targetLookAt.set(radio.camera.lookAt);
2904	3075	cameraView.object = group;
2905		- cameraView.lighttouched = true;
	3076	+ //cameraView.lighttouched = true;
	3077	+ Globals.lighttouched = true;
2906	3078	topView.object = group;
2907	3079	frontView.object = group;
2908	3080	sideView.object = group;
..	..	@@ -2938,7 +3110,7 @@
2938	3110	if (useclient)
2939	3111	{
2940	3112	cameraView.object = client;
2941		- cameraView.lighttouched = true;
	3113	+ Globals.lighttouched = true;
2942	3114	//topView.object = client;
2943	3115	//frontView.object = client;
2944	3116	//sideView.object = client;
..	..	@@ -2946,7 +3118,7 @@
2946	3118	else
2947	3119	{
2948	3120	cameraView.object = group;
2949		- cameraView.lighttouched = true;
	3121	+ Globals.lighttouched = true;
2950	3122	//topView.object = group;
2951	3123	//frontView.object = group;
2952	3124	//sideView.object = group;
..	..	@@ -2981,6 +3153,28 @@
2981	3153	refreshContents();
2982	3154	}
2983	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	+ }
2984	3178
2985	3179	void ResetTransform()
2986	3180	{
..	..	@@ -3093,7 +3287,7 @@
3093	3287	refreshContents();
3094	3288	}
3095	3289
3096		- void ResetCentroid()
	3290	+ void ResetCentroid(boolean full)
3097	3291	{
3098	3292	Object3D obj;
3099	3293	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3108,12 +3302,16 @@
3108	3302	LA.matIdentity(Object3D.mat);
3109	3303	obj.getBounds(minima, maxima, false);
3110	3304	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3111		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3305	+ if (full)
	3306	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3112	3307	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3113	3308	obj.TransformMesh(Object3D.mat);
	3309	+
3114	3310	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3115		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3311	+ if (full)
	3312	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3116	3313	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3314	+
3117	3315	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3118	3316	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3119	3317	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3179,9 +3377,9 @@
3179	3377	obj = (Object3D)e.nextElement();
3180	3378
3181	3379	System.out.println("Object is: " + obj);
3182		- GrafreeD.AnalyzeObject(obj);
	3380	+ Grafreed.AnalyzeObject(obj);
3183	3381	System.out.println("Boundary rep: " + obj.bRep);
3184		- GrafreeD.AnalyzeObject(obj.bRep);
	3382	+ Grafreed.AnalyzeObject(obj.bRep);
3185	3383
3186	3384	// System.err.println((size/1024) + " KB is the size of " + obj);
3187	3385	}
..	..	@@ -3395,8 +3593,8 @@
3395	3593
3396	3594	void ParseVertices()
3397	3595	{
3398		- boolean epsequal = GrafreeD.epsequal;
3399		- GrafreeD.epsequal = true;
	3596	+ boolean epsequal = Grafreed.epsequal;
	3597	+ Grafreed.epsequal = true;
3400	3598
3401	3599	for (int i=0; i<group.selection.size(); i++)
3402	3600	{
..	..	@@ -3421,7 +3619,7 @@
3421	3619	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3422	3620	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3423	3621
3424		- g.add(GrafreeD.clipboard);
	3622	+ g.add(Grafreed.clipboard);
3425	3623
3426	3624	buffer.add(g);
3427	3625	}
..	..	@@ -3436,7 +3634,7 @@
3436	3634	makeSomething(buffer, i==group.selection.size()-1);
3437	3635	}
3438	3636
3439		- GrafreeD.epsequal = epsequal;
	3637	+ Grafreed.epsequal = epsequal;
3440	3638
3441	3639	refreshContents();
3442	3640	}
..	..	@@ -3454,7 +3652,16 @@
3454	3652	String pigment = Object3D.GetPigment(tex);
3455	3653	//String bump = Object3D.GetBump(tex);
3456	3654
3457		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3655	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3656	+
	3657	+ try
	3658	+ {
	3659	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3660	+ }
	3661	+ catch (Exception e)
	3662	+ {
	3663	+ System.err.println("FAIL: " + node);
	3664	+ }
3458	3665
3459	3666	double s = v.s;
3460	3667
..	..	@@ -3542,11 +3749,11 @@
3542	3749
3543	3750	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3544	3751
3545		- boolean random = CameraPane.RANDOM;
3546		- CameraPane.RANDOM = false; // parse all random nodes
	3752	+ boolean random = CameraPane.SWITCH;
	3753	+ CameraPane.SWITCH = false; // parse all random nodes
3547	3754	lowres.linkVerticesThis(null);
3548	3755	lowres.linkVerticesThis(sn);
3549		- CameraPane.RANDOM = random;
	3756	+ CameraPane.SWITCH = random;
3550	3757
3551	3758	System.err.flush();
3552	3759
..	..	@@ -3586,7 +3793,7 @@
3586	3793	return;
3587	3794
3588	3795	Object3D poses = group.selection.get(0);
3589		- Object3D ref = GrafreeD.clipboard.get(0);
	3796	+ Object3D ref = Grafreed.clipboard.get(0);
3590	3797
3591	3798	Object3D newgroup = new Object3D("Po:" + poses.name);
3592	3799
..	..	@@ -3755,7 +3962,7 @@
3755	3962	group.selection.RelinkToSupport(); // july 2014
3756	3963	System.out.println("DONE.");
3757	3964	refreshContents();
3758		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3965	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3759	3966	}
3760	3967
3761	3968	void ReduceMesh(boolean reduction34)
..	..	@@ -3780,9 +3987,9 @@
3780	3987
3781	3988	void ClipMesh()
3782	3989	{
3783		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3990	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3784	3991	{
3785		- Object3D content = GrafreeD.clipboard.get(0);
	3992	+ Object3D content = Grafreed.clipboard.get(0);
3786	3993
3787	3994	if (content instanceof cGroup && ((cGroup)content).transientlink )
3788	3995	content = ((cGroup)content).get(0);
..	..	@@ -3791,7 +3998,7 @@
3791	3998	// {
3792	3999	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3793	4000	// }
3794		- group.selection.ClipMesh(GrafreeD.clipboard);
	4001	+ group.selection.ClipMesh(Grafreed.clipboard);
3795	4002	}
3796	4003	// group.selection.ClipMesh(GrafreeD.clipboard);
3797	4004	System.out.println("DONE.");
..	..	@@ -4031,25 +4238,25 @@
4031	4238	System.err.println("info : " + child.GetPath());
4032	4239	}
4033	4240	}
4034		- else
4035		- {
4036		- objEditor.SetMaterial(group); // .GetMaterial());
4037		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4038		- System.err.println("info : " + group.GetPath());
4039		- }
	4241	+// else
	4242	+// {
	4243	+// objEditor.SetMaterial(group); // .GetMaterial());
	4244	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4245	+// System.err.println("info : " + group.GetPath());
	4246	+// }
4040	4247
4041	4248	objEditor.SetText(); // jan 2014
4042	4249
4043		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4250	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
4044	4251	CameraPane.flash = true;
4045	4252
4046	4253	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
4047	4254	// a camera
4048	4255	{
4049	4256	CameraPane.camerachangeframe = 0; // don't refuse it
4050		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4051		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
4052		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4257	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4258	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4259	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4053	4260	}
4054	4261
4055	4262	refreshContents();
..	..	@@ -4131,12 +4338,12 @@
4131	4338	{
4132	4339	if (group.selection.isEmpty())
4133	4340	return;
4134		- GrafreeD.clipboardIsTempGroup = false;
	4341	+ Grafreed.clipboardIsTempGroup = false;
4135	4342	Composite tGroup = null;
4136	4343	if (group.selection.size() > 0) // 1)
4137	4344	{
4138	4345	tGroup = new cGroup();
4139		- GrafreeD.clipboardIsTempGroup = true;
	4346	+ Grafreed.clipboardIsTempGroup = true;
4140	4347	}
4141	4348
4142	4349	if (cut)
..	..	@@ -4176,16 +4383,16 @@
4176	4383	//System.out.println("cut " + child);
4177	4384	//System.out.println("parent = " + child.parent);
4178	4385	// tmp.addChild(child);
4179		- if (GrafreeD.clipboardIsTempGroup)
	4386	+ if (Grafreed.clipboardIsTempGroup)
4180	4387	tGroup.add/Child/(tmp);
4181	4388	else
4182		- GrafreeD.clipboard = tmp;
	4389	+ Grafreed.clipboard = tmp;
4183	4390	}
4184	4391	else
4185		- if (GrafreeD.clipboardIsTempGroup)
	4392	+ if (Grafreed.clipboardIsTempGroup)
4186	4393	tGroup.add/Child/(child);
4187	4394	else
4188		- GrafreeD.clipboard = child;
	4395	+ Grafreed.clipboard = child;
4189	4396	}
4190	4397
4191	4398	//ResetModel();
..	..	@@ -4217,21 +4424,21 @@
4217	4424	//System.out.println("cut " + elem);
4218	4425	//System.out.println("parent = " + elem.parent);
4219	4426	// tmp.addChild(elem);
4220		- if (GrafreeD.clipboardIsTempGroup)
	4427	+ if (Grafreed.clipboardIsTempGroup)
4221	4428	tGroup.add/Child/(tmp);
4222	4429	else
4223		- GrafreeD.clipboard = tmp;
	4430	+ Grafreed.clipboard = tmp;
4224	4431	}
4225	4432	else
4226		- if (GrafreeD.clipboardIsTempGroup)
	4433	+ if (Grafreed.clipboardIsTempGroup)
4227	4434	tGroup.add/Child/(child);
4228	4435	else
4229		- GrafreeD.clipboard = child;
	4436	+ Grafreed.clipboard = child;
4230	4437	}
4231	4438
4232	4439	}
4233		- if (GrafreeD.clipboardIsTempGroup)
4234		- GrafreeD.clipboard = tGroup;
	4440	+ if (Grafreed.clipboardIsTempGroup)
	4441	+ Grafreed.clipboard = tGroup;
4235	4442	if (cut)
4236	4443	{
4237	4444	ResetModel();
..	..	@@ -4245,7 +4452,7 @@
4245	4452	// return;
4246	4453	boolean first = true;
4247	4454
4248		- if (GrafreeD.clipboardIsTempGroup)
	4455	+ if (Grafreed.clipboardIsTempGroup)
4249	4456	{
4250	4457	Composite temp;
4251	4458
..	..	@@ -4256,7 +4463,7 @@
4256	4463	temp = (Composite)Applet3D.clipboard.deepCopy();
4257	4464	*/
4258	4465	Object3D elem;
4259		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4466	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4260	4467	{
4261	4468	Object3D child = (Object3D)e.nextElement();
4262	4469
..	..	@@ -4290,21 +4497,21 @@
4290	4497	//Object3D cb = Applet3D.clipboard;
4291	4498	//temp.addChild(cb);
4292	4499	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4293		- assert(GrafreeD.clipboard.parent == null);
4294		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4295		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4296		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4297		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4500	+ assert(Grafreed.clipboard.parent == null);
	4501	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4502	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4503	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4504	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4298	4505	else
4299		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4300		- GrafreeD.clipboard.get(0).parent = keepparent;
	4506	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4507	+ Grafreed.clipboard.get(0).parent = keepparent;
4301	4508	}
4302	4509
4303	4510	ResetModel();
4304	4511	refreshContents();
4305	4512	}
4306	4513
4307		- void pasteInto(boolean copyit)
	4514	+ void pasteInto(boolean copyit, boolean clone)
4308	4515	{
4309	4516	// if (GrafreeD.clipboard == null)
4310	4517	// return;
..	..	@@ -4333,15 +4540,22 @@
4333	4540	if (copyit)
4334	4541	{
4335	4542	// paste(false);
4336		- CloneClipboard(false); // sept 2014
	4543	+ if (clone)
	4544	+ {
	4545	+ CloneClipboard(false); // sept 2014
	4546	+ }
	4547	+ else
	4548	+ {
	4549	+ paste(false);
	4550	+ }
4337	4551	}
4338	4552	else
4339	4553	{
4340	4554	boolean first = true;
4341	4555
4342		- if (GrafreeD.clipboardIsTempGroup)
	4556	+ if (Grafreed.clipboardIsTempGroup)
4343	4557	{
4344		- Composite temp = (Composite)GrafreeD.clipboard;
	4558	+ Composite temp = (Composite)Grafreed.clipboard;
4345	4559	Object3D copy;
4346	4560	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4347	4561	{
..	..	@@ -4351,7 +4565,7 @@
4351	4565	}
4352	4566	} else
4353	4567	{
4354		- linkSomething(GrafreeD.clipboard); //.get(0));
	4568	+ linkSomething(Grafreed.clipboard); //.get(0));
4355	4569	}
4356	4570	}
4357	4571	}
..	..	@@ -4796,7 +5010,7 @@
4796	5010
4797	5011	void ImportVRMLX3D()
4798	5012	{
4799		- if (GrafreeD.standAlone)
	5013	+ if (Grafreed.standAlone)
4800	5014	{
4801	5015	/**/
4802	5016	FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
..	..	@@ -4813,7 +5027,7 @@
4813	5027
4814	5028	String GetFile(String dialogName)
4815	5029	{
4816		- if (GrafreeD.standAlone)
	5030	+ if (Grafreed.standAlone)
4817	5031	{
4818	5032	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4819	5033	browser.show();
..	..	@@ -4877,10 +5091,12 @@
4877	5091	cButton flashSelectionButton;
4878	5092	cButton editButton;
4879	5093	cButton uneditButton;
	5094	+ JCheckBox allParamsButton;
4880	5095	cButton clearpanelButton;
4881		- cButton allParamsButton;
4882	5096	cButton unselectButton;
4883	5097
	5098	+ cButton oneStepButton;
	5099	+
4884	5100	cButton screenfitButton;
4885	5101	cButton screenfitpointButton;
4886	5102	cButton snapobjectButton;
..	..	@@ -4924,7 +5140,7 @@
4924	5140	private MenuItem linkverticesItem;
4925	5141	private MenuItem relinkverticesItem;
4926	5142	private MenuItem setMasterItem;
4927		- private MenuItem resetMeshItem;
	5143	+ private MenuItem resetAllItem;
4928	5144	private MenuItem stepAllItem;
4929	5145	private MenuItem revertMeshItem;
4930	5146	private MenuItem poseMeshItem;
..	..	@@ -4935,6 +5151,7 @@
4935	5151	private MenuItem mergeGeometriesItem;
4936	5152	private MenuItem copyItem;
4937	5153	private MenuItem pasteItem;
	5154	+ private MenuItem pasteIntoItem;
4938	5155	private MenuItem pasteLinkItem;
4939	5156	private MenuItem pasteCloneItem;
4940	5157	private MenuItem pasteExpandItem;
..	..	@@ -4984,8 +5201,10 @@
4984	5201	private MenuItem panoTexturesItem;
4985	5202
4986	5203	private MenuItem resetCentroidItem;
4987		- private MenuItem transformgeometryItem;
	5204	+ private MenuItem resetCentroidXZItem;
4988	5205	private MenuItem resetTransformItem;
	5206	+ private MenuItem transformGeometryItem;
	5207	+ private MenuItem transformChildrenItem;
4989	5208	private MenuItem hideItem;
4990	5209	private MenuItem grabItem;
4991	5210	private MenuItem backItem;
..	..	@@ -5007,6 +5226,7 @@
5007	5226
5008	5227	private MenuItem resetParentItem;
5009	5228	private MenuItem repairParentItem;
	5229	+ private MenuItem repairShadowItem;
5010	5230	private MenuItem sortbysizeItem;
5011	5231	private MenuItem sortbynameItem;
5012	5232
..	..	@@ -5031,7 +5251,7 @@
5031	5251	private MenuItem blobItem;
5032	5252	private MenuItem latheItem;
5033	5253	private MenuItem bezierItem;
5034		- private MenuItem checkerItem;
	5254	+ private MenuItem overlayItem;
5035	5255	private MenuItem meshItem;
5036	5256	// private MenuItem meshGroupItem;
5037	5257	private MenuItem springItem;