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