~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,
..	..	@@ -434,76 +435,24 @@
434	435	oe.buttonGroup.add(dummyButton);
435	436	*/
436	437	aConstraints.gridy += 1;
	438	+
	439	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	440	+
437	441	oe.aConstraints.gridwidth = 1;
438	442	oe.aConstraints.gridx = 0;
439	443
440		- 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");
441	446	liveCB.addItemListener(this);
442	447
443	448	oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
445		- supportCB.addItemListener(this);
446		-
447		- // oe.aConstraints.gridx += 1;
448		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
449		- // localCB.addItemListener(this);
450		-
451		- oe.aConstraints.gridx += 1;
452		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
453		- crowdCB.addItemListener(this);
454		-
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
457		- smoothCB.addItemListener(this);
458		-
459		- oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
461		- fastCB.addItemListener(this);
462		- oe.aConstraints.gridx += 1;
463		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
464		- slowCB.addItemListener(this);
465		- oe.aConstraints.gridx += 1;
466		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
467		- boxCB.addItemListener(this);
468		-
469		-// oe.aConstraints.gridx += 1;
470		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
471		-// speakerMocapCB.addItemListener(this);
472		-
473		- if (false)
474		- {
475		- // handled in scripts
476		- oe.aConstraints.gridx += 1;
477		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
478		- speakerCameraCB.addItemListener(this);
479		-
480		- oe.aConstraints.gridx += 1;
481		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
482		- speakerFocusCB.addItemListener(this);
483		-
484		- oe.aConstraints.gridx += 1;
485		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
486		- smoothfocusCB.addItemListener(this);
487		- }
488		-
489		-//oe.aConstraints.gridx += 1;
490		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
491		-// debugCB.addItemListener(this);
492		-
493		- oe.aConstraints.gridx += 1;
494		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
495		- oeilCB.addItemListener(this);
496		-
497		- oe.aConstraints.gridx += 1;
498		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
499		- lookAtCB.addItemListener(this);
500		-
501		- oe.aConstraints.gridx += 1;
502		- 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");
503	451	trackCB.addItemListener(this);
504	452
505	453	oe.aConstraints.gridx += 1;
506	454	oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	455	+ screenfitButton.setToolTipText("Screen fit");
507	456	screenfitButton.addActionListener(this);
508	457	oe.aConstraints.gridx += 1;
509	458	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
..	..	@@ -511,6 +460,7 @@
511	460	// oe.aConstraints.gridx += 1;
512	461	oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
513	462	snapobjectButton.addActionListener(this);
	463	+ snapobjectButton.setToolTipText("Snap Object");
514	464	oe.aConstraints.gridx += 1;
515	465
516	466	//aConstraints.gridx = 0;
..	..	@@ -519,28 +469,39 @@
519	469	oe.aConstraints.gridwidth = 1;
520	470
521	471	oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	472	+ flashSelectionButton.setToolTipText("Show selection");
522	473	flashSelectionButton.addActionListener(this);
	474	+
	475	+ oe.toolbarPanel.add(new cButton(" ", false));
	476	+
523	477	oe.aConstraints.gridx += 1;
524	478	oe.aConstraints.weighty = 0;
525	479	oe.aConstraints.gridwidth = 1;
526	480
527	481	//
528	482	oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	483	+ twoButton.setToolTipText("Show center view only");
529	484	twoButton.addActionListener(this);
530	485	oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
531	486	fourButton.addActionListener(this);
	487	+ fourButton.setToolTipText("Show left panel only");
532	488	oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	489	+ sixButton.setToolTipText("2-column layout left");
533	490	sixButton.addActionListener(this);
534	491	oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	492	+ threeButton.setToolTipText("2-column layout right");
535	493	threeButton.addActionListener(this);
536	494	oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	495	+ sevenButton.setToolTipText("3-column layout");
537	496	sevenButton.addActionListener(this);
538	497	//
539	498
540		- 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");
541	501	rootButton.addActionListener(this);
542	502	oe.aConstraints.gridx += 1;
543	503	oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	504	+ closeButton.setToolTipText("Close tab");
544	505	closeButton.addActionListener(this);
545	506	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
546	507	//clearButton.addActionListener(this);
..	..	@@ -643,17 +604,91 @@
643	604	radio.layout = sevenButton;
644	605	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
645	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	+ }
646	681
647	682	void EditObject(Object3D obj)
648	683	{
649		- cRadio dummyButton = new cRadio(obj.name);
650		- dummyButton.SetObject(obj);
651		- dummyButton.layout = sevenButton;
652		- dummyButton.SetCamera(cameraView.renderCamera, false);
653		- dummyButton.addActionListener(this);
654		- radioPanel.add(dummyButton);
655		- buttonGroup.add(dummyButton);
656		- 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();
657	692	}
658	693	void SetupViews(ObjEditor oe)
659	694	{
..	..	@@ -673,6 +708,7 @@
673	708	JCheckBox fastCB;
674	709	JCheckBox slowCB;
675	710	JCheckBox boxCB;
	711	+ JCheckBox zoomBoxCB;
676	712	JCheckBox trackCB;
677	713	JCheckBox smoothfocusCB;
678	714	// JCheckBox speakerMocapCB;
..	..	@@ -715,8 +751,7 @@
715	751	dropAttributes \|= Object3D.TEXTURE;
716	752	else
717	753	dropAttributes &= ~Object3D.TEXTURE;
718		- }
719		- else if(e.getSource() == liveCB)
	754	+ } else if(e.getSource() == liveCB)
720	755	{
721	756	cameraView.ToggleLive();
722	757	}
..	..	@@ -753,6 +788,10 @@
753	788	Recompile();
754	789	cameraView.repaint();
755	790	// refreshContents();
	791	+ }
	792	+ else if(e.getSource() == zoomBoxCB)
	793	+ {
	794	+ cameraView.ToggleZoomBoxMode();
756	795	}
757	796	else if(e.getSource() == smoothfocusCB)
758	797	{
..	..	@@ -1118,6 +1157,8 @@
1118	1157	resetParentItem.addActionListener(this);
1119	1158	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1120	1159	repairParentItem.addActionListener(this);
	1160	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1161	+ repairShadowItem.addActionListener(this);
1121	1162	menu.add(invariantsItem = new MenuItem("Invariants"));
1122	1163	invariantsItem.addActionListener(this);
1123	1164	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1478,6 +1519,7 @@
1478	1519	//
1479	1520	public void actionPerformed(ActionEvent event) // , Object arg)
1480	1521	{
	1522	+ Object source = event.getSource();
1481	1523	/*
1482	1524	if (event.getSource() == nameField)
1483	1525	{
..	..	@@ -1489,11 +1531,11 @@
1489	1531	}
1490	1532	else
1491	1533	*/
1492		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1534	+ if (source == lookAtItem \|\| source == lookFromItem)
1493	1535	{
1494	1536	ScreenFit();
1495	1537	} else
1496		- if (event.getSource() == switchItem)
	1538	+ if (source == switchItem)
1497	1539	{
1498	1540	cVector v1 = new cVector();
1499	1541	cVector v2 = new cVector();
..	..	@@ -1502,11 +1544,11 @@
1502	1544	objEditor.cameraView.renderCamera.setAim(v2, v1);
1503	1545	objEditor.cameraView.repaint();
1504	1546	} else
1505		- if (event.getSource() == rectoidItem)
	1547	+ if (source == rectoidItem)
1506	1548	{
1507	1549	makeSomething(new Box());
1508	1550	} else
1509		- if (event.getSource() == particleItem)
	1551	+ if (source == particleItem)
1510	1552	{
1511	1553	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1512	1554	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1527,9 +1569,9 @@
1527	1569	applyExample(particleGeom, "SMOKE");
1528	1570	makeSomething(particleGeom);
1529	1571	} else
1530		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1572	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1531	1573	{
1532		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1574	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1533	1575
1534	1576	ragdoll.toParent = LA.newMatrix();
1535	1577	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1547,7 +1589,7 @@
1547	1589	} else
1548	1590	/*
1549	1591	*/
1550		- if (event.getSource() == heightFieldItem)
	1592	+ if (source == heightFieldItem)
1551	1593	{
1552	1594	Object3D obj = new Object3D();
1553	1595
..	..	@@ -1585,31 +1627,31 @@
1585	1627
1586	1628	makeSomething(obj);
1587	1629	} else
1588		- if (event.getSource() == gridItem)
	1630	+ if (source == gridItem)
1589	1631	{
1590	1632	makeSomething(new Grid());
1591	1633	} else
1592		- if (event.getSource() == ellipsoidItem)
	1634	+ if (source == ellipsoidItem)
1593	1635	{
1594	1636	makeSomething(new Sphere());
1595	1637	} else
1596		- if (event.getSource() == coneItem)
	1638	+ if (source == coneItem)
1597	1639	{
1598	1640	makeSomething(new Cone());
1599	1641	} else
1600		- if (event.getSource() == torusItem)
	1642	+ if (source == torusItem)
1601	1643	{
1602	1644	makeSomething(new Torus());
1603	1645	} else
1604		- if (event.getSource() == superItem)
	1646	+ if (source == superItem)
1605	1647	{
1606	1648	makeSomething(new Superellipsoid());
1607	1649	} else
1608		- if (event.getSource() == kleinItem)
	1650	+ if (source == kleinItem)
1609	1651	{
1610	1652	makeSomething(new Klein());
1611	1653	} else
1612		- if (event.getSource() == blobItem)
	1654	+ if (source == blobItem)
1613	1655	{
1614	1656	Blob blob = new Blob();
1615	1657	BlobComponent comp = new BlobComponent();
..	..	@@ -1617,15 +1659,15 @@
1617	1659	//blob.retile();
1618	1660	makeSomething(blob);
1619	1661	} else
1620		- if (event.getSource() == latheItem)
	1662	+ if (source == latheItem)
1621	1663	{
1622	1664	makeSomething(new Lathe());
1623	1665	} else
1624		- if (event.getSource() == bezierItem)
	1666	+ if (source == bezierItem)
1625	1667	{
1626	1668	makeSomething(new BezierSurface());
1627	1669	} else
1628		- if (event.getSource() == checkerItem)
	1670	+ if (source == checkerItem)
1629	1671	{
1630	1672	/*
1631	1673	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1640,7 +1682,7 @@
1640	1682	*/
1641	1683	makeSomething(new Checker());
1642	1684	} else
1643		- if (event.getSource() == meshItem)
	1685	+ if (source == meshItem)
1644	1686	{
1645	1687	Object3D itemtomake = new Object3D();
1646	1688	Object3D child;
..	..	@@ -1661,35 +1703,35 @@
1661	1703	makeSomething(child);
1662	1704	}
1663	1705	} else
1664		- if (event.getSource() == springItem)
	1706	+ if (source == springItem)
1665	1707	{
1666	1708	cSpring s = new cSpring();
1667	1709	s.setup();
1668	1710	makeSomething(s);
1669	1711	} else
1670		- if (event.getSource() == flagItem)
	1712	+ if (source == flagItem)
1671	1713	{
1672	1714	cSpring s = new cFlag();
1673	1715	s.setup();
1674	1716	makeSomething(s);
1675	1717	} else
1676		- if (event.getSource() == lightItem)
	1718	+ if (source == lightItem)
1677	1719	{
1678	1720	makeSomething(new Light());
1679	1721	} else
1680		- if (event.getSource() == csgItem)
	1722	+ if (source == csgItem)
1681	1723	{
1682	1724	group(new CSG());
1683	1725	} else
1684		- if (event.getSource() == templateItem)
	1726	+ if (source == templateItem)
1685	1727	{
1686	1728	group(new cTemplate());
1687	1729	} else
1688		- if (event.getSource() == attributeItem)
	1730	+ if (source == attributeItem)
1689	1731	{
1690	1732	makeSomething(new Attribute());
1691	1733	} else
1692		- if (event.getSource() == pointflowItem)
	1734	+ if (source == pointflowItem)
1693	1735	{
1694	1736	makeSomething(new PointFlow());
1695	1737	} else
..	..	@@ -1701,7 +1743,7 @@
1701	1743	} else
1702	1744	*/
1703	1745
1704		- if (event.getSource() == superLoopItem)
	1746	+ if (source == superLoopItem)
1705	1747	{
1706	1748	Composite g = new cGroup();
1707	1749	for (int i=0; i<15; i++)
..	..	@@ -1723,7 +1765,7 @@
1723	1765
1724	1766	group(g);
1725	1767	} else
1726		- if (event.getSource() == loopItem)
	1768	+ if (source == loopItem)
1727	1769	{
1728	1770	Composite csg = new GroupLeaf();
1729	1771	csg.count = 5;
..	..	@@ -1732,7 +1774,7 @@
1732	1774	csg.addChild(child);
1733	1775	child.addChild(csg);
1734	1776	} else
1735		- if (event.getSource() == doubleItem)
	1777	+ if (source == doubleItem)
1736	1778	{
1737	1779	Composite csg = new GroupLeaf();
1738	1780	csg.count = 5;
..	..	@@ -1744,7 +1786,7 @@
1744	1786	csg.addChild(child);
1745	1787	child.addChild(csg);
1746	1788	} else
1747		- if (event.getSource() == tripleItem)
	1789	+ if (source == tripleItem)
1748	1790	{
1749	1791	Composite csg = new GroupLeaf();
1750	1792	csg.count = 4;
..	..	@@ -1760,70 +1802,70 @@
1760	1802	child.addChild(csg);
1761	1803	} else
1762	1804
1763		- if (event.getSource() == importGFDItem)
	1805	+ if (source == importGFDItem)
1764	1806	{
1765	1807	ImportGFD();
1766	1808	} else
1767		- if (event.getSource() == importVRMLX3DItem)
	1809	+ if (source == importVRMLX3DItem)
1768	1810	{
1769	1811	ImportVRMLX3D();
1770	1812	} else
1771		- if (event.getSource() == import3DSItem)
	1813	+ if (source == import3DSItem)
1772	1814	{
1773	1815	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1774	1816	} else
1775		- if (event.getSource() == importOBJItem)
	1817	+ if (source == importOBJItem)
1776	1818	{
1777	1819	objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1778	1820	} else
1779		- if (event.getSource() == computeAOItem)
	1821	+ if (source == computeAOItem)
1780	1822	{
1781		- CameraPane.drawMode = CameraPane.OCCLUSION;
1782		- CameraPane.theRenderer.repaint();
	1823	+ Globals.drawMode = CameraPane.OCCLUSION;
	1824	+ Globals.theRenderer.repaint();
1783	1825	} else
1784		- if (event.getSource() == recompileItem)
	1826	+ if (source == recompileItem)
1785	1827	{
1786	1828	Recompile();
1787	1829	refreshContents();
1788	1830	} else
1789		- if (event.getSource() == editScriptItem)
	1831	+ if (source == editScriptItem)
1790	1832	{
1791	1833	OpenDialog();
1792	1834	refreshContents();
1793	1835	} else
1794		- if (event.getSource() == invariantsItem)
	1836	+ if (source == invariantsItem)
1795	1837	{
1796	1838	System.out.println("Invariants:");
1797	1839	GrafreeD.grafreeD.universe.invariants();
1798	1840	} else
1799		- if (event.getSource() == memoryItem)
	1841	+ if (source == memoryItem)
1800	1842	{
1801	1843	//System.out.println("Invariants:");
1802	1844	PrintMemory();
1803	1845	} else
1804		- if (event.getSource() == pathItem)
	1846	+ if (source == pathItem)
1805	1847	{
1806	1848	PrintPath();
1807	1849	} else
1808		- if (event.getSource() == analyzeItem)
	1850	+ if (source == analyzeItem)
1809	1851	{
1810	1852	AnalyzeObject();
1811	1853	} else
1812		- if (event.getSource() == dumpItem)
	1854	+ if (source == dumpItem)
1813	1855	{
1814	1856	DumpObject();
1815	1857	} else
1816		- if (event.getSource() == screenfitButton)
	1858	+ if (source == screenfitButton)
1817	1859	{
1818	1860	//Reload(lastConverter, lastFilename, true);
1819	1861	ScreenFit();
1820	1862	} else
1821		- if (event.getSource() == screenfitpointButton)
	1863	+ if (source == screenfitpointButton)
1822	1864	{
1823	1865	//Reload(lastConverter, lastFilename, true);
1824	1866	ScreenFitPoint();
1825	1867	} else
1826		- if (event.getSource() == snapobjectButton)
	1868	+ if (source == snapobjectButton)
1827	1869	{
1828	1870	//Reload(lastConverter, lastFilename, true);
1829	1871	SnapObject();
..	..	@@ -1834,13 +1876,13 @@
1834	1876	// Recompile();
1835	1877	// refreshContents();
1836	1878	// } else
1837		- if (event.getSource() == gcButton)
	1879	+ if (source == gcButton)
1838	1880	{
1839	1881	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1840	1882	System.gc();
1841	1883	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1842	1884	} else
1843		- if (event.getSource() == editLeafItem)
	1885	+ if (source == editLeafItem)
1844	1886	{
1845	1887	Object3D obj;
1846	1888	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1854,62 +1896,62 @@
1854	1896	}
1855	1897	refreshContents(true);
1856	1898	} else
1857		- if (event.getSource() == openWindowItem)
	1899	+ if (source == openWindowItem)
1858	1900	{
1859	1901	EditSelection(true);
1860	1902	} else
1861		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1903	+ if (source == cutItem \|\| source == clearButton)
1862	1904	{
1863	1905	loadClipboard(true);
1864	1906	} else
1865		- if (event.getSource() == duplicateItem)
	1907	+ if (source == duplicateItem)
1866	1908	{
1867	1909	Object3D keep = GrafreeD.clipboard;
1868	1910	loadClipboard(false);
1869	1911	paste(false);
1870	1912	GrafreeD.clipboard = keep;
1871	1913	} else
1872		- if (event.getSource() == cloneItem)
	1914	+ if (source == cloneItem)
1873	1915	{
1874	1916	CloneSelection(false);
1875	1917	} else
1876		- if (event.getSource() == cloneSupportItem)
	1918	+ if (source == cloneSupportItem)
1877	1919	{
1878	1920	CloneSelection(true);
1879	1921	} else
1880		- if (event.getSource() == copyItem)
	1922	+ if (source == copyItem)
1881	1923	{
1882	1924	loadClipboard(false);
1883	1925	} else
1884		- if (event.getSource() == pasteItem)
	1926	+ if (source == pasteItem)
1885	1927	{
1886	1928	paste(false);
1887	1929	} else
1888		- if (event.getSource() == pasteLinkItem)
	1930	+ if (source == pasteLinkItem)
1889	1931	{
1890	1932	pasteInto(false);
1891	1933	} else
1892		- if (event.getSource() == pasteCloneItem)
	1934	+ if (source == pasteCloneItem)
1893	1935	{
1894	1936	pasteInto(true);
1895	1937	} else
1896		- if (event.getSource() == pasteExpandItem)
	1938	+ if (source == pasteExpandItem)
1897	1939	{
1898	1940	paste(true);
1899	1941	} else
1900		- if (event.getSource() == synchronizeItem)
	1942	+ if (source == synchronizeItem)
1901	1943	{
1902	1944	Overwrite(Object3D.TRANSFORM);
1903	1945	} else
1904		- if (event.getSource() == overwriteNameItem)
	1946	+ if (source == overwriteNameItem)
1905	1947	{
1906	1948	Overwrite(Object3D.NAME);
1907	1949	} else
1908		- if (event.getSource() == overwriteUVItem)
	1950	+ if (source == overwriteUVItem)
1909	1951	{
1910	1952	Overwrite(Object3D.UV);
1911	1953	} else
1912		- if (event.getSource() == overwriteMatItem)
	1954	+ if (source == overwriteMatItem)
1913	1955	{
1914	1956	/* july 2015
1915	1957	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1929,7 +1971,7 @@
1929	1971
1930	1972	Overwrite(dropAttributes);
1931	1973	}
1932		- if (event.getSource() == overwriteGeoItem)
	1974	+ if (source == overwriteGeoItem)
1933	1975	{
1934	1976	Overwrite(Object3D.GEOMETRY);
1935	1977	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1946,7 +1988,7 @@
1946	1988	// refreshContents();
1947	1989	// }
1948	1990	} else
1949		- if (event.getSource() == generateMeshItem)
	1991	+ if (source == generateMeshItem)
1950	1992	{
1951	1993	//if (group.selection.size() == 1)
1952	1994	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1957,7 +1999,7 @@
1957	1999	ResetModel();
1958	2000	refreshContents();
1959	2001	} else
1960		- if (event.getSource() == extractGeometriesItem)
	2002	+ if (source == extractGeometriesItem)
1961	2003	{
1962	2004	boolean one = false;
1963	2005
..	..	@@ -1984,7 +2026,7 @@
1984	2026	ResetModel();
1985	2027	refreshContents();
1986	2028	} else
1987		- if (event.getSource() == cloneGeometriesItem)
	2029	+ if (source == cloneGeometriesItem)
1988	2030	{
1989	2031	boolean one = false;
1990	2032
..	..	@@ -2010,7 +2052,7 @@
2010	2052	ResetModel();
2011	2053	refreshContents();
2012	2054	} else
2013		- if (event.getSource() == shareGeometriesItem)
	2055	+ if (source == shareGeometriesItem)
2014	2056	{
2015	2057	boolean one = false;
2016	2058
..	..	@@ -2040,7 +2082,7 @@
2040	2082	refreshContents();
2041	2083	}
2042	2084	} else
2043		- if (event.getSource() == mergeGeometriesItem)
	2085	+ if (source == mergeGeometriesItem)
2044	2086	{
2045	2087	boolean one = false;
2046	2088
..	..	@@ -2070,7 +2112,7 @@
2070	2112	ResetModel();
2071	2113	refreshContents();
2072	2114	} else
2073		- if (event.getSource() == linkverticesItem)
	2115	+ if (source == linkverticesItem)
2074	2116	{
2075	2117	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2076	2118	// {
..	..	@@ -2090,7 +2132,7 @@
2090	2132	if (content instanceof cGroup && ((cGroup)content).transientlink )
2091	2133	content = ((cGroup)content).get(0);
2092	2134
2093		- 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));
2094	2136	for (int i=0; i<group.selection.size(); i++)
2095	2137	{
2096	2138	boolean random = CameraPane.RANDOM;
..	..	@@ -2099,11 +2141,11 @@
2099	2141	// group.selection.get(i).setMasterThis(content); // should be identity
2100	2142	CameraPane.RANDOM = random;
2101	2143	}
2102		- 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));
2103	2145	refreshContents();
2104	2146	}
2105	2147	} else
2106		- if (event.getSource() == resetsupportItem)
	2148	+ if (source == resetsupportItem)
2107	2149	{
2108	2150	for (int i=0; i<group.selection.size(); i++)
2109	2151	{
..	..	@@ -2115,7 +2157,7 @@
2115	2157
2116	2158	refreshContents();
2117	2159	} else
2118		- if (event.getSource() == relinkverticesItem)
	2160	+ if (source == relinkverticesItem)
2119	2161	{
2120	2162	boolean random = CameraPane.RANDOM;
2121	2163	CameraPane.RANDOM = false; // parse all random nodes
..	..	@@ -2124,7 +2166,7 @@
2124	2166
2125	2167	refreshContents();
2126	2168	} else
2127		- if (event.getSource() == resetreferencesItem)
	2169	+ if (source == resetreferencesItem)
2128	2170	{
2129	2171	for (int i=0; i<group.selection.size(); i++)
2130	2172	{
..	..	@@ -2133,7 +2175,7 @@
2133	2175
2134	2176	refreshContents();
2135	2177	} else
2136		- if (event.getSource() == setMasterItem)
	2178	+ if (source == setMasterItem)
2137	2179	{
2138	2180	if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2139	2181	{
..	..	@@ -2146,7 +2188,7 @@
2146	2188	refreshContents();
2147	2189	}
2148	2190	} else
2149		- if (event.getSource() == poseMeshItem)
	2191	+ if (source == poseMeshItem)
2150	2192	{
2151	2193	if (group.selection.size() == 1)
2152	2194	{
..	..	@@ -2165,19 +2207,19 @@
2165	2207	}
2166	2208
2167	2209	} else
2168		- if (event.getSource() == revertMeshItem)
	2210	+ if (source == revertMeshItem)
2169	2211	{
2170	2212	RevertMeshes();
2171	2213	} else
2172		- if (event.getSource() == resetMeshItem)
	2214	+ if (source == resetMeshItem)
2173	2215	{
2174	2216	ResetAll();
2175	2217	} else
2176		- if (event.getSource() == stepAllItem)
	2218	+ if (source == stepAllItem)
2177	2219	{
2178	2220	StepAll();
2179	2221	} else
2180		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2222	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2181	2223	{
2182	2224	//int indices[] = jList.getSelectedIndices();
2183	2225	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2185,46 +2227,46 @@
2185	2227
2186	2228	ClearSelection(false);
2187	2229	} else
2188		- if (event.getSource() == clearAllItem)
	2230	+ if (source == clearAllItem)
2189	2231	{
2190	2232	ClearSelection(true);
2191	2233	} else
2192		- if (event.getSource() == grabItem)
	2234	+ if (source == grabItem)
2193	2235	{
2194	2236	group(new cGroup(), true);
2195	2237	} else
2196		- if (event.getSource() == hideItem)
	2238	+ if (source == hideItem)
2197	2239	{
2198	2240	group(new HiddenObject());
2199	2241	} else
2200		- if (event.getSource() == frontItem)
	2242	+ if (source == frontItem)
2201	2243	{
2202	2244	front();
2203	2245	} else
2204		- if (event.getSource() == backItem)
	2246	+ if (source == backItem)
2205	2247	{
2206	2248	back();
2207	2249	} else
2208		- if (event.getSource() == cameraItem)
	2250	+ if (source == cameraItem)
2209	2251	{
2210	2252	makeSomething(new Camera());
2211	2253	} else
2212		- if (event.getSource() == compositeItem)
	2254	+ if (source == compositeItem)
2213	2255	{
2214	2256	group(new Composite());
2215	2257	} else
2216		- if (event.getSource() == randomItem)
	2258	+ if (source == randomItem)
2217	2259	{
2218	2260	RandomNode random = new RandomNode();
2219	2261	group(random);
2220	2262	if (random.size() > 0)
2221	2263	random.name = random.get(0).name + "Rnd";
2222	2264	} else
2223		- if (event.getSource() == physicsItem)
	2265	+ if (source == physicsItem)
2224	2266	{
2225	2267	group(new PhysicsNode());
2226	2268	} else
2227		- if (event.getSource() == frameselectorItem)
	2269	+ if (source == frameselectorItem)
2228	2270	{
2229	2271	for (int i=0; i<group.selection.size(); i++)
2230	2272	{
..	..	@@ -2236,7 +2278,7 @@
2236	2278	ResetModel();
2237	2279	refreshContents();
2238	2280	} else
2239		- if (event.getSource() == switchGeoItem)
	2281	+ if (source == switchGeoItem)
2240	2282	{
2241	2283	for (int i=0; i<group.selection.size(); i++)
2242	2284	{
..	..	@@ -2248,7 +2290,7 @@
2248	2290	ResetModel();
2249	2291	refreshContents();
2250	2292	} else
2251		- if (event.getSource() == switchTransfoItem)
	2293	+ if (source == switchTransfoItem)
2252	2294	{
2253	2295	for (int i=0; i<group.selection.size(); i++)
2254	2296	{
..	..	@@ -2260,7 +2302,7 @@
2260	2302	ResetModel();
2261	2303	refreshContents();
2262	2304	} else
2263		- if (event.getSource() == morphItem)
	2305	+ if (source == morphItem)
2264	2306	{
2265	2307	for (int i=0; i<group.selection.size(); i++)
2266	2308	{
..	..	@@ -2272,7 +2314,7 @@
2272	2314	ResetModel();
2273	2315	refreshContents();
2274	2316	} else
2275		- if (event.getSource() == scriptNodeItem)
	2317	+ if (source == scriptNodeItem)
2276	2318	{
2277	2319	boolean atleastone = false;
2278	2320
..	..	@@ -2311,31 +2353,31 @@
2311	2353	}
2312	2354	}
2313	2355	} else
2314		- if (event.getSource() == linkerItem)
	2356	+ if (source == linkerItem)
2315	2357	{
2316	2358	group(new cLinker());
2317	2359	} else
2318		- if (event.getSource() == textureItem)
	2360	+ if (source == textureItem)
2319	2361	{
2320	2362	group(new TextureNode());
2321	2363	} else
2322		- if (event.getSource() == billboardItem)
	2364	+ if (source == billboardItem)
2323	2365	{
2324	2366	group(new BillboardNode());
2325	2367	} else
2326		- if (event.getSource() == shadowXItem)
	2368	+ if (source == shadowXItem)
2327	2369	{
2328	2370	CastShadow(0);
2329	2371	} else
2330		- if (event.getSource() == shadowYItem)
	2372	+ if (source == shadowYItem)
2331	2373	{
2332	2374	CastShadow(1);
2333	2375	} else
2334		- if (event.getSource() == shadowZItem)
	2376	+ if (source == shadowZItem)
2335	2377	{
2336	2378	CastShadow(2);
2337	2379	} else
2338		- if (event.getSource() == ungroupItem)
	2380	+ if (source == ungroupItem)
2339	2381	{
2340	2382	//ungroup();
2341	2383	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2347,179 +2389,179 @@
2347	2389
2348	2390	refreshContents();
2349	2391	} else
2350		- if (event.getSource() == genUVItem)
	2392	+ if (source == genUVItem)
2351	2393	{
2352	2394	GenUV();
2353	2395	} else
2354		- if (event.getSource() == genNormalsCADItem)
	2396	+ if (source == genNormalsCADItem)
2355	2397	{
2356	2398	GenNormals(true);
2357	2399	} else
2358		- if (event.getSource() == genNormalsMESHItem)
	2400	+ if (source == genNormalsMESHItem)
2359	2401	{
2360	2402	GenNormals(true); // TODO
2361	2403	} else
2362		- if (event.getSource() == genNormalsORGANItem)
	2404	+ if (source == genNormalsORGANItem)
2363	2405	{
2364	2406	GenNormals(false);
2365	2407	} else
2366		- if (event.getSource() == genNormalsMINEItem)
	2408	+ if (source == genNormalsMINEItem)
2367	2409	{
2368	2410	GenNormalsMINE();
2369	2411	} else
2370		- if (event.getSource() == stripifyItem)
	2412	+ if (source == stripifyItem)
2371	2413	{
2372	2414	Stripify();
2373	2415	} else
2374		- if (event.getSource() == unstripifyItem)
	2416	+ if (source == unstripifyItem)
2375	2417	{
2376	2418	Unstripify();
2377	2419	} else
2378		- if (event.getSource() == trimItem)
	2420	+ if (source == trimItem)
2379	2421	{
2380	2422	Trim();
2381	2423	} else
2382		- if (event.getSource() == untrimItem)
	2424	+ if (source == untrimItem)
2383	2425	{
2384	2426	Untrim();
2385	2427	} else
2386		- if (event.getSource() == clearColorsItem)
	2428	+ if (source == clearColorsItem)
2387	2429	{
2388	2430	ClearColors();
2389	2431	} else
2390		- if (event.getSource() == clearMaterialsItem)
	2432	+ if (source == clearMaterialsItem)
2391	2433	{
2392	2434	ClearMaterials();
2393	2435	} else
2394		- if (event.getSource() == liveleavesItem)
	2436	+ if (source == liveleavesItem)
2395	2437	{
2396	2438	LiveLeaves(true);
2397	2439	} else
2398		- if (event.getSource() == unliveleavesItem)
	2440	+ if (source == unliveleavesItem)
2399	2441	{
2400	2442	LiveLeaves(false);
2401	2443	} else
2402		- if (event.getSource() == supportleavesItem)
	2444	+ if (source == supportleavesItem)
2403	2445	{
2404	2446	SupportLeaves(true);
2405	2447	} else
2406		- if (event.getSource() == unsupportleavesItem)
	2448	+ if (source == unsupportleavesItem)
2407	2449	{
2408	2450	SupportLeaves(false);
2409	2451	} else
2410		- if (event.getSource() == hideleavesItem)
	2452	+ if (source == hideleavesItem)
2411	2453	{
2412	2454	HideLeaves(true);
2413	2455	} else
2414		- if (event.getSource() == showleavesItem)
	2456	+ if (source == showleavesItem)
2415	2457	{
2416	2458	HideLeaves(false);
2417	2459	} else
2418		- if (event.getSource() == markleavesItem)
	2460	+ if (source == markleavesItem)
2419	2461	{
2420	2462	MarkLeaves(true);
2421	2463	} else
2422		- if (event.getSource() == unmarkleavesItem)
	2464	+ if (source == unmarkleavesItem)
2423	2465	{
2424	2466	MarkLeaves(false);
2425	2467	} else
2426		- if (event.getSource() == flipVItem)
	2468	+ if (source == flipVItem)
2427	2469	{
2428	2470	FlipV(true);
2429	2471	} else
2430		- if (event.getSource() == unflipVItem)
	2472	+ if (source == unflipVItem)
2431	2473	{
2432	2474	FlipV(false);
2433	2475	} else
2434		- if (event.getSource() == lowTexturesItem)
	2476	+ if (source == lowTexturesItem)
2435	2477	{
2436	2478	SetTexRes(0);
2437	2479	} else
2438		- if (event.getSource() == normalTexturesItem)
	2480	+ if (source == normalTexturesItem)
2439	2481	{
2440	2482	SetTexRes(1);
2441	2483	} else
2442		- if (event.getSource() == highTexturesItem)
	2484	+ if (source == highTexturesItem)
2443	2485	{
2444	2486	SetTexRes(2);
2445	2487	} else
2446		- if (event.getSource() == veryhighTexturesItem)
	2488	+ if (source == veryhighTexturesItem)
2447	2489	{
2448	2490	SetTexRes(3);
2449	2491	} else
2450		- if (event.getSource() == maxTexturesItem)
	2492	+ if (source == maxTexturesItem)
2451	2493	{
2452	2494	SetTexRes(4);
2453	2495	} else
2454		- if (event.getSource() == panoTexturesItem)
	2496	+ if (source == panoTexturesItem)
2455	2497	{
2456	2498	SetTexRes(5);
2457	2499	} else
2458		- if (event.getSource() == reverseNormalsItem)
	2500	+ if (source == reverseNormalsItem)
2459	2501	{
2460	2502	ReverseNormals();
2461	2503	} else
2462		- if (event.getSource() == parseverticesItem)
	2504	+ if (source == parseverticesItem)
2463	2505	{
2464	2506	ParseVertices();
2465	2507	} else
2466		- if (event.getSource() == textureFieldItem)
	2508	+ if (source == textureFieldItem)
2467	2509	{
2468	2510	TextureVertices();
2469	2511	} else
2470		- if (event.getSource() == alignItem)
	2512	+ if (source == alignItem)
2471	2513	{
2472	2514	Align();
2473	2515	} else
2474		- if (event.getSource() == mirrorItem)
	2516	+ if (source == mirrorItem)
2475	2517	{
2476	2518	MirrorPoses();
2477	2519	} else
2478		- if (event.getSource() == reduceMorphItem)
	2520	+ if (source == reduceMorphItem)
2479	2521	{
2480	2522	MeshReduction(false);
2481	2523	} else
2482		- if (event.getSource() == reduce34MorphItem)
	2524	+ if (source == reduce34MorphItem)
2483	2525	{
2484	2526	MeshReduction(true);
2485	2527	} else
2486		- if (event.getSource() == reverseTrianglesItem)
	2528	+ if (source == reverseTrianglesItem)
2487	2529	{
2488	2530	ReverseTriangles();
2489	2531	} else
2490		- if (event.getSource() == reduceMeshItem)
	2532	+ if (source == reduceMeshItem)
2491	2533	{
2492	2534	ReduceMesh(false);
2493	2535	} else
2494		- if (event.getSource() == reduce34MeshItem)
	2536	+ if (source == reduce34MeshItem)
2495	2537	{
2496	2538	ReduceMesh(true);
2497	2539	} else
2498		- if (event.getSource() == increaseMeshItem)
	2540	+ if (source == increaseMeshItem)
2499	2541	{
2500	2542	IncreaseMesh();
2501	2543	} else
2502		- if (event.getSource() == clipMeshItem)
	2544	+ if (source == clipMeshItem)
2503	2545	{
2504	2546	ClipMesh();
2505	2547	} else
2506		- if (event.getSource() == smoothMeshItem)
	2548	+ if (source == smoothMeshItem)
2507	2549	{
2508	2550	SmoothMesh();
2509	2551	} else
2510		- if (event.getSource() == transformgeometryItem)
	2552	+ if (source == transformgeometryItem)
2511	2553	{
2512	2554	TransformGeometry();
2513	2555	} else
2514		- if (event.getSource() == resetTransformItem)
	2556	+ if (source == resetTransformItem)
2515	2557	{
2516	2558	ResetTransform();
2517	2559	} else
2518		- if (event.getSource() == resetCentroidItem)
	2560	+ if (source == resetCentroidItem)
2519	2561	{
2520	2562	ResetCentroid();
2521	2563	} else
2522		- if (event.getSource() == resetParentItem)
	2564	+ if (source == resetParentItem)
2523	2565	{
2524	2566	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2525	2567	{
..	..	@@ -2529,7 +2571,7 @@
2529	2571
2530	2572	refreshContents();
2531	2573	} else
2532		- if (event.getSource() == repairParentItem)
	2574	+ if (source == repairParentItem)
2533	2575	{
2534	2576	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2535	2577	{
..	..	@@ -2543,7 +2585,21 @@
2543	2585
2544	2586	refreshContents();
2545	2587	} else
2546		- 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)
2547	2603	{
2548	2604	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2549	2605	{
..	..	@@ -2555,7 +2611,7 @@
2555	2611	ResetModel();
2556	2612	refreshContents();
2557	2613	} else
2558		- if (event.getSource() == sortbynameItem)
	2614	+ if (source == sortbynameItem)
2559	2615	{
2560	2616	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2561	2617	{
..	..	@@ -2567,7 +2623,7 @@
2567	2623	ResetModel();
2568	2624	refreshContents();
2569	2625	} else
2570		- if (event.getSource() == attachPigmentItem)
	2626	+ if (source == attachPigmentItem)
2571	2627	{
2572	2628	String texture = GetFile("Attach pigment");
2573	2629	Object3D obj;
..	..	@@ -2579,7 +2635,7 @@
2579	2635
2580	2636	refreshContents();
2581	2637	} else
2582		- if (event.getSource() == detachPigmentItem)
	2638	+ if (source == detachPigmentItem)
2583	2639	{
2584	2640	Object3D obj;
2585	2641	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2590,7 +2646,7 @@
2590	2646
2591	2647	refreshContents();
2592	2648	} else
2593		- if (event.getSource() == attachBumpItem)
	2649	+ if (source == attachBumpItem)
2594	2650	{
2595	2651	String texture = GetFile("Attach bump");
2596	2652	Object3D obj;
..	..	@@ -2602,7 +2658,7 @@
2602	2658
2603	2659	refreshContents();
2604	2660	} else
2605		- if (event.getSource() == detachBumpItem)
	2661	+ if (source == detachBumpItem)
2606	2662	{
2607	2663	Object3D obj;
2608	2664	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2613,7 +2669,7 @@
2613	2669
2614	2670	refreshContents();
2615	2671	} else
2616		- if (event.getSource() == pigmentBumpItem)
	2672	+ if (source == pigmentBumpItem)
2617	2673	{
2618	2674	Object3D obj;
2619	2675	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2624,158 +2680,195 @@
2624	2680
2625	2681	refreshContents();
2626	2682	} else
2627		- if (event.getSource() == flashSelectionButton)
	2683	+ if (source == flashSelectionButton)
2628	2684	{
2629	2685	CameraPane.flash = true;
2630	2686	refreshContents();
2631	2687	} else
2632		- if (event.getSource() == oneButton)
	2688	+ if (source == oneButton)
2633	2689	{
2634	2690	} else
2635		- if (event.getSource() == twoButton)
	2691	+ if (source == twoButton)
2636	2692	{
2637	2693	radio.layout = twoButton;
2638	2694	// bug
2639	2695	//gridPanel.setDividerLocation(1.0);
2640	2696	//bigPanel.setDividerLocation(0.0);
2641		- bigThree.remove(scenePanel);
2642		- bigThree.remove(cameraPanel);
2643		- bigThree.remove(XYZPanel);
2644		- aWindowConstraints.gridx = 0;
2645		- aWindowConstraints.gridy = 0;
2646		- aWindowConstraints.gridwidth = 1;
2647		- // aConstraints.gridheight = 3;
2648		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2649		- aWindowConstraints.weightx = 0;
2650		- aWindowConstraints.weighty = 1;
2651		- //bigThree.add(jtp, aWindowConstraints);
2652		- aWindowConstraints.weightx = 1;
2653		- aWindowConstraints.gridwidth = 3;
2654		- // aConstraints.gridheight = 3;
2655		- aWindowConstraints.gridx = 1;
2656		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2657		- bigThree.add(cameraPanel, aWindowConstraints);
2658		- aWindowConstraints.weightx = 0;
2659		- aWindowConstraints.gridx = 4;
2660		- aWindowConstraints.gridwidth = 1;
2661		- // aConstraints.gridheight = 3;
2662		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2663		- //bigThree.add(XYZPanel, aWindowConstraints);
2664		- 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();
2665	2726	} else
2666		- if (event.getSource() == threeButton)
	2727	+ if (source == threeButton)
2667	2728	{
2668	2729	radio.layout = threeButton;
2669		- bigThree.remove(scenePanel);
2670		- bigThree.remove(cameraPanel);
2671		- bigThree.remove(XYZPanel);
2672		- aWindowConstraints.gridx = 0;
2673		- aWindowConstraints.gridy = 0;
2674		- aWindowConstraints.gridwidth = 1;
2675		- // aConstraints.gridheight = 3;
2676		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2677		- aWindowConstraints.weightx = 0;
2678		- aWindowConstraints.weighty = 1;
2679		- //bigThree.add(jtp, aWindowConstraints);
2680		- aWindowConstraints.weightx = 1;
2681		- aWindowConstraints.gridwidth = 3;
2682		- // aConstraints.gridheight = 3;
2683		- aWindowConstraints.gridx = 1;
2684		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2685		- bigThree.add(cameraPanel, aWindowConstraints);
2686		- aWindowConstraints.weightx = 0;
2687		- aWindowConstraints.gridx = 4;
2688		- aWindowConstraints.gridwidth = 1;
2689		- // aConstraints.gridheight = 3;
2690		- aConstraints.fill = GridBagConstraints.VERTICAL;
2691		- bigThree.add(XYZPanel, aWindowConstraints);
2692		- 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();
2693	2762	} else
2694		- if (event.getSource() == fourButton)
	2763	+ if (source == fourButton)
2695	2764	{
2696	2765	radio.layout = fourButton;
2697		- bigThree.remove(scenePanel);
2698		- bigThree.remove(cameraPanel);
2699		- bigThree.remove(XYZPanel);
2700		- aWindowConstraints.gridx = 0;
2701		- aWindowConstraints.gridy = 0;
2702		- aWindowConstraints.gridwidth = 1;
2703		- // aWindowConstraints.gridheight = 3;
2704		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2705		- aWindowConstraints.weightx = 1;
2706		- aWindowConstraints.weighty = 1;
2707		- bigThree.add(scenePanel, 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(cameraPanel, aWindowConstraints);
2714		- aWindowConstraints.weightx = 0;
2715		- aWindowConstraints.gridx = 4;
2716		- aWindowConstraints.gridwidth = 1;
2717		- // aWindowConstraints.gridheight = 3;
2718		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2719		- //bigThree.add(XYZPanel, aWindowConstraints);
2720		- 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();
2721	2797	} else
2722		- if (event.getSource() == sixButton)
	2798	+ if (source == sixButton)
2723	2799	{
2724	2800	radio.layout = sixButton;
2725		- bigThree.remove(scenePanel);
2726		- bigThree.remove(cameraPanel);
2727		- bigThree.remove(XYZPanel);
2728		- aWindowConstraints.gridx = 0;
2729		- aWindowConstraints.gridy = 0;
2730		- aWindowConstraints.gridwidth = 1;
2731		- // aConstraints.gridheight = 3;
2732		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2733		- aWindowConstraints.weightx = 0;
2734		- aWindowConstraints.weighty = 1;
2735		- bigThree.add(scenePanel, aWindowConstraints);
2736		- aWindowConstraints.weightx = 1;
2737		- aWindowConstraints.gridwidth = 3;
2738		- // aWindowConstraints.gridheight = 3;
2739		- aWindowConstraints.gridx = 1;
2740		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2741		- bigThree.add(cameraPanel, aWindowConstraints);
2742		- aWindowConstraints.weightx = 0;
2743		- aWindowConstraints.gridx = 4;
2744		- aWindowConstraints.gridwidth = 1;
2745		- // aWindowConstraints.gridheight = 3;
2746		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2747		- //bigThree.add(XYZPanel, aConstraints);
2748		- 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();
2749	2833	} else
2750		- if (event.getSource() == sevenButton)
	2834	+ if (source == sevenButton)
2751	2835	{
2752	2836	radio.layout = sevenButton;
2753		- bigThree.remove(scenePanel);
2754		- bigThree.remove(cameraPanel);
2755		- bigThree.remove(XYZPanel);
2756		- aWindowConstraints.gridx = 0;
2757		- aWindowConstraints.gridy = 0;
2758		- aWindowConstraints.gridwidth = 1;
2759		- // aWindowConstraints.gridheight = 3;
2760		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2761		- aWindowConstraints.weightx = 0;
2762		- aWindowConstraints.weighty = 1;
2763		- bigThree.add(scenePanel, aWindowConstraints);
2764		- aWindowConstraints.weightx = 1;
2765		- aWindowConstraints.gridwidth = 3;
2766		- // aWindowConstraints.gridheight = 3;
2767		- aWindowConstraints.gridx = 1;
2768		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2769		- bigThree.add(cameraPanel, aWindowConstraints);
2770		- aWindowConstraints.weightx = 0;
2771		- aWindowConstraints.gridx = 4;
2772		- aWindowConstraints.gridwidth = 1;
2773		- // aConstraints.gridheight = 3;
2774		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2775		- bigThree.add(XYZPanel, aWindowConstraints);
2776		- 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();
2777	2870	} else
2778		- if (event.getSource() == rootButton)
	2871	+ if (source == rootButton)
2779	2872	{
2780	2873	Object3D obj;
2781	2874	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2787,7 +2880,7 @@
2787	2880
2788	2881	refreshContents(true);
2789	2882	} else
2790		- if (event.getSource() == closeButton)
	2883	+ if (source == closeButton)
2791	2884	{
2792	2885	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2793	2886	cRadio ab;
..	..	@@ -2808,11 +2901,11 @@
2808	2901	}
2809	2902	refreshContents(true);
2810	2903	} else
2811		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2904	+ if (source == editItem \|\| source == editButton)
2812	2905	{
2813	2906	EditSelection(false);
2814	2907	} else
2815		- if (event.getSource() == uneditButton)
	2908	+ if (source == uneditButton)
2816	2909	{
2817	2910	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2818	2911	{
..	..	@@ -2824,12 +2917,12 @@
2824	2917
2825	2918	child.editWindow = null; // ???????????
2826	2919	}
2827		- objEditor.ctrlPanel.revalidate();
	2920	+ objEditor.ctrlPanel.validate();
2828	2921	//objEditor.jTree.clearSelection();
2829	2922	//objEditor.ResetSliders();
2830	2923	refreshContents(true);
2831	2924	} else
2832		- if (event.getSource() == clearPanelButton)
	2925	+ if (source == clearPanelButton)
2833	2926	{
2834	2927	assert(copy == group);
2835	2928	//copy.ClearUI();
..	..	@@ -2840,7 +2933,7 @@
2840	2933	listUI.clear();
2841	2934	refreshContents(true);
2842	2935	} else
2843		- if (event.getSource() == allParamsButton)
	2936	+ if (source == allParamsButton)
2844	2937	{
2845	2938	assert(copy == group);
2846	2939
..	..	@@ -2861,19 +2954,19 @@
2861	2954
2862	2955	refreshContents(true);
2863	2956	} else
2864		- if (event.getSource() == unselectButton)
	2957	+ if (source == unselectButton)
2865	2958	{
2866	2959	objEditor.jTree.clearSelection();
2867	2960	// ?? oct 2012 GrafreeD.clipboard.clear();
2868	2961	objEditor.ResetSliders();
2869	2962	refreshContents(true);
2870	2963	} else
2871		- if(event.getSource() instanceof cRadio)
	2964	+ if(source instanceof cRadio)
2872	2965	{
2873	2966	group.parent = keepparent;
2874	2967	group.attributes = 0;
2875	2968	//group.editWindow = null;
2876		- /cRadio/ radio = (cRadio)event.getSource();
	2969	+ /cRadio/ radio = (cRadio)source;
2877	2970	Object3D obj = radio.GetObject();
2878	2971	System.out.println("Edit " + obj);
2879	2972	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2893,7 +2986,7 @@
2893	2986	}
2894	2987
2895	2988	copy = group;
2896		- //CameraPane.theRenderer.object = group;
	2989	+ //Globals.theRenderer.object = group;
2897	2990	if(!useclient)
2898	2991	{
2899	2992	cameraView.renderCamera = radio.camera;
..	..	@@ -2902,7 +2995,8 @@
2902	2995	cameraView.cameras[cameraView.cameracount] = radio.camera;
2903	2996	cameraView.targetLookAt.set(radio.camera.lookAt);
2904	2997	cameraView.object = group;
2905		- cameraView.lighttouched = true;
	2998	+ //cameraView.lighttouched = true;
	2999	+ Globals.lighttouched = true;
2906	3000	topView.object = group;
2907	3001	frontView.object = group;
2908	3002	sideView.object = group;
..	..	@@ -2938,7 +3032,7 @@
2938	3032	if (useclient)
2939	3033	{
2940	3034	cameraView.object = client;
2941		- cameraView.lighttouched = true;
	3035	+ Globals.lighttouched = true;
2942	3036	//topView.object = client;
2943	3037	//frontView.object = client;
2944	3038	//sideView.object = client;
..	..	@@ -2946,7 +3040,7 @@
2946	3040	else
2947	3041	{
2948	3042	cameraView.object = group;
2949		- cameraView.lighttouched = true;
	3043	+ Globals.lighttouched = true;
2950	3044	//topView.object = group;
2951	3045	//frontView.object = group;
2952	3046	//sideView.object = group;
..	..	@@ -3454,7 +3548,7 @@
3454	3548	String pigment = Object3D.GetPigment(tex);
3455	3549	//String bump = Object3D.GetBump(tex);
3456	3550
3457		- 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);
3458	3552
3459	3553	double s = v.s;
3460	3554
..	..	@@ -3755,7 +3849,7 @@
3755	3849	group.selection.RelinkToSupport(); // july 2014
3756	3850	System.out.println("DONE.");
3757	3851	refreshContents();
3758		- 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));
3759	3853	}
3760	3854
3761	3855	void ReduceMesh(boolean reduction34)
..	..	@@ -4040,16 +4134,16 @@
4040	4134
4041	4135	objEditor.SetText(); // jan 2014
4042	4136
4043		- 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))
4044	4138	CameraPane.flash = true;
4045	4139
4046	4140	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
4047	4141	// a camera
4048	4142	{
4049	4143	CameraPane.camerachangeframe = 0; // don't refuse it
4050		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4051		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
4052		- // 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;
4053	4147	}
4054	4148
4055	4149	refreshContents();
..	..	@@ -5007,6 +5101,7 @@
5007	5101
5008	5102	private MenuItem resetParentItem;
5009	5103	private MenuItem repairParentItem;
	5104	+ private MenuItem repairShadowItem;
5010	5105	private MenuItem sortbysizeItem;
5011	5106	private MenuItem sortbynameItem;
5012	5107