~nbriere/GrafreeD.git - Noware Git Repository

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