~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,
..	..	@@ -219,6 +220,8 @@
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
..	..	@@ -231,6 +234,10 @@
231	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"));
..	..	@@ -287,6 +294,8 @@
287	294	genNormalsCADItem.addActionListener(this);
288	295	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
289	296	genNormalsMESHItem.addActionListener(this);
	297	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	298	+ genNormalsMINEItem.addActionListener(this);
290	299	stripifyItem = menu.add(new MenuItem("Stripify"));
291	300	stripifyItem.addActionListener(this);
292	301	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -426,76 +435,24 @@
426	435	oe.buttonGroup.add(dummyButton);
427	436	*/
428	437	aConstraints.gridy += 1;
	438	+
	439	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	440	+
429	441	oe.aConstraints.gridwidth = 1;
430	442	oe.aConstraints.gridx = 0;
431	443
432		- 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");
433	446	liveCB.addItemListener(this);
434	447
435	448	oe.aConstraints.gridx += 1;
436		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
437		- supportCB.addItemListener(this);
438		-
439		- // oe.aConstraints.gridx += 1;
440		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
441		- // localCB.addItemListener(this);
442		-
443		- oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
445		- crowdCB.addItemListener(this);
446		-
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
449		- smoothCB.addItemListener(this);
450		-
451		- oe.aConstraints.gridx += 1;
452		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
453		- fastCB.addItemListener(this);
454		- oe.aConstraints.gridx += 1;
455		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
456		- slowCB.addItemListener(this);
457		- oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
459		- boxCB.addItemListener(this);
460		-
461		-// oe.aConstraints.gridx += 1;
462		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
463		-// speakerMocapCB.addItemListener(this);
464		-
465		- if (false)
466		- {
467		- // handled in scripts
468		- oe.aConstraints.gridx += 1;
469		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
470		- speakerCameraCB.addItemListener(this);
471		-
472		- oe.aConstraints.gridx += 1;
473		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
474		- speakerFocusCB.addItemListener(this);
475		-
476		- oe.aConstraints.gridx += 1;
477		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
478		- smoothfocusCB.addItemListener(this);
479		- }
480		-
481		-//oe.aConstraints.gridx += 1;
482		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
483		-// debugCB.addItemListener(this);
484		-
485		- oe.aConstraints.gridx += 1;
486		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
487		- oeilCB.addItemListener(this);
488		-
489		- oe.aConstraints.gridx += 1;
490		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
491		- lookAtCB.addItemListener(this);
492		-
493		- oe.aConstraints.gridx += 1;
494		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	449	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
	450	+ trackCB.setToolTipText("Enable tracking");
495	451	trackCB.addItemListener(this);
496	452
497	453	oe.aConstraints.gridx += 1;
498	454	oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	455	+ screenfitButton.setToolTipText("Screen fit");
499	456	screenfitButton.addActionListener(this);
500	457	oe.aConstraints.gridx += 1;
501	458	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
..	..	@@ -503,6 +460,7 @@
503	460	// oe.aConstraints.gridx += 1;
504	461	oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
505	462	snapobjectButton.addActionListener(this);
	463	+ snapobjectButton.setToolTipText("Snap Object");
506	464	oe.aConstraints.gridx += 1;
507	465
508	466	//aConstraints.gridx = 0;
..	..	@@ -511,28 +469,39 @@
511	469	oe.aConstraints.gridwidth = 1;
512	470
513	471	oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	472	+ flashSelectionButton.setToolTipText("Show selection");
514	473	flashSelectionButton.addActionListener(this);
	474	+
	475	+ oe.toolbarPanel.add(new cButton(" ", false));
	476	+
515	477	oe.aConstraints.gridx += 1;
516	478	oe.aConstraints.weighty = 0;
517	479	oe.aConstraints.gridwidth = 1;
518	480
519	481	//
520	482	oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	483	+ twoButton.setToolTipText("Show center view only");
521	484	twoButton.addActionListener(this);
522	485	oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
523	486	fourButton.addActionListener(this);
	487	+ fourButton.setToolTipText("Show left panel only");
524	488	oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	489	+ sixButton.setToolTipText("2-column layout left");
525	490	sixButton.addActionListener(this);
526	491	oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	492	+ threeButton.setToolTipText("2-column layout right");
527	493	threeButton.addActionListener(this);
528	494	oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	495	+ sevenButton.setToolTipText("3-column layout");
529	496	sevenButton.addActionListener(this);
530	497	//
531	498
532		- 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");
533	501	rootButton.addActionListener(this);
534	502	oe.aConstraints.gridx += 1;
535	503	oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	504	+ closeButton.setToolTipText("Close tab");
536	505	closeButton.addActionListener(this);
537	506	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
538	507	//clearButton.addActionListener(this);
..	..	@@ -635,17 +604,91 @@
635	604	radio.layout = sevenButton;
636	605	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
637	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	+ }
638	681
639	682	void EditObject(Object3D obj)
640	683	{
641		- cRadio dummyButton = new cRadio(obj.name);
642		- dummyButton.SetObject(obj);
643		- dummyButton.layout = sevenButton;
644		- dummyButton.SetCamera(cameraView.renderCamera, false);
645		- dummyButton.addActionListener(this);
646		- radioPanel.add(dummyButton);
647		- buttonGroup.add(dummyButton);
648		- dummyButton.doClick();
	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();
649	692	}
650	693	void SetupViews(ObjEditor oe)
651	694	{
..	..	@@ -665,6 +708,7 @@
665	708	JCheckBox fastCB;
666	709	JCheckBox slowCB;
667	710	JCheckBox boxCB;
	711	+ JCheckBox zoomBoxCB;
668	712	JCheckBox trackCB;
669	713	JCheckBox smoothfocusCB;
670	714	// JCheckBox speakerMocapCB;
..	..	@@ -707,8 +751,7 @@
707	751	dropAttributes \|= Object3D.TEXTURE;
708	752	else
709	753	dropAttributes &= ~Object3D.TEXTURE;
710		- }
711		- else if(e.getSource() == liveCB)
	754	+ } else if(e.getSource() == liveCB)
712	755	{
713	756	cameraView.ToggleLive();
714	757	}
..	..	@@ -745,6 +788,10 @@
745	788	Recompile();
746	789	cameraView.repaint();
747	790	// refreshContents();
	791	+ }
	792	+ else if(e.getSource() == zoomBoxCB)
	793	+ {
	794	+ cameraView.ToggleZoomBoxMode();
748	795	}
749	796	else if(e.getSource() == smoothfocusCB)
750	797	{
..	..	@@ -1035,6 +1082,8 @@
1035	1082	torusItem.addActionListener(this);
1036	1083	superItem = menu.add(new MenuItem("Superellipsoid"));
1037	1084	superItem.addActionListener(this);
	1085	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1086	+ kleinItem.addActionListener(this);
1038	1087	particleItem = menu.add(new MenuItem("Particle system"));
1039	1088	particleItem.addActionListener(this);
1040	1089	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1108,6 +1157,8 @@
1108	1157	resetParentItem.addActionListener(this);
1109	1158	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1110	1159	repairParentItem.addActionListener(this);
	1160	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1161	+ repairShadowItem.addActionListener(this);
1111	1162	menu.add(invariantsItem = new MenuItem("Invariants"));
1112	1163	invariantsItem.addActionListener(this);
1113	1164	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1468,6 +1519,7 @@
1468	1519	//
1469	1520	public void actionPerformed(ActionEvent event) // , Object arg)
1470	1521	{
	1522	+ Object source = event.getSource();
1471	1523	/*
1472	1524	if (event.getSource() == nameField)
1473	1525	{
..	..	@@ -1479,11 +1531,11 @@
1479	1531	}
1480	1532	else
1481	1533	*/
1482		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1534	+ if (source == lookAtItem \|\| source == lookFromItem)
1483	1535	{
1484	1536	ScreenFit();
1485	1537	} else
1486		- if (event.getSource() == switchItem)
	1538	+ if (source == switchItem)
1487	1539	{
1488	1540	cVector v1 = new cVector();
1489	1541	cVector v2 = new cVector();
..	..	@@ -1492,11 +1544,11 @@
1492	1544	objEditor.cameraView.renderCamera.setAim(v2, v1);
1493	1545	objEditor.cameraView.repaint();
1494	1546	} else
1495		- if (event.getSource() == rectoidItem)
	1547	+ if (source == rectoidItem)
1496	1548	{
1497	1549	makeSomething(new Box());
1498	1550	} else
1499		- if (event.getSource() == particleItem)
	1551	+ if (source == particleItem)
1500	1552	{
1501	1553	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1502	1554	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1517,9 +1569,9 @@
1517	1569	applyExample(particleGeom, "SMOKE");
1518	1570	makeSomething(particleGeom);
1519	1571	} else
1520		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1572	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1521	1573	{
1522		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1574	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1523	1575
1524	1576	ragdoll.toParent = LA.newMatrix();
1525	1577	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1537,7 +1589,7 @@
1537	1589	} else
1538	1590	/*
1539	1591	*/
1540		- if (event.getSource() == heightFieldItem)
	1592	+ if (source == heightFieldItem)
1541	1593	{
1542	1594	Object3D obj = new Object3D();
1543	1595
..	..	@@ -1575,27 +1627,31 @@
1575	1627
1576	1628	makeSomething(obj);
1577	1629	} else
1578		- if (event.getSource() == gridItem)
	1630	+ if (source == gridItem)
1579	1631	{
1580	1632	makeSomething(new Grid());
1581	1633	} else
1582		- if (event.getSource() == ellipsoidItem)
	1634	+ if (source == ellipsoidItem)
1583	1635	{
1584	1636	makeSomething(new Sphere());
1585	1637	} else
1586		- if (event.getSource() == coneItem)
	1638	+ if (source == coneItem)
1587	1639	{
1588	1640	makeSomething(new Cone());
1589	1641	} else
1590		- if (event.getSource() == torusItem)
	1642	+ if (source == torusItem)
1591	1643	{
1592	1644	makeSomething(new Torus());
1593	1645	} else
1594		- if (event.getSource() == superItem)
	1646	+ if (source == superItem)
1595	1647	{
1596	1648	makeSomething(new Superellipsoid());
1597	1649	} else
1598		- if (event.getSource() == blobItem)
	1650	+ if (source == kleinItem)
	1651	+ {
	1652	+ makeSomething(new Klein());
	1653	+ } else
	1654	+ if (source == blobItem)
1599	1655	{
1600	1656	Blob blob = new Blob();
1601	1657	BlobComponent comp = new BlobComponent();
..	..	@@ -1603,15 +1659,15 @@
1603	1659	//blob.retile();
1604	1660	makeSomething(blob);
1605	1661	} else
1606		- if (event.getSource() == latheItem)
	1662	+ if (source == latheItem)
1607	1663	{
1608	1664	makeSomething(new Lathe());
1609	1665	} else
1610		- if (event.getSource() == bezierItem)
	1666	+ if (source == bezierItem)
1611	1667	{
1612	1668	makeSomething(new BezierSurface());
1613	1669	} else
1614		- if (event.getSource() == checkerItem)
	1670	+ if (source == checkerItem)
1615	1671	{
1616	1672	/*
1617	1673	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1626,7 +1682,7 @@
1626	1682	*/
1627	1683	makeSomething(new Checker());
1628	1684	} else
1629		- if (event.getSource() == meshItem)
	1685	+ if (source == meshItem)
1630	1686	{
1631	1687	Object3D itemtomake = new Object3D();
1632	1688	Object3D child;
..	..	@@ -1647,35 +1703,35 @@
1647	1703	makeSomething(child);
1648	1704	}
1649	1705	} else
1650		- if (event.getSource() == springItem)
	1706	+ if (source == springItem)
1651	1707	{
1652	1708	cSpring s = new cSpring();
1653	1709	s.setup();
1654	1710	makeSomething(s);
1655	1711	} else
1656		- if (event.getSource() == flagItem)
	1712	+ if (source == flagItem)
1657	1713	{
1658	1714	cSpring s = new cFlag();
1659	1715	s.setup();
1660	1716	makeSomething(s);
1661	1717	} else
1662		- if (event.getSource() == lightItem)
	1718	+ if (source == lightItem)
1663	1719	{
1664	1720	makeSomething(new Light());
1665	1721	} else
1666		- if (event.getSource() == csgItem)
	1722	+ if (source == csgItem)
1667	1723	{
1668	1724	group(new CSG());
1669	1725	} else
1670		- if (event.getSource() == templateItem)
	1726	+ if (source == templateItem)
1671	1727	{
1672	1728	group(new cTemplate());
1673	1729	} else
1674		- if (event.getSource() == attributeItem)
	1730	+ if (source == attributeItem)
1675	1731	{
1676	1732	makeSomething(new Attribute());
1677	1733	} else
1678		- if (event.getSource() == pointflowItem)
	1734	+ if (source == pointflowItem)
1679	1735	{
1680	1736	makeSomething(new PointFlow());
1681	1737	} else
..	..	@@ -1687,7 +1743,7 @@
1687	1743	} else
1688	1744	*/
1689	1745
1690		- if (event.getSource() == superLoopItem)
	1746	+ if (source == superLoopItem)
1691	1747	{
1692	1748	Composite g = new cGroup();
1693	1749	for (int i=0; i<15; i++)
..	..	@@ -1709,7 +1765,7 @@
1709	1765
1710	1766	group(g);
1711	1767	} else
1712		- if (event.getSource() == loopItem)
	1768	+ if (source == loopItem)
1713	1769	{
1714	1770	Composite csg = new GroupLeaf();
1715	1771	csg.count = 5;
..	..	@@ -1718,7 +1774,7 @@
1718	1774	csg.addChild(child);
1719	1775	child.addChild(csg);
1720	1776	} else
1721		- if (event.getSource() == doubleItem)
	1777	+ if (source == doubleItem)
1722	1778	{
1723	1779	Composite csg = new GroupLeaf();
1724	1780	csg.count = 5;
..	..	@@ -1730,7 +1786,7 @@
1730	1786	csg.addChild(child);
1731	1787	child.addChild(csg);
1732	1788	} else
1733		- if (event.getSource() == tripleItem)
	1789	+ if (source == tripleItem)
1734	1790	{
1735	1791	Composite csg = new GroupLeaf();
1736	1792	csg.count = 4;
..	..	@@ -1746,70 +1802,70 @@
1746	1802	child.addChild(csg);
1747	1803	} else
1748	1804
1749		- if (event.getSource() == importGFDItem)
	1805	+ if (source == importGFDItem)
1750	1806	{
1751	1807	ImportGFD();
1752	1808	} else
1753		- if (event.getSource() == importVRMLX3DItem)
	1809	+ if (source == importVRMLX3DItem)
1754	1810	{
1755	1811	ImportVRMLX3D();
1756	1812	} else
1757		- if (event.getSource() == import3DSItem)
	1813	+ if (source == import3DSItem)
1758	1814	{
1759	1815	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1760	1816	} else
1761		- if (event.getSource() == importOBJItem)
	1817	+ if (source == importOBJItem)
1762	1818	{
1763	1819	objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1764	1820	} else
1765		- if (event.getSource() == computeAOItem)
	1821	+ if (source == computeAOItem)
1766	1822	{
1767		- CameraPane.drawMode = CameraPane.OCCLUSION;
1768		- CameraPane.theRenderer.repaint();
	1823	+ Globals.drawMode = CameraPane.OCCLUSION;
	1824	+ Globals.theRenderer.repaint();
1769	1825	} else
1770		- if (event.getSource() == recompileItem)
	1826	+ if (source == recompileItem)
1771	1827	{
1772	1828	Recompile();
1773	1829	refreshContents();
1774	1830	} else
1775		- if (event.getSource() == editScriptItem)
	1831	+ if (source == editScriptItem)
1776	1832	{
1777	1833	OpenDialog();
1778	1834	refreshContents();
1779	1835	} else
1780		- if (event.getSource() == invariantsItem)
	1836	+ if (source == invariantsItem)
1781	1837	{
1782	1838	System.out.println("Invariants:");
1783		- GrafreeD.theApplet3D.universe.invariants();
	1839	+ GrafreeD.grafreeD.universe.invariants();
1784	1840	} else
1785		- if (event.getSource() == memoryItem)
	1841	+ if (source == memoryItem)
1786	1842	{
1787	1843	//System.out.println("Invariants:");
1788	1844	PrintMemory();
1789	1845	} else
1790		- if (event.getSource() == pathItem)
	1846	+ if (source == pathItem)
1791	1847	{
1792	1848	PrintPath();
1793	1849	} else
1794		- if (event.getSource() == analyzeItem)
	1850	+ if (source == analyzeItem)
1795	1851	{
1796	1852	AnalyzeObject();
1797	1853	} else
1798		- if (event.getSource() == dumpItem)
	1854	+ if (source == dumpItem)
1799	1855	{
1800	1856	DumpObject();
1801	1857	} else
1802		- if (event.getSource() == screenfitButton)
	1858	+ if (source == screenfitButton)
1803	1859	{
1804	1860	//Reload(lastConverter, lastFilename, true);
1805	1861	ScreenFit();
1806	1862	} else
1807		- if (event.getSource() == screenfitpointButton)
	1863	+ if (source == screenfitpointButton)
1808	1864	{
1809	1865	//Reload(lastConverter, lastFilename, true);
1810	1866	ScreenFitPoint();
1811	1867	} else
1812		- if (event.getSource() == snapobjectButton)
	1868	+ if (source == snapobjectButton)
1813	1869	{
1814	1870	//Reload(lastConverter, lastFilename, true);
1815	1871	SnapObject();
..	..	@@ -1820,13 +1876,13 @@
1820	1876	// Recompile();
1821	1877	// refreshContents();
1822	1878	// } else
1823		- if (event.getSource() == gcButton)
	1879	+ if (source == gcButton)
1824	1880	{
1825	1881	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	1882	System.gc();
1827	1883	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1828	1884	} else
1829		- if (event.getSource() == editLeafItem)
	1885	+ if (source == editLeafItem)
1830	1886	{
1831	1887	Object3D obj;
1832	1888	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1840,62 +1896,62 @@
1840	1896	}
1841	1897	refreshContents(true);
1842	1898	} else
1843		- if (event.getSource() == openWindowItem)
	1899	+ if (source == openWindowItem)
1844	1900	{
1845	1901	EditSelection(true);
1846	1902	} else
1847		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1903	+ if (source == cutItem \|\| source == clearButton)
1848	1904	{
1849	1905	loadClipboard(true);
1850	1906	} else
1851		- if (event.getSource() == duplicateItem)
	1907	+ if (source == duplicateItem)
1852	1908	{
1853	1909	Object3D keep = GrafreeD.clipboard;
1854	1910	loadClipboard(false);
1855	1911	paste(false);
1856	1912	GrafreeD.clipboard = keep;
1857	1913	} else
1858		- if (event.getSource() == cloneItem)
	1914	+ if (source == cloneItem)
1859	1915	{
1860	1916	CloneSelection(false);
1861	1917	} else
1862		- if (event.getSource() == cloneSupportItem)
	1918	+ if (source == cloneSupportItem)
1863	1919	{
1864	1920	CloneSelection(true);
1865	1921	} else
1866		- if (event.getSource() == copyItem)
	1922	+ if (source == copyItem)
1867	1923	{
1868	1924	loadClipboard(false);
1869	1925	} else
1870		- if (event.getSource() == pasteItem)
	1926	+ if (source == pasteItem)
1871	1927	{
1872	1928	paste(false);
1873	1929	} else
1874		- if (event.getSource() == pasteLinkItem)
	1930	+ if (source == pasteLinkItem)
1875	1931	{
1876	1932	pasteInto(false);
1877	1933	} else
1878		- if (event.getSource() == pasteCloneItem)
	1934	+ if (source == pasteCloneItem)
1879	1935	{
1880	1936	pasteInto(true);
1881	1937	} else
1882		- if (event.getSource() == pasteExpandItem)
	1938	+ if (source == pasteExpandItem)
1883	1939	{
1884	1940	paste(true);
1885	1941	} else
1886		- if (event.getSource() == synchronizeItem)
	1942	+ if (source == synchronizeItem)
1887	1943	{
1888	1944	Overwrite(Object3D.TRANSFORM);
1889	1945	} else
1890		- if (event.getSource() == overwriteNameItem)
	1946	+ if (source == overwriteNameItem)
1891	1947	{
1892	1948	Overwrite(Object3D.NAME);
1893	1949	} else
1894		- if (event.getSource() == overwriteUVItem)
	1950	+ if (source == overwriteUVItem)
1895	1951	{
1896	1952	Overwrite(Object3D.UV);
1897	1953	} else
1898		- if (event.getSource() == overwriteMatItem)
	1954	+ if (source == overwriteMatItem)
1899	1955	{
1900	1956	/* july 2015
1901	1957	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1915,7 +1971,7 @@
1915	1971
1916	1972	Overwrite(dropAttributes);
1917	1973	}
1918		- if (event.getSource() == overwriteGeoItem)
	1974	+ if (source == overwriteGeoItem)
1919	1975	{
1920	1976	Overwrite(Object3D.GEOMETRY);
1921	1977	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1932,7 +1988,7 @@
1932	1988	// refreshContents();
1933	1989	// }
1934	1990	} else
1935		- if (event.getSource() == generateMeshItem)
	1991	+ if (source == generateMeshItem)
1936	1992	{
1937	1993	//if (group.selection.size() == 1)
1938	1994	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1943,7 +1999,7 @@
1943	1999	ResetModel();
1944	2000	refreshContents();
1945	2001	} else
1946		- if (event.getSource() == extractGeometriesItem)
	2002	+ if (source == extractGeometriesItem)
1947	2003	{
1948	2004	boolean one = false;
1949	2005
..	..	@@ -1970,7 +2026,7 @@
1970	2026	ResetModel();
1971	2027	refreshContents();
1972	2028	} else
1973		- if (event.getSource() == cloneGeometriesItem)
	2029	+ if (source == cloneGeometriesItem)
1974	2030	{
1975	2031	boolean one = false;
1976	2032
..	..	@@ -1996,32 +2052,37 @@
1996	2052	ResetModel();
1997	2053	refreshContents();
1998	2054	} else
1999		- if (event.getSource() == shareGeometriesItem)
	2055	+ if (source == shareGeometriesItem)
2000	2056	{
2001	2057	boolean one = false;
2002	2058
2003	2059	if (group.selection.size() == 1)
2004	2060	one = true;
2005	2061
	2062	+ Object3D merge = null;
	2063	+
2006	2064	Object3D content = new cGroup();
2007	2065
2008	2066	for (int i=0; i<group.selection.size(); i++)
2009	2067	{
2010		- Object3D sel = new Merge(group.selection.get(i));
	2068	+ merge = new Merge(group.selection.get(i));
2011	2069
2012	2070	if (one)
2013		- makeSomething(sel, false);
	2071	+ makeSomething(merge, false);
2014	2072	else
2015		- content.addChild(sel);
	2073	+ content.addChild(merge);
2016	2074	}
2017	2075
2018	2076	if (!one)
2019		- makeSomething(content, false);
2020		-
2021		- ResetModel();
2022		- refreshContents();
	2077	+ makeSomething(content, true);
	2078	+ else
	2079	+ {
	2080	+ ResetModel();
	2081	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2082	+ refreshContents();
	2083	+ }
2023	2084	} else
2024		- if (event.getSource() == mergeGeometriesItem)
	2085	+ if (source == mergeGeometriesItem)
2025	2086	{
2026	2087	boolean one = false;
2027	2088
..	..	@@ -2051,7 +2112,7 @@
2051	2112	ResetModel();
2052	2113	refreshContents();
2053	2114	} else
2054		- if (event.getSource() == linkverticesItem)
	2115	+ if (source == linkverticesItem)
2055	2116	{
2056	2117	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2057	2118	// {
..	..	@@ -2071,7 +2132,7 @@
2071	2132	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	2133	content = ((cGroup)content).get(0);
2073	2134
2074		- 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));
2075	2136	for (int i=0; i<group.selection.size(); i++)
2076	2137	{
2077	2138	boolean random = CameraPane.RANDOM;
..	..	@@ -2080,11 +2141,11 @@
2080	2141	// group.selection.get(i).setMasterThis(content); // should be identity
2081	2142	CameraPane.RANDOM = random;
2082	2143	}
2083		- 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));
2084	2145	refreshContents();
2085	2146	}
2086	2147	} else
2087		- if (event.getSource() == resetsupportItem)
	2148	+ if (source == resetsupportItem)
2088	2149	{
2089	2150	for (int i=0; i<group.selection.size(); i++)
2090	2151	{
..	..	@@ -2096,7 +2157,16 @@
2096	2157
2097	2158	refreshContents();
2098	2159	} else
2099		- 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)
2100	2170	{
2101	2171	for (int i=0; i<group.selection.size(); i++)
2102	2172	{
..	..	@@ -2105,7 +2175,7 @@
2105	2175
2106	2176	refreshContents();
2107	2177	} else
2108		- if (event.getSource() == setMasterItem)
	2178	+ if (source == setMasterItem)
2109	2179	{
2110	2180	if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2111	2181	{
..	..	@@ -2118,7 +2188,7 @@
2118	2188	refreshContents();
2119	2189	}
2120	2190	} else
2121		- if (event.getSource() == poseMeshItem)
	2191	+ if (source == poseMeshItem)
2122	2192	{
2123	2193	if (group.selection.size() == 1)
2124	2194	{
..	..	@@ -2137,19 +2207,19 @@
2137	2207	}
2138	2208
2139	2209	} else
2140		- if (event.getSource() == revertMeshItem)
	2210	+ if (source == revertMeshItem)
2141	2211	{
2142	2212	RevertMeshes();
2143	2213	} else
2144		- if (event.getSource() == resetMeshItem)
	2214	+ if (source == resetMeshItem)
2145	2215	{
2146	2216	ResetAll();
2147	2217	} else
2148		- if (event.getSource() == stepAllItem)
	2218	+ if (source == stepAllItem)
2149	2219	{
2150	2220	StepAll();
2151	2221	} else
2152		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2222	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2153	2223	{
2154	2224	//int indices[] = jList.getSelectedIndices();
2155	2225	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2157,42 +2227,46 @@
2157	2227
2158	2228	ClearSelection(false);
2159	2229	} else
2160		- if (event.getSource() == clearAllItem)
	2230	+ if (source == clearAllItem)
2161	2231	{
2162	2232	ClearSelection(true);
2163	2233	} else
2164		- if (event.getSource() == grabItem)
	2234	+ if (source == grabItem)
2165	2235	{
2166	2236	group(new cGroup(), true);
2167	2237	} else
2168		- if (event.getSource() == frontItem)
	2238	+ if (source == hideItem)
	2239	+ {
	2240	+ group(new HiddenObject());
	2241	+ } else
	2242	+ if (source == frontItem)
2169	2243	{
2170	2244	front();
2171	2245	} else
2172		- if (event.getSource() == backItem)
	2246	+ if (source == backItem)
2173	2247	{
2174	2248	back();
2175	2249	} else
2176		- if (event.getSource() == cameraItem)
	2250	+ if (source == cameraItem)
2177	2251	{
2178	2252	makeSomething(new Camera());
2179	2253	} else
2180		- if (event.getSource() == compositeItem)
	2254	+ if (source == compositeItem)
2181	2255	{
2182	2256	group(new Composite());
2183	2257	} else
2184		- if (event.getSource() == randomItem)
	2258	+ if (source == randomItem)
2185	2259	{
2186	2260	RandomNode random = new RandomNode();
2187	2261	group(random);
2188	2262	if (random.size() > 0)
2189	2263	random.name = random.get(0).name + "Rnd";
2190	2264	} else
2191		- if (event.getSource() == physicsItem)
	2265	+ if (source == physicsItem)
2192	2266	{
2193	2267	group(new PhysicsNode());
2194	2268	} else
2195		- if (event.getSource() == frameselectorItem)
	2269	+ if (source == frameselectorItem)
2196	2270	{
2197	2271	for (int i=0; i<group.selection.size(); i++)
2198	2272	{
..	..	@@ -2204,7 +2278,7 @@
2204	2278	ResetModel();
2205	2279	refreshContents();
2206	2280	} else
2207		- if (event.getSource() == switchGeoItem)
	2281	+ if (source == switchGeoItem)
2208	2282	{
2209	2283	for (int i=0; i<group.selection.size(); i++)
2210	2284	{
..	..	@@ -2216,7 +2290,7 @@
2216	2290	ResetModel();
2217	2291	refreshContents();
2218	2292	} else
2219		- if (event.getSource() == switchTransfoItem)
	2293	+ if (source == switchTransfoItem)
2220	2294	{
2221	2295	for (int i=0; i<group.selection.size(); i++)
2222	2296	{
..	..	@@ -2228,7 +2302,7 @@
2228	2302	ResetModel();
2229	2303	refreshContents();
2230	2304	} else
2231		- if (event.getSource() == morphItem)
	2305	+ if (source == morphItem)
2232	2306	{
2233	2307	for (int i=0; i<group.selection.size(); i++)
2234	2308	{
..	..	@@ -2240,7 +2314,7 @@
2240	2314	ResetModel();
2241	2315	refreshContents();
2242	2316	} else
2243		- if (event.getSource() == scriptNodeItem)
	2317	+ if (source == scriptNodeItem)
2244	2318	{
2245	2319	boolean atleastone = false;
2246	2320
..	..	@@ -2279,199 +2353,215 @@
2279	2353	}
2280	2354	}
2281	2355	} else
2282		- if (event.getSource() == linkerItem)
	2356	+ if (source == linkerItem)
2283	2357	{
2284	2358	group(new cLinker());
2285	2359	} else
2286		- if (event.getSource() == textureItem)
	2360	+ if (source == textureItem)
2287	2361	{
2288	2362	group(new TextureNode());
2289	2363	} else
2290		- if (event.getSource() == shadowXItem)
	2364	+ if (source == billboardItem)
	2365	+ {
	2366	+ group(new BillboardNode());
	2367	+ } else
	2368	+ if (source == shadowXItem)
2291	2369	{
2292	2370	CastShadow(0);
2293	2371	} else
2294		- if (event.getSource() == shadowYItem)
	2372	+ if (source == shadowYItem)
2295	2373	{
2296	2374	CastShadow(1);
2297	2375	} else
2298		- if (event.getSource() == shadowZItem)
	2376	+ if (source == shadowZItem)
2299	2377	{
2300	2378	CastShadow(2);
2301	2379	} else
2302		- if (event.getSource() == ungroupItem)
	2380	+ if (source == ungroupItem)
2303	2381	{
2304		- 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();
2305	2391	} else
2306		- if (event.getSource() == genUVItem)
	2392	+ if (source == genUVItem)
2307	2393	{
2308	2394	GenUV();
2309	2395	} else
2310		- if (event.getSource() == genNormalsCADItem)
	2396	+ if (source == genNormalsCADItem)
2311	2397	{
2312	2398	GenNormals(true);
2313	2399	} else
2314		- if (event.getSource() == genNormalsMESHItem)
	2400	+ if (source == genNormalsMESHItem)
2315	2401	{
2316	2402	GenNormals(true); // TODO
2317	2403	} else
2318		- if (event.getSource() == genNormalsORGANItem)
	2404	+ if (source == genNormalsORGANItem)
2319	2405	{
2320	2406	GenNormals(false);
2321	2407	} else
2322		- if (event.getSource() == stripifyItem)
	2408	+ if (source == genNormalsMINEItem)
	2409	+ {
	2410	+ GenNormalsMINE();
	2411	+ } else
	2412	+ if (source == stripifyItem)
2323	2413	{
2324	2414	Stripify();
2325	2415	} else
2326		- if (event.getSource() == unstripifyItem)
	2416	+ if (source == unstripifyItem)
2327	2417	{
2328	2418	Unstripify();
2329	2419	} else
2330		- if (event.getSource() == trimItem)
	2420	+ if (source == trimItem)
2331	2421	{
2332	2422	Trim();
2333	2423	} else
2334		- if (event.getSource() == untrimItem)
	2424	+ if (source == untrimItem)
2335	2425	{
2336	2426	Untrim();
2337	2427	} else
2338		- if (event.getSource() == clearColorsItem)
	2428	+ if (source == clearColorsItem)
2339	2429	{
2340	2430	ClearColors();
2341	2431	} else
2342		- if (event.getSource() == clearMaterialsItem)
	2432	+ if (source == clearMaterialsItem)
2343	2433	{
2344	2434	ClearMaterials();
2345	2435	} else
2346		- if (event.getSource() == liveleavesItem)
	2436	+ if (source == liveleavesItem)
2347	2437	{
2348	2438	LiveLeaves(true);
2349	2439	} else
2350		- if (event.getSource() == unliveleavesItem)
	2440	+ if (source == unliveleavesItem)
2351	2441	{
2352	2442	LiveLeaves(false);
2353	2443	} else
2354		- if (event.getSource() == supportleavesItem)
	2444	+ if (source == supportleavesItem)
2355	2445	{
2356	2446	SupportLeaves(true);
2357	2447	} else
2358		- if (event.getSource() == unsupportleavesItem)
	2448	+ if (source == unsupportleavesItem)
2359	2449	{
2360	2450	SupportLeaves(false);
2361	2451	} else
2362		- if (event.getSource() == hideleavesItem)
	2452	+ if (source == hideleavesItem)
2363	2453	{
2364	2454	HideLeaves(true);
2365	2455	} else
2366		- if (event.getSource() == showleavesItem)
	2456	+ if (source == showleavesItem)
2367	2457	{
2368	2458	HideLeaves(false);
2369	2459	} else
2370		- if (event.getSource() == markleavesItem)
	2460	+ if (source == markleavesItem)
2371	2461	{
2372	2462	MarkLeaves(true);
2373	2463	} else
2374		- if (event.getSource() == unmarkleavesItem)
	2464	+ if (source == unmarkleavesItem)
2375	2465	{
2376	2466	MarkLeaves(false);
2377	2467	} else
2378		- if (event.getSource() == flipVItem)
	2468	+ if (source == flipVItem)
2379	2469	{
2380	2470	FlipV(true);
2381	2471	} else
2382		- if (event.getSource() == unflipVItem)
	2472	+ if (source == unflipVItem)
2383	2473	{
2384	2474	FlipV(false);
2385	2475	} else
2386		- if (event.getSource() == lowTexturesItem)
	2476	+ if (source == lowTexturesItem)
2387	2477	{
2388	2478	SetTexRes(0);
2389	2479	} else
2390		- if (event.getSource() == normalTexturesItem)
	2480	+ if (source == normalTexturesItem)
2391	2481	{
2392	2482	SetTexRes(1);
2393	2483	} else
2394		- if (event.getSource() == highTexturesItem)
	2484	+ if (source == highTexturesItem)
2395	2485	{
2396	2486	SetTexRes(2);
2397	2487	} else
2398		- if (event.getSource() == veryhighTexturesItem)
	2488	+ if (source == veryhighTexturesItem)
2399	2489	{
2400	2490	SetTexRes(3);
2401	2491	} else
2402		- if (event.getSource() == maxTexturesItem)
	2492	+ if (source == maxTexturesItem)
2403	2493	{
2404	2494	SetTexRes(4);
2405	2495	} else
2406		- if (event.getSource() == panoTexturesItem)
	2496	+ if (source == panoTexturesItem)
2407	2497	{
2408	2498	SetTexRes(5);
2409	2499	} else
2410		- if (event.getSource() == reverseNormalsItem)
	2500	+ if (source == reverseNormalsItem)
2411	2501	{
2412	2502	ReverseNormals();
2413	2503	} else
2414		- if (event.getSource() == parseverticesItem)
	2504	+ if (source == parseverticesItem)
2415	2505	{
2416	2506	ParseVertices();
2417	2507	} else
2418		- if (event.getSource() == textureFieldItem)
	2508	+ if (source == textureFieldItem)
2419	2509	{
2420	2510	TextureVertices();
2421	2511	} else
2422		- if (event.getSource() == alignItem)
	2512	+ if (source == alignItem)
2423	2513	{
2424	2514	Align();
2425	2515	} else
2426		- if (event.getSource() == mirrorItem)
	2516	+ if (source == mirrorItem)
2427	2517	{
2428	2518	MirrorPoses();
2429	2519	} else
2430		- if (event.getSource() == reduceMorphItem)
	2520	+ if (source == reduceMorphItem)
2431	2521	{
2432	2522	MeshReduction(false);
2433	2523	} else
2434		- if (event.getSource() == reduce34MorphItem)
	2524	+ if (source == reduce34MorphItem)
2435	2525	{
2436	2526	MeshReduction(true);
2437	2527	} else
2438		- if (event.getSource() == reverseTrianglesItem)
	2528	+ if (source == reverseTrianglesItem)
2439	2529	{
2440	2530	ReverseTriangles();
2441	2531	} else
2442		- if (event.getSource() == reduceMeshItem)
	2532	+ if (source == reduceMeshItem)
2443	2533	{
2444	2534	ReduceMesh(false);
2445	2535	} else
2446		- if (event.getSource() == reduce34MeshItem)
	2536	+ if (source == reduce34MeshItem)
2447	2537	{
2448	2538	ReduceMesh(true);
2449	2539	} else
2450		- if (event.getSource() == increaseMeshItem)
	2540	+ if (source == increaseMeshItem)
2451	2541	{
2452	2542	IncreaseMesh();
2453	2543	} else
2454		- if (event.getSource() == clipMeshItem)
	2544	+ if (source == clipMeshItem)
2455	2545	{
2456	2546	ClipMesh();
2457	2547	} else
2458		- if (event.getSource() == smoothMeshItem)
	2548	+ if (source == smoothMeshItem)
2459	2549	{
2460	2550	SmoothMesh();
2461	2551	} else
2462		- if (event.getSource() == transformgeometryItem)
	2552	+ if (source == transformgeometryItem)
2463	2553	{
2464	2554	TransformGeometry();
2465	2555	} else
2466		- if (event.getSource() == resetTransformItem)
	2556	+ if (source == resetTransformItem)
2467	2557	{
2468	2558	ResetTransform();
2469	2559	} else
2470		- if (event.getSource() == resetCentroidItem)
	2560	+ if (source == resetCentroidItem)
2471	2561	{
2472	2562	ResetCentroid();
2473	2563	} else
2474		- if (event.getSource() == resetParentItem)
	2564	+ if (source == resetParentItem)
2475	2565	{
2476	2566	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	2567	{
..	..	@@ -2481,7 +2571,7 @@
2481	2571
2482	2572	refreshContents();
2483	2573	} else
2484		- if (event.getSource() == repairParentItem)
	2574	+ if (source == repairParentItem)
2485	2575	{
2486	2576	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2487	2577	{
..	..	@@ -2495,7 +2585,21 @@
2495	2585
2496	2586	refreshContents();
2497	2587	} else
2498		- 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)
2499	2603	{
2500	2604	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2501	2605	{
..	..	@@ -2507,7 +2611,7 @@
2507	2611	ResetModel();
2508	2612	refreshContents();
2509	2613	} else
2510		- if (event.getSource() == sortbynameItem)
	2614	+ if (source == sortbynameItem)
2511	2615	{
2512	2616	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2513	2617	{
..	..	@@ -2519,7 +2623,7 @@
2519	2623	ResetModel();
2520	2624	refreshContents();
2521	2625	} else
2522		- if (event.getSource() == attachPigmentItem)
	2626	+ if (source == attachPigmentItem)
2523	2627	{
2524	2628	String texture = GetFile("Attach pigment");
2525	2629	Object3D obj;
..	..	@@ -2531,7 +2635,7 @@
2531	2635
2532	2636	refreshContents();
2533	2637	} else
2534		- if (event.getSource() == detachPigmentItem)
	2638	+ if (source == detachPigmentItem)
2535	2639	{
2536	2640	Object3D obj;
2537	2641	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2542,7 +2646,7 @@
2542	2646
2543	2647	refreshContents();
2544	2648	} else
2545		- if (event.getSource() == attachBumpItem)
	2649	+ if (source == attachBumpItem)
2546	2650	{
2547	2651	String texture = GetFile("Attach bump");
2548	2652	Object3D obj;
..	..	@@ -2554,7 +2658,7 @@
2554	2658
2555	2659	refreshContents();
2556	2660	} else
2557		- if (event.getSource() == detachBumpItem)
	2661	+ if (source == detachBumpItem)
2558	2662	{
2559	2663	Object3D obj;
2560	2664	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2565,7 +2669,7 @@
2565	2669
2566	2670	refreshContents();
2567	2671	} else
2568		- if (event.getSource() == pigmentBumpItem)
	2672	+ if (source == pigmentBumpItem)
2569	2673	{
2570	2674	Object3D obj;
2571	2675	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2576,158 +2680,195 @@
2576	2680
2577	2681	refreshContents();
2578	2682	} else
2579		- if (event.getSource() == flashSelectionButton)
	2683	+ if (source == flashSelectionButton)
2580	2684	{
2581	2685	CameraPane.flash = true;
2582	2686	refreshContents();
2583	2687	} else
2584		- if (event.getSource() == oneButton)
	2688	+ if (source == oneButton)
2585	2689	{
2586	2690	} else
2587		- if (event.getSource() == twoButton)
	2691	+ if (source == twoButton)
2588	2692	{
2589	2693	radio.layout = twoButton;
2590	2694	// bug
2591	2695	//gridPanel.setDividerLocation(1.0);
2592	2696	//bigPanel.setDividerLocation(0.0);
2593		- bigThree.remove(jtp);
2594		- bigThree.remove(cameraPanel);
2595		- bigThree.remove(XYZPanel);
2596		- aWindowConstraints.gridx = 0;
2597		- aWindowConstraints.gridy = 0;
2598		- aWindowConstraints.gridwidth = 1;
2599		- // aConstraints.gridheight = 3;
2600		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2601		- aWindowConstraints.weightx = 0;
2602		- aWindowConstraints.weighty = 1;
2603		- //bigThree.add(jtp, aWindowConstraints);
2604		- aWindowConstraints.weightx = 1;
2605		- aWindowConstraints.gridwidth = 3;
2606		- // aConstraints.gridheight = 3;
2607		- aWindowConstraints.gridx = 1;
2608		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2609		- bigThree.add(cameraPanel, aWindowConstraints);
2610		- aWindowConstraints.weightx = 0;
2611		- aWindowConstraints.gridx = 4;
2612		- aWindowConstraints.gridwidth = 1;
2613		- // aConstraints.gridheight = 3;
2614		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2615		- //bigThree.add(XYZPanel, aWindowConstraints);
2616		- bigThree.revalidate();
	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();
2617	2726	} else
2618		- if (event.getSource() == threeButton)
	2727	+ if (source == threeButton)
2619	2728	{
2620	2729	radio.layout = threeButton;
2621		- bigThree.remove(jtp);
2622		- bigThree.remove(cameraPanel);
2623		- bigThree.remove(XYZPanel);
2624		- aWindowConstraints.gridx = 0;
2625		- aWindowConstraints.gridy = 0;
2626		- aWindowConstraints.gridwidth = 1;
2627		- // aConstraints.gridheight = 3;
2628		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2629		- aWindowConstraints.weightx = 0;
2630		- aWindowConstraints.weighty = 1;
2631		- //bigThree.add(jtp, aWindowConstraints);
2632		- aWindowConstraints.weightx = 1;
2633		- aWindowConstraints.gridwidth = 3;
2634		- // aConstraints.gridheight = 3;
2635		- aWindowConstraints.gridx = 1;
2636		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2637		- bigThree.add(cameraPanel, aWindowConstraints);
2638		- aWindowConstraints.weightx = 0;
2639		- aWindowConstraints.gridx = 4;
2640		- aWindowConstraints.gridwidth = 1;
2641		- // aConstraints.gridheight = 3;
2642		- aConstraints.fill = GridBagConstraints.VERTICAL;
2643		- bigThree.add(XYZPanel, aWindowConstraints);
2644		- bigThree.revalidate();
	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();
2645	2762	} else
2646		- if (event.getSource() == fourButton)
	2763	+ if (source == fourButton)
2647	2764	{
2648	2765	radio.layout = fourButton;
2649		- bigThree.remove(jtp);
2650		- bigThree.remove(cameraPanel);
2651		- bigThree.remove(XYZPanel);
2652		- aWindowConstraints.gridx = 0;
2653		- aWindowConstraints.gridy = 0;
2654		- aWindowConstraints.gridwidth = 1;
2655		- // aWindowConstraints.gridheight = 3;
2656		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2657		- aWindowConstraints.weightx = 1;
2658		- aWindowConstraints.weighty = 1;
2659		- bigThree.add(jtp, aWindowConstraints);
2660		- aWindowConstraints.weightx = 1;
2661		- aWindowConstraints.gridwidth = 3;
2662		- // aConstraints.gridheight = 3;
2663		- aWindowConstraints.gridx = 1;
2664		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2665		- //bigThree.add(cameraPanel, aWindowConstraints);
2666		- aWindowConstraints.weightx = 0;
2667		- aWindowConstraints.gridx = 4;
2668		- aWindowConstraints.gridwidth = 1;
2669		- // aWindowConstraints.gridheight = 3;
2670		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2671		- //bigThree.add(XYZPanel, aWindowConstraints);
2672		- bigThree.revalidate();
	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();
2673	2797	} else
2674		- if (event.getSource() == sixButton)
	2798	+ if (source == sixButton)
2675	2799	{
2676	2800	radio.layout = sixButton;
2677		- bigThree.remove(jtp);
2678		- bigThree.remove(cameraPanel);
2679		- bigThree.remove(XYZPanel);
2680		- aWindowConstraints.gridx = 0;
2681		- aWindowConstraints.gridy = 0;
2682		- aWindowConstraints.gridwidth = 1;
2683		- // aConstraints.gridheight = 3;
2684		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2685		- aWindowConstraints.weightx = 0;
2686		- aWindowConstraints.weighty = 1;
2687		- bigThree.add(jtp, aWindowConstraints);
2688		- aWindowConstraints.weightx = 1;
2689		- aWindowConstraints.gridwidth = 3;
2690		- // aWindowConstraints.gridheight = 3;
2691		- aWindowConstraints.gridx = 1;
2692		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2693		- bigThree.add(cameraPanel, aWindowConstraints);
2694		- aWindowConstraints.weightx = 0;
2695		- aWindowConstraints.gridx = 4;
2696		- aWindowConstraints.gridwidth = 1;
2697		- // aWindowConstraints.gridheight = 3;
2698		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2699		- //bigThree.add(XYZPanel, aConstraints);
2700		- bigThree.revalidate();
	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();
2701	2833	} else
2702		- if (event.getSource() == sevenButton)
	2834	+ if (source == sevenButton)
2703	2835	{
2704	2836	radio.layout = sevenButton;
2705		- bigThree.remove(jtp);
2706		- bigThree.remove(cameraPanel);
2707		- bigThree.remove(XYZPanel);
2708		- aWindowConstraints.gridx = 0;
2709		- aWindowConstraints.gridy = 0;
2710		- aWindowConstraints.gridwidth = 1;
2711		- // aWindowConstraints.gridheight = 3;
2712		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2713		- aWindowConstraints.weightx = 0;
2714		- aWindowConstraints.weighty = 1;
2715		- bigThree.add(jtp, aWindowConstraints);
2716		- aWindowConstraints.weightx = 1;
2717		- aWindowConstraints.gridwidth = 3;
2718		- // aWindowConstraints.gridheight = 3;
2719		- aWindowConstraints.gridx = 1;
2720		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2721		- bigThree.add(cameraPanel, aWindowConstraints);
2722		- aWindowConstraints.weightx = 0;
2723		- aWindowConstraints.gridx = 4;
2724		- aWindowConstraints.gridwidth = 1;
2725		- // aConstraints.gridheight = 3;
2726		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2727		- bigThree.add(XYZPanel, aWindowConstraints);
2728		- bigThree.revalidate();
	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();
2729	2870	} else
2730		- if (event.getSource() == rootButton)
	2871	+ if (source == rootButton)
2731	2872	{
2732	2873	Object3D obj;
2733	2874	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2739,7 +2880,7 @@
2739	2880
2740	2881	refreshContents(true);
2741	2882	} else
2742		- if (event.getSource() == closeButton)
	2883	+ if (source == closeButton)
2743	2884	{
2744	2885	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2745	2886	cRadio ab;
..	..	@@ -2760,11 +2901,11 @@
2760	2901	}
2761	2902	refreshContents(true);
2762	2903	} else
2763		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2904	+ if (source == editItem \|\| source == editButton)
2764	2905	{
2765	2906	EditSelection(false);
2766	2907	} else
2767		- if (event.getSource() == uneditButton)
	2908	+ if (source == uneditButton)
2768	2909	{
2769	2910	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2770	2911	{
..	..	@@ -2776,12 +2917,12 @@
2776	2917
2777	2918	child.editWindow = null; // ???????????
2778	2919	}
2779		- objEditor.ctrlPanel.revalidate();
	2920	+ objEditor.ctrlPanel.validate();
2780	2921	//objEditor.jTree.clearSelection();
2781	2922	//objEditor.ResetSliders();
2782	2923	refreshContents(true);
2783	2924	} else
2784		- if (event.getSource() == clearPanelButton)
	2925	+ if (source == clearPanelButton)
2785	2926	{
2786	2927	assert(copy == group);
2787	2928	//copy.ClearUI();
..	..	@@ -2792,7 +2933,7 @@
2792	2933	listUI.clear();
2793	2934	refreshContents(true);
2794	2935	} else
2795		- if (event.getSource() == allParamsButton)
	2936	+ if (source == allParamsButton)
2796	2937	{
2797	2938	assert(copy == group);
2798	2939
..	..	@@ -2813,19 +2954,19 @@
2813	2954
2814	2955	refreshContents(true);
2815	2956	} else
2816		- if (event.getSource() == unselectButton)
	2957	+ if (source == unselectButton)
2817	2958	{
2818	2959	objEditor.jTree.clearSelection();
2819	2960	// ?? oct 2012 GrafreeD.clipboard.clear();
2820	2961	objEditor.ResetSliders();
2821	2962	refreshContents(true);
2822	2963	} else
2823		- if(event.getSource() instanceof cRadio)
	2964	+ if(source instanceof cRadio)
2824	2965	{
2825	2966	group.parent = keepparent;
2826	2967	group.attributes = 0;
2827	2968	//group.editWindow = null;
2828		- /cRadio/ radio = (cRadio)event.getSource();
	2969	+ /cRadio/ radio = (cRadio)source;
2829	2970	Object3D obj = radio.GetObject();
2830	2971	System.out.println("Edit " + obj);
2831	2972	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2845,7 +2986,7 @@
2845	2986	}
2846	2987
2847	2988	copy = group;
2848		- //CameraPane.theRenderer.object = group;
	2989	+ //Globals.theRenderer.object = group;
2849	2990	if(!useclient)
2850	2991	{
2851	2992	cameraView.renderCamera = radio.camera;
..	..	@@ -2854,7 +2995,8 @@
2854	2995	cameraView.cameras[cameraView.cameracount] = radio.camera;
2855	2996	cameraView.targetLookAt.set(radio.camera.lookAt);
2856	2997	cameraView.object = group;
2857		- cameraView.lighttouched = true;
	2998	+ //cameraView.lighttouched = true;
	2999	+ Globals.lighttouched = true;
2858	3000	topView.object = group;
2859	3001	frontView.object = group;
2860	3002	sideView.object = group;
..	..	@@ -2890,7 +3032,7 @@
2890	3032	if (useclient)
2891	3033	{
2892	3034	cameraView.object = client;
2893		- cameraView.lighttouched = true;
	3035	+ Globals.lighttouched = true;
2894	3036	//topView.object = client;
2895	3037	//frontView.object = client;
2896	3038	//sideView.object = client;
..	..	@@ -2898,7 +3040,7 @@
2898	3040	else
2899	3041	{
2900	3042	cameraView.object = group;
2901		- cameraView.lighttouched = true;
	3043	+ Globals.lighttouched = true;
2902	3044	//topView.object = group;
2903	3045	//frontView.object = group;
2904	3046	//sideView.object = group;
..	..	@@ -3179,6 +3321,13 @@
3179	3321	refreshContents();
3180	3322	}
3181	3323
	3324	+ void GenNormalsMINE()
	3325	+ {
	3326	+ group.selection.GenNormalsMINE();
	3327	+
	3328	+ refreshContents();
	3329	+ }
	3330	+
3182	3331	void Stripify()
3183	3332	{
3184	3333	group.StripifyS();
..	..	@@ -3399,7 +3548,7 @@
3399	3548	String pigment = Object3D.GetPigment(tex);
3400	3549	//String bump = Object3D.GetBump(tex);
3401	3550
3402		- 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);
3403	3552
3404	3553	double s = v.s;
3405	3554
..	..	@@ -3447,12 +3596,26 @@
3447	3596
3448	3597	void Align()
3449	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	+
3450	3613	for (int i=0; i<group.selection.size(); i++)
3451	3614	{
3452	3615	Object3D obj = group.selection.get(i);
3453	3616
3454		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3455		- 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);
3456	3619	}
3457	3620
3458	3621	refreshContents();
..	..	@@ -3686,7 +3849,7 @@
3686	3849	group.selection.RelinkToSupport(); // july 2014
3687	3850	System.out.println("DONE.");
3688	3851	refreshContents();
3689		- 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));
3690	3853	}
3691	3854
3692	3855	void ReduceMesh(boolean reduction34)
..	..	@@ -3971,16 +4134,16 @@
3971	4134
3972	4135	objEditor.SetText(); // jan 2014
3973	4136
3974		- 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))
3975	4138	CameraPane.flash = true;
3976	4139
3977	4140	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
3978	4141	// a camera
3979	4142	{
3980	4143	CameraPane.camerachangeframe = 0; // don't refuse it
3981		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3982		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3983		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4144	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4145	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4146	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3984	4147	}
3985	4148
3986	4149	refreshContents();
..	..	@@ -4474,6 +4637,26 @@
4474	4637	makeSomething(csg);
4475	4638	}
4476	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	+
4477	4660	void ungroup()
4478	4661	{
4479	4662	/*
..	..	@@ -4833,6 +5016,7 @@
4833	5016	private MenuItem resetsupportItem;
4834	5017	private MenuItem resetreferencesItem;
4835	5018	private MenuItem linkverticesItem;
	5019	+ private MenuItem relinkverticesItem;
4836	5020	private MenuItem setMasterItem;
4837	5021	private MenuItem resetMeshItem;
4838	5022	private MenuItem stepAllItem;
..	..	@@ -4854,6 +5038,7 @@
4854	5038	private MenuItem genNormalsMESHItem;
4855	5039	private MenuItem genNormalsCADItem;
4856	5040	private MenuItem genNormalsORGANItem;
	5041	+ private MenuItem genNormalsMINEItem;
4857	5042	private MenuItem stripifyItem;
4858	5043	private MenuItem unstripifyItem;
4859	5044	private MenuItem trimItem;
..	..	@@ -4895,6 +5080,7 @@
4895	5080	private MenuItem resetCentroidItem;
4896	5081	private MenuItem transformgeometryItem;
4897	5082	private MenuItem resetTransformItem;
	5083	+ private MenuItem hideItem;
4898	5084	private MenuItem grabItem;
4899	5085	private MenuItem backItem;
4900	5086	private MenuItem frontItem;
..	..	@@ -4915,6 +5101,7 @@
4915	5101
4916	5102	private MenuItem resetParentItem;
4917	5103	private MenuItem repairParentItem;
	5104	+ private MenuItem repairShadowItem;
4918	5105	private MenuItem sortbysizeItem;
4919	5106	private MenuItem sortbynameItem;
4920	5107
..	..	@@ -4935,6 +5122,7 @@
4935	5122	private MenuItem coneItem;
4936	5123	private MenuItem torusItem;
4937	5124	private MenuItem superItem;
	5125	+ private MenuItem kleinItem;
4938	5126	private MenuItem blobItem;
4939	5127	private MenuItem latheItem;
4940	5128	private MenuItem bezierItem;
..	..	@@ -4947,6 +5135,7 @@
4947	5135	private MenuItem csgItem;
4948	5136	private MenuItem templateItem;
4949	5137	private MenuItem textureItem;
	5138	+ private MenuItem billboardItem;
4950	5139	private MenuItem shadowXItem;
4951	5140	private MenuItem shadowYItem;
4952	5141	private MenuItem shadowZItem;