~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,
..	..	@@ -83,7 +84,7 @@
83	84
84	85	void CloneSelection(boolean supports)
85	86	{
86		- // Object3D keep = GraphreeD.clipboard;
	87	+ // Object3D keep = GrafreeD.clipboard;
87	88	//Object3D obj;
88	89	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
89	90	{
..	..	@@ -97,14 +98,14 @@
97	98
98	99	void CloneClipboard(boolean supports)
99	100	{
100		- assert(GraphreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
102		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GraphreeD.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(GraphreeD.clipboard, false));
107		- GraphreeD.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)GraphreeD.clone(obj);
	122	+ Object3D clone = (Object3D)GrafreeD.clone(obj);
122	123	obj.parent = parent;
123	124	// obj.support = support;
124	125	// clone.support = support; // aout 2013
..	..	@@ -149,6 +150,8 @@
149	150
150	151	void SetupMenu2(ObjEditor oe)
151	152	{
	153	+ if (Globals.ADVANCED)
	154	+ {
152	155	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153	156	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154	157	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -160,17 +163,21 @@
160	163	lookAtItem.addActionListener(this);
161	164	//lookFromItem.addActinoListener(this);
162	165	//switchItem.addActionListener(this);
	166	+ }
	167	+
163	168	Menu menu;
164	169	oe.menuBar.add(menu = new Menu("Edit"));
165	170	//editItem = menu.add(new MenuItem("Edit"));
166	171	//editItem.addActionListener(this);
167	172	duplicateItem = menu.add(new MenuItem("Duplicate"));
168	173	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	174	cloneItem = menu.add(new MenuItem("Clone"));
171	175	cloneItem.addActionListener(this);
	176	+ if (Globals.ADVANCED)
	177	+ {
172	178	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	179	cloneSupportItem.addActionListener(this);
	180	+ }
174	181	menu.add("-");
175	182	cutItem = menu.add(new MenuItem("Cut"));
176	183	cutItem.addActionListener(this);
..	..	@@ -178,18 +185,31 @@
178	185	copyItem.addActionListener(this);
179	186	pasteItem = menu.add(new MenuItem("Paste"));
180	187	pasteItem.addActionListener(this);
	188	+ menu.add("-");
	189	+
	190	+ menu.add("-");
	191	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	192	+ pasteIntoItem.addActionListener(this);
181	193	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	194	pasteLinkItem.addActionListener(this);
183	195	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	196	pasteCloneItem.addActionListener(this);
185	197	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	198	// pasteExpandItem.addActionListener(this);
	199	+ menu.add("-");
187	200	clearItem = menu.add(new MenuItem("Clear"));
188	201	clearItem.addActionListener(this);
	202	+
	203	+ if (Globals.ADVANCED)
	204	+ {
	205	+ // Deletes the cameras...
189	206	clearAllItem = menu.add(new MenuItem("Clear All"));
190	207	clearAllItem.addActionListener(this);
	208	+ }
191	209
192	210	oe.menuBar.add(menu = new Menu("Setting"));
	211	+ if (Globals.ADVANCED)
	212	+ {
193	213	resetMeshItem = menu.add(new MenuItem("Reset All"));
194	214	resetMeshItem.addActionListener(this);
195	215	stepAllItem = menu.add(new MenuItem("Step All"));
..	..	@@ -199,6 +219,7 @@
199	219	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	220	resetreferencesItem.addActionListener(this);
201	221	menu.add("-");
	222	+ }
202	223	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	224	overwriteGeoItem.addActionListener(this);
204	225	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,48 +231,68 @@
210	231	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	232	overwriteUVItem.addActionListener(this);
212	233	menu.add("-");
	234	+ if (Globals.ADVANCED)
	235	+ {
213	236	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	237	generateMeshItem.addActionListener(this);
215	238	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	239	poseMeshItem.addActionListener(this);
217	240	menu.add("-");
	241	+ }
218	242	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	243	resetsupportItem.addActionListener(this);
220	244	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	245	linkverticesItem.addActionListener(this);
	246	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	247	+ relinkverticesItem.addActionListener(this);
	248	+
	249	+ if (Globals.ADVANCED)
	250	+ {
222	251	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	252	setMasterItem.addActionListener(this);
	253	+ }
224	254
225	255	oe.menuBar.add(menu = new Menu("Group"));
226	256	grabItem = menu.add(new MenuItem("Grab"));
227	257	grabItem.addActionListener(this);
228		- frontItem = menu.add(new MenuItem("Front"));
229		- frontItem.addActionListener(this);
230	258	backItem = menu.add(new MenuItem("Back"));
231	259	backItem.addActionListener(this);
	260	+ frontItem = menu.add(new MenuItem("Front"));
	261	+ frontItem.addActionListener(this);
232	262	compositeItem = menu.add(new MenuItem("Composite"));
233	263	compositeItem.addActionListener(this);
	264	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	265	+ hideItem.addActionListener(this);
	266	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	267	+ ungroupItem.addActionListener(this);
234	268	menu.add("-");
235		- randomItem = menu.add(new MenuItem("Random"));
	269	+ randomItem = menu.add(new MenuItem("Switch node"));
236	270	randomItem.addActionListener(this);
237		- physicsItem = menu.add(new MenuItem("Physics"));
238		- physicsItem.addActionListener(this);
239		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
240		- frameselectorItem.addActionListener(this);
241	271	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	272	switchGeoItem.addActionListener(this);
243	273	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	274	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	275	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	276	morphItem.addActionListener(this);
	277	+
	278	+ if (Globals.ADVANCED)
	279	+ {
	280	+ menu.add("-");
	281	+ physicsItem = menu.add(new MenuItem("Physics"));
	282	+ physicsItem.addActionListener(this);
	283	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	284	+ frameselectorItem.addActionListener(this);
247	285	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	286	scriptNodeItem.addActionListener(this);
249	287	cameraItem = menu.add(new MenuItem("Camera"));
250	288	cameraItem.addActionListener(this);
	289	+ }
251	290
252	291	oe.menuBar.add(menu = new Menu("Object"));
253	292	textureItem = menu.add(new MenuItem("Texture"));
254	293	textureItem.addActionListener(this);
	294	+ billboardItem = menu.add(new MenuItem("Billboard"));
	295	+ billboardItem.addActionListener(this);
255	296	csgItem = menu.add(new MenuItem("CSG"));
256	297	csgItem.addActionListener(this);
257	298	shadowXItem = menu.add(new MenuItem("Shadow X"));
..	..	@@ -260,23 +301,25 @@
260	301	shadowYItem.addActionListener(this);
261	302	shadowZItem = menu.add(new MenuItem("Shadow Z"));
262	303	shadowZItem.addActionListener(this);
	304	+ if (Globals.ADVANCED)
	305	+ {
	306	+ menu.add("-");
263	307	linkerItem = menu.add(new MenuItem("Linker"));
264	308	linkerItem.addActionListener(this);
265		- templateItem = menu.add(new MenuItem("Template"));
266		- templateItem.addActionListener(this);
267	309	attributeItem = menu.add(new MenuItem("Attribute"));
268	310	attributeItem.addActionListener(this);
	311	+ templateItem = menu.add(new MenuItem("Template"));
	312	+ templateItem.addActionListener(this);
269	313	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	314	pointflowItem.addActionListener(this);
	315	+ }
271	316	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	317	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	318	resetTransformItem.addActionListener(this);
276	319	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	320	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	321	+ transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
	322	+ transformgeometryItem.addActionListener(this);
280	323
281	324	oe.menuBar.add(menu = new Menu("Geometry"));
282	325	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -285,6 +328,13 @@
285	328	genNormalsORGANItem.addActionListener(this);
286	329	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287	330	genNormalsCADItem.addActionListener(this);
	331	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	332	+ genNormalsMESHItem.addActionListener(this);
	333	+ if (Globals.ADVANCED)
	334	+ {
	335	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	336	+ genNormalsMINEItem.addActionListener(this);
	337	+ }
288	338	stripifyItem = menu.add(new MenuItem("Stripify"));
289	339	stripifyItem.addActionListener(this);
290	340	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -306,10 +356,14 @@
306	356	reduce34MeshItem.addActionListener(this);
307	357	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	358	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	359	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	360	clipMeshItem.addActionListener(this);
	361	+
	362	+ if (Globals.ADVANCED)
	363	+ {
	364	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	365	+ smoothMeshItem.addActionListener(this);
	366	+ }
313	367
314	368	oe.menuBar.add(menu = new Menu("Attributes"));
315	369	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
..	..	@@ -319,10 +373,13 @@
319	373	liveleavesItem.addActionListener(this);
320	374	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
321	375	unliveleavesItem.addActionListener(this);
	376	+ if (Globals.ADVANCED)
	377	+ {
322	378	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
323	379	supportleavesItem.addActionListener(this);
324	380	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
325	381	unsupportleavesItem.addActionListener(this);
	382	+ }
326	383	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
327	384	hideleavesItem.addActionListener(this);
328	385	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -365,6 +422,8 @@
365	422	sortbysizeItem.addActionListener(this);
366	423	sortbynameItem = menu.add(new MenuItem("Sort by name"));
367	424	sortbynameItem.addActionListener(this);
	425	+ if (Globals.ADVANCED)
	426	+ {
368	427	menu.add("-");
369	428	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
370	429	extractGeometriesItem.addActionListener(this);
..	..	@@ -374,20 +433,23 @@
374	433	shareGeometriesItem.addActionListener(this);
375	434	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
376	435	mergeGeometriesItem.addActionListener(this);
	436	+ }
377	437
378	438	oe.menuBar.add(menu = new Menu("Insert"));
379	439	buildCreateMenu(menu);
380	440
381		-
382	441	oe.menuBar.add(menu = new Menu("Include"));
383		- importGFDItem = menu.add(new MenuItem("GraphreeD Object..."));
384		- importGFDItem.addActionListener(this);
385		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
386		- importVRMLX3DItem.addActionListener(this);
387		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
	442	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
388	443	importOBJItem.addActionListener(this);
389		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
	444	+ menu.add("-");
	445	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
390	446	import3DSItem.addActionListener(this);
	447	+ menu.add("-");
	448	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	449	+ importVRMLX3DItem.addActionListener(this);
	450	+ menu.add("-");
	451	+ importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
	452	+ importGFDItem.addActionListener(this);
391	453
392	454	oe.menuBar.add(menu = new Menu("Tools"));
393	455	buildToolsMenu(menu);
..	..	@@ -423,150 +485,98 @@
423	485	oe.radioPanel.add(dummyButton);
424	486	oe.buttonGroup.add(dummyButton);
425	487	*/
426		- aConstraints.gridy += 1;
427		- oe.aConstraints.gridwidth = 1;
428		- oe.aConstraints.gridx = 0;
	488	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
429	489
430		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	490	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	491	+ liveCB.setToolTipText("Enabled animation");
431	492	liveCB.addItemListener(this);
432	493
433		- oe.aConstraints.gridx += 1;
434		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
435		- supportCB.addItemListener(this);
436		-
437		- // oe.aConstraints.gridx += 1;
438		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
439		- // localCB.addItemListener(this);
440		-
441		- oe.aConstraints.gridx += 1;
442		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
443		- crowdCB.addItemListener(this);
444		-
445		- oe.aConstraints.gridx += 1;
446		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
447		- smoothCB.addItemListener(this);
448		-
449		- oe.aConstraints.gridx += 1;
450		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	494	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	495	+ oneStepButton.setToolTipText("Animate one step forward");
	496	+ oneStepButton.addActionListener(this);
	497	+
	498	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	499	+ fastCB.setToolTipText("Fast mode");
451	500	fastCB.addItemListener(this);
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
454		- slowCB.addItemListener(this);
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
457		- boxCB.addItemListener(this);
458		-
459		-// oe.aConstraints.gridx += 1;
460		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
461		-// speakerMocapCB.addItemListener(this);
462		-
463		- if (false)
464		- {
465		- // handled in scripts
466		- oe.aConstraints.gridx += 1;
467		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
468		- speakerCameraCB.addItemListener(this);
469		-
470		- oe.aConstraints.gridx += 1;
471		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
472		- speakerFocusCB.addItemListener(this);
473		-
474		- oe.aConstraints.gridx += 1;
475		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
476		- smoothfocusCB.addItemListener(this);
477		- }
478		-
479		-//oe.aConstraints.gridx += 1;
480		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
481		-// debugCB.addItemListener(this);
482		-
483		- oe.aConstraints.gridx += 1;
484		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
485		- oeilCB.addItemListener(this);
486		-
487		- oe.aConstraints.gridx += 1;
488		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
489		- lookAtCB.addItemListener(this);
490		-
491		- oe.aConstraints.gridx += 1;
492		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	501	+
	502	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	503	+ trackCB.setToolTipText("Enable tracking");
493	504	trackCB.addItemListener(this);
494	505
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	506	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	507	+ screenfitButton.setToolTipText("Screen fit");
497	508	screenfitButton.addActionListener(this);
498		- oe.aConstraints.gridx += 1;
	509	+
499	510	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
500	511	// screenfitpointButton.addActionListener(this);
501		-// oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
503		- snapobjectButton.addActionListener(this);
504		- oe.aConstraints.gridx += 1;
505	512
506		- //aConstraints.gridx = 0;
507		- //aConstraints.gridy += 1;
508		- oe.aConstraints.weighty = 0;
509		- oe.aConstraints.gridwidth = 1;
510		-
511		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	513	+ if (Globals.ADVANCED)
	514	+ {
	515	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	516	+ snapobjectButton.addActionListener(this);
	517	+ snapobjectButton.setToolTipText("Snap Object");
	518	+ }
	519	+
	520	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	521	+ flashSelectionButton.setToolTipText("Show selection");
512	522	flashSelectionButton.addActionListener(this);
513		- oe.aConstraints.gridx += 1;
514		- oe.aConstraints.weighty = 0;
515		- oe.aConstraints.gridwidth = 1;
516	523
517		- //
518		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	524	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	525	+
	526	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	527	+ twoButton.setToolTipText("Show center view only");
519	528	twoButton.addActionListener(this);
520		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	529	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
521	530	fourButton.addActionListener(this);
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	531	+ fourButton.setToolTipText("Show left panel only");
	532	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	533	+ sixButton.setToolTipText("2-column layout left");
523	534	sixButton.addActionListener(this);
524		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	535	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	536	+ threeButton.setToolTipText("2-column layout right");
525	537	threeButton.addActionListener(this);
526		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	538	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	539	+ sevenButton.setToolTipText("3-column layout");
527	540	sevenButton.addActionListener(this);
528	541	//
529	542
530		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	543	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	544	+ rootButton.setToolTipText("Edit selection in new tab");
531	545	rootButton.addActionListener(this);
532		- oe.aConstraints.gridx += 1;
533		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	546	+
	547	+ oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	548	+ closeButton.setToolTipText("Close tab");
534	549	closeButton.addActionListener(this);
535	550	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536	551	//clearButton.addActionListener(this);
537		- oe.aConstraints.gridx += 1;
538	552
539		- oe.aConstraints.gridx = 1; //
540		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	553	+ cGridBag commandsPanel = new cGridBag();
	554	+
	555	+ commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	556	+ editButton.setToolTipText("Edit selection");
541	557	editButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- oe.aConstraints.weighty = 0;
544		- oe.aConstraints.gridwidth = 1;
545	558
546		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	559	+ commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	560	+ uneditButton.setToolTipText("Unedit selection");
547	561	uneditButton.addActionListener(this);
548	562
549		- oe.aConstraints.gridx += 1;
550		- oe.aConstraints.weighty = 0;
551		- oe.aConstraints.gridwidth = 1;
552		-
553		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
554		- clearPanelButton.addActionListener(this);
555		-
556		- oe.aConstraints.gridx += 1;
557		- oe.aConstraints.weighty = 0;
558		- oe.aConstraints.gridwidth = 1;
559		-
560		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	563	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	564	+ allParamsButton.setToolTipText("Edit all params");
561	565	allParamsButton.addActionListener(this);
562	566
563		- oe.aConstraints.gridx += 1;
564		- oe.aConstraints.weighty = 0;
565		- oe.aConstraints.gridwidth = 1;
566		-
567		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	567	+ commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	568	+ clearPanelButton.setToolTipText("Clear edit panel");
	569	+ clearPanelButton.addActionListener(this);
	570	+
	571	+ commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	572	+ unselectButton.setToolTipText("Unselect");
568	573	unselectButton.addActionListener(this);
569	574
	575	+ commandsPanel.preferredHeight = 1;
	576	+
	577	+ oe.treePanel.add(commandsPanel);
	578	+ oe.treePanel.Return();
	579	+
570	580	// oe.aConstraints.gridx += 1;
571	581	// oe.aConstraints.weighty = 0;
572	582	// oe.aConstraints.gridwidth = 1;
..	..	@@ -578,40 +588,37 @@
578	588	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
579	589	// gcButton.addActionListener(this);
580	590
581		- oe.aConstraints.gridx = 0;
582		- oe.aConstraints.gridy += 1;
583		-
584		- //ctrlPanel.add(objList = new List(5, true));
585		- oe.aConstraints.gridwidth = 100;
586		- // oe.aConstraints.gridheight = 100;
587		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
588		- oe.aConstraints.gridheight = 1;
589		- oe.aConstraints.weighty = 0.5;
590		- oe.aConstraints.gridx = 0;
591		- JScrollPane jSP;
	591	+ cGridBag jSPPanel = new cGridBag();
	592	+
	593	+ JScrollPane jSP;
592	594	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
593		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	595	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
594	596	ResetModel();
595		- oe.aConstraints.weighty = 0.5;
596		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
597		- oe.aConstraints.gridy += 1;
598		- oe.aConstraints.gridwidth = 1;
	597	+
	598	+ oe.treePanel.add(jSPPanel);
	599	+ oe.treePanel.Return();
599	600
600		- oe.aConstraints.weighty = 0;
601		- oe.aConstraints.gridwidth = 2;
602		-
603		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
	601	+ cGridBag copyOptionsPanel = new cGridBag();
	602	+
	603	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	604	+ colorCB.setToolTipText("Copy color when dropped");
604	605	colorCB.addItemListener(this);
605		- oe.aConstraints.gridx += 2;
606		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	606	+
	607	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	608	+ materialCB.setToolTipText("Copy material when dropped");
607	609	materialCB.addItemListener(this);
608		- oe.aConstraints.gridx += 2;
609		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	610	+
	611	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	612	+ textureCB.setToolTipText("Copy texture when dropped");
610	613	textureCB.addItemListener(this);
611	614
612		- oe.aConstraints.gridx = 0;
613		- oe.aConstraints.gridy += 1;
	615	+ copyOptionsPanel.preferredHeight = 1;
	616	+ oe.treePanel.add(copyOptionsPanel);
	617	+ oe.treePanel.Return();
614	618
	619	+// mainPanel.setDividerLocation(0.5); //1.0);
	620	+// mainPanel.setResizeWeight(0.5);
	621	+
615	622	//jList.addListSelectionListener(this);
616	623	oe.jTree.addTreeSelectionListener(this);
617	624	//jTree.setRootVisible(false);
..	..	@@ -633,17 +640,89 @@
633	640	radio.layout = sevenButton;
634	641	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
635	642	}
	643	+
	644	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	645	+ {
	646	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	647	+ boxCB.setToolTipText("Display bounding boxes");
	648	+ boxCB.addItemListener(this);
	649	+
	650	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	651	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	652	+ zoomBoxCB.addItemListener(this);
	653	+
	654	+ if (Globals.ADVANCED)
	655	+ {
	656	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	657	+ supportCB.setToolTipText("Enable rigging");
	658	+ supportCB.addItemListener(this);
	659	+
	660	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	661	+ // localCB.addItemListener(this);
	662	+
	663	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	664	+ crowdCB.setToolTipText("Used for crowds");
	665	+ crowdCB.addItemListener(this);
	666	+
	667	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	668	+ smoothCB.setToolTipText("Snapping delay");
	669	+ smoothCB.addItemListener(this);
	670	+
	671	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	672	+ slowCB.setToolTipText("Smooth interpolation");
	673	+ slowCB.addItemListener(this);
	674	+
	675	+// constraints.gridy += 1;
	676	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	677	+// speakerMocapCB.addItemListener(this);
	678	+
	679	+ if (false)
	680	+ {
	681	+ // handled in scripts
	682	+ //constraints.gridy += 1;
	683	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	684	+ speakerCameraCB.addItemListener(this);
	685	+
	686	+ //constraints.gridy += 1;
	687	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	688	+ speakerFocusCB.addItemListener(this);
	689	+
	690	+ //constraints.gridy += 1;
	691	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	692	+ smoothfocusCB.addItemListener(this);
	693	+ }
	694	+
	695	+//constraints.gridx += 1;
	696	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	697	+// debugCB.addItemListener(this);
	698	+
	699	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	700	+ oeilCB.addItemListener(this);
	701	+
	702	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	703	+ lookAtCB.setToolTipText("Look-at target");
	704	+ lookAtCB.addItemListener(this);
	705	+
	706	+ }
	707	+
	708	+ cGridBag fill = new cGridBag();
	709	+
	710	+ fill.preferredHeight = 200;
	711	+
	712	+ panel.add(fill);
	713	+
	714	+ }
636	715
637	716	void EditObject(Object3D obj)
638	717	{
639		- cRadio dummyButton = new cRadio(obj.name);
640		- dummyButton.SetObject(obj);
641		- dummyButton.layout = sevenButton;
642		- dummyButton.SetCamera(cameraView.renderCamera, false);
643		- dummyButton.addActionListener(this);
644		- radioPanel.add(dummyButton);
645		- buttonGroup.add(dummyButton);
646		- dummyButton.doClick();
	718	+ cRadio radioButton = new cRadio(obj.name);
	719	+ radioButton.SetObject(obj);
	720	+ radioButton.layout = sevenButton;
	721	+ radioButton.SetCamera(cameraView.renderCamera, false);
	722	+ radioButton.addActionListener(this);
	723	+ radioPanel.add(radioButton);
	724	+ buttonGroup.add(radioButton);
	725	+ radioButton.doClick();
647	726	}
648	727	void SetupViews(ObjEditor oe)
649	728	{
..	..	@@ -663,6 +742,7 @@
663	742	JCheckBox fastCB;
664	743	JCheckBox slowCB;
665	744	JCheckBox boxCB;
	745	+ JCheckBox zoomBoxCB;
666	746	JCheckBox trackCB;
667	747	JCheckBox smoothfocusCB;
668	748	// JCheckBox speakerMocapCB;
..	..	@@ -705,8 +785,7 @@
705	785	dropAttributes \|= Object3D.TEXTURE;
706	786	else
707	787	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	788	+ } else if(e.getSource() == liveCB)
710	789	{
711	790	cameraView.ToggleLive();
712	791	}
..	..	@@ -743,6 +822,10 @@
743	822	Recompile();
744	823	cameraView.repaint();
745	824	// refreshContents();
	825	+ }
	826	+ else if(e.getSource() == zoomBoxCB)
	827	+ {
	828	+ cameraView.ToggleZoomBoxMode();
746	829	}
747	830	else if(e.getSource() == smoothfocusCB)
748	831	{
..	..	@@ -911,11 +994,11 @@
911	994	{
912	995	loadClipboard(true);
913	996	objEditor.jTree.setSelectionPath(destinationPath);
914		- pasteInto(false);
	997	+ pasteInto(false, false);
915	998	} else {
916	999	loadClipboard(false);
917	1000	objEditor.jTree.setSelectionPath(destinationPath);
918		- pasteInto(false); // true); // ???
	1001	+ pasteInto(false, false); // true); // ???
919	1002	}
920	1003	}
921	1004	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1033,29 +1116,37 @@
1033	1116	torusItem.addActionListener(this);
1034	1117	superItem = menu.add(new MenuItem("Superellipsoid"));
1035	1118	superItem.addActionListener(this);
	1119	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1120	+ kleinItem.addActionListener(this);
1036	1121	particleItem = menu.add(new MenuItem("Particle system"));
1037	1122	particleItem.addActionListener(this);
	1123	+ if (Globals.ADVANCED)
	1124	+ {
1038	1125	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1039	1126	ragdollItem.addActionListener(this);
1040	1127	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1041	1128	ragdoll2Item.addActionListener(this);
	1129	+ }
1042	1130	menu.add("-");
1043		- meshItem = menu.add(new MenuItem("Mesh"));
	1131	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1044	1132	meshItem.addActionListener(this);
1045	1133	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1046	1134	// meshGroupItem.addActionListener(this);
	1135	+ if (Globals.ADVANCED)
	1136	+ {
1047	1137	springItem = menu.add(new MenuItem("Spring"));
1048	1138	springItem.addActionListener(this);
1049	1139	flagItem = menu.add(new MenuItem("Flag"));
1050	1140	flagItem.addActionListener(this);
1051		- bezierItem = menu.add(new MenuItem("Patch"));
1052		- bezierItem.addActionListener(this);
1053		- checkerItem = menu.add(new MenuItem("Checker"));
1054		- checkerItem.addActionListener(this);
1055	1141	blobItem = menu.add(new MenuItem("Blob"));
1056	1142	blobItem.addActionListener(this);
1057	1143	latheItem = menu.add(new MenuItem("Lathe"));
1058	1144	latheItem.addActionListener(this);
	1145	+ }
	1146	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1147	+ bezierItem.addActionListener(this);
	1148	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1149	+ overlayItem.addActionListener(this);
1059	1150	lightItem = menu.add(new MenuItem("Light"));
1060	1151	lightItem.addActionListener(this);
1061	1152	menu.add("-");
..	..	@@ -1065,34 +1156,39 @@
1065	1156	loopItem.addActionListener(this);
1066	1157	doubleItem = menu.add(new MenuItem("Fork"));
1067	1158	doubleItem.addActionListener(this);
	1159	+ if (Globals.ADVANCED)
	1160	+ {
1068	1161	tripleItem = menu.add(new MenuItem("Trident"));
1069	1162	tripleItem.addActionListener(this);
	1163	+ }
1070	1164	}
1071	1165
1072	1166	void buildToolsMenu(Menu menu)
1073	1167	{
1074	1168	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1075	1169	animationItem.addItemListener(this);
1076		- animationItem.setState(CameraPane.ANIMATION);
	1170	+ animationItem.setState(Globals.ANIMATION);
1077	1171
1078	1172	menu.add("-");
1079	1173	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1080	1174	parseverticesItem.addActionListener(this);
1081	1175	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1082	1176	textureFieldItem.addActionListener(this);
1083		- alignItem = menu.add(new MenuItem("Align"));
	1177	+ alignItem = menu.add(new MenuItem("Align Objects"));
1084	1178	alignItem.addActionListener(this);
1085		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1086		- mirrorItem.addActionListener(this);
1087	1179	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1088	1180	reduceMorphItem.addActionListener(this);
1089	1181	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1090	1182	reduce34MorphItem.addActionListener(this);
1091		-
	1183	+ menu.add("-");
1092	1184	menu.add(computeAOItem = new MenuItem("Compute AO"));
1093	1185	computeAOItem.addActionListener(this);
1094		- menu.add("-");
1095	1186
	1187	+ if (Globals.ADVANCED)
	1188	+ {
	1189	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1190	+ mirrorItem.addActionListener(this);
	1191	+ menu.add("-");
1096	1192	menu.add(memoryItem = new MenuItem("Memory Usage"));
1097	1193	memoryItem.addActionListener(this);
1098	1194	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1106,6 +1202,8 @@
1106	1202	resetParentItem.addActionListener(this);
1107	1203	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	1204	repairParentItem.addActionListener(this);
	1205	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1206	+ repairShadowItem.addActionListener(this);
1109	1207	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	1208	invariantsItem.addActionListener(this);
1111	1209	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1113,6 +1211,7 @@
1113	1211	menu.add("-");
1114	1212	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1115	1213	editScriptItem.addActionListener(this);
	1214	+ }
1116	1215	}
1117	1216
1118	1217	void ScreenFit()
..	..	@@ -1441,9 +1540,9 @@
1441	1540
1442	1541	void Overwrite(int mask)
1443	1542	{
1444		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1543	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1445	1544	{
1446		- Object3D content = GraphreeD.clipboard.get(0);
	1545	+ Object3D content = GrafreeD.clipboard.get(0);
1447	1546
1448	1547	if (content instanceof cGroup && ((cGroup)content).transientlink )
1449	1548	content = ((cGroup)content).get(0);
..	..	@@ -1466,6 +1565,7 @@
1466	1565	//
1467	1566	public void actionPerformed(ActionEvent event) // , Object arg)
1468	1567	{
	1568	+ Object source = event.getSource();
1469	1569	/*
1470	1570	if (event.getSource() == nameField)
1471	1571	{
..	..	@@ -1477,11 +1577,11 @@
1477	1577	}
1478	1578	else
1479	1579	*/
1480		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1580	+ if (source == lookAtItem \|\| source == lookFromItem)
1481	1581	{
1482	1582	ScreenFit();
1483	1583	} else
1484		- if (event.getSource() == switchItem)
	1584	+ if (source == switchItem)
1485	1585	{
1486	1586	cVector v1 = new cVector();
1487	1587	cVector v2 = new cVector();
..	..	@@ -1490,11 +1590,11 @@
1490	1590	objEditor.cameraView.renderCamera.setAim(v2, v1);
1491	1591	objEditor.cameraView.repaint();
1492	1592	} else
1493		- if (event.getSource() == rectoidItem)
	1593	+ if (source == rectoidItem)
1494	1594	{
1495	1595	makeSomething(new Box());
1496	1596	} else
1497		- if (event.getSource() == particleItem)
	1597	+ if (source == particleItem)
1498	1598	{
1499	1599	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1500	1600	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1515,9 +1615,9 @@
1515	1615	applyExample(particleGeom, "SMOKE");
1516	1616	makeSomething(particleGeom);
1517	1617	} else
1518		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1618	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1519	1619	{
1520		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1620	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1521	1621
1522	1622	ragdoll.toParent = LA.newMatrix();
1523	1623	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1535,7 +1635,7 @@
1535	1635	} else
1536	1636	/*
1537	1637	*/
1538		- if (event.getSource() == heightFieldItem)
	1638	+ if (source == heightFieldItem)
1539	1639	{
1540	1640	Object3D obj = new Object3D();
1541	1641
..	..	@@ -1573,27 +1673,31 @@
1573	1673
1574	1674	makeSomething(obj);
1575	1675	} else
1576		- if (event.getSource() == gridItem)
	1676	+ if (source == gridItem)
1577	1677	{
1578	1678	makeSomething(new Grid());
1579	1679	} else
1580		- if (event.getSource() == ellipsoidItem)
	1680	+ if (source == ellipsoidItem)
1581	1681	{
1582	1682	makeSomething(new Sphere());
1583	1683	} else
1584		- if (event.getSource() == coneItem)
	1684	+ if (source == coneItem)
1585	1685	{
1586	1686	makeSomething(new Cone());
1587	1687	} else
1588		- if (event.getSource() == torusItem)
	1688	+ if (source == torusItem)
1589	1689	{
1590	1690	makeSomething(new Torus());
1591	1691	} else
1592		- if (event.getSource() == superItem)
	1692	+ if (source == superItem)
1593	1693	{
1594	1694	makeSomething(new Superellipsoid());
1595	1695	} else
1596		- if (event.getSource() == blobItem)
	1696	+ if (source == kleinItem)
	1697	+ {
	1698	+ makeSomething(new Klein());
	1699	+ } else
	1700	+ if (source == blobItem)
1597	1701	{
1598	1702	Blob blob = new Blob();
1599	1703	BlobComponent comp = new BlobComponent();
..	..	@@ -1601,15 +1705,15 @@
1601	1705	//blob.retile();
1602	1706	makeSomething(blob);
1603	1707	} else
1604		- if (event.getSource() == latheItem)
	1708	+ if (source == latheItem)
1605	1709	{
1606	1710	makeSomething(new Lathe());
1607	1711	} else
1608		- if (event.getSource() == bezierItem)
	1712	+ if (source == bezierItem)
1609	1713	{
1610	1714	makeSomething(new BezierSurface());
1611	1715	} else
1612		- if (event.getSource() == checkerItem)
	1716	+ if (source == overlayItem)
1613	1717	{
1614	1718	/*
1615	1719	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1624,7 +1728,7 @@
1624	1728	*/
1625	1729	makeSomething(new Checker());
1626	1730	} else
1627		- if (event.getSource() == meshItem)
	1731	+ if (source == meshItem)
1628	1732	{
1629	1733	Object3D itemtomake = new Object3D();
1630	1734	Object3D child;
..	..	@@ -1645,35 +1749,35 @@
1645	1749	makeSomething(child);
1646	1750	}
1647	1751	} else
1648		- if (event.getSource() == springItem)
	1752	+ if (source == springItem)
1649	1753	{
1650	1754	cSpring s = new cSpring();
1651	1755	s.setup();
1652	1756	makeSomething(s);
1653	1757	} else
1654		- if (event.getSource() == flagItem)
	1758	+ if (source == flagItem)
1655	1759	{
1656	1760	cSpring s = new cFlag();
1657	1761	s.setup();
1658	1762	makeSomething(s);
1659	1763	} else
1660		- if (event.getSource() == lightItem)
	1764	+ if (source == lightItem)
1661	1765	{
1662	1766	makeSomething(new Light());
1663	1767	} else
1664		- if (event.getSource() == csgItem)
	1768	+ if (source == csgItem)
1665	1769	{
1666	1770	group(new CSG());
1667	1771	} else
1668		- if (event.getSource() == templateItem)
	1772	+ if (source == templateItem)
1669	1773	{
1670	1774	group(new cTemplate());
1671	1775	} else
1672		- if (event.getSource() == attributeItem)
	1776	+ if (source == attributeItem)
1673	1777	{
1674	1778	makeSomething(new Attribute());
1675	1779	} else
1676		- if (event.getSource() == pointflowItem)
	1780	+ if (source == pointflowItem)
1677	1781	{
1678	1782	makeSomething(new PointFlow());
1679	1783	} else
..	..	@@ -1685,7 +1789,7 @@
1685	1789	} else
1686	1790	*/
1687	1791
1688		- if (event.getSource() == superLoopItem)
	1792	+ if (source == superLoopItem)
1689	1793	{
1690	1794	Composite g = new cGroup();
1691	1795	for (int i=0; i<15; i++)
..	..	@@ -1707,7 +1811,7 @@
1707	1811
1708	1812	group(g);
1709	1813	} else
1710		- if (event.getSource() == loopItem)
	1814	+ if (source == loopItem)
1711	1815	{
1712	1816	Composite csg = new GroupLeaf();
1713	1817	csg.count = 5;
..	..	@@ -1716,7 +1820,7 @@
1716	1820	csg.addChild(child);
1717	1821	child.addChild(csg);
1718	1822	} else
1719		- if (event.getSource() == doubleItem)
	1823	+ if (source == doubleItem)
1720	1824	{
1721	1825	Composite csg = new GroupLeaf();
1722	1826	csg.count = 5;
..	..	@@ -1728,7 +1832,7 @@
1728	1832	csg.addChild(child);
1729	1833	child.addChild(csg);
1730	1834	} else
1731		- if (event.getSource() == tripleItem)
	1835	+ if (source == tripleItem)
1732	1836	{
1733	1837	Composite csg = new GroupLeaf();
1734	1838	csg.count = 4;
..	..	@@ -1744,70 +1848,83 @@
1744	1848	child.addChild(csg);
1745	1849	} else
1746	1850
1747		- if (event.getSource() == importGFDItem)
	1851	+ if (source == importGFDItem)
1748	1852	{
1749	1853	ImportGFD();
1750	1854	} else
1751		- if (event.getSource() == importVRMLX3DItem)
	1855	+ if (source == importVRMLX3DItem)
1752	1856	{
1753	1857	ImportVRMLX3D();
1754	1858	} else
1755		- if (event.getSource() == import3DSItem)
	1859	+ if (source == import3DSItem)
1756	1860	{
1757	1861	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1758	1862	} else
1759		- if (event.getSource() == importOBJItem)
	1863	+ if (source == importOBJItem)
1760	1864	{
1761		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	1865	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	1866	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	1867	+ browser.setVisible(true);
	1868	+ String filename = browser.getFile();
	1869	+ if (filename != null && filename.length() > 0)
	1870	+ {
	1871	+ String fullname = browser.getDirectory() + filename;
	1872	+ makeSomething(ReadOBJ(fullname), true);
	1873	+ }
1762	1874	} else
1763		- if (event.getSource() == computeAOItem)
	1875	+ if (source == computeAOItem)
1764	1876	{
1765		- CameraPane.drawMode = CameraPane.OCCLUSION;
1766		- CameraPane.theRenderer.repaint();
	1877	+ Globals.drawMode = CameraPane.OCCLUSION;
	1878	+ Globals.theRenderer.repaint();
1767	1879	} else
1768		- if (event.getSource() == recompileItem)
	1880	+ if (source == recompileItem)
1769	1881	{
1770	1882	Recompile();
1771	1883	refreshContents();
1772	1884	} else
1773		- if (event.getSource() == editScriptItem)
	1885	+ if (source == editScriptItem)
1774	1886	{
1775	1887	OpenDialog();
1776	1888	refreshContents();
1777	1889	} else
1778		- if (event.getSource() == invariantsItem)
	1890	+ if (source == invariantsItem)
1779	1891	{
1780	1892	System.out.println("Invariants:");
1781		- GraphreeD.theApplet3D.universe.invariants();
	1893	+ GrafreeD.grafreeD.universe.invariants();
1782	1894	} else
1783		- if (event.getSource() == memoryItem)
	1895	+ if (source == memoryItem)
1784	1896	{
1785	1897	//System.out.println("Invariants:");
1786	1898	PrintMemory();
1787	1899	} else
1788		- if (event.getSource() == pathItem)
	1900	+ if (source == pathItem)
1789	1901	{
1790	1902	PrintPath();
1791	1903	} else
1792		- if (event.getSource() == analyzeItem)
	1904	+ if (source == analyzeItem)
1793	1905	{
1794	1906	AnalyzeObject();
1795	1907	} else
1796		- if (event.getSource() == dumpItem)
	1908	+ if (source == dumpItem)
1797	1909	{
1798	1910	DumpObject();
1799	1911	} else
1800		- if (event.getSource() == screenfitButton)
	1912	+ if (source == oneStepButton)
	1913	+ {
	1914	+ Globals.ONESTEP = true;
	1915	+ cameraView.repaint();
	1916	+ } else
	1917	+ if (source == screenfitButton)
1801	1918	{
1802	1919	//Reload(lastConverter, lastFilename, true);
1803	1920	ScreenFit();
1804	1921	} else
1805		- if (event.getSource() == screenfitpointButton)
	1922	+ if (source == screenfitpointButton)
1806	1923	{
1807	1924	//Reload(lastConverter, lastFilename, true);
1808	1925	ScreenFitPoint();
1809	1926	} else
1810		- if (event.getSource() == snapobjectButton)
	1927	+ if (source == snapobjectButton)
1811	1928	{
1812	1929	//Reload(lastConverter, lastFilename, true);
1813	1930	SnapObject();
..	..	@@ -1818,13 +1935,13 @@
1818	1935	// Recompile();
1819	1936	// refreshContents();
1820	1937	// } else
1821		- if (event.getSource() == gcButton)
	1938	+ if (source == gcButton)
1822	1939	{
1823	1940	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1824	1941	System.gc();
1825	1942	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	1943	} else
1827		- if (event.getSource() == editLeafItem)
	1944	+ if (source == editLeafItem)
1828	1945	{
1829	1946	Object3D obj;
1830	1947	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1838,65 +1955,70 @@
1838	1955	}
1839	1956	refreshContents(true);
1840	1957	} else
1841		- if (event.getSource() == openWindowItem)
	1958	+ if (source == openWindowItem)
1842	1959	{
1843	1960	EditSelection(true);
1844	1961	} else
1845		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1962	+ if (source == cutItem \|\| source == clearButton)
1846	1963	{
1847	1964	loadClipboard(true);
1848	1965	} else
1849		- if (event.getSource() == duplicateItem)
	1966	+ if (source == duplicateItem)
1850	1967	{
1851		- Object3D keep = GraphreeD.clipboard;
	1968	+ Object3D keep = GrafreeD.clipboard;
1852	1969	loadClipboard(false);
1853	1970	paste(false);
1854		- GraphreeD.clipboard = keep;
	1971	+ GrafreeD.clipboard = keep;
1855	1972	} else
1856		- if (event.getSource() == cloneItem)
	1973	+ if (source == cloneItem)
1857	1974	{
1858	1975	CloneSelection(false);
1859	1976	} else
1860		- if (event.getSource() == cloneSupportItem)
	1977	+ if (source == cloneSupportItem)
1861	1978	{
1862	1979	CloneSelection(true);
1863	1980	} else
1864		- if (event.getSource() == copyItem)
	1981	+ if (source == copyItem)
1865	1982	{
1866	1983	loadClipboard(false);
1867	1984	} else
1868		- if (event.getSource() == pasteItem)
	1985	+ if (source == pasteItem)
1869	1986	{
1870	1987	paste(false);
1871	1988	} else
1872		- if (event.getSource() == pasteLinkItem)
	1989	+ if (source == pasteIntoItem)
1873	1990	{
1874		- pasteInto(false);
	1991	+ pasteInto(true, false);
1875	1992	} else
1876		- if (event.getSource() == pasteCloneItem)
	1993	+ if (source == pasteLinkItem)
1877	1994	{
1878		- pasteInto(true);
	1995	+ pasteInto(false, false);
1879	1996	} else
1880		- if (event.getSource() == pasteExpandItem)
	1997	+ if (source == pasteCloneItem)
	1998	+ {
	1999	+ pasteInto(true, true);
	2000	+ } else
	2001	+ if (source == pasteExpandItem)
1881	2002	{
1882	2003	paste(true);
1883	2004	} else
1884		- if (event.getSource() == synchronizeItem)
	2005	+ if (source == synchronizeItem)
1885	2006	{
1886	2007	Overwrite(Object3D.TRANSFORM);
1887	2008	} else
1888		- if (event.getSource() == overwriteNameItem)
	2009	+ if (source == overwriteNameItem)
1889	2010	{
1890	2011	Overwrite(Object3D.NAME);
1891	2012	} else
1892		- if (event.getSource() == overwriteUVItem)
	2013	+ if (source == overwriteUVItem)
1893	2014	{
1894	2015	Overwrite(Object3D.UV);
1895	2016	} else
1896		- if (event.getSource() == overwriteMatItem)
	2017	+ if (source == overwriteMatItem)
1897	2018	{
	2019	+ /* july 2015
1898	2020	if ((dropAttributes & Object3D.TEXTURE) == 0)
1899		- Overwrite(Object3D.MATERIAL);
	2021	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1900	2022	else
1901	2023	{
1902	2024	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1908,13 +2030,16 @@
1908	2030	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1909	2031	}
1910	2032	}
	2033	+ */
	2034	+
	2035	+ Overwrite(dropAttributes);
1911	2036	}
1912		- if (event.getSource() == overwriteGeoItem)
	2037	+ if (source == overwriteGeoItem)
1913	2038	{
1914	2039	Overwrite(Object3D.GEOMETRY);
1915		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2040	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1916	2041	// {
1917		-// Object3D content = GraphreeD.clipboard.get(0);
	2042	+// Object3D content = GrafreeD.clipboard.get(0);
1918	2043	//
1919	2044	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1920	2045	// content = ((cGroup)content).get(0);
..	..	@@ -1926,7 +2051,7 @@
1926	2051	// refreshContents();
1927	2052	// }
1928	2053	} else
1929		- if (event.getSource() == generateMeshItem)
	2054	+ if (source == generateMeshItem)
1930	2055	{
1931	2056	//if (group.selection.size() == 1)
1932	2057	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1937,7 +2062,7 @@
1937	2062	ResetModel();
1938	2063	refreshContents();
1939	2064	} else
1940		- if (event.getSource() == extractGeometriesItem)
	2065	+ if (source == extractGeometriesItem)
1941	2066	{
1942	2067	boolean one = false;
1943	2068
..	..	@@ -1964,7 +2089,7 @@
1964	2089	ResetModel();
1965	2090	refreshContents();
1966	2091	} else
1967		- if (event.getSource() == cloneGeometriesItem)
	2092	+ if (source == cloneGeometriesItem)
1968	2093	{
1969	2094	boolean one = false;
1970	2095
..	..	@@ -1990,32 +2115,37 @@
1990	2115	ResetModel();
1991	2116	refreshContents();
1992	2117	} else
1993		- if (event.getSource() == shareGeometriesItem)
	2118	+ if (source == shareGeometriesItem)
1994	2119	{
1995	2120	boolean one = false;
1996	2121
1997	2122	if (group.selection.size() == 1)
1998	2123	one = true;
1999	2124
	2125	+ Object3D merge = null;
	2126	+
2000	2127	Object3D content = new cGroup();
2001	2128
2002	2129	for (int i=0; i<group.selection.size(); i++)
2003	2130	{
2004		- Object3D sel = new Merge(group.selection.get(i));
	2131	+ merge = new Merge(group.selection.get(i));
2005	2132
2006	2133	if (one)
2007		- makeSomething(sel, false);
	2134	+ makeSomething(merge, false);
2008	2135	else
2009		- content.addChild(sel);
	2136	+ content.addChild(merge);
2010	2137	}
2011	2138
2012	2139	if (!one)
2013		- makeSomething(content, false);
2014		-
2015		- ResetModel();
2016		- refreshContents();
	2140	+ makeSomething(content, true);
	2141	+ else
	2142	+ {
	2143	+ ResetModel();
	2144	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2145	+ refreshContents();
	2146	+ }
2017	2147	} else
2018		- if (event.getSource() == mergeGeometriesItem)
	2148	+ if (source == mergeGeometriesItem)
2019	2149	{
2020	2150	boolean one = false;
2021	2151
..	..	@@ -2045,11 +2175,11 @@
2045	2175	ResetModel();
2046	2176	refreshContents();
2047	2177	} else
2048		- if (event.getSource() == linkverticesItem)
	2178	+ if (source == linkverticesItem)
2049	2179	{
2050		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2180	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2051	2181	// {
2052		-// Object3D content = GraphreeD.clipboard.get(0);
	2182	+// Object3D content = GrafreeD.clipboard.get(0);
2053	2183	//
2054	2184	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2055	2185	// content = ((cGroup)content).get(0);
..	..	@@ -2058,39 +2188,48 @@
2058	2188	// group.selection.get(0).setMasterThis(content); // should be identity
2059	2189	// refreshContents();
2060	2190	// }
2061		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2191	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
2062	2192	{
2063		- Object3D content = GraphreeD.clipboard.get(0);
	2193	+ Object3D content = GrafreeD.clipboard.get(0);
2064	2194
2065	2195	if (content instanceof cGroup && ((cGroup)content).transientlink )
2066	2196	content = ((cGroup)content).get(0);
2067	2197
2068		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2198	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2069	2199	for (int i=0; i<group.selection.size(); i++)
2070	2200	{
2071		- boolean random = CameraPane.RANDOM;
2072		- CameraPane.RANDOM = false; // parse all random nodes
	2201	+ boolean random = CameraPane.SWITCH;
	2202	+ CameraPane.SWITCH = false; // parse all random nodes
2073	2203	group.selection.get(i).linkVerticesThis(content);
2074	2204	// group.selection.get(i).setMasterThis(content); // should be identity
2075		- CameraPane.RANDOM = random;
	2205	+ CameraPane.SWITCH = random;
2076	2206	}
2077		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2207	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2078	2208	refreshContents();
2079	2209	}
2080	2210	} else
2081		- if (event.getSource() == resetsupportItem)
	2211	+ if (source == resetsupportItem)
2082	2212	{
2083	2213	for (int i=0; i<group.selection.size(); i++)
2084	2214	{
2085		- boolean random = CameraPane.RANDOM;
2086		- CameraPane.RANDOM = false; // parse all random nodes
	2215	+ boolean random = CameraPane.SWITCH;
	2216	+ CameraPane.SWITCH = false; // parse all random nodes
2087	2217	group.selection.get(i).linkVerticesThis(null);
2088		- CameraPane.RANDOM = random;
	2218	+ CameraPane.SWITCH = random;
2089	2219	}
2090	2220
2091	2221	refreshContents();
2092	2222	} else
2093		- if (event.getSource() == resetreferencesItem)
	2223	+ if (source == relinkverticesItem)
	2224	+ {
	2225	+ boolean random = CameraPane.SWITCH;
	2226	+ CameraPane.SWITCH = false; // parse all random nodes
	2227	+ group.selection.RelinkToSupport();
	2228	+ CameraPane.SWITCH = random;
	2229	+
	2230	+ refreshContents();
	2231	+ } else
	2232	+ if (source == resetreferencesItem)
2094	2233	{
2095	2234	for (int i=0; i<group.selection.size(); i++)
2096	2235	{
..	..	@@ -2099,11 +2238,11 @@
2099	2238
2100	2239	refreshContents();
2101	2240	} else
2102		- if (event.getSource() == setMasterItem)
	2241	+ if (source == setMasterItem)
2103	2242	{
2104		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2243	+ if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2105	2244	{
2106		- Object3D content = GraphreeD.clipboard.get(0);
	2245	+ Object3D content = GrafreeD.clipboard.get(0);
2107	2246
2108	2247	if (content instanceof cGroup && ((cGroup)content).transientlink )
2109	2248	content = ((cGroup)content).get(0);
..	..	@@ -2112,13 +2251,13 @@
2112	2251	refreshContents();
2113	2252	}
2114	2253	} else
2115		- if (event.getSource() == poseMeshItem)
	2254	+ if (source == poseMeshItem)
2116	2255	{
2117	2256	if (group.selection.size() == 1)
2118	2257	{
2119		- if (GraphreeD.clipboard.size() == 1)
	2258	+ if (GrafreeD.clipboard.size() == 1)
2120	2259	{
2121		- Object3D content = GraphreeD.clipboard.get(0);
	2260	+ Object3D content = GrafreeD.clipboard.get(0);
2122	2261
2123	2262	if (content instanceof cGroup && ((cGroup)content).transientlink )
2124	2263	content = ((cGroup)content).get(0);
..	..	@@ -2131,19 +2270,19 @@
2131	2270	}
2132	2271
2133	2272	} else
2134		- if (event.getSource() == revertMeshItem)
	2273	+ if (source == revertMeshItem)
2135	2274	{
2136	2275	RevertMeshes();
2137	2276	} else
2138		- if (event.getSource() == resetMeshItem)
	2277	+ if (source == resetMeshItem)
2139	2278	{
2140	2279	ResetAll();
2141	2280	} else
2142		- if (event.getSource() == stepAllItem)
	2281	+ if (source == stepAllItem)
2143	2282	{
2144	2283	StepAll();
2145	2284	} else
2146		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2285	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2147	2286	{
2148	2287	//int indices[] = jList.getSelectedIndices();
2149	2288	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2151,42 +2290,46 @@
2151	2290
2152	2291	ClearSelection(false);
2153	2292	} else
2154		- if (event.getSource() == clearAllItem)
	2293	+ if (source == clearAllItem)
2155	2294	{
2156	2295	ClearSelection(true);
2157	2296	} else
2158		- if (event.getSource() == grabItem)
	2297	+ if (source == grabItem)
2159	2298	{
2160	2299	group(new cGroup(), true);
2161	2300	} else
2162		- if (event.getSource() == frontItem)
	2301	+ if (source == hideItem)
	2302	+ {
	2303	+ group(new HiddenObject());
	2304	+ } else
	2305	+ if (source == frontItem)
2163	2306	{
2164	2307	front();
2165	2308	} else
2166		- if (event.getSource() == backItem)
	2309	+ if (source == backItem)
2167	2310	{
2168	2311	back();
2169	2312	} else
2170		- if (event.getSource() == cameraItem)
	2313	+ if (source == cameraItem)
2171	2314	{
2172	2315	makeSomething(new Camera());
2173	2316	} else
2174		- if (event.getSource() == compositeItem)
	2317	+ if (source == compositeItem)
2175	2318	{
2176	2319	group(new Composite());
2177	2320	} else
2178		- if (event.getSource() == randomItem)
	2321	+ if (source == randomItem)
2179	2322	{
2180	2323	RandomNode random = new RandomNode();
2181	2324	group(random);
2182	2325	if (random.size() > 0)
2183		- random.name = random.get(0).name + "Rnd";
	2326	+ random.name = random.get(0).name + "Switch";
2184	2327	} else
2185		- if (event.getSource() == physicsItem)
	2328	+ if (source == physicsItem)
2186	2329	{
2187	2330	group(new PhysicsNode());
2188	2331	} else
2189		- if (event.getSource() == frameselectorItem)
	2332	+ if (source == frameselectorItem)
2190	2333	{
2191	2334	for (int i=0; i<group.selection.size(); i++)
2192	2335	{
..	..	@@ -2198,7 +2341,7 @@
2198	2341	ResetModel();
2199	2342	refreshContents();
2200	2343	} else
2201		- if (event.getSource() == switchGeoItem)
	2344	+ if (source == switchGeoItem)
2202	2345	{
2203	2346	for (int i=0; i<group.selection.size(); i++)
2204	2347	{
..	..	@@ -2210,7 +2353,7 @@
2210	2353	ResetModel();
2211	2354	refreshContents();
2212	2355	} else
2213		- if (event.getSource() == switchTransfoItem)
	2356	+ if (source == switchTransfoItem)
2214	2357	{
2215	2358	for (int i=0; i<group.selection.size(); i++)
2216	2359	{
..	..	@@ -2222,7 +2365,7 @@
2222	2365	ResetModel();
2223	2366	refreshContents();
2224	2367	} else
2225		- if (event.getSource() == morphItem)
	2368	+ if (source == morphItem)
2226	2369	{
2227	2370	for (int i=0; i<group.selection.size(); i++)
2228	2371	{
..	..	@@ -2234,7 +2377,7 @@
2234	2377	ResetModel();
2235	2378	refreshContents();
2236	2379	} else
2237		- if (event.getSource() == scriptNodeItem)
	2380	+ if (source == scriptNodeItem)
2238	2381	{
2239	2382	boolean atleastone = false;
2240	2383
..	..	@@ -2273,195 +2416,215 @@
2273	2416	}
2274	2417	}
2275	2418	} else
2276		- if (event.getSource() == linkerItem)
	2419	+ if (source == linkerItem)
2277	2420	{
2278	2421	group(new cLinker());
2279	2422	} else
2280		- if (event.getSource() == textureItem)
	2423	+ if (source == textureItem)
2281	2424	{
2282	2425	group(new TextureNode());
2283	2426	} else
2284		- if (event.getSource() == shadowXItem)
	2427	+ if (source == billboardItem)
	2428	+ {
	2429	+ group(new BillboardNode());
	2430	+ } else
	2431	+ if (source == shadowXItem)
2285	2432	{
2286	2433	CastShadow(0);
2287	2434	} else
2288		- if (event.getSource() == shadowYItem)
	2435	+ if (source == shadowYItem)
2289	2436	{
2290	2437	CastShadow(1);
2291	2438	} else
2292		- if (event.getSource() == shadowZItem)
	2439	+ if (source == shadowZItem)
2293	2440	{
2294	2441	CastShadow(2);
2295	2442	} else
2296		- if (event.getSource() == ungroupItem)
	2443	+ if (source == ungroupItem)
2297	2444	{
2298		- ungroup();
	2445	+ //ungroup();
	2446	+ for (int i=0; i<group.selection.size(); i++)
	2447	+ {
	2448	+ Ungroup(group.selection.get(i));
	2449	+ }
	2450	+
	2451	+ ClearSelection(false);
	2452	+
	2453	+ refreshContents();
2299	2454	} else
2300		- if (event.getSource() == genUVItem)
	2455	+ if (source == genUVItem)
2301	2456	{
2302	2457	GenUV();
2303	2458	} else
2304		- if (event.getSource() == genNormalsCADItem)
	2459	+ if (source == genNormalsCADItem)
2305	2460	{
2306	2461	GenNormals(true);
2307	2462	} else
2308		- if (event.getSource() == genNormalsORGANItem)
	2463	+ if (source == genNormalsMESHItem)
	2464	+ {
	2465	+ GenNormals(true); // TODO
	2466	+ } else
	2467	+ if (source == genNormalsORGANItem)
2309	2468	{
2310	2469	GenNormals(false);
2311	2470	} else
2312		- if (event.getSource() == stripifyItem)
	2471	+ if (source == genNormalsMINEItem)
	2472	+ {
	2473	+ GenNormalsMINE();
	2474	+ } else
	2475	+ if (source == stripifyItem)
2313	2476	{
2314	2477	Stripify();
2315	2478	} else
2316		- if (event.getSource() == unstripifyItem)
	2479	+ if (source == unstripifyItem)
2317	2480	{
2318	2481	Unstripify();
2319	2482	} else
2320		- if (event.getSource() == trimItem)
	2483	+ if (source == trimItem)
2321	2484	{
2322	2485	Trim();
2323	2486	} else
2324		- if (event.getSource() == untrimItem)
	2487	+ if (source == untrimItem)
2325	2488	{
2326	2489	Untrim();
2327	2490	} else
2328		- if (event.getSource() == clearColorsItem)
	2491	+ if (source == clearColorsItem)
2329	2492	{
2330	2493	ClearColors();
2331	2494	} else
2332		- if (event.getSource() == clearMaterialsItem)
	2495	+ if (source == clearMaterialsItem)
2333	2496	{
2334	2497	ClearMaterials();
2335	2498	} else
2336		- if (event.getSource() == liveleavesItem)
	2499	+ if (source == liveleavesItem)
2337	2500	{
2338	2501	LiveLeaves(true);
2339	2502	} else
2340		- if (event.getSource() == unliveleavesItem)
	2503	+ if (source == unliveleavesItem)
2341	2504	{
2342	2505	LiveLeaves(false);
2343	2506	} else
2344		- if (event.getSource() == supportleavesItem)
	2507	+ if (source == supportleavesItem)
2345	2508	{
2346	2509	SupportLeaves(true);
2347	2510	} else
2348		- if (event.getSource() == unsupportleavesItem)
	2511	+ if (source == unsupportleavesItem)
2349	2512	{
2350	2513	SupportLeaves(false);
2351	2514	} else
2352		- if (event.getSource() == hideleavesItem)
	2515	+ if (source == hideleavesItem)
2353	2516	{
2354	2517	HideLeaves(true);
2355	2518	} else
2356		- if (event.getSource() == showleavesItem)
	2519	+ if (source == showleavesItem)
2357	2520	{
2358	2521	HideLeaves(false);
2359	2522	} else
2360		- if (event.getSource() == markleavesItem)
	2523	+ if (source == markleavesItem)
2361	2524	{
2362	2525	MarkLeaves(true);
2363	2526	} else
2364		- if (event.getSource() == unmarkleavesItem)
	2527	+ if (source == unmarkleavesItem)
2365	2528	{
2366	2529	MarkLeaves(false);
2367	2530	} else
2368		- if (event.getSource() == flipVItem)
	2531	+ if (source == flipVItem)
2369	2532	{
2370	2533	FlipV(true);
2371	2534	} else
2372		- if (event.getSource() == unflipVItem)
	2535	+ if (source == unflipVItem)
2373	2536	{
2374	2537	FlipV(false);
2375	2538	} else
2376		- if (event.getSource() == lowTexturesItem)
	2539	+ if (source == lowTexturesItem)
2377	2540	{
2378	2541	SetTexRes(0);
2379	2542	} else
2380		- if (event.getSource() == normalTexturesItem)
	2543	+ if (source == normalTexturesItem)
2381	2544	{
2382	2545	SetTexRes(1);
2383	2546	} else
2384		- if (event.getSource() == highTexturesItem)
	2547	+ if (source == highTexturesItem)
2385	2548	{
2386	2549	SetTexRes(2);
2387	2550	} else
2388		- if (event.getSource() == veryhighTexturesItem)
	2551	+ if (source == veryhighTexturesItem)
2389	2552	{
2390	2553	SetTexRes(3);
2391	2554	} else
2392		- if (event.getSource() == maxTexturesItem)
	2555	+ if (source == maxTexturesItem)
2393	2556	{
2394	2557	SetTexRes(4);
2395	2558	} else
2396		- if (event.getSource() == panoTexturesItem)
	2559	+ if (source == panoTexturesItem)
2397	2560	{
2398	2561	SetTexRes(5);
2399	2562	} else
2400		- if (event.getSource() == reverseNormalsItem)
	2563	+ if (source == reverseNormalsItem)
2401	2564	{
2402	2565	ReverseNormals();
2403	2566	} else
2404		- if (event.getSource() == parseverticesItem)
	2567	+ if (source == parseverticesItem)
2405	2568	{
2406	2569	ParseVertices();
2407	2570	} else
2408		- if (event.getSource() == textureFieldItem)
	2571	+ if (source == textureFieldItem)
2409	2572	{
2410	2573	TextureVertices();
2411	2574	} else
2412		- if (event.getSource() == alignItem)
	2575	+ if (source == alignItem)
2413	2576	{
2414	2577	Align();
2415	2578	} else
2416		- if (event.getSource() == mirrorItem)
	2579	+ if (source == mirrorItem)
2417	2580	{
2418	2581	MirrorPoses();
2419	2582	} else
2420		- if (event.getSource() == reduceMorphItem)
	2583	+ if (source == reduceMorphItem)
2421	2584	{
2422	2585	MeshReduction(false);
2423	2586	} else
2424		- if (event.getSource() == reduce34MorphItem)
	2587	+ if (source == reduce34MorphItem)
2425	2588	{
2426	2589	MeshReduction(true);
2427	2590	} else
2428		- if (event.getSource() == reverseTrianglesItem)
	2591	+ if (source == reverseTrianglesItem)
2429	2592	{
2430	2593	ReverseTriangles();
2431	2594	} else
2432		- if (event.getSource() == reduceMeshItem)
	2595	+ if (source == reduceMeshItem)
2433	2596	{
2434	2597	ReduceMesh(false);
2435	2598	} else
2436		- if (event.getSource() == reduce34MeshItem)
	2599	+ if (source == reduce34MeshItem)
2437	2600	{
2438	2601	ReduceMesh(true);
2439	2602	} else
2440		- if (event.getSource() == increaseMeshItem)
	2603	+ if (source == increaseMeshItem)
2441	2604	{
2442	2605	IncreaseMesh();
2443	2606	} else
2444		- if (event.getSource() == clipMeshItem)
	2607	+ if (source == clipMeshItem)
2445	2608	{
2446	2609	ClipMesh();
2447	2610	} else
2448		- if (event.getSource() == smoothMeshItem)
	2611	+ if (source == smoothMeshItem)
2449	2612	{
2450	2613	SmoothMesh();
2451	2614	} else
2452		- if (event.getSource() == transformgeometryItem)
	2615	+ if (source == transformgeometryItem)
2453	2616	{
2454	2617	TransformGeometry();
2455	2618	} else
2456		- if (event.getSource() == resetTransformItem)
	2619	+ if (source == resetTransformItem)
2457	2620	{
2458	2621	ResetTransform();
2459	2622	} else
2460		- if (event.getSource() == resetCentroidItem)
	2623	+ if (source == resetCentroidItem)
2461	2624	{
2462	2625	ResetCentroid();
2463	2626	} else
2464		- if (event.getSource() == resetParentItem)
	2627	+ if (source == resetParentItem)
2465	2628	{
2466	2629	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2467	2630	{
..	..	@@ -2471,7 +2634,7 @@
2471	2634
2472	2635	refreshContents();
2473	2636	} else
2474		- if (event.getSource() == repairParentItem)
	2637	+ if (source == repairParentItem)
2475	2638	{
2476	2639	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	2640	{
..	..	@@ -2485,7 +2648,21 @@
2485	2648
2486	2649	refreshContents();
2487	2650	} else
2488		- if (event.getSource() == sortbysizeItem)
	2651	+ if (source == repairShadowItem)
	2652	+ {
	2653	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2654	+ {
	2655	+ Object3D obj = (Object3D)e.nextElement();
	2656	+ obj.RepairShadow();
	2657	+// for (int i=0; i<obj.size(); i++)
	2658	+// {
	2659	+// obj.get(i).parent = obj;
	2660	+// }
	2661	+ }
	2662	+
	2663	+ refreshContents();
	2664	+ } else
	2665	+ if (source == sortbysizeItem)
2489	2666	{
2490	2667	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2491	2668	{
..	..	@@ -2497,7 +2674,7 @@
2497	2674	ResetModel();
2498	2675	refreshContents();
2499	2676	} else
2500		- if (event.getSource() == sortbynameItem)
	2677	+ if (source == sortbynameItem)
2501	2678	{
2502	2679	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2503	2680	{
..	..	@@ -2509,7 +2686,7 @@
2509	2686	ResetModel();
2510	2687	refreshContents();
2511	2688	} else
2512		- if (event.getSource() == attachPigmentItem)
	2689	+ if (source == attachPigmentItem)
2513	2690	{
2514	2691	String texture = GetFile("Attach pigment");
2515	2692	Object3D obj;
..	..	@@ -2521,7 +2698,7 @@
2521	2698
2522	2699	refreshContents();
2523	2700	} else
2524		- if (event.getSource() == detachPigmentItem)
	2701	+ if (source == detachPigmentItem)
2525	2702	{
2526	2703	Object3D obj;
2527	2704	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2532,7 +2709,7 @@
2532	2709
2533	2710	refreshContents();
2534	2711	} else
2535		- if (event.getSource() == attachBumpItem)
	2712	+ if (source == attachBumpItem)
2536	2713	{
2537	2714	String texture = GetFile("Attach bump");
2538	2715	Object3D obj;
..	..	@@ -2544,7 +2721,7 @@
2544	2721
2545	2722	refreshContents();
2546	2723	} else
2547		- if (event.getSource() == detachBumpItem)
	2724	+ if (source == detachBumpItem)
2548	2725	{
2549	2726	Object3D obj;
2550	2727	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2555,7 +2732,7 @@
2555	2732
2556	2733	refreshContents();
2557	2734	} else
2558		- if (event.getSource() == pigmentBumpItem)
	2735	+ if (source == pigmentBumpItem)
2559	2736	{
2560	2737	Object3D obj;
2561	2738	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2566,158 +2743,195 @@
2566	2743
2567	2744	refreshContents();
2568	2745	} else
2569		- if (event.getSource() == flashSelectionButton)
	2746	+ if (source == flashSelectionButton)
2570	2747	{
2571	2748	CameraPane.flash = true;
2572	2749	refreshContents();
2573	2750	} else
2574		- if (event.getSource() == oneButton)
	2751	+ if (source == oneButton)
2575	2752	{
2576	2753	} else
2577		- if (event.getSource() == twoButton)
	2754	+ if (source == twoButton)
2578	2755	{
2579	2756	radio.layout = twoButton;
2580	2757	// bug
2581	2758	//gridPanel.setDividerLocation(1.0);
2582	2759	//bigPanel.setDividerLocation(0.0);
2583		- bigThree.remove(jtp);
2584		- bigThree.remove(cameraPanel);
2585		- bigThree.remove(XYZPanel);
2586		- aWindowConstraints.gridx = 0;
2587		- aWindowConstraints.gridy = 0;
2588		- aWindowConstraints.gridwidth = 1;
2589		- // aConstraints.gridheight = 3;
2590		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2591		- aWindowConstraints.weightx = 0;
2592		- aWindowConstraints.weighty = 1;
2593		- //bigThree.add(jtp, aWindowConstraints);
2594		- aWindowConstraints.weightx = 1;
2595		- aWindowConstraints.gridwidth = 3;
2596		- // aConstraints.gridheight = 3;
2597		- aWindowConstraints.gridx = 1;
2598		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2599		- bigThree.add(cameraPanel, aWindowConstraints);
2600		- aWindowConstraints.weightx = 0;
2601		- aWindowConstraints.gridx = 4;
2602		- aWindowConstraints.gridwidth = 1;
2603		- // aConstraints.gridheight = 3;
2604		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2605		- //bigThree.add(XYZPanel, aWindowConstraints);
2606		- bigThree.revalidate();
	2760	+// bigThree.remove(scenePanel);
	2761	+// bigThree.remove(centralPanel);
	2762	+// bigThree.remove(XYZPanel);
	2763	+// aWindowConstraints.gridx = 0;
	2764	+// aWindowConstraints.gridy = 0;
	2765	+// aWindowConstraints.gridwidth = 1;
	2766	+// // aConstraints.gridheight = 3;
	2767	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2768	+// aWindowConstraints.weightx = 0;
	2769	+// aWindowConstraints.weighty = 1;
	2770	+// //bigThree.add(jtp, aWindowConstraints);
	2771	+// aWindowConstraints.weightx = 1;
	2772	+// aWindowConstraints.gridwidth = 3;
	2773	+// // aConstraints.gridheight = 3;
	2774	+// aWindowConstraints.gridx = 1;
	2775	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2776	+// bigThree.add(centralPanel, aWindowConstraints);
	2777	+// aWindowConstraints.weightx = 0;
	2778	+// aWindowConstraints.gridx = 4;
	2779	+// aWindowConstraints.gridwidth = 1;
	2780	+// // aConstraints.gridheight = 3;
	2781	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2782	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2783	+// scenePanel.setVisible(false);
	2784	+// centralPanel.setVisible(true);
	2785	+// XYZPanel.setVisible(false);
	2786	+ bigThree.ClearUI();
	2787	+ bigThree.add(centralPanel);
	2788	+ bigThree.FlushUI();
2607	2789	} else
2608		- if (event.getSource() == threeButton)
	2790	+ if (source == threeButton)
2609	2791	{
2610	2792	radio.layout = threeButton;
2611		- bigThree.remove(jtp);
2612		- bigThree.remove(cameraPanel);
2613		- bigThree.remove(XYZPanel);
2614		- aWindowConstraints.gridx = 0;
2615		- aWindowConstraints.gridy = 0;
2616		- aWindowConstraints.gridwidth = 1;
2617		- // aConstraints.gridheight = 3;
2618		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2619		- aWindowConstraints.weightx = 0;
2620		- aWindowConstraints.weighty = 1;
2621		- //bigThree.add(jtp, aWindowConstraints);
2622		- aWindowConstraints.weightx = 1;
2623		- aWindowConstraints.gridwidth = 3;
2624		- // aConstraints.gridheight = 3;
2625		- aWindowConstraints.gridx = 1;
2626		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2627		- bigThree.add(cameraPanel, aWindowConstraints);
2628		- aWindowConstraints.weightx = 0;
2629		- aWindowConstraints.gridx = 4;
2630		- aWindowConstraints.gridwidth = 1;
2631		- // aConstraints.gridheight = 3;
2632		- aConstraints.fill = GridBagConstraints.VERTICAL;
2633		- bigThree.add(XYZPanel, aWindowConstraints);
2634		- bigThree.revalidate();
	2793	+
	2794	+// bigThree.remove(scenePanel);
	2795	+// bigThree.remove(centralPanel);
	2796	+// bigThree.remove(XYZPanel);
	2797	+// aWindowConstraints.gridx = 0;
	2798	+// aWindowConstraints.gridy = 0;
	2799	+// aWindowConstraints.gridwidth = 1;
	2800	+// // aConstraints.gridheight = 3;
	2801	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2802	+// aWindowConstraints.weightx = 0;
	2803	+// aWindowConstraints.weighty = 1;
	2804	+// //bigThree.add(jtp, aWindowConstraints);
	2805	+// aWindowConstraints.weightx = 1;
	2806	+// aWindowConstraints.gridwidth = 3;
	2807	+// // aConstraints.gridheight = 3;
	2808	+// aWindowConstraints.gridx = 1;
	2809	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2810	+// bigThree.add(centralPanel, aWindowConstraints);
	2811	+// aWindowConstraints.weightx = 0;
	2812	+// aWindowConstraints.gridx = 4;
	2813	+// aWindowConstraints.gridwidth = 1;
	2814	+// // aConstraints.gridheight = 3;
	2815	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2816	+// bigThree.add(XYZPanel, aWindowConstraints);
	2817	+// bigThree.validate();
	2818	+// scenePanel.setVisible(false);
	2819	+// centralPanel.setVisible(true);
	2820	+// XYZPanel.setVisible(true);
	2821	+ bigThree.ClearUI();
	2822	+ bigThree.add(centralPanel);
	2823	+ bigThree.add(XYZPanel);
	2824	+ bigThree.FlushUI();
2635	2825	} else
2636		- if (event.getSource() == fourButton)
	2826	+ if (source == fourButton)
2637	2827	{
2638	2828	radio.layout = fourButton;
2639		- bigThree.remove(jtp);
2640		- bigThree.remove(cameraPanel);
2641		- bigThree.remove(XYZPanel);
2642		- aWindowConstraints.gridx = 0;
2643		- aWindowConstraints.gridy = 0;
2644		- aWindowConstraints.gridwidth = 1;
2645		- // aWindowConstraints.gridheight = 3;
2646		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2647		- aWindowConstraints.weightx = 1;
2648		- aWindowConstraints.weighty = 1;
2649		- bigThree.add(jtp, aWindowConstraints);
2650		- aWindowConstraints.weightx = 1;
2651		- aWindowConstraints.gridwidth = 3;
2652		- // aConstraints.gridheight = 3;
2653		- aWindowConstraints.gridx = 1;
2654		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2655		- //bigThree.add(cameraPanel, aWindowConstraints);
2656		- aWindowConstraints.weightx = 0;
2657		- aWindowConstraints.gridx = 4;
2658		- aWindowConstraints.gridwidth = 1;
2659		- // aWindowConstraints.gridheight = 3;
2660		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2661		- //bigThree.add(XYZPanel, aWindowConstraints);
2662		- bigThree.revalidate();
	2829	+
	2830	+// bigThree.remove(scenePanel);
	2831	+// bigThree.remove(centralPanel);
	2832	+// bigThree.remove(XYZPanel);
	2833	+// aWindowConstraints.gridx = 0;
	2834	+// aWindowConstraints.gridy = 0;
	2835	+// aWindowConstraints.gridwidth = 1;
	2836	+// // aWindowConstraints.gridheight = 3;
	2837	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2838	+// aWindowConstraints.weightx = 1;
	2839	+// aWindowConstraints.weighty = 1;
	2840	+// bigThree.add(scenePanel, aWindowConstraints);
	2841	+// aWindowConstraints.weightx = 1;
	2842	+// aWindowConstraints.gridwidth = 3;
	2843	+// // aConstraints.gridheight = 3;
	2844	+// aWindowConstraints.gridx = 1;
	2845	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2846	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2847	+// aWindowConstraints.weightx = 0;
	2848	+// aWindowConstraints.gridx = 4;
	2849	+// aWindowConstraints.gridwidth = 1;
	2850	+// // aWindowConstraints.gridheight = 3;
	2851	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2852	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2853	+// bigThree.validate();
	2854	+// scenePanel.setVisible(true);
	2855	+// centralPanel.setVisible(false);
	2856	+// XYZPanel.setVisible(false);
	2857	+ bigThree.ClearUI();
	2858	+ bigThree.add(scenePanel);
	2859	+ bigThree.FlushUI();
2663	2860	} else
2664		- if (event.getSource() == sixButton)
	2861	+ if (source == sixButton)
2665	2862	{
2666	2863	radio.layout = sixButton;
2667		- bigThree.remove(jtp);
2668		- bigThree.remove(cameraPanel);
2669		- bigThree.remove(XYZPanel);
2670		- aWindowConstraints.gridx = 0;
2671		- aWindowConstraints.gridy = 0;
2672		- aWindowConstraints.gridwidth = 1;
2673		- // aConstraints.gridheight = 3;
2674		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2675		- aWindowConstraints.weightx = 0;
2676		- aWindowConstraints.weighty = 1;
2677		- bigThree.add(jtp, aWindowConstraints);
2678		- aWindowConstraints.weightx = 1;
2679		- aWindowConstraints.gridwidth = 3;
2680		- // aWindowConstraints.gridheight = 3;
2681		- aWindowConstraints.gridx = 1;
2682		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2683		- bigThree.add(cameraPanel, aWindowConstraints);
2684		- aWindowConstraints.weightx = 0;
2685		- aWindowConstraints.gridx = 4;
2686		- aWindowConstraints.gridwidth = 1;
2687		- // aWindowConstraints.gridheight = 3;
2688		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2689		- //bigThree.add(XYZPanel, aConstraints);
2690		- bigThree.revalidate();
	2864	+
	2865	+// bigThree.remove(scenePanel);
	2866	+// bigThree.remove(centralPanel);
	2867	+// bigThree.remove(XYZPanel);
	2868	+// aWindowConstraints.gridx = 0;
	2869	+// aWindowConstraints.gridy = 0;
	2870	+// aWindowConstraints.gridwidth = 1;
	2871	+// // aConstraints.gridheight = 3;
	2872	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2873	+// aWindowConstraints.weightx = 0;
	2874	+// aWindowConstraints.weighty = 1;
	2875	+// bigThree.add(scenePanel, aWindowConstraints);
	2876	+// aWindowConstraints.weightx = 1;
	2877	+// aWindowConstraints.gridwidth = 3;
	2878	+// // aWindowConstraints.gridheight = 3;
	2879	+// aWindowConstraints.gridx = 1;
	2880	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2881	+// bigThree.add(centralPanel, aWindowConstraints);
	2882	+// aWindowConstraints.weightx = 0;
	2883	+// aWindowConstraints.gridx = 4;
	2884	+// aWindowConstraints.gridwidth = 1;
	2885	+// // aWindowConstraints.gridheight = 3;
	2886	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2887	+// //bigThree.add(XYZPanel, aConstraints);
	2888	+// bigThree.validate();
	2889	+// scenePanel.setVisible(true);
	2890	+// centralPanel.setVisible(true);
	2891	+// XYZPanel.setVisible(false);
	2892	+ bigThree.ClearUI();
	2893	+ bigThree.add(scenePanel);
	2894	+ bigThree.add(centralPanel);
	2895	+ bigThree.FlushUI();
2691	2896	} else
2692		- if (event.getSource() == sevenButton)
	2897	+ if (source == sevenButton)
2693	2898	{
2694	2899	radio.layout = sevenButton;
2695		- bigThree.remove(jtp);
2696		- bigThree.remove(cameraPanel);
2697		- bigThree.remove(XYZPanel);
2698		- aWindowConstraints.gridx = 0;
2699		- aWindowConstraints.gridy = 0;
2700		- aWindowConstraints.gridwidth = 1;
2701		- // aWindowConstraints.gridheight = 3;
2702		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2703		- aWindowConstraints.weightx = 0;
2704		- aWindowConstraints.weighty = 1;
2705		- bigThree.add(jtp, aWindowConstraints);
2706		- aWindowConstraints.weightx = 1;
2707		- aWindowConstraints.gridwidth = 3;
2708		- // aWindowConstraints.gridheight = 3;
2709		- aWindowConstraints.gridx = 1;
2710		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2711		- bigThree.add(cameraPanel, aWindowConstraints);
2712		- aWindowConstraints.weightx = 0;
2713		- aWindowConstraints.gridx = 4;
2714		- aWindowConstraints.gridwidth = 1;
2715		- // aConstraints.gridheight = 3;
2716		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2717		- bigThree.add(XYZPanel, aWindowConstraints);
2718		- bigThree.revalidate();
	2900	+
	2901	+// bigThree.remove(scenePanel);
	2902	+// bigThree.remove(centralPanel);
	2903	+// bigThree.remove(XYZPanel);
	2904	+// aWindowConstraints.gridx = 0;
	2905	+// aWindowConstraints.gridy = 0;
	2906	+// aWindowConstraints.gridwidth = 1;
	2907	+// // aWindowConstraints.gridheight = 3;
	2908	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2909	+// aWindowConstraints.weightx = 0;
	2910	+// aWindowConstraints.weighty = 1;
	2911	+// bigThree.add(scenePanel, aWindowConstraints);
	2912	+// aWindowConstraints.weightx = 1;
	2913	+// aWindowConstraints.gridwidth = 3;
	2914	+// // aWindowConstraints.gridheight = 3;
	2915	+// aWindowConstraints.gridx = 1;
	2916	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2917	+// bigThree.add(centralPanel, aWindowConstraints);
	2918	+// aWindowConstraints.weightx = 0;
	2919	+// aWindowConstraints.gridx = 4;
	2920	+// aWindowConstraints.gridwidth = 1;
	2921	+// // aConstraints.gridheight = 3;
	2922	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2923	+// bigThree.add(XYZPanel, aWindowConstraints);
	2924	+// bigThree.validate();
	2925	+// scenePanel.setVisible(true);
	2926	+// centralPanel.setVisible(true);
	2927	+// XYZPanel.setVisible(true);
	2928	+ bigThree.ClearUI();
	2929	+ bigThree.add(scenePanel);
	2930	+ bigThree.add(centralPanel);
	2931	+ bigThree.add(XYZPanel);
	2932	+ bigThree.FlushUI();
2719	2933	} else
2720		- if (event.getSource() == rootButton)
	2934	+ if (source == rootButton)
2721	2935	{
2722	2936	Object3D obj;
2723	2937	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2729,7 +2943,7 @@
2729	2943
2730	2944	refreshContents(true);
2731	2945	} else
2732		- if (event.getSource() == closeButton)
	2946	+ if (source == closeButton)
2733	2947	{
2734	2948	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2735	2949	cRadio ab;
..	..	@@ -2750,11 +2964,11 @@
2750	2964	}
2751	2965	refreshContents(true);
2752	2966	} else
2753		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2967	+ if (source == editItem \|\| source == editButton)
2754	2968	{
2755	2969	EditSelection(false);
2756	2970	} else
2757		- if (event.getSource() == uneditButton)
	2971	+ if (source == uneditButton)
2758	2972	{
2759	2973	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2760	2974	{
..	..	@@ -2766,12 +2980,12 @@
2766	2980
2767	2981	child.editWindow = null; // ???????????
2768	2982	}
2769		- objEditor.ctrlPanel.revalidate();
	2983	+ objEditor.ctrlPanel.FlushUI();
2770	2984	//objEditor.jTree.clearSelection();
2771	2985	//objEditor.ResetSliders();
2772	2986	refreshContents(true);
2773	2987	} else
2774		- if (event.getSource() == clearPanelButton)
	2988	+ if (source == clearPanelButton)
2775	2989	{
2776	2990	assert(copy == group);
2777	2991	//copy.ClearUI();
..	..	@@ -2782,7 +2996,7 @@
2782	2996	listUI.clear();
2783	2997	refreshContents(true);
2784	2998	} else
2785		- if (event.getSource() == allParamsButton)
	2999	+ if (source == allParamsButton)
2786	3000	{
2787	3001	assert(copy == group);
2788	3002
..	..	@@ -2803,19 +3017,19 @@
2803	3017
2804	3018	refreshContents(true);
2805	3019	} else
2806		- if (event.getSource() == unselectButton)
	3020	+ if (source == unselectButton)
2807	3021	{
2808	3022	objEditor.jTree.clearSelection();
2809		- // ?? oct 2012 GraphreeD.clipboard.clear();
	3023	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2810	3024	objEditor.ResetSliders();
2811	3025	refreshContents(true);
2812	3026	} else
2813		- if(event.getSource() instanceof cRadio)
	3027	+ if(source instanceof cRadio)
2814	3028	{
2815	3029	group.parent = keepparent;
2816	3030	group.attributes = 0;
2817	3031	//group.editWindow = null;
2818		- /cRadio/ radio = (cRadio)event.getSource();
	3032	+ /cRadio/ radio = (cRadio)source;
2819	3033	Object3D obj = radio.GetObject();
2820	3034	System.out.println("Edit " + obj);
2821	3035	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2835,7 +3049,7 @@
2835	3049	}
2836	3050
2837	3051	copy = group;
2838		- //CameraPane.theRenderer.object = group;
	3052	+ //Globals.theRenderer.object = group;
2839	3053	if(!useclient)
2840	3054	{
2841	3055	cameraView.renderCamera = radio.camera;
..	..	@@ -2844,7 +3058,8 @@
2844	3058	cameraView.cameras[cameraView.cameracount] = radio.camera;
2845	3059	cameraView.targetLookAt.set(radio.camera.lookAt);
2846	3060	cameraView.object = group;
2847		- cameraView.lighttouched = true;
	3061	+ //cameraView.lighttouched = true;
	3062	+ Globals.lighttouched = true;
2848	3063	topView.object = group;
2849	3064	frontView.object = group;
2850	3065	sideView.object = group;
..	..	@@ -2880,7 +3095,7 @@
2880	3095	if (useclient)
2881	3096	{
2882	3097	cameraView.object = client;
2883		- cameraView.lighttouched = true;
	3098	+ Globals.lighttouched = true;
2884	3099	//topView.object = client;
2885	3100	//frontView.object = client;
2886	3101	//sideView.object = client;
..	..	@@ -2888,7 +3103,7 @@
2888	3103	else
2889	3104	{
2890	3105	cameraView.object = group;
2891		- cameraView.lighttouched = true;
	3106	+ Globals.lighttouched = true;
2892	3107	//topView.object = group;
2893	3108	//frontView.object = group;
2894	3109	//sideView.object = group;
..	..	@@ -3121,9 +3336,9 @@
3121	3336	obj = (Object3D)e.nextElement();
3122	3337
3123	3338	System.out.println("Object is: " + obj);
3124		- GraphreeD.AnalyzeObject(obj);
	3339	+ GrafreeD.AnalyzeObject(obj);
3125	3340	System.out.println("Boundary rep: " + obj.bRep);
3126		- GraphreeD.AnalyzeObject(obj.bRep);
	3341	+ GrafreeD.AnalyzeObject(obj.bRep);
3127	3342
3128	3343	// System.err.println((size/1024) + " KB is the size of " + obj);
3129	3344	}
..	..	@@ -3165,6 +3380,13 @@
3165	3380	void GenNormals(boolean crease)
3166	3381	{
3167	3382	group.GenNormalsS(crease);
	3383	+
	3384	+ refreshContents();
	3385	+ }
	3386	+
	3387	+ void GenNormalsMINE()
	3388	+ {
	3389	+ group.selection.GenNormalsMINE();
3168	3390
3169	3391	refreshContents();
3170	3392	}
..	..	@@ -3250,7 +3472,7 @@
3250	3472	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3251	3473	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3252	3474	//
3253		-// g.add(GraphreeD.clipboard);
	3475	+// g.add(GrafreeD.clipboard);
3254	3476	//
3255	3477	// buffer.add(g);
3256	3478	// }
..	..	@@ -3269,8 +3491,8 @@
3269	3491	// nodes = new Object3D();
3270	3492	// vertices = new Vector<Vertex>();
3271	3493	//
3272		-// boolean epsequal = GraphreeD.epsequal;
3273		-// GraphreeD.epsequal = true;
	3494	+// boolean epsequal = GrafreeD.epsequal;
	3495	+// GrafreeD.epsequal = true;
3274	3496	//
3275	3497	// for (int i=0; i<group.selection.size(); i++)
3276	3498	// {
..	..	@@ -3311,7 +3533,7 @@
3311	3533	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3312	3534	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3313	3535	//
3314		-// g.add(GraphreeD.clipboard);
	3536	+// g.add(GrafreeD.clipboard);
3315	3537	//
3316	3538	// buffer.add(g);
3317	3539	// }
..	..	@@ -3319,7 +3541,7 @@
3319	3541	// makeSomething(buffer, i==group.selection.size()-1);
3320	3542	// }
3321	3543	//
3322		-// GraphreeD.epsequal = epsequal;
	3544	+// GrafreeD.epsequal = epsequal;
3323	3545	//
3324	3546	// //buffer = null;
3325	3547	// temprep = null;
..	..	@@ -3330,8 +3552,8 @@
3330	3552
3331	3553	void ParseVertices()
3332	3554	{
3333		- boolean epsequal = GraphreeD.epsequal;
3334		- GraphreeD.epsequal = true;
	3555	+ boolean epsequal = GrafreeD.epsequal;
	3556	+ GrafreeD.epsequal = true;
3335	3557
3336	3558	for (int i=0; i<group.selection.size(); i++)
3337	3559	{
..	..	@@ -3356,7 +3578,7 @@
3356	3578	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3357	3579	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3358	3580
3359		- g.add(GraphreeD.clipboard);
	3581	+ g.add(GrafreeD.clipboard);
3360	3582
3361	3583	buffer.add(g);
3362	3584	}
..	..	@@ -3371,7 +3593,7 @@
3371	3593	makeSomething(buffer, i==group.selection.size()-1);
3372	3594	}
3373	3595
3374		- GraphreeD.epsequal = epsequal;
	3596	+ GrafreeD.epsequal = epsequal;
3375	3597
3376	3598	refreshContents();
3377	3599	}
..	..	@@ -3389,7 +3611,7 @@
3389	3611	String pigment = Object3D.GetPigment(tex);
3390	3612	//String bump = Object3D.GetBump(tex);
3391	3613
3392		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3614	+ com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3393	3615
3394	3616	double s = v.s;
3395	3617
..	..	@@ -3416,7 +3638,7 @@
3416	3638	scale /= 3;
3417	3639
3418	3640	scale /= 0xFF;
3419		- scale /= 4;
	3641	+ // c'est quoi ca? scale /= 4;
3420	3642
3421	3643	//v.AO = scale;
3422	3644
..	..	@@ -3437,12 +3659,26 @@
3437	3659
3438	3660	void Align()
3439	3661	{
	3662	+ if (group.selection.size() == 0)
	3663	+ return;
	3664	+
	3665	+ cVector bbmin = new cVector();
	3666	+ cVector bbmax = new cVector();
	3667	+
	3668	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3669	+
	3670	+ double dx = bbmax.x - bbmin.x;
	3671	+ double dy = bbmax.y - bbmin.y;
	3672	+ double dz = bbmax.z - bbmin.z;
	3673	+
	3674	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3675	+
3440	3676	for (int i=0; i<group.selection.size(); i++)
3441	3677	{
3442	3678	Object3D obj = group.selection.get(i);
3443	3679
3444		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3445		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3680	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3681	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3446	3682	}
3447	3683
3448	3684	refreshContents();
..	..	@@ -3455,7 +3691,7 @@
3455	3691	// ref.SaveSupports();
3456	3692	// Object3D par = ref.parent;
3457	3693	// ref.parent = null;
3458		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	3694	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3459	3695	// ref.parent = par;
3460	3696	// ref.RestoreSupports();
3461	3697
..	..	@@ -3463,11 +3699,11 @@
3463	3699
3464	3700	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3465	3701
3466		- boolean random = CameraPane.RANDOM;
3467		- CameraPane.RANDOM = false; // parse all random nodes
	3702	+ boolean random = CameraPane.SWITCH;
	3703	+ CameraPane.SWITCH = false; // parse all random nodes
3468	3704	lowres.linkVerticesThis(null);
3469	3705	lowres.linkVerticesThis(sn);
3470		- CameraPane.RANDOM = random;
	3706	+ CameraPane.SWITCH = random;
3471	3707
3472	3708	System.err.flush();
3473	3709
..	..	@@ -3485,7 +3721,7 @@
3485	3721	// lowres.SaveSupports();
3486	3722	// par = lowres.parent;
3487	3723	// lowres.parent = null;
3488		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	3724	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3489	3725	Object3D newlow = CloneObject(lowres, false);
3490	3726	newlow.name = sn.switchobject.get(i).name;
3491	3727	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3507,7 +3743,7 @@
3507	3743	return;
3508	3744
3509	3745	Object3D poses = group.selection.get(0);
3510		- Object3D ref = GraphreeD.clipboard.get(0);
	3746	+ Object3D ref = GrafreeD.clipboard.get(0);
3511	3747
3512	3748	Object3D newgroup = new Object3D("Po:" + poses.name);
3513	3749
..	..	@@ -3676,7 +3912,7 @@
3676	3912	group.selection.RelinkToSupport(); // july 2014
3677	3913	System.out.println("DONE.");
3678	3914	refreshContents();
3679		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3915	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3680	3916	}
3681	3917
3682	3918	void ReduceMesh(boolean reduction34)
..	..	@@ -3701,20 +3937,20 @@
3701	3937
3702	3938	void ClipMesh()
3703	3939	{
3704		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	3940	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
3705	3941	{
3706		- Object3D content = GraphreeD.clipboard.get(0);
	3942	+ Object3D content = GrafreeD.clipboard.get(0);
3707	3943
3708	3944	if (content instanceof cGroup && ((cGroup)content).transientlink )
3709	3945	content = ((cGroup)content).get(0);
3710	3946
3711	3947	// for (int i=0; i<group.selection.size(); i++)
3712	3948	// {
3713		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	3949	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3714	3950	// }
3715		- group.selection.ClipMesh(GraphreeD.clipboard);
	3951	+ group.selection.ClipMesh(GrafreeD.clipboard);
3716	3952	}
3717		-// group.selection.ClipMesh(GraphreeD.clipboard);
	3953	+// group.selection.ClipMesh(GrafreeD.clipboard);
3718	3954	System.out.println("DONE.");
3719	3955	refreshContents();
3720	3956	}
..	..	@@ -3952,25 +4188,25 @@
3952	4188	System.err.println("info : " + child.GetPath());
3953	4189	}
3954	4190	}
3955		- else
3956		- {
3957		- objEditor.SetMaterial(group); // .GetMaterial());
3958		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3959		- System.err.println("info : " + group.GetPath());
3960		- }
	4191	+// else
	4192	+// {
	4193	+// objEditor.SetMaterial(group); // .GetMaterial());
	4194	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4195	+// System.err.println("info : " + group.GetPath());
	4196	+// }
3961	4197
3962	4198	objEditor.SetText(); // jan 2014
3963	4199
3964		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4200	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
3965	4201	CameraPane.flash = true;
3966	4202
3967	4203	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
3968	4204	// a camera
3969	4205	{
3970	4206	CameraPane.camerachangeframe = 0; // don't refuse it
3971		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3972		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3973		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4207	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4208	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4209	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3974	4210	}
3975	4211
3976	4212	refreshContents();
..	..	@@ -4052,12 +4288,12 @@
4052	4288	{
4053	4289	if (group.selection.isEmpty())
4054	4290	return;
4055		- GraphreeD.clipboardIsTempGroup = false;
	4291	+ GrafreeD.clipboardIsTempGroup = false;
4056	4292	Composite tGroup = null;
4057	4293	if (group.selection.size() > 0) // 1)
4058	4294	{
4059	4295	tGroup = new cGroup();
4060		- GraphreeD.clipboardIsTempGroup = true;
	4296	+ GrafreeD.clipboardIsTempGroup = true;
4061	4297	}
4062	4298
4063	4299	if (cut)
..	..	@@ -4097,16 +4333,16 @@
4097	4333	//System.out.println("cut " + child);
4098	4334	//System.out.println("parent = " + child.parent);
4099	4335	// tmp.addChild(child);
4100		- if (GraphreeD.clipboardIsTempGroup)
	4336	+ if (GrafreeD.clipboardIsTempGroup)
4101	4337	tGroup.add/Child/(tmp);
4102	4338	else
4103		- GraphreeD.clipboard = tmp;
	4339	+ GrafreeD.clipboard = tmp;
4104	4340	}
4105	4341	else
4106		- if (GraphreeD.clipboardIsTempGroup)
	4342	+ if (GrafreeD.clipboardIsTempGroup)
4107	4343	tGroup.add/Child/(child);
4108	4344	else
4109		- GraphreeD.clipboard = child;
	4345	+ GrafreeD.clipboard = child;
4110	4346	}
4111	4347
4112	4348	//ResetModel();
..	..	@@ -4138,21 +4374,21 @@
4138	4374	//System.out.println("cut " + elem);
4139	4375	//System.out.println("parent = " + elem.parent);
4140	4376	// tmp.addChild(elem);
4141		- if (GraphreeD.clipboardIsTempGroup)
	4377	+ if (GrafreeD.clipboardIsTempGroup)
4142	4378	tGroup.add/Child/(tmp);
4143	4379	else
4144		- GraphreeD.clipboard = tmp;
	4380	+ GrafreeD.clipboard = tmp;
4145	4381	}
4146	4382	else
4147		- if (GraphreeD.clipboardIsTempGroup)
	4383	+ if (GrafreeD.clipboardIsTempGroup)
4148	4384	tGroup.add/Child/(child);
4149	4385	else
4150		- GraphreeD.clipboard = child;
	4386	+ GrafreeD.clipboard = child;
4151	4387	}
4152	4388
4153	4389	}
4154		- if (GraphreeD.clipboardIsTempGroup)
4155		- GraphreeD.clipboard = tGroup;
	4390	+ if (GrafreeD.clipboardIsTempGroup)
	4391	+ GrafreeD.clipboard = tGroup;
4156	4392	if (cut)
4157	4393	{
4158	4394	ResetModel();
..	..	@@ -4162,11 +4398,11 @@
4162	4398
4163	4399	void paste(boolean expand)
4164	4400	{
4165		- // if (GraphreeD.clipboard == null)
	4401	+ // if (GrafreeD.clipboard == null)
4166	4402	// return;
4167	4403	boolean first = true;
4168	4404
4169		- if (GraphreeD.clipboardIsTempGroup)
	4405	+ if (GrafreeD.clipboardIsTempGroup)
4170	4406	{
4171	4407	Composite temp;
4172	4408
..	..	@@ -4177,7 +4413,7 @@
4177	4413	temp = (Composite)Applet3D.clipboard.deepCopy();
4178	4414	*/
4179	4415	Object3D elem;
4180		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4416	+ for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4181	4417	{
4182	4418	Object3D child = (Object3D)e.nextElement();
4183	4419
..	..	@@ -4191,7 +4427,7 @@
4191	4427	else
4192	4428	elem = child.deepCopy(); // ?
4193	4429	child.parent = keepparent;
4194		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	4430	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4195	4431	// elem = elem.get(0);
4196	4432	makeSomething(elem, true); // ?? first);
4197	4433	//group.addChild(elem);
..	..	@@ -4211,23 +4447,23 @@
4211	4447	//Object3D cb = Applet3D.clipboard;
4212	4448	//temp.addChild(cb);
4213	4449	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4214		- assert(GraphreeD.clipboard.parent == null);
4215		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
4216		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
4217		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
4218		- makeSomething(expand?GraphreeD.clipboard.get(0).copyExpand():GraphreeD.clipboard.get(0).deepCopy());
	4450	+ assert(GrafreeD.clipboard.parent == null);
	4451	+ Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
	4452	+ GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
	4453	+ if (LA.isIdentity(GrafreeD.clipboard.toParent))
	4454	+ makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
4219	4455	else
4220		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4221		- GraphreeD.clipboard.get(0).parent = keepparent;
	4456	+ makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
	4457	+ GrafreeD.clipboard.get(0).parent = keepparent;
4222	4458	}
4223	4459
4224	4460	ResetModel();
4225	4461	refreshContents();
4226	4462	}
4227	4463
4228		- void pasteInto(boolean copyit)
	4464	+ void pasteInto(boolean copyit, boolean clone)
4229	4465	{
4230		-// if (GraphreeD.clipboard == null)
	4466	+// if (GrafreeD.clipboard == null)
4231	4467	// return;
4232	4468
4233	4469	if (group.selection.size() != 1)
..	..	@@ -4254,15 +4490,22 @@
4254	4490	if (copyit)
4255	4491	{
4256	4492	// paste(false);
4257		- CloneClipboard(false); // sept 2014
	4493	+ if (clone)
	4494	+ {
	4495	+ CloneClipboard(false); // sept 2014
	4496	+ }
	4497	+ else
	4498	+ {
	4499	+ paste(false);
	4500	+ }
4258	4501	}
4259	4502	else
4260	4503	{
4261	4504	boolean first = true;
4262	4505
4263		- if (GraphreeD.clipboardIsTempGroup)
	4506	+ if (GrafreeD.clipboardIsTempGroup)
4264	4507	{
4265		- Composite temp = (Composite)GraphreeD.clipboard;
	4508	+ Composite temp = (Composite)GrafreeD.clipboard;
4266	4509	Object3D copy;
4267	4510	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4268	4511	{
..	..	@@ -4272,7 +4515,7 @@
4272	4515	}
4273	4516	} else
4274	4517	{
4275		- linkSomething(GraphreeD.clipboard); //.get(0));
	4518	+ linkSomething(GrafreeD.clipboard); //.get(0));
4276	4519	}
4277	4520	}
4278	4521	}
..	..	@@ -4464,6 +4707,26 @@
4464	4707	makeSomething(csg);
4465	4708	}
4466	4709
	4710	+ void Ungroup(Object3D g)
	4711	+ {
	4712	+ if (g instanceof HiddenObject)
	4713	+ {
	4714	+ HiddenObject h = (HiddenObject) g;
	4715	+
	4716	+ for (int i=0; i<h.ActualSize(); i++)
	4717	+ {
	4718	+ objEditor.makeSomething(h.get(i), false);
	4719	+ }
	4720	+ }
	4721	+ else
	4722	+ {
	4723	+ for (int i=0; i<g.Size(); i++)
	4724	+ {
	4725	+ objEditor.makeSomething(g.get(i), false);
	4726	+ }
	4727	+ }
	4728	+ }
	4729	+
4467	4730	void ungroup()
4468	4731	{
4469	4732	/*
..	..	@@ -4659,7 +4922,7 @@
4659	4922
4660	4923	void ImportGFD()
4661	4924	{
4662		- FileDialog browser = new FileDialog(objEditor.frame, "Import GraphreeD", FileDialog.LOAD);
	4925	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4663	4926	browser.show();
4664	4927	String filename = browser.getFile();
4665	4928	if (filename != null && filename.length() > 0)
..	..	@@ -4697,7 +4960,7 @@
4697	4960
4698	4961	void ImportVRMLX3D()
4699	4962	{
4700		- if (GraphreeD.standAlone)
	4963	+ if (GrafreeD.standAlone)
4701	4964	{
4702	4965	/**/
4703	4966	FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
..	..	@@ -4714,7 +4977,7 @@
4714	4977
4715	4978	String GetFile(String dialogName)
4716	4979	{
4717		- if (GraphreeD.standAlone)
	4980	+ if (GrafreeD.standAlone)
4718	4981	{
4719	4982	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4720	4983	browser.show();
..	..	@@ -4778,10 +5041,12 @@
4778	5041	cButton flashSelectionButton;
4779	5042	cButton editButton;
4780	5043	cButton uneditButton;
	5044	+ JCheckBox allParamsButton;
4781	5045	cButton clearpanelButton;
4782		- cButton allParamsButton;
4783	5046	cButton unselectButton;
4784	5047
	5048	+ cButton oneStepButton;
	5049	+
4785	5050	cButton screenfitButton;
4786	5051	cButton screenfitpointButton;
4787	5052	cButton snapobjectButton;
..	..	@@ -4823,6 +5088,7 @@
4823	5088	private MenuItem resetsupportItem;
4824	5089	private MenuItem resetreferencesItem;
4825	5090	private MenuItem linkverticesItem;
	5091	+ private MenuItem relinkverticesItem;
4826	5092	private MenuItem setMasterItem;
4827	5093	private MenuItem resetMeshItem;
4828	5094	private MenuItem stepAllItem;
..	..	@@ -4835,14 +5101,17 @@
4835	5101	private MenuItem mergeGeometriesItem;
4836	5102	private MenuItem copyItem;
4837	5103	private MenuItem pasteItem;
	5104	+ private MenuItem pasteIntoItem;
4838	5105	private MenuItem pasteLinkItem;
4839	5106	private MenuItem pasteCloneItem;
4840	5107	private MenuItem pasteExpandItem;
4841	5108	private MenuItem clearItem;
4842	5109	private MenuItem clearAllItem;
4843	5110	private MenuItem genUVItem;
	5111	+ private MenuItem genNormalsMESHItem;
4844	5112	private MenuItem genNormalsCADItem;
4845	5113	private MenuItem genNormalsORGANItem;
	5114	+ private MenuItem genNormalsMINEItem;
4846	5115	private MenuItem stripifyItem;
4847	5116	private MenuItem unstripifyItem;
4848	5117	private MenuItem trimItem;
..	..	@@ -4884,6 +5153,7 @@
4884	5153	private MenuItem resetCentroidItem;
4885	5154	private MenuItem transformgeometryItem;
4886	5155	private MenuItem resetTransformItem;
	5156	+ private MenuItem hideItem;
4887	5157	private MenuItem grabItem;
4888	5158	private MenuItem backItem;
4889	5159	private MenuItem frontItem;
..	..	@@ -4904,6 +5174,7 @@
4904	5174
4905	5175	private MenuItem resetParentItem;
4906	5176	private MenuItem repairParentItem;
	5177	+ private MenuItem repairShadowItem;
4907	5178	private MenuItem sortbysizeItem;
4908	5179	private MenuItem sortbynameItem;
4909	5180
..	..	@@ -4924,10 +5195,11 @@
4924	5195	private MenuItem coneItem;
4925	5196	private MenuItem torusItem;
4926	5197	private MenuItem superItem;
	5198	+ private MenuItem kleinItem;
4927	5199	private MenuItem blobItem;
4928	5200	private MenuItem latheItem;
4929	5201	private MenuItem bezierItem;
4930		- private MenuItem checkerItem;
	5202	+ private MenuItem overlayItem;
4931	5203	private MenuItem meshItem;
4932	5204	// private MenuItem meshGroupItem;
4933	5205	private MenuItem springItem;
..	..	@@ -4936,6 +5208,7 @@
4936	5208	private MenuItem csgItem;
4937	5209	private MenuItem templateItem;
4938	5210	private MenuItem textureItem;
	5211	+ private MenuItem billboardItem;
4939	5212	private MenuItem shadowXItem;
4940	5213	private MenuItem shadowYItem;
4941	5214	private MenuItem shadowZItem;