~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
..	..	@@ -219,18 +220,24 @@
219	220	resetsupportItem.addActionListener(this);
220	221	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	222	linkverticesItem.addActionListener(this);
	223	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	224	+ relinkverticesItem.addActionListener(this);
222	225	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	226	setMasterItem.addActionListener(this);
224	227
225	228	oe.menuBar.add(menu = new Menu("Group"));
226	229	grabItem = menu.add(new MenuItem("Grab"));
227	230	grabItem.addActionListener(this);
228		- frontItem = menu.add(new MenuItem("Front"));
229		- frontItem.addActionListener(this);
230	231	backItem = menu.add(new MenuItem("Back"));
231	232	backItem.addActionListener(this);
	233	+ frontItem = menu.add(new MenuItem("Front"));
	234	+ frontItem.addActionListener(this);
232	235	compositeItem = menu.add(new MenuItem("Composite"));
233	236	compositeItem.addActionListener(this);
	237	+ hideItem = menu.add(new MenuItem("Hide"));
	238	+ hideItem.addActionListener(this);
	239	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	240	+ ungroupItem.addActionListener(this);
234	241	menu.add("-");
235	242	randomItem = menu.add(new MenuItem("Random"));
236	243	randomItem.addActionListener(this);
..	..	@@ -252,6 +259,8 @@
252	259	oe.menuBar.add(menu = new Menu("Object"));
253	260	textureItem = menu.add(new MenuItem("Texture"));
254	261	textureItem.addActionListener(this);
	262	+ billboardItem = menu.add(new MenuItem("Billboard"));
	263	+ billboardItem.addActionListener(this);
255	264	csgItem = menu.add(new MenuItem("CSG"));
256	265	csgItem.addActionListener(this);
257	266	shadowXItem = menu.add(new MenuItem("Shadow X"));
..	..	@@ -269,14 +278,12 @@
269	278	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	279	pointflowItem.addActionListener(this);
271	280	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	281	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	282	resetTransformItem.addActionListener(this);
276	283	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	284	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	285	+ transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
	286	+ transformgeometryItem.addActionListener(this);
280	287
281	288	oe.menuBar.add(menu = new Menu("Geometry"));
282	289	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -285,6 +292,10 @@
285	292	genNormalsORGANItem.addActionListener(this);
286	293	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287	294	genNormalsCADItem.addActionListener(this);
	295	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	296	+ genNormalsMESHItem.addActionListener(this);
	297	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	298	+ genNormalsMINEItem.addActionListener(this);
288	299	stripifyItem = menu.add(new MenuItem("Stripify"));
289	300	stripifyItem.addActionListener(this);
290	301	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -380,7 +391,7 @@
380	391
381	392
382	393	oe.menuBar.add(menu = new Menu("Include"));
383		- importGFDItem = menu.add(new MenuItem("GraphreeD Object..."));
	394	+ importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
384	395	importGFDItem.addActionListener(this);
385	396	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
386	397	importVRMLX3DItem.addActionListener(this);
..	..	@@ -424,76 +435,24 @@
424	435	oe.buttonGroup.add(dummyButton);
425	436	*/
426	437	aConstraints.gridy += 1;
	438	+
	439	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	440	+
427	441	oe.aConstraints.gridwidth = 1;
428	442	oe.aConstraints.gridx = 0;
429	443
430		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	444	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
	445	+ liveCB.setToolTipText("Enabled animation");
431	446	liveCB.addItemListener(this);
432	447
433	448	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);
451		- 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);
	449	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
	450	+ trackCB.setToolTipText("Enable tracking");
493	451	trackCB.addItemListener(this);
494	452
495	453	oe.aConstraints.gridx += 1;
496	454	oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	455	+ screenfitButton.setToolTipText("Screen fit");
497	456	screenfitButton.addActionListener(this);
498	457	oe.aConstraints.gridx += 1;
499	458	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
..	..	@@ -501,6 +460,7 @@
501	460	// oe.aConstraints.gridx += 1;
502	461	oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
503	462	snapobjectButton.addActionListener(this);
	463	+ snapobjectButton.setToolTipText("Snap Object");
504	464	oe.aConstraints.gridx += 1;
505	465
506	466	//aConstraints.gridx = 0;
..	..	@@ -509,28 +469,39 @@
509	469	oe.aConstraints.gridwidth = 1;
510	470
511	471	oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	472	+ flashSelectionButton.setToolTipText("Show selection");
512	473	flashSelectionButton.addActionListener(this);
	474	+
	475	+ oe.toolbarPanel.add(new cButton(" ", false));
	476	+
513	477	oe.aConstraints.gridx += 1;
514	478	oe.aConstraints.weighty = 0;
515	479	oe.aConstraints.gridwidth = 1;
516	480
517	481	//
518	482	oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	483	+ twoButton.setToolTipText("Show center view only");
519	484	twoButton.addActionListener(this);
520	485	oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
521	486	fourButton.addActionListener(this);
	487	+ fourButton.setToolTipText("Show left panel only");
522	488	oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	489	+ sixButton.setToolTipText("2-column layout left");
523	490	sixButton.addActionListener(this);
524	491	oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	492	+ threeButton.setToolTipText("2-column layout right");
525	493	threeButton.addActionListener(this);
526	494	oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	495	+ sevenButton.setToolTipText("3-column layout");
527	496	sevenButton.addActionListener(this);
528	497	//
529	498
530		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	499	+ oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
	500	+ rootButton.setToolTipText("Edit object in new tab");
531	501	rootButton.addActionListener(this);
532	502	oe.aConstraints.gridx += 1;
533	503	oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	504	+ closeButton.setToolTipText("Close tab");
534	505	closeButton.addActionListener(this);
535	506	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536	507	//clearButton.addActionListener(this);
..	..	@@ -633,17 +604,91 @@
633	604	radio.layout = sevenButton;
634	605	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
635	606	}
	607	+
	608	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	609	+ {
	610	+ //constraints.gridx = 0;
	611	+ //constraints.gridy = 0;
	612	+ panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	613	+ fastCB.setToolTipText("Fast mode");
	614	+ fastCB.addItemListener(this);
	615	+ //constraints.gridy += 1;
	616	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	617	+ supportCB.setToolTipText("Enabled rigging");
	618	+ supportCB.addItemListener(this);
	619	+
	620	+ // constraints.gridy += 1;
	621	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	622	+ // localCB.addItemListener(this);
	623	+
	624	+ //constraints.gridy += 1;
	625	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	626	+ crowdCB.setToolTipText("Used for crowds");
	627	+ crowdCB.addItemListener(this);
	628	+
	629	+ //constraints.gridy += 1;
	630	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	631	+ smoothCB.setToolTipText("Snapping delay");
	632	+ smoothCB.addItemListener(this);
	633	+
	634	+ //constraints.gridy += 1;
	635	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	636	+ slowCB.setToolTipText("Smooth interpolation");
	637	+ slowCB.addItemListener(this);
	638	+ //constraints.gridy += 1;
	639	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	640	+ boxCB.setToolTipText("Display bounding boxes");
	641	+ boxCB.addItemListener(this);
	642	+ //constraints.gridy += 1;
	643	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	644	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	645	+ zoomBoxCB.addItemListener(this);
	646	+
	647	+// constraints.gridy += 1;
	648	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	649	+// speakerMocapCB.addItemListener(this);
	650	+
	651	+ if (false)
	652	+ {
	653	+ // handled in scripts
	654	+ //constraints.gridy += 1;
	655	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	656	+ speakerCameraCB.addItemListener(this);
	657	+
	658	+ //constraints.gridy += 1;
	659	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	660	+ speakerFocusCB.addItemListener(this);
	661	+
	662	+ //constraints.gridy += 1;
	663	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	664	+ smoothfocusCB.addItemListener(this);
	665	+ }
	666	+
	667	+//constraints.gridx += 1;
	668	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	669	+// debugCB.addItemListener(this);
	670	+
	671	+ //constraints.gridy += 1;
	672	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	673	+ oeilCB.addItemListener(this);
	674	+
	675	+ //constraints.gridy += 1;
	676	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	677	+ lookAtCB.setToolTipText("Look-at target");
	678	+ lookAtCB.addItemListener(this);
	679	+
	680	+ }
636	681
637	682	void EditObject(Object3D obj)
638	683	{
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();
	684	+ cRadio radioButton = new cRadio(obj.name);
	685	+ radioButton.SetObject(obj);
	686	+ radioButton.layout = sevenButton;
	687	+ radioButton.SetCamera(cameraView.renderCamera, false);
	688	+ radioButton.addActionListener(this);
	689	+ radioPanel.add(radioButton);
	690	+ buttonGroup.add(radioButton);
	691	+ radioButton.doClick();
647	692	}
648	693	void SetupViews(ObjEditor oe)
649	694	{
..	..	@@ -663,6 +708,7 @@
663	708	JCheckBox fastCB;
664	709	JCheckBox slowCB;
665	710	JCheckBox boxCB;
	711	+ JCheckBox zoomBoxCB;
666	712	JCheckBox trackCB;
667	713	JCheckBox smoothfocusCB;
668	714	// JCheckBox speakerMocapCB;
..	..	@@ -705,8 +751,7 @@
705	751	dropAttributes \|= Object3D.TEXTURE;
706	752	else
707	753	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	754	+ } else if(e.getSource() == liveCB)
710	755	{
711	756	cameraView.ToggleLive();
712	757	}
..	..	@@ -743,6 +788,10 @@
743	788	Recompile();
744	789	cameraView.repaint();
745	790	// refreshContents();
	791	+ }
	792	+ else if(e.getSource() == zoomBoxCB)
	793	+ {
	794	+ cameraView.ToggleZoomBoxMode();
746	795	}
747	796	else if(e.getSource() == smoothfocusCB)
748	797	{
..	..	@@ -1033,6 +1082,8 @@
1033	1082	torusItem.addActionListener(this);
1034	1083	superItem = menu.add(new MenuItem("Superellipsoid"));
1035	1084	superItem.addActionListener(this);
	1085	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1086	+ kleinItem.addActionListener(this);
1036	1087	particleItem = menu.add(new MenuItem("Particle system"));
1037	1088	particleItem.addActionListener(this);
1038	1089	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1106,6 +1157,8 @@
1106	1157	resetParentItem.addActionListener(this);
1107	1158	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	1159	repairParentItem.addActionListener(this);
	1160	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1161	+ repairShadowItem.addActionListener(this);
1109	1162	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	1163	invariantsItem.addActionListener(this);
1111	1164	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1441,9 +1494,9 @@
1441	1494
1442	1495	void Overwrite(int mask)
1443	1496	{
1444		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1497	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1445	1498	{
1446		- Object3D content = GraphreeD.clipboard.get(0);
	1499	+ Object3D content = GrafreeD.clipboard.get(0);
1447	1500
1448	1501	if (content instanceof cGroup && ((cGroup)content).transientlink )
1449	1502	content = ((cGroup)content).get(0);
..	..	@@ -1466,6 +1519,7 @@
1466	1519	//
1467	1520	public void actionPerformed(ActionEvent event) // , Object arg)
1468	1521	{
	1522	+ Object source = event.getSource();
1469	1523	/*
1470	1524	if (event.getSource() == nameField)
1471	1525	{
..	..	@@ -1477,11 +1531,11 @@
1477	1531	}
1478	1532	else
1479	1533	*/
1480		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1534	+ if (source == lookAtItem \|\| source == lookFromItem)
1481	1535	{
1482	1536	ScreenFit();
1483	1537	} else
1484		- if (event.getSource() == switchItem)
	1538	+ if (source == switchItem)
1485	1539	{
1486	1540	cVector v1 = new cVector();
1487	1541	cVector v2 = new cVector();
..	..	@@ -1490,11 +1544,11 @@
1490	1544	objEditor.cameraView.renderCamera.setAim(v2, v1);
1491	1545	objEditor.cameraView.repaint();
1492	1546	} else
1493		- if (event.getSource() == rectoidItem)
	1547	+ if (source == rectoidItem)
1494	1548	{
1495	1549	makeSomething(new Box());
1496	1550	} else
1497		- if (event.getSource() == particleItem)
	1551	+ if (source == particleItem)
1498	1552	{
1499	1553	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1500	1554	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1515,9 +1569,9 @@
1515	1569	applyExample(particleGeom, "SMOKE");
1516	1570	makeSomething(particleGeom);
1517	1571	} else
1518		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1572	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1519	1573	{
1520		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1574	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1521	1575
1522	1576	ragdoll.toParent = LA.newMatrix();
1523	1577	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1535,7 +1589,7 @@
1535	1589	} else
1536	1590	/*
1537	1591	*/
1538		- if (event.getSource() == heightFieldItem)
	1592	+ if (source == heightFieldItem)
1539	1593	{
1540	1594	Object3D obj = new Object3D();
1541	1595
..	..	@@ -1573,27 +1627,31 @@
1573	1627
1574	1628	makeSomething(obj);
1575	1629	} else
1576		- if (event.getSource() == gridItem)
	1630	+ if (source == gridItem)
1577	1631	{
1578	1632	makeSomething(new Grid());
1579	1633	} else
1580		- if (event.getSource() == ellipsoidItem)
	1634	+ if (source == ellipsoidItem)
1581	1635	{
1582	1636	makeSomething(new Sphere());
1583	1637	} else
1584		- if (event.getSource() == coneItem)
	1638	+ if (source == coneItem)
1585	1639	{
1586	1640	makeSomething(new Cone());
1587	1641	} else
1588		- if (event.getSource() == torusItem)
	1642	+ if (source == torusItem)
1589	1643	{
1590	1644	makeSomething(new Torus());
1591	1645	} else
1592		- if (event.getSource() == superItem)
	1646	+ if (source == superItem)
1593	1647	{
1594	1648	makeSomething(new Superellipsoid());
1595	1649	} else
1596		- if (event.getSource() == blobItem)
	1650	+ if (source == kleinItem)
	1651	+ {
	1652	+ makeSomething(new Klein());
	1653	+ } else
	1654	+ if (source == blobItem)
1597	1655	{
1598	1656	Blob blob = new Blob();
1599	1657	BlobComponent comp = new BlobComponent();
..	..	@@ -1601,15 +1659,15 @@
1601	1659	//blob.retile();
1602	1660	makeSomething(blob);
1603	1661	} else
1604		- if (event.getSource() == latheItem)
	1662	+ if (source == latheItem)
1605	1663	{
1606	1664	makeSomething(new Lathe());
1607	1665	} else
1608		- if (event.getSource() == bezierItem)
	1666	+ if (source == bezierItem)
1609	1667	{
1610	1668	makeSomething(new BezierSurface());
1611	1669	} else
1612		- if (event.getSource() == checkerItem)
	1670	+ if (source == checkerItem)
1613	1671	{
1614	1672	/*
1615	1673	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1624,7 +1682,7 @@
1624	1682	*/
1625	1683	makeSomething(new Checker());
1626	1684	} else
1627		- if (event.getSource() == meshItem)
	1685	+ if (source == meshItem)
1628	1686	{
1629	1687	Object3D itemtomake = new Object3D();
1630	1688	Object3D child;
..	..	@@ -1645,35 +1703,35 @@
1645	1703	makeSomething(child);
1646	1704	}
1647	1705	} else
1648		- if (event.getSource() == springItem)
	1706	+ if (source == springItem)
1649	1707	{
1650	1708	cSpring s = new cSpring();
1651	1709	s.setup();
1652	1710	makeSomething(s);
1653	1711	} else
1654		- if (event.getSource() == flagItem)
	1712	+ if (source == flagItem)
1655	1713	{
1656	1714	cSpring s = new cFlag();
1657	1715	s.setup();
1658	1716	makeSomething(s);
1659	1717	} else
1660		- if (event.getSource() == lightItem)
	1718	+ if (source == lightItem)
1661	1719	{
1662	1720	makeSomething(new Light());
1663	1721	} else
1664		- if (event.getSource() == csgItem)
	1722	+ if (source == csgItem)
1665	1723	{
1666	1724	group(new CSG());
1667	1725	} else
1668		- if (event.getSource() == templateItem)
	1726	+ if (source == templateItem)
1669	1727	{
1670	1728	group(new cTemplate());
1671	1729	} else
1672		- if (event.getSource() == attributeItem)
	1730	+ if (source == attributeItem)
1673	1731	{
1674	1732	makeSomething(new Attribute());
1675	1733	} else
1676		- if (event.getSource() == pointflowItem)
	1734	+ if (source == pointflowItem)
1677	1735	{
1678	1736	makeSomething(new PointFlow());
1679	1737	} else
..	..	@@ -1685,7 +1743,7 @@
1685	1743	} else
1686	1744	*/
1687	1745
1688		- if (event.getSource() == superLoopItem)
	1746	+ if (source == superLoopItem)
1689	1747	{
1690	1748	Composite g = new cGroup();
1691	1749	for (int i=0; i<15; i++)
..	..	@@ -1707,7 +1765,7 @@
1707	1765
1708	1766	group(g);
1709	1767	} else
1710		- if (event.getSource() == loopItem)
	1768	+ if (source == loopItem)
1711	1769	{
1712	1770	Composite csg = new GroupLeaf();
1713	1771	csg.count = 5;
..	..	@@ -1716,7 +1774,7 @@
1716	1774	csg.addChild(child);
1717	1775	child.addChild(csg);
1718	1776	} else
1719		- if (event.getSource() == doubleItem)
	1777	+ if (source == doubleItem)
1720	1778	{
1721	1779	Composite csg = new GroupLeaf();
1722	1780	csg.count = 5;
..	..	@@ -1728,7 +1786,7 @@
1728	1786	csg.addChild(child);
1729	1787	child.addChild(csg);
1730	1788	} else
1731		- if (event.getSource() == tripleItem)
	1789	+ if (source == tripleItem)
1732	1790	{
1733	1791	Composite csg = new GroupLeaf();
1734	1792	csg.count = 4;
..	..	@@ -1744,70 +1802,70 @@
1744	1802	child.addChild(csg);
1745	1803	} else
1746	1804
1747		- if (event.getSource() == importGFDItem)
	1805	+ if (source == importGFDItem)
1748	1806	{
1749	1807	ImportGFD();
1750	1808	} else
1751		- if (event.getSource() == importVRMLX3DItem)
	1809	+ if (source == importVRMLX3DItem)
1752	1810	{
1753	1811	ImportVRMLX3D();
1754	1812	} else
1755		- if (event.getSource() == import3DSItem)
	1813	+ if (source == import3DSItem)
1756	1814	{
1757	1815	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1758	1816	} else
1759		- if (event.getSource() == importOBJItem)
	1817	+ if (source == importOBJItem)
1760	1818	{
1761	1819	objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1762	1820	} else
1763		- if (event.getSource() == computeAOItem)
	1821	+ if (source == computeAOItem)
1764	1822	{
1765		- CameraPane.drawMode = CameraPane.OCCLUSION;
1766		- CameraPane.theRenderer.repaint();
	1823	+ Globals.drawMode = CameraPane.OCCLUSION;
	1824	+ Globals.theRenderer.repaint();
1767	1825	} else
1768		- if (event.getSource() == recompileItem)
	1826	+ if (source == recompileItem)
1769	1827	{
1770	1828	Recompile();
1771	1829	refreshContents();
1772	1830	} else
1773		- if (event.getSource() == editScriptItem)
	1831	+ if (source == editScriptItem)
1774	1832	{
1775	1833	OpenDialog();
1776	1834	refreshContents();
1777	1835	} else
1778		- if (event.getSource() == invariantsItem)
	1836	+ if (source == invariantsItem)
1779	1837	{
1780	1838	System.out.println("Invariants:");
1781		- GraphreeD.theApplet3D.universe.invariants();
	1839	+ GrafreeD.grafreeD.universe.invariants();
1782	1840	} else
1783		- if (event.getSource() == memoryItem)
	1841	+ if (source == memoryItem)
1784	1842	{
1785	1843	//System.out.println("Invariants:");
1786	1844	PrintMemory();
1787	1845	} else
1788		- if (event.getSource() == pathItem)
	1846	+ if (source == pathItem)
1789	1847	{
1790	1848	PrintPath();
1791	1849	} else
1792		- if (event.getSource() == analyzeItem)
	1850	+ if (source == analyzeItem)
1793	1851	{
1794	1852	AnalyzeObject();
1795	1853	} else
1796		- if (event.getSource() == dumpItem)
	1854	+ if (source == dumpItem)
1797	1855	{
1798	1856	DumpObject();
1799	1857	} else
1800		- if (event.getSource() == screenfitButton)
	1858	+ if (source == screenfitButton)
1801	1859	{
1802	1860	//Reload(lastConverter, lastFilename, true);
1803	1861	ScreenFit();
1804	1862	} else
1805		- if (event.getSource() == screenfitpointButton)
	1863	+ if (source == screenfitpointButton)
1806	1864	{
1807	1865	//Reload(lastConverter, lastFilename, true);
1808	1866	ScreenFitPoint();
1809	1867	} else
1810		- if (event.getSource() == snapobjectButton)
	1868	+ if (source == snapobjectButton)
1811	1869	{
1812	1870	//Reload(lastConverter, lastFilename, true);
1813	1871	SnapObject();
..	..	@@ -1818,13 +1876,13 @@
1818	1876	// Recompile();
1819	1877	// refreshContents();
1820	1878	// } else
1821		- if (event.getSource() == gcButton)
	1879	+ if (source == gcButton)
1822	1880	{
1823	1881	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1824	1882	System.gc();
1825	1883	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	1884	} else
1827		- if (event.getSource() == editLeafItem)
	1885	+ if (source == editLeafItem)
1828	1886	{
1829	1887	Object3D obj;
1830	1888	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1838,65 +1896,66 @@
1838	1896	}
1839	1897	refreshContents(true);
1840	1898	} else
1841		- if (event.getSource() == openWindowItem)
	1899	+ if (source == openWindowItem)
1842	1900	{
1843	1901	EditSelection(true);
1844	1902	} else
1845		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1903	+ if (source == cutItem \|\| source == clearButton)
1846	1904	{
1847	1905	loadClipboard(true);
1848	1906	} else
1849		- if (event.getSource() == duplicateItem)
	1907	+ if (source == duplicateItem)
1850	1908	{
1851		- Object3D keep = GraphreeD.clipboard;
	1909	+ Object3D keep = GrafreeD.clipboard;
1852	1910	loadClipboard(false);
1853	1911	paste(false);
1854		- GraphreeD.clipboard = keep;
	1912	+ GrafreeD.clipboard = keep;
1855	1913	} else
1856		- if (event.getSource() == cloneItem)
	1914	+ if (source == cloneItem)
1857	1915	{
1858	1916	CloneSelection(false);
1859	1917	} else
1860		- if (event.getSource() == cloneSupportItem)
	1918	+ if (source == cloneSupportItem)
1861	1919	{
1862	1920	CloneSelection(true);
1863	1921	} else
1864		- if (event.getSource() == copyItem)
	1922	+ if (source == copyItem)
1865	1923	{
1866	1924	loadClipboard(false);
1867	1925	} else
1868		- if (event.getSource() == pasteItem)
	1926	+ if (source == pasteItem)
1869	1927	{
1870	1928	paste(false);
1871	1929	} else
1872		- if (event.getSource() == pasteLinkItem)
	1930	+ if (source == pasteLinkItem)
1873	1931	{
1874	1932	pasteInto(false);
1875	1933	} else
1876		- if (event.getSource() == pasteCloneItem)
	1934	+ if (source == pasteCloneItem)
1877	1935	{
1878	1936	pasteInto(true);
1879	1937	} else
1880		- if (event.getSource() == pasteExpandItem)
	1938	+ if (source == pasteExpandItem)
1881	1939	{
1882	1940	paste(true);
1883	1941	} else
1884		- if (event.getSource() == synchronizeItem)
	1942	+ if (source == synchronizeItem)
1885	1943	{
1886	1944	Overwrite(Object3D.TRANSFORM);
1887	1945	} else
1888		- if (event.getSource() == overwriteNameItem)
	1946	+ if (source == overwriteNameItem)
1889	1947	{
1890	1948	Overwrite(Object3D.NAME);
1891	1949	} else
1892		- if (event.getSource() == overwriteUVItem)
	1950	+ if (source == overwriteUVItem)
1893	1951	{
1894	1952	Overwrite(Object3D.UV);
1895	1953	} else
1896		- if (event.getSource() == overwriteMatItem)
	1954	+ if (source == overwriteMatItem)
1897	1955	{
	1956	+ /* july 2015
1898	1957	if ((dropAttributes & Object3D.TEXTURE) == 0)
1899		- Overwrite(Object3D.MATERIAL);
	1958	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1900	1959	else
1901	1960	{
1902	1961	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1908,13 +1967,16 @@
1908	1967	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1909	1968	}
1910	1969	}
	1970	+ */
	1971	+
	1972	+ Overwrite(dropAttributes);
1911	1973	}
1912		- if (event.getSource() == overwriteGeoItem)
	1974	+ if (source == overwriteGeoItem)
1913	1975	{
1914	1976	Overwrite(Object3D.GEOMETRY);
1915		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1977	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1916	1978	// {
1917		-// Object3D content = GraphreeD.clipboard.get(0);
	1979	+// Object3D content = GrafreeD.clipboard.get(0);
1918	1980	//
1919	1981	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1920	1982	// content = ((cGroup)content).get(0);
..	..	@@ -1926,7 +1988,7 @@
1926	1988	// refreshContents();
1927	1989	// }
1928	1990	} else
1929		- if (event.getSource() == generateMeshItem)
	1991	+ if (source == generateMeshItem)
1930	1992	{
1931	1993	//if (group.selection.size() == 1)
1932	1994	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1937,7 +1999,7 @@
1937	1999	ResetModel();
1938	2000	refreshContents();
1939	2001	} else
1940		- if (event.getSource() == extractGeometriesItem)
	2002	+ if (source == extractGeometriesItem)
1941	2003	{
1942	2004	boolean one = false;
1943	2005
..	..	@@ -1964,7 +2026,7 @@
1964	2026	ResetModel();
1965	2027	refreshContents();
1966	2028	} else
1967		- if (event.getSource() == cloneGeometriesItem)
	2029	+ if (source == cloneGeometriesItem)
1968	2030	{
1969	2031	boolean one = false;
1970	2032
..	..	@@ -1990,32 +2052,37 @@
1990	2052	ResetModel();
1991	2053	refreshContents();
1992	2054	} else
1993		- if (event.getSource() == shareGeometriesItem)
	2055	+ if (source == shareGeometriesItem)
1994	2056	{
1995	2057	boolean one = false;
1996	2058
1997	2059	if (group.selection.size() == 1)
1998	2060	one = true;
1999	2061
	2062	+ Object3D merge = null;
	2063	+
2000	2064	Object3D content = new cGroup();
2001	2065
2002	2066	for (int i=0; i<group.selection.size(); i++)
2003	2067	{
2004		- Object3D sel = new Merge(group.selection.get(i));
	2068	+ merge = new Merge(group.selection.get(i));
2005	2069
2006	2070	if (one)
2007		- makeSomething(sel, false);
	2071	+ makeSomething(merge, false);
2008	2072	else
2009		- content.addChild(sel);
	2073	+ content.addChild(merge);
2010	2074	}
2011	2075
2012	2076	if (!one)
2013		- makeSomething(content, false);
2014		-
2015		- ResetModel();
2016		- refreshContents();
	2077	+ makeSomething(content, true);
	2078	+ else
	2079	+ {
	2080	+ ResetModel();
	2081	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2082	+ refreshContents();
	2083	+ }
2017	2084	} else
2018		- if (event.getSource() == mergeGeometriesItem)
	2085	+ if (source == mergeGeometriesItem)
2019	2086	{
2020	2087	boolean one = false;
2021	2088
..	..	@@ -2045,11 +2112,11 @@
2045	2112	ResetModel();
2046	2113	refreshContents();
2047	2114	} else
2048		- if (event.getSource() == linkverticesItem)
	2115	+ if (source == linkverticesItem)
2049	2116	{
2050		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2117	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2051	2118	// {
2052		-// Object3D content = GraphreeD.clipboard.get(0);
	2119	+// Object3D content = GrafreeD.clipboard.get(0);
2053	2120	//
2054	2121	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2055	2122	// content = ((cGroup)content).get(0);
..	..	@@ -2058,14 +2125,14 @@
2058	2125	// group.selection.get(0).setMasterThis(content); // should be identity
2059	2126	// refreshContents();
2060	2127	// }
2061		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2128	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
2062	2129	{
2063		- Object3D content = GraphreeD.clipboard.get(0);
	2130	+ Object3D content = GrafreeD.clipboard.get(0);
2064	2131
2065	2132	if (content instanceof cGroup && ((cGroup)content).transientlink )
2066	2133	content = ((cGroup)content).get(0);
2067	2134
2068		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2135	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2069	2136	for (int i=0; i<group.selection.size(); i++)
2070	2137	{
2071	2138	boolean random = CameraPane.RANDOM;
..	..	@@ -2074,11 +2141,11 @@
2074	2141	// group.selection.get(i).setMasterThis(content); // should be identity
2075	2142	CameraPane.RANDOM = random;
2076	2143	}
2077		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2144	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2078	2145	refreshContents();
2079	2146	}
2080	2147	} else
2081		- if (event.getSource() == resetsupportItem)
	2148	+ if (source == resetsupportItem)
2082	2149	{
2083	2150	for (int i=0; i<group.selection.size(); i++)
2084	2151	{
..	..	@@ -2090,7 +2157,16 @@
2090	2157
2091	2158	refreshContents();
2092	2159	} else
2093		- if (event.getSource() == resetreferencesItem)
	2160	+ if (source == relinkverticesItem)
	2161	+ {
	2162	+ boolean random = CameraPane.RANDOM;
	2163	+ CameraPane.RANDOM = false; // parse all random nodes
	2164	+ group.selection.RelinkToSupport();
	2165	+ CameraPane.RANDOM = random;
	2166	+
	2167	+ refreshContents();
	2168	+ } else
	2169	+ if (source == resetreferencesItem)
2094	2170	{
2095	2171	for (int i=0; i<group.selection.size(); i++)
2096	2172	{
..	..	@@ -2099,11 +2175,11 @@
2099	2175
2100	2176	refreshContents();
2101	2177	} else
2102		- if (event.getSource() == setMasterItem)
	2178	+ if (source == setMasterItem)
2103	2179	{
2104		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2180	+ if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2105	2181	{
2106		- Object3D content = GraphreeD.clipboard.get(0);
	2182	+ Object3D content = GrafreeD.clipboard.get(0);
2107	2183
2108	2184	if (content instanceof cGroup && ((cGroup)content).transientlink )
2109	2185	content = ((cGroup)content).get(0);
..	..	@@ -2112,13 +2188,13 @@
2112	2188	refreshContents();
2113	2189	}
2114	2190	} else
2115		- if (event.getSource() == poseMeshItem)
	2191	+ if (source == poseMeshItem)
2116	2192	{
2117	2193	if (group.selection.size() == 1)
2118	2194	{
2119		- if (GraphreeD.clipboard.size() == 1)
	2195	+ if (GrafreeD.clipboard.size() == 1)
2120	2196	{
2121		- Object3D content = GraphreeD.clipboard.get(0);
	2197	+ Object3D content = GrafreeD.clipboard.get(0);
2122	2198
2123	2199	if (content instanceof cGroup && ((cGroup)content).transientlink )
2124	2200	content = ((cGroup)content).get(0);
..	..	@@ -2131,19 +2207,19 @@
2131	2207	}
2132	2208
2133	2209	} else
2134		- if (event.getSource() == revertMeshItem)
	2210	+ if (source == revertMeshItem)
2135	2211	{
2136	2212	RevertMeshes();
2137	2213	} else
2138		- if (event.getSource() == resetMeshItem)
	2214	+ if (source == resetMeshItem)
2139	2215	{
2140	2216	ResetAll();
2141	2217	} else
2142		- if (event.getSource() == stepAllItem)
	2218	+ if (source == stepAllItem)
2143	2219	{
2144	2220	StepAll();
2145	2221	} else
2146		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2222	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2147	2223	{
2148	2224	//int indices[] = jList.getSelectedIndices();
2149	2225	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2151,42 +2227,46 @@
2151	2227
2152	2228	ClearSelection(false);
2153	2229	} else
2154		- if (event.getSource() == clearAllItem)
	2230	+ if (source == clearAllItem)
2155	2231	{
2156	2232	ClearSelection(true);
2157	2233	} else
2158		- if (event.getSource() == grabItem)
	2234	+ if (source == grabItem)
2159	2235	{
2160	2236	group(new cGroup(), true);
2161	2237	} else
2162		- if (event.getSource() == frontItem)
	2238	+ if (source == hideItem)
	2239	+ {
	2240	+ group(new HiddenObject());
	2241	+ } else
	2242	+ if (source == frontItem)
2163	2243	{
2164	2244	front();
2165	2245	} else
2166		- if (event.getSource() == backItem)
	2246	+ if (source == backItem)
2167	2247	{
2168	2248	back();
2169	2249	} else
2170		- if (event.getSource() == cameraItem)
	2250	+ if (source == cameraItem)
2171	2251	{
2172	2252	makeSomething(new Camera());
2173	2253	} else
2174		- if (event.getSource() == compositeItem)
	2254	+ if (source == compositeItem)
2175	2255	{
2176	2256	group(new Composite());
2177	2257	} else
2178		- if (event.getSource() == randomItem)
	2258	+ if (source == randomItem)
2179	2259	{
2180	2260	RandomNode random = new RandomNode();
2181	2261	group(random);
2182	2262	if (random.size() > 0)
2183	2263	random.name = random.get(0).name + "Rnd";
2184	2264	} else
2185		- if (event.getSource() == physicsItem)
	2265	+ if (source == physicsItem)
2186	2266	{
2187	2267	group(new PhysicsNode());
2188	2268	} else
2189		- if (event.getSource() == frameselectorItem)
	2269	+ if (source == frameselectorItem)
2190	2270	{
2191	2271	for (int i=0; i<group.selection.size(); i++)
2192	2272	{
..	..	@@ -2198,7 +2278,7 @@
2198	2278	ResetModel();
2199	2279	refreshContents();
2200	2280	} else
2201		- if (event.getSource() == switchGeoItem)
	2281	+ if (source == switchGeoItem)
2202	2282	{
2203	2283	for (int i=0; i<group.selection.size(); i++)
2204	2284	{
..	..	@@ -2210,7 +2290,7 @@
2210	2290	ResetModel();
2211	2291	refreshContents();
2212	2292	} else
2213		- if (event.getSource() == switchTransfoItem)
	2293	+ if (source == switchTransfoItem)
2214	2294	{
2215	2295	for (int i=0; i<group.selection.size(); i++)
2216	2296	{
..	..	@@ -2222,7 +2302,7 @@
2222	2302	ResetModel();
2223	2303	refreshContents();
2224	2304	} else
2225		- if (event.getSource() == morphItem)
	2305	+ if (source == morphItem)
2226	2306	{
2227	2307	for (int i=0; i<group.selection.size(); i++)
2228	2308	{
..	..	@@ -2234,7 +2314,7 @@
2234	2314	ResetModel();
2235	2315	refreshContents();
2236	2316	} else
2237		- if (event.getSource() == scriptNodeItem)
	2317	+ if (source == scriptNodeItem)
2238	2318	{
2239	2319	boolean atleastone = false;
2240	2320
..	..	@@ -2273,195 +2353,215 @@
2273	2353	}
2274	2354	}
2275	2355	} else
2276		- if (event.getSource() == linkerItem)
	2356	+ if (source == linkerItem)
2277	2357	{
2278	2358	group(new cLinker());
2279	2359	} else
2280		- if (event.getSource() == textureItem)
	2360	+ if (source == textureItem)
2281	2361	{
2282	2362	group(new TextureNode());
2283	2363	} else
2284		- if (event.getSource() == shadowXItem)
	2364	+ if (source == billboardItem)
	2365	+ {
	2366	+ group(new BillboardNode());
	2367	+ } else
	2368	+ if (source == shadowXItem)
2285	2369	{
2286	2370	CastShadow(0);
2287	2371	} else
2288		- if (event.getSource() == shadowYItem)
	2372	+ if (source == shadowYItem)
2289	2373	{
2290	2374	CastShadow(1);
2291	2375	} else
2292		- if (event.getSource() == shadowZItem)
	2376	+ if (source == shadowZItem)
2293	2377	{
2294	2378	CastShadow(2);
2295	2379	} else
2296		- if (event.getSource() == ungroupItem)
	2380	+ if (source == ungroupItem)
2297	2381	{
2298		- ungroup();
	2382	+ //ungroup();
	2383	+ for (int i=0; i<group.selection.size(); i++)
	2384	+ {
	2385	+ Ungroup(group.selection.get(i));
	2386	+ }
	2387	+
	2388	+ ClearSelection(false);
	2389	+
	2390	+ refreshContents();
2299	2391	} else
2300		- if (event.getSource() == genUVItem)
	2392	+ if (source == genUVItem)
2301	2393	{
2302	2394	GenUV();
2303	2395	} else
2304		- if (event.getSource() == genNormalsCADItem)
	2396	+ if (source == genNormalsCADItem)
2305	2397	{
2306	2398	GenNormals(true);
2307	2399	} else
2308		- if (event.getSource() == genNormalsORGANItem)
	2400	+ if (source == genNormalsMESHItem)
	2401	+ {
	2402	+ GenNormals(true); // TODO
	2403	+ } else
	2404	+ if (source == genNormalsORGANItem)
2309	2405	{
2310	2406	GenNormals(false);
2311	2407	} else
2312		- if (event.getSource() == stripifyItem)
	2408	+ if (source == genNormalsMINEItem)
	2409	+ {
	2410	+ GenNormalsMINE();
	2411	+ } else
	2412	+ if (source == stripifyItem)
2313	2413	{
2314	2414	Stripify();
2315	2415	} else
2316		- if (event.getSource() == unstripifyItem)
	2416	+ if (source == unstripifyItem)
2317	2417	{
2318	2418	Unstripify();
2319	2419	} else
2320		- if (event.getSource() == trimItem)
	2420	+ if (source == trimItem)
2321	2421	{
2322	2422	Trim();
2323	2423	} else
2324		- if (event.getSource() == untrimItem)
	2424	+ if (source == untrimItem)
2325	2425	{
2326	2426	Untrim();
2327	2427	} else
2328		- if (event.getSource() == clearColorsItem)
	2428	+ if (source == clearColorsItem)
2329	2429	{
2330	2430	ClearColors();
2331	2431	} else
2332		- if (event.getSource() == clearMaterialsItem)
	2432	+ if (source == clearMaterialsItem)
2333	2433	{
2334	2434	ClearMaterials();
2335	2435	} else
2336		- if (event.getSource() == liveleavesItem)
	2436	+ if (source == liveleavesItem)
2337	2437	{
2338	2438	LiveLeaves(true);
2339	2439	} else
2340		- if (event.getSource() == unliveleavesItem)
	2440	+ if (source == unliveleavesItem)
2341	2441	{
2342	2442	LiveLeaves(false);
2343	2443	} else
2344		- if (event.getSource() == supportleavesItem)
	2444	+ if (source == supportleavesItem)
2345	2445	{
2346	2446	SupportLeaves(true);
2347	2447	} else
2348		- if (event.getSource() == unsupportleavesItem)
	2448	+ if (source == unsupportleavesItem)
2349	2449	{
2350	2450	SupportLeaves(false);
2351	2451	} else
2352		- if (event.getSource() == hideleavesItem)
	2452	+ if (source == hideleavesItem)
2353	2453	{
2354	2454	HideLeaves(true);
2355	2455	} else
2356		- if (event.getSource() == showleavesItem)
	2456	+ if (source == showleavesItem)
2357	2457	{
2358	2458	HideLeaves(false);
2359	2459	} else
2360		- if (event.getSource() == markleavesItem)
	2460	+ if (source == markleavesItem)
2361	2461	{
2362	2462	MarkLeaves(true);
2363	2463	} else
2364		- if (event.getSource() == unmarkleavesItem)
	2464	+ if (source == unmarkleavesItem)
2365	2465	{
2366	2466	MarkLeaves(false);
2367	2467	} else
2368		- if (event.getSource() == flipVItem)
	2468	+ if (source == flipVItem)
2369	2469	{
2370	2470	FlipV(true);
2371	2471	} else
2372		- if (event.getSource() == unflipVItem)
	2472	+ if (source == unflipVItem)
2373	2473	{
2374	2474	FlipV(false);
2375	2475	} else
2376		- if (event.getSource() == lowTexturesItem)
	2476	+ if (source == lowTexturesItem)
2377	2477	{
2378	2478	SetTexRes(0);
2379	2479	} else
2380		- if (event.getSource() == normalTexturesItem)
	2480	+ if (source == normalTexturesItem)
2381	2481	{
2382	2482	SetTexRes(1);
2383	2483	} else
2384		- if (event.getSource() == highTexturesItem)
	2484	+ if (source == highTexturesItem)
2385	2485	{
2386	2486	SetTexRes(2);
2387	2487	} else
2388		- if (event.getSource() == veryhighTexturesItem)
	2488	+ if (source == veryhighTexturesItem)
2389	2489	{
2390	2490	SetTexRes(3);
2391	2491	} else
2392		- if (event.getSource() == maxTexturesItem)
	2492	+ if (source == maxTexturesItem)
2393	2493	{
2394	2494	SetTexRes(4);
2395	2495	} else
2396		- if (event.getSource() == panoTexturesItem)
	2496	+ if (source == panoTexturesItem)
2397	2497	{
2398	2498	SetTexRes(5);
2399	2499	} else
2400		- if (event.getSource() == reverseNormalsItem)
	2500	+ if (source == reverseNormalsItem)
2401	2501	{
2402	2502	ReverseNormals();
2403	2503	} else
2404		- if (event.getSource() == parseverticesItem)
	2504	+ if (source == parseverticesItem)
2405	2505	{
2406	2506	ParseVertices();
2407	2507	} else
2408		- if (event.getSource() == textureFieldItem)
	2508	+ if (source == textureFieldItem)
2409	2509	{
2410	2510	TextureVertices();
2411	2511	} else
2412		- if (event.getSource() == alignItem)
	2512	+ if (source == alignItem)
2413	2513	{
2414	2514	Align();
2415	2515	} else
2416		- if (event.getSource() == mirrorItem)
	2516	+ if (source == mirrorItem)
2417	2517	{
2418	2518	MirrorPoses();
2419	2519	} else
2420		- if (event.getSource() == reduceMorphItem)
	2520	+ if (source == reduceMorphItem)
2421	2521	{
2422	2522	MeshReduction(false);
2423	2523	} else
2424		- if (event.getSource() == reduce34MorphItem)
	2524	+ if (source == reduce34MorphItem)
2425	2525	{
2426	2526	MeshReduction(true);
2427	2527	} else
2428		- if (event.getSource() == reverseTrianglesItem)
	2528	+ if (source == reverseTrianglesItem)
2429	2529	{
2430	2530	ReverseTriangles();
2431	2531	} else
2432		- if (event.getSource() == reduceMeshItem)
	2532	+ if (source == reduceMeshItem)
2433	2533	{
2434	2534	ReduceMesh(false);
2435	2535	} else
2436		- if (event.getSource() == reduce34MeshItem)
	2536	+ if (source == reduce34MeshItem)
2437	2537	{
2438	2538	ReduceMesh(true);
2439	2539	} else
2440		- if (event.getSource() == increaseMeshItem)
	2540	+ if (source == increaseMeshItem)
2441	2541	{
2442	2542	IncreaseMesh();
2443	2543	} else
2444		- if (event.getSource() == clipMeshItem)
	2544	+ if (source == clipMeshItem)
2445	2545	{
2446	2546	ClipMesh();
2447	2547	} else
2448		- if (event.getSource() == smoothMeshItem)
	2548	+ if (source == smoothMeshItem)
2449	2549	{
2450	2550	SmoothMesh();
2451	2551	} else
2452		- if (event.getSource() == transformgeometryItem)
	2552	+ if (source == transformgeometryItem)
2453	2553	{
2454	2554	TransformGeometry();
2455	2555	} else
2456		- if (event.getSource() == resetTransformItem)
	2556	+ if (source == resetTransformItem)
2457	2557	{
2458	2558	ResetTransform();
2459	2559	} else
2460		- if (event.getSource() == resetCentroidItem)
	2560	+ if (source == resetCentroidItem)
2461	2561	{
2462	2562	ResetCentroid();
2463	2563	} else
2464		- if (event.getSource() == resetParentItem)
	2564	+ if (source == resetParentItem)
2465	2565	{
2466	2566	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2467	2567	{
..	..	@@ -2471,7 +2571,7 @@
2471	2571
2472	2572	refreshContents();
2473	2573	} else
2474		- if (event.getSource() == repairParentItem)
	2574	+ if (source == repairParentItem)
2475	2575	{
2476	2576	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	2577	{
..	..	@@ -2485,7 +2585,21 @@
2485	2585
2486	2586	refreshContents();
2487	2587	} else
2488		- if (event.getSource() == sortbysizeItem)
	2588	+ if (source == repairShadowItem)
	2589	+ {
	2590	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2591	+ {
	2592	+ Object3D obj = (Object3D)e.nextElement();
	2593	+ obj.RepairShadow();
	2594	+// for (int i=0; i<obj.size(); i++)
	2595	+// {
	2596	+// obj.get(i).parent = obj;
	2597	+// }
	2598	+ }
	2599	+
	2600	+ refreshContents();
	2601	+ } else
	2602	+ if (source == sortbysizeItem)
2489	2603	{
2490	2604	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2491	2605	{
..	..	@@ -2497,7 +2611,7 @@
2497	2611	ResetModel();
2498	2612	refreshContents();
2499	2613	} else
2500		- if (event.getSource() == sortbynameItem)
	2614	+ if (source == sortbynameItem)
2501	2615	{
2502	2616	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2503	2617	{
..	..	@@ -2509,7 +2623,7 @@
2509	2623	ResetModel();
2510	2624	refreshContents();
2511	2625	} else
2512		- if (event.getSource() == attachPigmentItem)
	2626	+ if (source == attachPigmentItem)
2513	2627	{
2514	2628	String texture = GetFile("Attach pigment");
2515	2629	Object3D obj;
..	..	@@ -2521,7 +2635,7 @@
2521	2635
2522	2636	refreshContents();
2523	2637	} else
2524		- if (event.getSource() == detachPigmentItem)
	2638	+ if (source == detachPigmentItem)
2525	2639	{
2526	2640	Object3D obj;
2527	2641	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2532,7 +2646,7 @@
2532	2646
2533	2647	refreshContents();
2534	2648	} else
2535		- if (event.getSource() == attachBumpItem)
	2649	+ if (source == attachBumpItem)
2536	2650	{
2537	2651	String texture = GetFile("Attach bump");
2538	2652	Object3D obj;
..	..	@@ -2544,7 +2658,7 @@
2544	2658
2545	2659	refreshContents();
2546	2660	} else
2547		- if (event.getSource() == detachBumpItem)
	2661	+ if (source == detachBumpItem)
2548	2662	{
2549	2663	Object3D obj;
2550	2664	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2555,7 +2669,7 @@
2555	2669
2556	2670	refreshContents();
2557	2671	} else
2558		- if (event.getSource() == pigmentBumpItem)
	2672	+ if (source == pigmentBumpItem)
2559	2673	{
2560	2674	Object3D obj;
2561	2675	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2566,158 +2680,195 @@
2566	2680
2567	2681	refreshContents();
2568	2682	} else
2569		- if (event.getSource() == flashSelectionButton)
	2683	+ if (source == flashSelectionButton)
2570	2684	{
2571	2685	CameraPane.flash = true;
2572	2686	refreshContents();
2573	2687	} else
2574		- if (event.getSource() == oneButton)
	2688	+ if (source == oneButton)
2575	2689	{
2576	2690	} else
2577		- if (event.getSource() == twoButton)
	2691	+ if (source == twoButton)
2578	2692	{
2579	2693	radio.layout = twoButton;
2580	2694	// bug
2581	2695	//gridPanel.setDividerLocation(1.0);
2582	2696	//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();
	2697	+// bigThree.remove(scenePanel);
	2698	+// bigThree.remove(centralPanel);
	2699	+// bigThree.remove(XYZPanel);
	2700	+// aWindowConstraints.gridx = 0;
	2701	+// aWindowConstraints.gridy = 0;
	2702	+// aWindowConstraints.gridwidth = 1;
	2703	+// // aConstraints.gridheight = 3;
	2704	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2705	+// aWindowConstraints.weightx = 0;
	2706	+// aWindowConstraints.weighty = 1;
	2707	+// //bigThree.add(jtp, aWindowConstraints);
	2708	+// aWindowConstraints.weightx = 1;
	2709	+// aWindowConstraints.gridwidth = 3;
	2710	+// // aConstraints.gridheight = 3;
	2711	+// aWindowConstraints.gridx = 1;
	2712	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2713	+// bigThree.add(centralPanel, aWindowConstraints);
	2714	+// aWindowConstraints.weightx = 0;
	2715	+// aWindowConstraints.gridx = 4;
	2716	+// aWindowConstraints.gridwidth = 1;
	2717	+// // aConstraints.gridheight = 3;
	2718	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2719	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2720	+// scenePanel.setVisible(false);
	2721	+// centralPanel.setVisible(true);
	2722	+// XYZPanel.setVisible(false);
	2723	+ bigThree.ClearUI();
	2724	+ bigThree.add(centralPanel);
	2725	+ bigThree.FlushUI();
2607	2726	} else
2608		- if (event.getSource() == threeButton)
	2727	+ if (source == threeButton)
2609	2728	{
2610	2729	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();
	2730	+
	2731	+// bigThree.remove(scenePanel);
	2732	+// bigThree.remove(centralPanel);
	2733	+// bigThree.remove(XYZPanel);
	2734	+// aWindowConstraints.gridx = 0;
	2735	+// aWindowConstraints.gridy = 0;
	2736	+// aWindowConstraints.gridwidth = 1;
	2737	+// // aConstraints.gridheight = 3;
	2738	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2739	+// aWindowConstraints.weightx = 0;
	2740	+// aWindowConstraints.weighty = 1;
	2741	+// //bigThree.add(jtp, aWindowConstraints);
	2742	+// aWindowConstraints.weightx = 1;
	2743	+// aWindowConstraints.gridwidth = 3;
	2744	+// // aConstraints.gridheight = 3;
	2745	+// aWindowConstraints.gridx = 1;
	2746	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2747	+// bigThree.add(centralPanel, aWindowConstraints);
	2748	+// aWindowConstraints.weightx = 0;
	2749	+// aWindowConstraints.gridx = 4;
	2750	+// aWindowConstraints.gridwidth = 1;
	2751	+// // aConstraints.gridheight = 3;
	2752	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2753	+// bigThree.add(XYZPanel, aWindowConstraints);
	2754	+// bigThree.validate();
	2755	+// scenePanel.setVisible(false);
	2756	+// centralPanel.setVisible(true);
	2757	+// XYZPanel.setVisible(true);
	2758	+ bigThree.ClearUI();
	2759	+ bigThree.add(centralPanel);
	2760	+ bigThree.add(XYZPanel);
	2761	+ bigThree.FlushUI();
2635	2762	} else
2636		- if (event.getSource() == fourButton)
	2763	+ if (source == fourButton)
2637	2764	{
2638	2765	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();
	2766	+
	2767	+// bigThree.remove(scenePanel);
	2768	+// bigThree.remove(centralPanel);
	2769	+// bigThree.remove(XYZPanel);
	2770	+// aWindowConstraints.gridx = 0;
	2771	+// aWindowConstraints.gridy = 0;
	2772	+// aWindowConstraints.gridwidth = 1;
	2773	+// // aWindowConstraints.gridheight = 3;
	2774	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2775	+// aWindowConstraints.weightx = 1;
	2776	+// aWindowConstraints.weighty = 1;
	2777	+// bigThree.add(scenePanel, aWindowConstraints);
	2778	+// aWindowConstraints.weightx = 1;
	2779	+// aWindowConstraints.gridwidth = 3;
	2780	+// // aConstraints.gridheight = 3;
	2781	+// aWindowConstraints.gridx = 1;
	2782	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2783	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2784	+// aWindowConstraints.weightx = 0;
	2785	+// aWindowConstraints.gridx = 4;
	2786	+// aWindowConstraints.gridwidth = 1;
	2787	+// // aWindowConstraints.gridheight = 3;
	2788	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2789	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2790	+// bigThree.validate();
	2791	+// scenePanel.setVisible(true);
	2792	+// centralPanel.setVisible(false);
	2793	+// XYZPanel.setVisible(false);
	2794	+ bigThree.ClearUI();
	2795	+ bigThree.add(scenePanel);
	2796	+ bigThree.FlushUI();
2663	2797	} else
2664		- if (event.getSource() == sixButton)
	2798	+ if (source == sixButton)
2665	2799	{
2666	2800	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();
	2801	+
	2802	+// bigThree.remove(scenePanel);
	2803	+// bigThree.remove(centralPanel);
	2804	+// bigThree.remove(XYZPanel);
	2805	+// aWindowConstraints.gridx = 0;
	2806	+// aWindowConstraints.gridy = 0;
	2807	+// aWindowConstraints.gridwidth = 1;
	2808	+// // aConstraints.gridheight = 3;
	2809	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2810	+// aWindowConstraints.weightx = 0;
	2811	+// aWindowConstraints.weighty = 1;
	2812	+// bigThree.add(scenePanel, aWindowConstraints);
	2813	+// aWindowConstraints.weightx = 1;
	2814	+// aWindowConstraints.gridwidth = 3;
	2815	+// // aWindowConstraints.gridheight = 3;
	2816	+// aWindowConstraints.gridx = 1;
	2817	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2818	+// bigThree.add(centralPanel, aWindowConstraints);
	2819	+// aWindowConstraints.weightx = 0;
	2820	+// aWindowConstraints.gridx = 4;
	2821	+// aWindowConstraints.gridwidth = 1;
	2822	+// // aWindowConstraints.gridheight = 3;
	2823	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2824	+// //bigThree.add(XYZPanel, aConstraints);
	2825	+// bigThree.validate();
	2826	+// scenePanel.setVisible(true);
	2827	+// centralPanel.setVisible(true);
	2828	+// XYZPanel.setVisible(false);
	2829	+ bigThree.ClearUI();
	2830	+ bigThree.add(scenePanel);
	2831	+ bigThree.add(centralPanel);
	2832	+ bigThree.FlushUI();
2691	2833	} else
2692		- if (event.getSource() == sevenButton)
	2834	+ if (source == sevenButton)
2693	2835	{
2694	2836	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();
	2837	+
	2838	+// bigThree.remove(scenePanel);
	2839	+// bigThree.remove(centralPanel);
	2840	+// bigThree.remove(XYZPanel);
	2841	+// aWindowConstraints.gridx = 0;
	2842	+// aWindowConstraints.gridy = 0;
	2843	+// aWindowConstraints.gridwidth = 1;
	2844	+// // aWindowConstraints.gridheight = 3;
	2845	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2846	+// aWindowConstraints.weightx = 0;
	2847	+// aWindowConstraints.weighty = 1;
	2848	+// bigThree.add(scenePanel, aWindowConstraints);
	2849	+// aWindowConstraints.weightx = 1;
	2850	+// aWindowConstraints.gridwidth = 3;
	2851	+// // aWindowConstraints.gridheight = 3;
	2852	+// aWindowConstraints.gridx = 1;
	2853	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2854	+// bigThree.add(centralPanel, aWindowConstraints);
	2855	+// aWindowConstraints.weightx = 0;
	2856	+// aWindowConstraints.gridx = 4;
	2857	+// aWindowConstraints.gridwidth = 1;
	2858	+// // aConstraints.gridheight = 3;
	2859	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2860	+// bigThree.add(XYZPanel, aWindowConstraints);
	2861	+// bigThree.validate();
	2862	+// scenePanel.setVisible(true);
	2863	+// centralPanel.setVisible(true);
	2864	+// XYZPanel.setVisible(true);
	2865	+ bigThree.ClearUI();
	2866	+ bigThree.add(scenePanel);
	2867	+ bigThree.add(centralPanel);
	2868	+ bigThree.add(XYZPanel);
	2869	+ bigThree.FlushUI();
2719	2870	} else
2720		- if (event.getSource() == rootButton)
	2871	+ if (source == rootButton)
2721	2872	{
2722	2873	Object3D obj;
2723	2874	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2729,7 +2880,7 @@
2729	2880
2730	2881	refreshContents(true);
2731	2882	} else
2732		- if (event.getSource() == closeButton)
	2883	+ if (source == closeButton)
2733	2884	{
2734	2885	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2735	2886	cRadio ab;
..	..	@@ -2750,11 +2901,11 @@
2750	2901	}
2751	2902	refreshContents(true);
2752	2903	} else
2753		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2904	+ if (source == editItem \|\| source == editButton)
2754	2905	{
2755	2906	EditSelection(false);
2756	2907	} else
2757		- if (event.getSource() == uneditButton)
	2908	+ if (source == uneditButton)
2758	2909	{
2759	2910	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2760	2911	{
..	..	@@ -2766,12 +2917,12 @@
2766	2917
2767	2918	child.editWindow = null; // ???????????
2768	2919	}
2769		- objEditor.ctrlPanel.revalidate();
	2920	+ objEditor.ctrlPanel.validate();
2770	2921	//objEditor.jTree.clearSelection();
2771	2922	//objEditor.ResetSliders();
2772	2923	refreshContents(true);
2773	2924	} else
2774		- if (event.getSource() == clearPanelButton)
	2925	+ if (source == clearPanelButton)
2775	2926	{
2776	2927	assert(copy == group);
2777	2928	//copy.ClearUI();
..	..	@@ -2782,7 +2933,7 @@
2782	2933	listUI.clear();
2783	2934	refreshContents(true);
2784	2935	} else
2785		- if (event.getSource() == allParamsButton)
	2936	+ if (source == allParamsButton)
2786	2937	{
2787	2938	assert(copy == group);
2788	2939
..	..	@@ -2803,19 +2954,19 @@
2803	2954
2804	2955	refreshContents(true);
2805	2956	} else
2806		- if (event.getSource() == unselectButton)
	2957	+ if (source == unselectButton)
2807	2958	{
2808	2959	objEditor.jTree.clearSelection();
2809		- // ?? oct 2012 GraphreeD.clipboard.clear();
	2960	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2810	2961	objEditor.ResetSliders();
2811	2962	refreshContents(true);
2812	2963	} else
2813		- if(event.getSource() instanceof cRadio)
	2964	+ if(source instanceof cRadio)
2814	2965	{
2815	2966	group.parent = keepparent;
2816	2967	group.attributes = 0;
2817	2968	//group.editWindow = null;
2818		- /cRadio/ radio = (cRadio)event.getSource();
	2969	+ /cRadio/ radio = (cRadio)source;
2819	2970	Object3D obj = radio.GetObject();
2820	2971	System.out.println("Edit " + obj);
2821	2972	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2835,7 +2986,7 @@
2835	2986	}
2836	2987
2837	2988	copy = group;
2838		- //CameraPane.theRenderer.object = group;
	2989	+ //Globals.theRenderer.object = group;
2839	2990	if(!useclient)
2840	2991	{
2841	2992	cameraView.renderCamera = radio.camera;
..	..	@@ -2844,7 +2995,8 @@
2844	2995	cameraView.cameras[cameraView.cameracount] = radio.camera;
2845	2996	cameraView.targetLookAt.set(radio.camera.lookAt);
2846	2997	cameraView.object = group;
2847		- cameraView.lighttouched = true;
	2998	+ //cameraView.lighttouched = true;
	2999	+ Globals.lighttouched = true;
2848	3000	topView.object = group;
2849	3001	frontView.object = group;
2850	3002	sideView.object = group;
..	..	@@ -2880,7 +3032,7 @@
2880	3032	if (useclient)
2881	3033	{
2882	3034	cameraView.object = client;
2883		- cameraView.lighttouched = true;
	3035	+ Globals.lighttouched = true;
2884	3036	//topView.object = client;
2885	3037	//frontView.object = client;
2886	3038	//sideView.object = client;
..	..	@@ -2888,7 +3040,7 @@
2888	3040	else
2889	3041	{
2890	3042	cameraView.object = group;
2891		- cameraView.lighttouched = true;
	3043	+ Globals.lighttouched = true;
2892	3044	//topView.object = group;
2893	3045	//frontView.object = group;
2894	3046	//sideView.object = group;
..	..	@@ -3121,9 +3273,9 @@
3121	3273	obj = (Object3D)e.nextElement();
3122	3274
3123	3275	System.out.println("Object is: " + obj);
3124		- GraphreeD.AnalyzeObject(obj);
	3276	+ GrafreeD.AnalyzeObject(obj);
3125	3277	System.out.println("Boundary rep: " + obj.bRep);
3126		- GraphreeD.AnalyzeObject(obj.bRep);
	3278	+ GrafreeD.AnalyzeObject(obj.bRep);
3127	3279
3128	3280	// System.err.println((size/1024) + " KB is the size of " + obj);
3129	3281	}
..	..	@@ -3165,6 +3317,13 @@
3165	3317	void GenNormals(boolean crease)
3166	3318	{
3167	3319	group.GenNormalsS(crease);
	3320	+
	3321	+ refreshContents();
	3322	+ }
	3323	+
	3324	+ void GenNormalsMINE()
	3325	+ {
	3326	+ group.selection.GenNormalsMINE();
3168	3327
3169	3328	refreshContents();
3170	3329	}
..	..	@@ -3250,7 +3409,7 @@
3250	3409	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3251	3410	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3252	3411	//
3253		-// g.add(GraphreeD.clipboard);
	3412	+// g.add(GrafreeD.clipboard);
3254	3413	//
3255	3414	// buffer.add(g);
3256	3415	// }
..	..	@@ -3269,8 +3428,8 @@
3269	3428	// nodes = new Object3D();
3270	3429	// vertices = new Vector<Vertex>();
3271	3430	//
3272		-// boolean epsequal = GraphreeD.epsequal;
3273		-// GraphreeD.epsequal = true;
	3431	+// boolean epsequal = GrafreeD.epsequal;
	3432	+// GrafreeD.epsequal = true;
3274	3433	//
3275	3434	// for (int i=0; i<group.selection.size(); i++)
3276	3435	// {
..	..	@@ -3311,7 +3470,7 @@
3311	3470	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3312	3471	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3313	3472	//
3314		-// g.add(GraphreeD.clipboard);
	3473	+// g.add(GrafreeD.clipboard);
3315	3474	//
3316	3475	// buffer.add(g);
3317	3476	// }
..	..	@@ -3319,7 +3478,7 @@
3319	3478	// makeSomething(buffer, i==group.selection.size()-1);
3320	3479	// }
3321	3480	//
3322		-// GraphreeD.epsequal = epsequal;
	3481	+// GrafreeD.epsequal = epsequal;
3323	3482	//
3324	3483	// //buffer = null;
3325	3484	// temprep = null;
..	..	@@ -3330,8 +3489,8 @@
3330	3489
3331	3490	void ParseVertices()
3332	3491	{
3333		- boolean epsequal = GraphreeD.epsequal;
3334		- GraphreeD.epsequal = true;
	3492	+ boolean epsequal = GrafreeD.epsequal;
	3493	+ GrafreeD.epsequal = true;
3335	3494
3336	3495	for (int i=0; i<group.selection.size(); i++)
3337	3496	{
..	..	@@ -3356,7 +3515,7 @@
3356	3515	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3357	3516	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3358	3517
3359		- g.add(GraphreeD.clipboard);
	3518	+ g.add(GrafreeD.clipboard);
3360	3519
3361	3520	buffer.add(g);
3362	3521	}
..	..	@@ -3371,7 +3530,7 @@
3371	3530	makeSomething(buffer, i==group.selection.size()-1);
3372	3531	}
3373	3532
3374		- GraphreeD.epsequal = epsequal;
	3533	+ GrafreeD.epsequal = epsequal;
3375	3534
3376	3535	refreshContents();
3377	3536	}
..	..	@@ -3389,7 +3548,7 @@
3389	3548	String pigment = Object3D.GetPigment(tex);
3390	3549	//String bump = Object3D.GetBump(tex);
3391	3550
3392		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3551	+ com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3393	3552
3394	3553	double s = v.s;
3395	3554
..	..	@@ -3416,7 +3575,7 @@
3416	3575	scale /= 3;
3417	3576
3418	3577	scale /= 0xFF;
3419		- scale /= 4;
	3578	+ // c'est quoi ca? scale /= 4;
3420	3579
3421	3580	//v.AO = scale;
3422	3581
..	..	@@ -3437,12 +3596,26 @@
3437	3596
3438	3597	void Align()
3439	3598	{
	3599	+ if (group.selection.size() == 0)
	3600	+ return;
	3601	+
	3602	+ cVector bbmin = new cVector();
	3603	+ cVector bbmax = new cVector();
	3604	+
	3605	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3606	+
	3607	+ double dx = bbmax.x - bbmin.x;
	3608	+ double dy = bbmax.y - bbmin.y;
	3609	+ double dz = bbmax.z - bbmin.z;
	3610	+
	3611	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3612	+
3440	3613	for (int i=0; i<group.selection.size(); i++)
3441	3614	{
3442	3615	Object3D obj = group.selection.get(i);
3443	3616
3444		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3445		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3617	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3618	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3446	3619	}
3447	3620
3448	3621	refreshContents();
..	..	@@ -3455,7 +3628,7 @@
3455	3628	// ref.SaveSupports();
3456	3629	// Object3D par = ref.parent;
3457	3630	// ref.parent = null;
3458		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	3631	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3459	3632	// ref.parent = par;
3460	3633	// ref.RestoreSupports();
3461	3634
..	..	@@ -3485,7 +3658,7 @@
3485	3658	// lowres.SaveSupports();
3486	3659	// par = lowres.parent;
3487	3660	// lowres.parent = null;
3488		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	3661	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3489	3662	Object3D newlow = CloneObject(lowres, false);
3490	3663	newlow.name = sn.switchobject.get(i).name;
3491	3664	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3507,7 +3680,7 @@
3507	3680	return;
3508	3681
3509	3682	Object3D poses = group.selection.get(0);
3510		- Object3D ref = GraphreeD.clipboard.get(0);
	3683	+ Object3D ref = GrafreeD.clipboard.get(0);
3511	3684
3512	3685	Object3D newgroup = new Object3D("Po:" + poses.name);
3513	3686
..	..	@@ -3676,7 +3849,7 @@
3676	3849	group.selection.RelinkToSupport(); // july 2014
3677	3850	System.out.println("DONE.");
3678	3851	refreshContents();
3679		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3852	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3680	3853	}
3681	3854
3682	3855	void ReduceMesh(boolean reduction34)
..	..	@@ -3701,20 +3874,20 @@
3701	3874
3702	3875	void ClipMesh()
3703	3876	{
3704		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	3877	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
3705	3878	{
3706		- Object3D content = GraphreeD.clipboard.get(0);
	3879	+ Object3D content = GrafreeD.clipboard.get(0);
3707	3880
3708	3881	if (content instanceof cGroup && ((cGroup)content).transientlink )
3709	3882	content = ((cGroup)content).get(0);
3710	3883
3711	3884	// for (int i=0; i<group.selection.size(); i++)
3712	3885	// {
3713		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	3886	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3714	3887	// }
3715		- group.selection.ClipMesh(GraphreeD.clipboard);
	3888	+ group.selection.ClipMesh(GrafreeD.clipboard);
3716	3889	}
3717		-// group.selection.ClipMesh(GraphreeD.clipboard);
	3890	+// group.selection.ClipMesh(GrafreeD.clipboard);
3718	3891	System.out.println("DONE.");
3719	3892	refreshContents();
3720	3893	}
..	..	@@ -3961,16 +4134,16 @@
3961	4134
3962	4135	objEditor.SetText(); // jan 2014
3963	4136
3964		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4137	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
3965	4138	CameraPane.flash = true;
3966	4139
3967	4140	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
3968	4141	// a camera
3969	4142	{
3970	4143	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;
	4144	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4145	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4146	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3974	4147	}
3975	4148
3976	4149	refreshContents();
..	..	@@ -4052,12 +4225,12 @@
4052	4225	{
4053	4226	if (group.selection.isEmpty())
4054	4227	return;
4055		- GraphreeD.clipboardIsTempGroup = false;
	4228	+ GrafreeD.clipboardIsTempGroup = false;
4056	4229	Composite tGroup = null;
4057	4230	if (group.selection.size() > 0) // 1)
4058	4231	{
4059	4232	tGroup = new cGroup();
4060		- GraphreeD.clipboardIsTempGroup = true;
	4233	+ GrafreeD.clipboardIsTempGroup = true;
4061	4234	}
4062	4235
4063	4236	if (cut)
..	..	@@ -4097,16 +4270,16 @@
4097	4270	//System.out.println("cut " + child);
4098	4271	//System.out.println("parent = " + child.parent);
4099	4272	// tmp.addChild(child);
4100		- if (GraphreeD.clipboardIsTempGroup)
	4273	+ if (GrafreeD.clipboardIsTempGroup)
4101	4274	tGroup.add/Child/(tmp);
4102	4275	else
4103		- GraphreeD.clipboard = tmp;
	4276	+ GrafreeD.clipboard = tmp;
4104	4277	}
4105	4278	else
4106		- if (GraphreeD.clipboardIsTempGroup)
	4279	+ if (GrafreeD.clipboardIsTempGroup)
4107	4280	tGroup.add/Child/(child);
4108	4281	else
4109		- GraphreeD.clipboard = child;
	4282	+ GrafreeD.clipboard = child;
4110	4283	}
4111	4284
4112	4285	//ResetModel();
..	..	@@ -4138,21 +4311,21 @@
4138	4311	//System.out.println("cut " + elem);
4139	4312	//System.out.println("parent = " + elem.parent);
4140	4313	// tmp.addChild(elem);
4141		- if (GraphreeD.clipboardIsTempGroup)
	4314	+ if (GrafreeD.clipboardIsTempGroup)
4142	4315	tGroup.add/Child/(tmp);
4143	4316	else
4144		- GraphreeD.clipboard = tmp;
	4317	+ GrafreeD.clipboard = tmp;
4145	4318	}
4146	4319	else
4147		- if (GraphreeD.clipboardIsTempGroup)
	4320	+ if (GrafreeD.clipboardIsTempGroup)
4148	4321	tGroup.add/Child/(child);
4149	4322	else
4150		- GraphreeD.clipboard = child;
	4323	+ GrafreeD.clipboard = child;
4151	4324	}
4152	4325
4153	4326	}
4154		- if (GraphreeD.clipboardIsTempGroup)
4155		- GraphreeD.clipboard = tGroup;
	4327	+ if (GrafreeD.clipboardIsTempGroup)
	4328	+ GrafreeD.clipboard = tGroup;
4156	4329	if (cut)
4157	4330	{
4158	4331	ResetModel();
..	..	@@ -4162,11 +4335,11 @@
4162	4335
4163	4336	void paste(boolean expand)
4164	4337	{
4165		- // if (GraphreeD.clipboard == null)
	4338	+ // if (GrafreeD.clipboard == null)
4166	4339	// return;
4167	4340	boolean first = true;
4168	4341
4169		- if (GraphreeD.clipboardIsTempGroup)
	4342	+ if (GrafreeD.clipboardIsTempGroup)
4170	4343	{
4171	4344	Composite temp;
4172	4345
..	..	@@ -4177,7 +4350,7 @@
4177	4350	temp = (Composite)Applet3D.clipboard.deepCopy();
4178	4351	*/
4179	4352	Object3D elem;
4180		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4353	+ for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4181	4354	{
4182	4355	Object3D child = (Object3D)e.nextElement();
4183	4356
..	..	@@ -4191,7 +4364,7 @@
4191	4364	else
4192	4365	elem = child.deepCopy(); // ?
4193	4366	child.parent = keepparent;
4194		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	4367	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4195	4368	// elem = elem.get(0);
4196	4369	makeSomething(elem, true); // ?? first);
4197	4370	//group.addChild(elem);
..	..	@@ -4211,14 +4384,14 @@
4211	4384	//Object3D cb = Applet3D.clipboard;
4212	4385	//temp.addChild(cb);
4213	4386	//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());
	4387	+ assert(GrafreeD.clipboard.parent == null);
	4388	+ Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
	4389	+ GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
	4390	+ if (LA.isIdentity(GrafreeD.clipboard.toParent))
	4391	+ makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
4219	4392	else
4220		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4221		- GraphreeD.clipboard.get(0).parent = keepparent;
	4393	+ makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
	4394	+ GrafreeD.clipboard.get(0).parent = keepparent;
4222	4395	}
4223	4396
4224	4397	ResetModel();
..	..	@@ -4227,7 +4400,7 @@
4227	4400
4228	4401	void pasteInto(boolean copyit)
4229	4402	{
4230		-// if (GraphreeD.clipboard == null)
	4403	+// if (GrafreeD.clipboard == null)
4231	4404	// return;
4232	4405
4233	4406	if (group.selection.size() != 1)
..	..	@@ -4260,9 +4433,9 @@
4260	4433	{
4261	4434	boolean first = true;
4262	4435
4263		- if (GraphreeD.clipboardIsTempGroup)
	4436	+ if (GrafreeD.clipboardIsTempGroup)
4264	4437	{
4265		- Composite temp = (Composite)GraphreeD.clipboard;
	4438	+ Composite temp = (Composite)GrafreeD.clipboard;
4266	4439	Object3D copy;
4267	4440	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4268	4441	{
..	..	@@ -4272,7 +4445,7 @@
4272	4445	}
4273	4446	} else
4274	4447	{
4275		- linkSomething(GraphreeD.clipboard); //.get(0));
	4448	+ linkSomething(GrafreeD.clipboard); //.get(0));
4276	4449	}
4277	4450	}
4278	4451	}
..	..	@@ -4464,6 +4637,26 @@
4464	4637	makeSomething(csg);
4465	4638	}
4466	4639
	4640	+ void Ungroup(Object3D g)
	4641	+ {
	4642	+ if (g instanceof HiddenObject)
	4643	+ {
	4644	+ HiddenObject h = (HiddenObject) g;
	4645	+
	4646	+ for (int i=0; i<h.ActualSize(); i++)
	4647	+ {
	4648	+ objEditor.makeSomething(h.get(i), false);
	4649	+ }
	4650	+ }
	4651	+ else
	4652	+ {
	4653	+ for (int i=0; i<g.Size(); i++)
	4654	+ {
	4655	+ objEditor.makeSomething(g.get(i), false);
	4656	+ }
	4657	+ }
	4658	+ }
	4659	+
4467	4660	void ungroup()
4468	4661	{
4469	4662	/*
..	..	@@ -4659,7 +4852,7 @@
4659	4852
4660	4853	void ImportGFD()
4661	4854	{
4662		- FileDialog browser = new FileDialog(objEditor.frame, "Import GraphreeD", FileDialog.LOAD);
	4855	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4663	4856	browser.show();
4664	4857	String filename = browser.getFile();
4665	4858	if (filename != null && filename.length() > 0)
..	..	@@ -4697,7 +4890,7 @@
4697	4890
4698	4891	void ImportVRMLX3D()
4699	4892	{
4700		- if (GraphreeD.standAlone)
	4893	+ if (GrafreeD.standAlone)
4701	4894	{
4702	4895	/**/
4703	4896	FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
..	..	@@ -4714,7 +4907,7 @@
4714	4907
4715	4908	String GetFile(String dialogName)
4716	4909	{
4717		- if (GraphreeD.standAlone)
	4910	+ if (GrafreeD.standAlone)
4718	4911	{
4719	4912	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4720	4913	browser.show();
..	..	@@ -4823,6 +5016,7 @@
4823	5016	private MenuItem resetsupportItem;
4824	5017	private MenuItem resetreferencesItem;
4825	5018	private MenuItem linkverticesItem;
	5019	+ private MenuItem relinkverticesItem;
4826	5020	private MenuItem setMasterItem;
4827	5021	private MenuItem resetMeshItem;
4828	5022	private MenuItem stepAllItem;
..	..	@@ -4841,8 +5035,10 @@
4841	5035	private MenuItem clearItem;
4842	5036	private MenuItem clearAllItem;
4843	5037	private MenuItem genUVItem;
	5038	+ private MenuItem genNormalsMESHItem;
4844	5039	private MenuItem genNormalsCADItem;
4845	5040	private MenuItem genNormalsORGANItem;
	5041	+ private MenuItem genNormalsMINEItem;
4846	5042	private MenuItem stripifyItem;
4847	5043	private MenuItem unstripifyItem;
4848	5044	private MenuItem trimItem;
..	..	@@ -4884,6 +5080,7 @@
4884	5080	private MenuItem resetCentroidItem;
4885	5081	private MenuItem transformgeometryItem;
4886	5082	private MenuItem resetTransformItem;
	5083	+ private MenuItem hideItem;
4887	5084	private MenuItem grabItem;
4888	5085	private MenuItem backItem;
4889	5086	private MenuItem frontItem;
..	..	@@ -4904,6 +5101,7 @@
4904	5101
4905	5102	private MenuItem resetParentItem;
4906	5103	private MenuItem repairParentItem;
	5104	+ private MenuItem repairShadowItem;
4907	5105	private MenuItem sortbysizeItem;
4908	5106	private MenuItem sortbynameItem;
4909	5107
..	..	@@ -4924,6 +5122,7 @@
4924	5122	private MenuItem coneItem;
4925	5123	private MenuItem torusItem;
4926	5124	private MenuItem superItem;
	5125	+ private MenuItem kleinItem;
4927	5126	private MenuItem blobItem;
4928	5127	private MenuItem latheItem;
4929	5128	private MenuItem bezierItem;
..	..	@@ -4936,6 +5135,7 @@
4936	5135	private MenuItem csgItem;
4937	5136	private MenuItem templateItem;
4938	5137	private MenuItem textureItem;
	5138	+ private MenuItem billboardItem;
4939	5139	private MenuItem shadowXItem;
4940	5140	private MenuItem shadowYItem;
4941	5141	private MenuItem shadowZItem;