~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,
..	..	@@ -433,84 +434,26 @@
433	434	oe.radioPanel.add(dummyButton);
434	435	oe.buttonGroup.add(dummyButton);
435	436	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	437	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	438
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	439	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
	440	+ liveCB.setToolTipText("Enabled animation");
441	441	liveCB.addItemListener(this);
442	442
443		- 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);
	443	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
	444	+ trackCB.setToolTipText("Enable tracking");
503	445	trackCB.addItemListener(this);
504	446
505		- oe.aConstraints.gridx += 1;
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	447	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	448	+ screenfitButton.setToolTipText("Screen fit");
507	449	screenfitButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
	450	+
509	451	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
510	452	// screenfitpointButton.addActionListener(this);
511	453	// oe.aConstraints.gridx += 1;
512		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
	454	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
513	455	snapobjectButton.addActionListener(this);
	456	+ snapobjectButton.setToolTipText("Snap Object");
514	457	oe.aConstraints.gridx += 1;
515	458
516	459	//aConstraints.gridx = 0;
..	..	@@ -518,32 +461,35 @@
518	461	oe.aConstraints.weighty = 0;
519	462	oe.aConstraints.gridwidth = 1;
520	463
521		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	464	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	465	+ flashSelectionButton.setToolTipText("Show selection");
522	466	flashSelectionButton.addActionListener(this);
523	467
524		- oe.toolbarPanel.add(new cButton(" ", false));
	468	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
525	469
526		- oe.aConstraints.gridx += 1;
527		- oe.aConstraints.weighty = 0;
528		- oe.aConstraints.gridwidth = 1;
529		-
530		- //
531		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	470	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	471	+ twoButton.setToolTipText("Show center view only");
532	472	twoButton.addActionListener(this);
533		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	473	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
534	474	fourButton.addActionListener(this);
535		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	475	+ fourButton.setToolTipText("Show left panel only");
	476	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	477	+ sixButton.setToolTipText("2-column layout left");
536	478	sixButton.addActionListener(this);
537		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	479	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	480	+ threeButton.setToolTipText("2-column layout right");
538	481	threeButton.addActionListener(this);
539		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	482	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	483	+ sevenButton.setToolTipText("3-column layout");
540	484	sevenButton.addActionListener(this);
541	485	//
542	486
543		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	487	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	488	+ rootButton.setToolTipText("Edit object in new tab");
544	489	rootButton.addActionListener(this);
545	490	oe.aConstraints.gridx += 1;
546		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	491	+ oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	492	+ closeButton.setToolTipText("Close tab");
547	493	closeButton.addActionListener(this);
548	494	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
549	495	//clearButton.addActionListener(this);
..	..	@@ -646,6 +592,80 @@
646	592	radio.layout = sevenButton;
647	593	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
648	594	}
	595	+
	596	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	597	+ {
	598	+ //constraints.gridx = 0;
	599	+ //constraints.gridy = 0;
	600	+ panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	601	+ fastCB.setToolTipText("Fast mode");
	602	+ fastCB.addItemListener(this);
	603	+ //constraints.gridy += 1;
	604	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	605	+ supportCB.setToolTipText("Enabled rigging");
	606	+ supportCB.addItemListener(this);
	607	+
	608	+ // constraints.gridy += 1;
	609	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	610	+ // localCB.addItemListener(this);
	611	+
	612	+ //constraints.gridy += 1;
	613	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	614	+ crowdCB.setToolTipText("Used for crowds");
	615	+ crowdCB.addItemListener(this);
	616	+
	617	+ //constraints.gridy += 1;
	618	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	619	+ smoothCB.setToolTipText("Snapping delay");
	620	+ smoothCB.addItemListener(this);
	621	+
	622	+ //constraints.gridy += 1;
	623	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	624	+ slowCB.setToolTipText("Smooth interpolation");
	625	+ slowCB.addItemListener(this);
	626	+ //constraints.gridy += 1;
	627	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	628	+ boxCB.setToolTipText("Display bounding boxes");
	629	+ boxCB.addItemListener(this);
	630	+ //constraints.gridy += 1;
	631	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	632	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	633	+ zoomBoxCB.addItemListener(this);
	634	+
	635	+// constraints.gridy += 1;
	636	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	637	+// speakerMocapCB.addItemListener(this);
	638	+
	639	+ if (false)
	640	+ {
	641	+ // handled in scripts
	642	+ //constraints.gridy += 1;
	643	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	644	+ speakerCameraCB.addItemListener(this);
	645	+
	646	+ //constraints.gridy += 1;
	647	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	648	+ speakerFocusCB.addItemListener(this);
	649	+
	650	+ //constraints.gridy += 1;
	651	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	652	+ smoothfocusCB.addItemListener(this);
	653	+ }
	654	+
	655	+//constraints.gridx += 1;
	656	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	657	+// debugCB.addItemListener(this);
	658	+
	659	+ //constraints.gridy += 1;
	660	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	661	+ oeilCB.addItemListener(this);
	662	+
	663	+ //constraints.gridy += 1;
	664	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	665	+ lookAtCB.setToolTipText("Look-at target");
	666	+ lookAtCB.addItemListener(this);
	667	+
	668	+ }
649	669
650	670	void EditObject(Object3D obj)
651	671	{
..	..	@@ -676,6 +696,7 @@
676	696	JCheckBox fastCB;
677	697	JCheckBox slowCB;
678	698	JCheckBox boxCB;
	699	+ JCheckBox zoomBoxCB;
679	700	JCheckBox trackCB;
680	701	JCheckBox smoothfocusCB;
681	702	// JCheckBox speakerMocapCB;
..	..	@@ -755,6 +776,10 @@
755	776	Recompile();
756	777	cameraView.repaint();
757	778	// refreshContents();
	779	+ }
	780	+ else if(e.getSource() == zoomBoxCB)
	781	+ {
	782	+ cameraView.ToggleZoomBoxMode();
758	783	}
759	784	else if(e.getSource() == smoothfocusCB)
760	785	{
..	..	@@ -1482,6 +1507,7 @@
1482	1507	//
1483	1508	public void actionPerformed(ActionEvent event) // , Object arg)
1484	1509	{
	1510	+ Object source = event.getSource();
1485	1511	/*
1486	1512	if (event.getSource() == nameField)
1487	1513	{
..	..	@@ -1493,11 +1519,11 @@
1493	1519	}
1494	1520	else
1495	1521	*/
1496		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1522	+ if (source == lookAtItem \|\| source == lookFromItem)
1497	1523	{
1498	1524	ScreenFit();
1499	1525	} else
1500		- if (event.getSource() == switchItem)
	1526	+ if (source == switchItem)
1501	1527	{
1502	1528	cVector v1 = new cVector();
1503	1529	cVector v2 = new cVector();
..	..	@@ -1506,11 +1532,11 @@
1506	1532	objEditor.cameraView.renderCamera.setAim(v2, v1);
1507	1533	objEditor.cameraView.repaint();
1508	1534	} else
1509		- if (event.getSource() == rectoidItem)
	1535	+ if (source == rectoidItem)
1510	1536	{
1511	1537	makeSomething(new Box());
1512	1538	} else
1513		- if (event.getSource() == particleItem)
	1539	+ if (source == particleItem)
1514	1540	{
1515	1541	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1516	1542	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1531,9 +1557,9 @@
1531	1557	applyExample(particleGeom, "SMOKE");
1532	1558	makeSomething(particleGeom);
1533	1559	} else
1534		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1560	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1535	1561	{
1536		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1562	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1537	1563
1538	1564	ragdoll.toParent = LA.newMatrix();
1539	1565	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1551,7 +1577,7 @@
1551	1577	} else
1552	1578	/*
1553	1579	*/
1554		- if (event.getSource() == heightFieldItem)
	1580	+ if (source == heightFieldItem)
1555	1581	{
1556	1582	Object3D obj = new Object3D();
1557	1583
..	..	@@ -1589,31 +1615,31 @@
1589	1615
1590	1616	makeSomething(obj);
1591	1617	} else
1592		- if (event.getSource() == gridItem)
	1618	+ if (source == gridItem)
1593	1619	{
1594	1620	makeSomething(new Grid());
1595	1621	} else
1596		- if (event.getSource() == ellipsoidItem)
	1622	+ if (source == ellipsoidItem)
1597	1623	{
1598	1624	makeSomething(new Sphere());
1599	1625	} else
1600		- if (event.getSource() == coneItem)
	1626	+ if (source == coneItem)
1601	1627	{
1602	1628	makeSomething(new Cone());
1603	1629	} else
1604		- if (event.getSource() == torusItem)
	1630	+ if (source == torusItem)
1605	1631	{
1606	1632	makeSomething(new Torus());
1607	1633	} else
1608		- if (event.getSource() == superItem)
	1634	+ if (source == superItem)
1609	1635	{
1610	1636	makeSomething(new Superellipsoid());
1611	1637	} else
1612		- if (event.getSource() == kleinItem)
	1638	+ if (source == kleinItem)
1613	1639	{
1614	1640	makeSomething(new Klein());
1615	1641	} else
1616		- if (event.getSource() == blobItem)
	1642	+ if (source == blobItem)
1617	1643	{
1618	1644	Blob blob = new Blob();
1619	1645	BlobComponent comp = new BlobComponent();
..	..	@@ -1621,15 +1647,15 @@
1621	1647	//blob.retile();
1622	1648	makeSomething(blob);
1623	1649	} else
1624		- if (event.getSource() == latheItem)
	1650	+ if (source == latheItem)
1625	1651	{
1626	1652	makeSomething(new Lathe());
1627	1653	} else
1628		- if (event.getSource() == bezierItem)
	1654	+ if (source == bezierItem)
1629	1655	{
1630	1656	makeSomething(new BezierSurface());
1631	1657	} else
1632		- if (event.getSource() == checkerItem)
	1658	+ if (source == checkerItem)
1633	1659	{
1634	1660	/*
1635	1661	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1644,7 +1670,7 @@
1644	1670	*/
1645	1671	makeSomething(new Checker());
1646	1672	} else
1647		- if (event.getSource() == meshItem)
	1673	+ if (source == meshItem)
1648	1674	{
1649	1675	Object3D itemtomake = new Object3D();
1650	1676	Object3D child;
..	..	@@ -1665,35 +1691,35 @@
1665	1691	makeSomething(child);
1666	1692	}
1667	1693	} else
1668		- if (event.getSource() == springItem)
	1694	+ if (source == springItem)
1669	1695	{
1670	1696	cSpring s = new cSpring();
1671	1697	s.setup();
1672	1698	makeSomething(s);
1673	1699	} else
1674		- if (event.getSource() == flagItem)
	1700	+ if (source == flagItem)
1675	1701	{
1676	1702	cSpring s = new cFlag();
1677	1703	s.setup();
1678	1704	makeSomething(s);
1679	1705	} else
1680		- if (event.getSource() == lightItem)
	1706	+ if (source == lightItem)
1681	1707	{
1682	1708	makeSomething(new Light());
1683	1709	} else
1684		- if (event.getSource() == csgItem)
	1710	+ if (source == csgItem)
1685	1711	{
1686	1712	group(new CSG());
1687	1713	} else
1688		- if (event.getSource() == templateItem)
	1714	+ if (source == templateItem)
1689	1715	{
1690	1716	group(new cTemplate());
1691	1717	} else
1692		- if (event.getSource() == attributeItem)
	1718	+ if (source == attributeItem)
1693	1719	{
1694	1720	makeSomething(new Attribute());
1695	1721	} else
1696		- if (event.getSource() == pointflowItem)
	1722	+ if (source == pointflowItem)
1697	1723	{
1698	1724	makeSomething(new PointFlow());
1699	1725	} else
..	..	@@ -1705,7 +1731,7 @@
1705	1731	} else
1706	1732	*/
1707	1733
1708		- if (event.getSource() == superLoopItem)
	1734	+ if (source == superLoopItem)
1709	1735	{
1710	1736	Composite g = new cGroup();
1711	1737	for (int i=0; i<15; i++)
..	..	@@ -1727,7 +1753,7 @@
1727	1753
1728	1754	group(g);
1729	1755	} else
1730		- if (event.getSource() == loopItem)
	1756	+ if (source == loopItem)
1731	1757	{
1732	1758	Composite csg = new GroupLeaf();
1733	1759	csg.count = 5;
..	..	@@ -1736,7 +1762,7 @@
1736	1762	csg.addChild(child);
1737	1763	child.addChild(csg);
1738	1764	} else
1739		- if (event.getSource() == doubleItem)
	1765	+ if (source == doubleItem)
1740	1766	{
1741	1767	Composite csg = new GroupLeaf();
1742	1768	csg.count = 5;
..	..	@@ -1748,7 +1774,7 @@
1748	1774	csg.addChild(child);
1749	1775	child.addChild(csg);
1750	1776	} else
1751		- if (event.getSource() == tripleItem)
	1777	+ if (source == tripleItem)
1752	1778	{
1753	1779	Composite csg = new GroupLeaf();
1754	1780	csg.count = 4;
..	..	@@ -1764,70 +1790,70 @@
1764	1790	child.addChild(csg);
1765	1791	} else
1766	1792
1767		- if (event.getSource() == importGFDItem)
	1793	+ if (source == importGFDItem)
1768	1794	{
1769	1795	ImportGFD();
1770	1796	} else
1771		- if (event.getSource() == importVRMLX3DItem)
	1797	+ if (source == importVRMLX3DItem)
1772	1798	{
1773	1799	ImportVRMLX3D();
1774	1800	} else
1775		- if (event.getSource() == import3DSItem)
	1801	+ if (source == import3DSItem)
1776	1802	{
1777	1803	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1778	1804	} else
1779		- if (event.getSource() == importOBJItem)
	1805	+ if (source == importOBJItem)
1780	1806	{
1781	1807	objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1782	1808	} else
1783		- if (event.getSource() == computeAOItem)
	1809	+ if (source == computeAOItem)
1784	1810	{
1785		- CameraPane.drawMode = CameraPane.OCCLUSION;
1786		- CameraPane.theRenderer.repaint();
	1811	+ Globals.drawMode = CameraPane.OCCLUSION;
	1812	+ Globals.theRenderer.repaint();
1787	1813	} else
1788		- if (event.getSource() == recompileItem)
	1814	+ if (source == recompileItem)
1789	1815	{
1790	1816	Recompile();
1791	1817	refreshContents();
1792	1818	} else
1793		- if (event.getSource() == editScriptItem)
	1819	+ if (source == editScriptItem)
1794	1820	{
1795	1821	OpenDialog();
1796	1822	refreshContents();
1797	1823	} else
1798		- if (event.getSource() == invariantsItem)
	1824	+ if (source == invariantsItem)
1799	1825	{
1800	1826	System.out.println("Invariants:");
1801	1827	GrafreeD.grafreeD.universe.invariants();
1802	1828	} else
1803		- if (event.getSource() == memoryItem)
	1829	+ if (source == memoryItem)
1804	1830	{
1805	1831	//System.out.println("Invariants:");
1806	1832	PrintMemory();
1807	1833	} else
1808		- if (event.getSource() == pathItem)
	1834	+ if (source == pathItem)
1809	1835	{
1810	1836	PrintPath();
1811	1837	} else
1812		- if (event.getSource() == analyzeItem)
	1838	+ if (source == analyzeItem)
1813	1839	{
1814	1840	AnalyzeObject();
1815	1841	} else
1816		- if (event.getSource() == dumpItem)
	1842	+ if (source == dumpItem)
1817	1843	{
1818	1844	DumpObject();
1819	1845	} else
1820		- if (event.getSource() == screenfitButton)
	1846	+ if (source == screenfitButton)
1821	1847	{
1822	1848	//Reload(lastConverter, lastFilename, true);
1823	1849	ScreenFit();
1824	1850	} else
1825		- if (event.getSource() == screenfitpointButton)
	1851	+ if (source == screenfitpointButton)
1826	1852	{
1827	1853	//Reload(lastConverter, lastFilename, true);
1828	1854	ScreenFitPoint();
1829	1855	} else
1830		- if (event.getSource() == snapobjectButton)
	1856	+ if (source == snapobjectButton)
1831	1857	{
1832	1858	//Reload(lastConverter, lastFilename, true);
1833	1859	SnapObject();
..	..	@@ -1838,13 +1864,13 @@
1838	1864	// Recompile();
1839	1865	// refreshContents();
1840	1866	// } else
1841		- if (event.getSource() == gcButton)
	1867	+ if (source == gcButton)
1842	1868	{
1843	1869	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1844	1870	System.gc();
1845	1871	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1846	1872	} else
1847		- if (event.getSource() == editLeafItem)
	1873	+ if (source == editLeafItem)
1848	1874	{
1849	1875	Object3D obj;
1850	1876	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1858,62 +1884,62 @@
1858	1884	}
1859	1885	refreshContents(true);
1860	1886	} else
1861		- if (event.getSource() == openWindowItem)
	1887	+ if (source == openWindowItem)
1862	1888	{
1863	1889	EditSelection(true);
1864	1890	} else
1865		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1891	+ if (source == cutItem \|\| source == clearButton)
1866	1892	{
1867	1893	loadClipboard(true);
1868	1894	} else
1869		- if (event.getSource() == duplicateItem)
	1895	+ if (source == duplicateItem)
1870	1896	{
1871	1897	Object3D keep = GrafreeD.clipboard;
1872	1898	loadClipboard(false);
1873	1899	paste(false);
1874	1900	GrafreeD.clipboard = keep;
1875	1901	} else
1876		- if (event.getSource() == cloneItem)
	1902	+ if (source == cloneItem)
1877	1903	{
1878	1904	CloneSelection(false);
1879	1905	} else
1880		- if (event.getSource() == cloneSupportItem)
	1906	+ if (source == cloneSupportItem)
1881	1907	{
1882	1908	CloneSelection(true);
1883	1909	} else
1884		- if (event.getSource() == copyItem)
	1910	+ if (source == copyItem)
1885	1911	{
1886	1912	loadClipboard(false);
1887	1913	} else
1888		- if (event.getSource() == pasteItem)
	1914	+ if (source == pasteItem)
1889	1915	{
1890	1916	paste(false);
1891	1917	} else
1892		- if (event.getSource() == pasteLinkItem)
	1918	+ if (source == pasteLinkItem)
1893	1919	{
1894	1920	pasteInto(false);
1895	1921	} else
1896		- if (event.getSource() == pasteCloneItem)
	1922	+ if (source == pasteCloneItem)
1897	1923	{
1898	1924	pasteInto(true);
1899	1925	} else
1900		- if (event.getSource() == pasteExpandItem)
	1926	+ if (source == pasteExpandItem)
1901	1927	{
1902	1928	paste(true);
1903	1929	} else
1904		- if (event.getSource() == synchronizeItem)
	1930	+ if (source == synchronizeItem)
1905	1931	{
1906	1932	Overwrite(Object3D.TRANSFORM);
1907	1933	} else
1908		- if (event.getSource() == overwriteNameItem)
	1934	+ if (source == overwriteNameItem)
1909	1935	{
1910	1936	Overwrite(Object3D.NAME);
1911	1937	} else
1912		- if (event.getSource() == overwriteUVItem)
	1938	+ if (source == overwriteUVItem)
1913	1939	{
1914	1940	Overwrite(Object3D.UV);
1915	1941	} else
1916		- if (event.getSource() == overwriteMatItem)
	1942	+ if (source == overwriteMatItem)
1917	1943	{
1918	1944	/* july 2015
1919	1945	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1933,7 +1959,7 @@
1933	1959
1934	1960	Overwrite(dropAttributes);
1935	1961	}
1936		- if (event.getSource() == overwriteGeoItem)
	1962	+ if (source == overwriteGeoItem)
1937	1963	{
1938	1964	Overwrite(Object3D.GEOMETRY);
1939	1965	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1950,7 +1976,7 @@
1950	1976	// refreshContents();
1951	1977	// }
1952	1978	} else
1953		- if (event.getSource() == generateMeshItem)
	1979	+ if (source == generateMeshItem)
1954	1980	{
1955	1981	//if (group.selection.size() == 1)
1956	1982	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1961,7 +1987,7 @@
1961	1987	ResetModel();
1962	1988	refreshContents();
1963	1989	} else
1964		- if (event.getSource() == extractGeometriesItem)
	1990	+ if (source == extractGeometriesItem)
1965	1991	{
1966	1992	boolean one = false;
1967	1993
..	..	@@ -1988,7 +2014,7 @@
1988	2014	ResetModel();
1989	2015	refreshContents();
1990	2016	} else
1991		- if (event.getSource() == cloneGeometriesItem)
	2017	+ if (source == cloneGeometriesItem)
1992	2018	{
1993	2019	boolean one = false;
1994	2020
..	..	@@ -2014,7 +2040,7 @@
2014	2040	ResetModel();
2015	2041	refreshContents();
2016	2042	} else
2017		- if (event.getSource() == shareGeometriesItem)
	2043	+ if (source == shareGeometriesItem)
2018	2044	{
2019	2045	boolean one = false;
2020	2046
..	..	@@ -2044,7 +2070,7 @@
2044	2070	refreshContents();
2045	2071	}
2046	2072	} else
2047		- if (event.getSource() == mergeGeometriesItem)
	2073	+ if (source == mergeGeometriesItem)
2048	2074	{
2049	2075	boolean one = false;
2050	2076
..	..	@@ -2074,7 +2100,7 @@
2074	2100	ResetModel();
2075	2101	refreshContents();
2076	2102	} else
2077		- if (event.getSource() == linkverticesItem)
	2103	+ if (source == linkverticesItem)
2078	2104	{
2079	2105	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2080	2106	// {
..	..	@@ -2094,7 +2120,7 @@
2094	2120	if (content instanceof cGroup && ((cGroup)content).transientlink )
2095	2121	content = ((cGroup)content).get(0);
2096	2122
2097		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2123	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2098	2124	for (int i=0; i<group.selection.size(); i++)
2099	2125	{
2100	2126	boolean random = CameraPane.RANDOM;
..	..	@@ -2103,11 +2129,11 @@
2103	2129	// group.selection.get(i).setMasterThis(content); // should be identity
2104	2130	CameraPane.RANDOM = random;
2105	2131	}
2106		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2132	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2107	2133	refreshContents();
2108	2134	}
2109	2135	} else
2110		- if (event.getSource() == resetsupportItem)
	2136	+ if (source == resetsupportItem)
2111	2137	{
2112	2138	for (int i=0; i<group.selection.size(); i++)
2113	2139	{
..	..	@@ -2119,7 +2145,7 @@
2119	2145
2120	2146	refreshContents();
2121	2147	} else
2122		- if (event.getSource() == relinkverticesItem)
	2148	+ if (source == relinkverticesItem)
2123	2149	{
2124	2150	boolean random = CameraPane.RANDOM;
2125	2151	CameraPane.RANDOM = false; // parse all random nodes
..	..	@@ -2128,7 +2154,7 @@
2128	2154
2129	2155	refreshContents();
2130	2156	} else
2131		- if (event.getSource() == resetreferencesItem)
	2157	+ if (source == resetreferencesItem)
2132	2158	{
2133	2159	for (int i=0; i<group.selection.size(); i++)
2134	2160	{
..	..	@@ -2137,7 +2163,7 @@
2137	2163
2138	2164	refreshContents();
2139	2165	} else
2140		- if (event.getSource() == setMasterItem)
	2166	+ if (source == setMasterItem)
2141	2167	{
2142	2168	if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2143	2169	{
..	..	@@ -2150,7 +2176,7 @@
2150	2176	refreshContents();
2151	2177	}
2152	2178	} else
2153		- if (event.getSource() == poseMeshItem)
	2179	+ if (source == poseMeshItem)
2154	2180	{
2155	2181	if (group.selection.size() == 1)
2156	2182	{
..	..	@@ -2169,19 +2195,19 @@
2169	2195	}
2170	2196
2171	2197	} else
2172		- if (event.getSource() == revertMeshItem)
	2198	+ if (source == revertMeshItem)
2173	2199	{
2174	2200	RevertMeshes();
2175	2201	} else
2176		- if (event.getSource() == resetMeshItem)
	2202	+ if (source == resetMeshItem)
2177	2203	{
2178	2204	ResetAll();
2179	2205	} else
2180		- if (event.getSource() == stepAllItem)
	2206	+ if (source == stepAllItem)
2181	2207	{
2182	2208	StepAll();
2183	2209	} else
2184		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2210	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2185	2211	{
2186	2212	//int indices[] = jList.getSelectedIndices();
2187	2213	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2189,46 +2215,46 @@
2189	2215
2190	2216	ClearSelection(false);
2191	2217	} else
2192		- if (event.getSource() == clearAllItem)
	2218	+ if (source == clearAllItem)
2193	2219	{
2194	2220	ClearSelection(true);
2195	2221	} else
2196		- if (event.getSource() == grabItem)
	2222	+ if (source == grabItem)
2197	2223	{
2198	2224	group(new cGroup(), true);
2199	2225	} else
2200		- if (event.getSource() == hideItem)
	2226	+ if (source == hideItem)
2201	2227	{
2202	2228	group(new HiddenObject());
2203	2229	} else
2204		- if (event.getSource() == frontItem)
	2230	+ if (source == frontItem)
2205	2231	{
2206	2232	front();
2207	2233	} else
2208		- if (event.getSource() == backItem)
	2234	+ if (source == backItem)
2209	2235	{
2210	2236	back();
2211	2237	} else
2212		- if (event.getSource() == cameraItem)
	2238	+ if (source == cameraItem)
2213	2239	{
2214	2240	makeSomething(new Camera());
2215	2241	} else
2216		- if (event.getSource() == compositeItem)
	2242	+ if (source == compositeItem)
2217	2243	{
2218	2244	group(new Composite());
2219	2245	} else
2220		- if (event.getSource() == randomItem)
	2246	+ if (source == randomItem)
2221	2247	{
2222	2248	RandomNode random = new RandomNode();
2223	2249	group(random);
2224	2250	if (random.size() > 0)
2225	2251	random.name = random.get(0).name + "Rnd";
2226	2252	} else
2227		- if (event.getSource() == physicsItem)
	2253	+ if (source == physicsItem)
2228	2254	{
2229	2255	group(new PhysicsNode());
2230	2256	} else
2231		- if (event.getSource() == frameselectorItem)
	2257	+ if (source == frameselectorItem)
2232	2258	{
2233	2259	for (int i=0; i<group.selection.size(); i++)
2234	2260	{
..	..	@@ -2240,7 +2266,7 @@
2240	2266	ResetModel();
2241	2267	refreshContents();
2242	2268	} else
2243		- if (event.getSource() == switchGeoItem)
	2269	+ if (source == switchGeoItem)
2244	2270	{
2245	2271	for (int i=0; i<group.selection.size(); i++)
2246	2272	{
..	..	@@ -2252,7 +2278,7 @@
2252	2278	ResetModel();
2253	2279	refreshContents();
2254	2280	} else
2255		- if (event.getSource() == switchTransfoItem)
	2281	+ if (source == switchTransfoItem)
2256	2282	{
2257	2283	for (int i=0; i<group.selection.size(); i++)
2258	2284	{
..	..	@@ -2264,7 +2290,7 @@
2264	2290	ResetModel();
2265	2291	refreshContents();
2266	2292	} else
2267		- if (event.getSource() == morphItem)
	2293	+ if (source == morphItem)
2268	2294	{
2269	2295	for (int i=0; i<group.selection.size(); i++)
2270	2296	{
..	..	@@ -2276,7 +2302,7 @@
2276	2302	ResetModel();
2277	2303	refreshContents();
2278	2304	} else
2279		- if (event.getSource() == scriptNodeItem)
	2305	+ if (source == scriptNodeItem)
2280	2306	{
2281	2307	boolean atleastone = false;
2282	2308
..	..	@@ -2315,31 +2341,31 @@
2315	2341	}
2316	2342	}
2317	2343	} else
2318		- if (event.getSource() == linkerItem)
	2344	+ if (source == linkerItem)
2319	2345	{
2320	2346	group(new cLinker());
2321	2347	} else
2322		- if (event.getSource() == textureItem)
	2348	+ if (source == textureItem)
2323	2349	{
2324	2350	group(new TextureNode());
2325	2351	} else
2326		- if (event.getSource() == billboardItem)
	2352	+ if (source == billboardItem)
2327	2353	{
2328	2354	group(new BillboardNode());
2329	2355	} else
2330		- if (event.getSource() == shadowXItem)
	2356	+ if (source == shadowXItem)
2331	2357	{
2332	2358	CastShadow(0);
2333	2359	} else
2334		- if (event.getSource() == shadowYItem)
	2360	+ if (source == shadowYItem)
2335	2361	{
2336	2362	CastShadow(1);
2337	2363	} else
2338		- if (event.getSource() == shadowZItem)
	2364	+ if (source == shadowZItem)
2339	2365	{
2340	2366	CastShadow(2);
2341	2367	} else
2342		- if (event.getSource() == ungroupItem)
	2368	+ if (source == ungroupItem)
2343	2369	{
2344	2370	//ungroup();
2345	2371	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2351,179 +2377,179 @@
2351	2377
2352	2378	refreshContents();
2353	2379	} else
2354		- if (event.getSource() == genUVItem)
	2380	+ if (source == genUVItem)
2355	2381	{
2356	2382	GenUV();
2357	2383	} else
2358		- if (event.getSource() == genNormalsCADItem)
	2384	+ if (source == genNormalsCADItem)
2359	2385	{
2360	2386	GenNormals(true);
2361	2387	} else
2362		- if (event.getSource() == genNormalsMESHItem)
	2388	+ if (source == genNormalsMESHItem)
2363	2389	{
2364	2390	GenNormals(true); // TODO
2365	2391	} else
2366		- if (event.getSource() == genNormalsORGANItem)
	2392	+ if (source == genNormalsORGANItem)
2367	2393	{
2368	2394	GenNormals(false);
2369	2395	} else
2370		- if (event.getSource() == genNormalsMINEItem)
	2396	+ if (source == genNormalsMINEItem)
2371	2397	{
2372	2398	GenNormalsMINE();
2373	2399	} else
2374		- if (event.getSource() == stripifyItem)
	2400	+ if (source == stripifyItem)
2375	2401	{
2376	2402	Stripify();
2377	2403	} else
2378		- if (event.getSource() == unstripifyItem)
	2404	+ if (source == unstripifyItem)
2379	2405	{
2380	2406	Unstripify();
2381	2407	} else
2382		- if (event.getSource() == trimItem)
	2408	+ if (source == trimItem)
2383	2409	{
2384	2410	Trim();
2385	2411	} else
2386		- if (event.getSource() == untrimItem)
	2412	+ if (source == untrimItem)
2387	2413	{
2388	2414	Untrim();
2389	2415	} else
2390		- if (event.getSource() == clearColorsItem)
	2416	+ if (source == clearColorsItem)
2391	2417	{
2392	2418	ClearColors();
2393	2419	} else
2394		- if (event.getSource() == clearMaterialsItem)
	2420	+ if (source == clearMaterialsItem)
2395	2421	{
2396	2422	ClearMaterials();
2397	2423	} else
2398		- if (event.getSource() == liveleavesItem)
	2424	+ if (source == liveleavesItem)
2399	2425	{
2400	2426	LiveLeaves(true);
2401	2427	} else
2402		- if (event.getSource() == unliveleavesItem)
	2428	+ if (source == unliveleavesItem)
2403	2429	{
2404	2430	LiveLeaves(false);
2405	2431	} else
2406		- if (event.getSource() == supportleavesItem)
	2432	+ if (source == supportleavesItem)
2407	2433	{
2408	2434	SupportLeaves(true);
2409	2435	} else
2410		- if (event.getSource() == unsupportleavesItem)
	2436	+ if (source == unsupportleavesItem)
2411	2437	{
2412	2438	SupportLeaves(false);
2413	2439	} else
2414		- if (event.getSource() == hideleavesItem)
	2440	+ if (source == hideleavesItem)
2415	2441	{
2416	2442	HideLeaves(true);
2417	2443	} else
2418		- if (event.getSource() == showleavesItem)
	2444	+ if (source == showleavesItem)
2419	2445	{
2420	2446	HideLeaves(false);
2421	2447	} else
2422		- if (event.getSource() == markleavesItem)
	2448	+ if (source == markleavesItem)
2423	2449	{
2424	2450	MarkLeaves(true);
2425	2451	} else
2426		- if (event.getSource() == unmarkleavesItem)
	2452	+ if (source == unmarkleavesItem)
2427	2453	{
2428	2454	MarkLeaves(false);
2429	2455	} else
2430		- if (event.getSource() == flipVItem)
	2456	+ if (source == flipVItem)
2431	2457	{
2432	2458	FlipV(true);
2433	2459	} else
2434		- if (event.getSource() == unflipVItem)
	2460	+ if (source == unflipVItem)
2435	2461	{
2436	2462	FlipV(false);
2437	2463	} else
2438		- if (event.getSource() == lowTexturesItem)
	2464	+ if (source == lowTexturesItem)
2439	2465	{
2440	2466	SetTexRes(0);
2441	2467	} else
2442		- if (event.getSource() == normalTexturesItem)
	2468	+ if (source == normalTexturesItem)
2443	2469	{
2444	2470	SetTexRes(1);
2445	2471	} else
2446		- if (event.getSource() == highTexturesItem)
	2472	+ if (source == highTexturesItem)
2447	2473	{
2448	2474	SetTexRes(2);
2449	2475	} else
2450		- if (event.getSource() == veryhighTexturesItem)
	2476	+ if (source == veryhighTexturesItem)
2451	2477	{
2452	2478	SetTexRes(3);
2453	2479	} else
2454		- if (event.getSource() == maxTexturesItem)
	2480	+ if (source == maxTexturesItem)
2455	2481	{
2456	2482	SetTexRes(4);
2457	2483	} else
2458		- if (event.getSource() == panoTexturesItem)
	2484	+ if (source == panoTexturesItem)
2459	2485	{
2460	2486	SetTexRes(5);
2461	2487	} else
2462		- if (event.getSource() == reverseNormalsItem)
	2488	+ if (source == reverseNormalsItem)
2463	2489	{
2464	2490	ReverseNormals();
2465	2491	} else
2466		- if (event.getSource() == parseverticesItem)
	2492	+ if (source == parseverticesItem)
2467	2493	{
2468	2494	ParseVertices();
2469	2495	} else
2470		- if (event.getSource() == textureFieldItem)
	2496	+ if (source == textureFieldItem)
2471	2497	{
2472	2498	TextureVertices();
2473	2499	} else
2474		- if (event.getSource() == alignItem)
	2500	+ if (source == alignItem)
2475	2501	{
2476	2502	Align();
2477	2503	} else
2478		- if (event.getSource() == mirrorItem)
	2504	+ if (source == mirrorItem)
2479	2505	{
2480	2506	MirrorPoses();
2481	2507	} else
2482		- if (event.getSource() == reduceMorphItem)
	2508	+ if (source == reduceMorphItem)
2483	2509	{
2484	2510	MeshReduction(false);
2485	2511	} else
2486		- if (event.getSource() == reduce34MorphItem)
	2512	+ if (source == reduce34MorphItem)
2487	2513	{
2488	2514	MeshReduction(true);
2489	2515	} else
2490		- if (event.getSource() == reverseTrianglesItem)
	2516	+ if (source == reverseTrianglesItem)
2491	2517	{
2492	2518	ReverseTriangles();
2493	2519	} else
2494		- if (event.getSource() == reduceMeshItem)
	2520	+ if (source == reduceMeshItem)
2495	2521	{
2496	2522	ReduceMesh(false);
2497	2523	} else
2498		- if (event.getSource() == reduce34MeshItem)
	2524	+ if (source == reduce34MeshItem)
2499	2525	{
2500	2526	ReduceMesh(true);
2501	2527	} else
2502		- if (event.getSource() == increaseMeshItem)
	2528	+ if (source == increaseMeshItem)
2503	2529	{
2504	2530	IncreaseMesh();
2505	2531	} else
2506		- if (event.getSource() == clipMeshItem)
	2532	+ if (source == clipMeshItem)
2507	2533	{
2508	2534	ClipMesh();
2509	2535	} else
2510		- if (event.getSource() == smoothMeshItem)
	2536	+ if (source == smoothMeshItem)
2511	2537	{
2512	2538	SmoothMesh();
2513	2539	} else
2514		- if (event.getSource() == transformgeometryItem)
	2540	+ if (source == transformgeometryItem)
2515	2541	{
2516	2542	TransformGeometry();
2517	2543	} else
2518		- if (event.getSource() == resetTransformItem)
	2544	+ if (source == resetTransformItem)
2519	2545	{
2520	2546	ResetTransform();
2521	2547	} else
2522		- if (event.getSource() == resetCentroidItem)
	2548	+ if (source == resetCentroidItem)
2523	2549	{
2524	2550	ResetCentroid();
2525	2551	} else
2526		- if (event.getSource() == resetParentItem)
	2552	+ if (source == resetParentItem)
2527	2553	{
2528	2554	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2529	2555	{
..	..	@@ -2533,7 +2559,7 @@
2533	2559
2534	2560	refreshContents();
2535	2561	} else
2536		- if (event.getSource() == repairParentItem)
	2562	+ if (source == repairParentItem)
2537	2563	{
2538	2564	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2539	2565	{
..	..	@@ -2547,7 +2573,7 @@
2547	2573
2548	2574	refreshContents();
2549	2575	} else
2550		- if (event.getSource() == repairShadowItem)
	2576	+ if (source == repairShadowItem)
2551	2577	{
2552	2578	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2553	2579	{
..	..	@@ -2561,7 +2587,7 @@
2561	2587
2562	2588	refreshContents();
2563	2589	} else
2564		- if (event.getSource() == sortbysizeItem)
	2590	+ if (source == sortbysizeItem)
2565	2591	{
2566	2592	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2567	2593	{
..	..	@@ -2573,7 +2599,7 @@
2573	2599	ResetModel();
2574	2600	refreshContents();
2575	2601	} else
2576		- if (event.getSource() == sortbynameItem)
	2602	+ if (source == sortbynameItem)
2577	2603	{
2578	2604	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2579	2605	{
..	..	@@ -2585,7 +2611,7 @@
2585	2611	ResetModel();
2586	2612	refreshContents();
2587	2613	} else
2588		- if (event.getSource() == attachPigmentItem)
	2614	+ if (source == attachPigmentItem)
2589	2615	{
2590	2616	String texture = GetFile("Attach pigment");
2591	2617	Object3D obj;
..	..	@@ -2597,7 +2623,7 @@
2597	2623
2598	2624	refreshContents();
2599	2625	} else
2600		- if (event.getSource() == detachPigmentItem)
	2626	+ if (source == detachPigmentItem)
2601	2627	{
2602	2628	Object3D obj;
2603	2629	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2608,7 +2634,7 @@
2608	2634
2609	2635	refreshContents();
2610	2636	} else
2611		- if (event.getSource() == attachBumpItem)
	2637	+ if (source == attachBumpItem)
2612	2638	{
2613	2639	String texture = GetFile("Attach bump");
2614	2640	Object3D obj;
..	..	@@ -2620,7 +2646,7 @@
2620	2646
2621	2647	refreshContents();
2622	2648	} else
2623		- if (event.getSource() == detachBumpItem)
	2649	+ if (source == detachBumpItem)
2624	2650	{
2625	2651	Object3D obj;
2626	2652	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2631,7 +2657,7 @@
2631	2657
2632	2658	refreshContents();
2633	2659	} else
2634		- if (event.getSource() == pigmentBumpItem)
	2660	+ if (source == pigmentBumpItem)
2635	2661	{
2636	2662	Object3D obj;
2637	2663	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2642,158 +2668,195 @@
2642	2668
2643	2669	refreshContents();
2644	2670	} else
2645		- if (event.getSource() == flashSelectionButton)
	2671	+ if (source == flashSelectionButton)
2646	2672	{
2647	2673	CameraPane.flash = true;
2648	2674	refreshContents();
2649	2675	} else
2650		- if (event.getSource() == oneButton)
	2676	+ if (source == oneButton)
2651	2677	{
2652	2678	} else
2653		- if (event.getSource() == twoButton)
	2679	+ if (source == twoButton)
2654	2680	{
2655	2681	radio.layout = twoButton;
2656	2682	// bug
2657	2683	//gridPanel.setDividerLocation(1.0);
2658	2684	//bigPanel.setDividerLocation(0.0);
2659		- bigThree.remove(scenePanel);
2660		- bigThree.remove(centralPanel);
2661		- bigThree.remove(XYZPanel);
2662		- aWindowConstraints.gridx = 0;
2663		- aWindowConstraints.gridy = 0;
2664		- aWindowConstraints.gridwidth = 1;
2665		- // aConstraints.gridheight = 3;
2666		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2667		- aWindowConstraints.weightx = 0;
2668		- aWindowConstraints.weighty = 1;
2669		- //bigThree.add(jtp, aWindowConstraints);
2670		- aWindowConstraints.weightx = 1;
2671		- aWindowConstraints.gridwidth = 3;
2672		- // aConstraints.gridheight = 3;
2673		- aWindowConstraints.gridx = 1;
2674		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2675		- bigThree.add(centralPanel, aWindowConstraints);
2676		- aWindowConstraints.weightx = 0;
2677		- aWindowConstraints.gridx = 4;
2678		- aWindowConstraints.gridwidth = 1;
2679		- // aConstraints.gridheight = 3;
2680		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2681		- //bigThree.add(XYZPanel, aWindowConstraints);
2682		- bigThree.revalidate();
	2685	+// bigThree.remove(scenePanel);
	2686	+// bigThree.remove(centralPanel);
	2687	+// bigThree.remove(XYZPanel);
	2688	+// aWindowConstraints.gridx = 0;
	2689	+// aWindowConstraints.gridy = 0;
	2690	+// aWindowConstraints.gridwidth = 1;
	2691	+// // aConstraints.gridheight = 3;
	2692	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2693	+// aWindowConstraints.weightx = 0;
	2694	+// aWindowConstraints.weighty = 1;
	2695	+// //bigThree.add(jtp, aWindowConstraints);
	2696	+// aWindowConstraints.weightx = 1;
	2697	+// aWindowConstraints.gridwidth = 3;
	2698	+// // aConstraints.gridheight = 3;
	2699	+// aWindowConstraints.gridx = 1;
	2700	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2701	+// bigThree.add(centralPanel, aWindowConstraints);
	2702	+// aWindowConstraints.weightx = 0;
	2703	+// aWindowConstraints.gridx = 4;
	2704	+// aWindowConstraints.gridwidth = 1;
	2705	+// // aConstraints.gridheight = 3;
	2706	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2707	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2708	+// scenePanel.setVisible(false);
	2709	+// centralPanel.setVisible(true);
	2710	+// XYZPanel.setVisible(false);
	2711	+ bigThree.ClearUI();
	2712	+ bigThree.add(centralPanel);
	2713	+ bigThree.FlushUI();
2683	2714	} else
2684		- if (event.getSource() == threeButton)
	2715	+ if (source == threeButton)
2685	2716	{
2686	2717	radio.layout = threeButton;
2687		- bigThree.remove(scenePanel);
2688		- bigThree.remove(centralPanel);
2689		- bigThree.remove(XYZPanel);
2690		- aWindowConstraints.gridx = 0;
2691		- aWindowConstraints.gridy = 0;
2692		- aWindowConstraints.gridwidth = 1;
2693		- // aConstraints.gridheight = 3;
2694		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2695		- aWindowConstraints.weightx = 0;
2696		- aWindowConstraints.weighty = 1;
2697		- //bigThree.add(jtp, aWindowConstraints);
2698		- aWindowConstraints.weightx = 1;
2699		- aWindowConstraints.gridwidth = 3;
2700		- // aConstraints.gridheight = 3;
2701		- aWindowConstraints.gridx = 1;
2702		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2703		- bigThree.add(centralPanel, aWindowConstraints);
2704		- aWindowConstraints.weightx = 0;
2705		- aWindowConstraints.gridx = 4;
2706		- aWindowConstraints.gridwidth = 1;
2707		- // aConstraints.gridheight = 3;
2708		- aConstraints.fill = GridBagConstraints.VERTICAL;
2709		- bigThree.add(XYZPanel, aWindowConstraints);
2710		- bigThree.revalidate();
	2718	+
	2719	+// bigThree.remove(scenePanel);
	2720	+// bigThree.remove(centralPanel);
	2721	+// bigThree.remove(XYZPanel);
	2722	+// aWindowConstraints.gridx = 0;
	2723	+// aWindowConstraints.gridy = 0;
	2724	+// aWindowConstraints.gridwidth = 1;
	2725	+// // aConstraints.gridheight = 3;
	2726	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2727	+// aWindowConstraints.weightx = 0;
	2728	+// aWindowConstraints.weighty = 1;
	2729	+// //bigThree.add(jtp, aWindowConstraints);
	2730	+// aWindowConstraints.weightx = 1;
	2731	+// aWindowConstraints.gridwidth = 3;
	2732	+// // aConstraints.gridheight = 3;
	2733	+// aWindowConstraints.gridx = 1;
	2734	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2735	+// bigThree.add(centralPanel, aWindowConstraints);
	2736	+// aWindowConstraints.weightx = 0;
	2737	+// aWindowConstraints.gridx = 4;
	2738	+// aWindowConstraints.gridwidth = 1;
	2739	+// // aConstraints.gridheight = 3;
	2740	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2741	+// bigThree.add(XYZPanel, aWindowConstraints);
	2742	+// bigThree.validate();
	2743	+// scenePanel.setVisible(false);
	2744	+// centralPanel.setVisible(true);
	2745	+// XYZPanel.setVisible(true);
	2746	+ bigThree.ClearUI();
	2747	+ bigThree.add(centralPanel);
	2748	+ bigThree.add(XYZPanel);
	2749	+ bigThree.FlushUI();
2711	2750	} else
2712		- if (event.getSource() == fourButton)
	2751	+ if (source == fourButton)
2713	2752	{
2714	2753	radio.layout = fourButton;
2715		- bigThree.remove(scenePanel);
2716		- bigThree.remove(centralPanel);
2717		- bigThree.remove(XYZPanel);
2718		- aWindowConstraints.gridx = 0;
2719		- aWindowConstraints.gridy = 0;
2720		- aWindowConstraints.gridwidth = 1;
2721		- // aWindowConstraints.gridheight = 3;
2722		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2723		- aWindowConstraints.weightx = 1;
2724		- aWindowConstraints.weighty = 1;
2725		- bigThree.add(scenePanel, aWindowConstraints);
2726		- aWindowConstraints.weightx = 1;
2727		- aWindowConstraints.gridwidth = 3;
2728		- // aConstraints.gridheight = 3;
2729		- aWindowConstraints.gridx = 1;
2730		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2731		- //bigThree.add(cameraPanel, aWindowConstraints);
2732		- aWindowConstraints.weightx = 0;
2733		- aWindowConstraints.gridx = 4;
2734		- aWindowConstraints.gridwidth = 1;
2735		- // aWindowConstraints.gridheight = 3;
2736		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2737		- //bigThree.add(XYZPanel, aWindowConstraints);
2738		- bigThree.revalidate();
	2754	+
	2755	+// bigThree.remove(scenePanel);
	2756	+// bigThree.remove(centralPanel);
	2757	+// bigThree.remove(XYZPanel);
	2758	+// aWindowConstraints.gridx = 0;
	2759	+// aWindowConstraints.gridy = 0;
	2760	+// aWindowConstraints.gridwidth = 1;
	2761	+// // aWindowConstraints.gridheight = 3;
	2762	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2763	+// aWindowConstraints.weightx = 1;
	2764	+// aWindowConstraints.weighty = 1;
	2765	+// bigThree.add(scenePanel, aWindowConstraints);
	2766	+// aWindowConstraints.weightx = 1;
	2767	+// aWindowConstraints.gridwidth = 3;
	2768	+// // aConstraints.gridheight = 3;
	2769	+// aWindowConstraints.gridx = 1;
	2770	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2771	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2772	+// aWindowConstraints.weightx = 0;
	2773	+// aWindowConstraints.gridx = 4;
	2774	+// aWindowConstraints.gridwidth = 1;
	2775	+// // aWindowConstraints.gridheight = 3;
	2776	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2777	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2778	+// bigThree.validate();
	2779	+// scenePanel.setVisible(true);
	2780	+// centralPanel.setVisible(false);
	2781	+// XYZPanel.setVisible(false);
	2782	+ bigThree.ClearUI();
	2783	+ bigThree.add(scenePanel);
	2784	+ bigThree.FlushUI();
2739	2785	} else
2740		- if (event.getSource() == sixButton)
	2786	+ if (source == sixButton)
2741	2787	{
2742	2788	radio.layout = sixButton;
2743		- bigThree.remove(scenePanel);
2744		- bigThree.remove(centralPanel);
2745		- bigThree.remove(XYZPanel);
2746		- aWindowConstraints.gridx = 0;
2747		- aWindowConstraints.gridy = 0;
2748		- aWindowConstraints.gridwidth = 1;
2749		- // aConstraints.gridheight = 3;
2750		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2751		- aWindowConstraints.weightx = 0;
2752		- aWindowConstraints.weighty = 1;
2753		- bigThree.add(scenePanel, aWindowConstraints);
2754		- aWindowConstraints.weightx = 1;
2755		- aWindowConstraints.gridwidth = 3;
2756		- // aWindowConstraints.gridheight = 3;
2757		- aWindowConstraints.gridx = 1;
2758		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2759		- bigThree.add(centralPanel, aWindowConstraints);
2760		- aWindowConstraints.weightx = 0;
2761		- aWindowConstraints.gridx = 4;
2762		- aWindowConstraints.gridwidth = 1;
2763		- // aWindowConstraints.gridheight = 3;
2764		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2765		- //bigThree.add(XYZPanel, aConstraints);
2766		- bigThree.revalidate();
	2789	+
	2790	+// bigThree.remove(scenePanel);
	2791	+// bigThree.remove(centralPanel);
	2792	+// bigThree.remove(XYZPanel);
	2793	+// aWindowConstraints.gridx = 0;
	2794	+// aWindowConstraints.gridy = 0;
	2795	+// aWindowConstraints.gridwidth = 1;
	2796	+// // aConstraints.gridheight = 3;
	2797	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2798	+// aWindowConstraints.weightx = 0;
	2799	+// aWindowConstraints.weighty = 1;
	2800	+// bigThree.add(scenePanel, aWindowConstraints);
	2801	+// aWindowConstraints.weightx = 1;
	2802	+// aWindowConstraints.gridwidth = 3;
	2803	+// // aWindowConstraints.gridheight = 3;
	2804	+// aWindowConstraints.gridx = 1;
	2805	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2806	+// bigThree.add(centralPanel, aWindowConstraints);
	2807	+// aWindowConstraints.weightx = 0;
	2808	+// aWindowConstraints.gridx = 4;
	2809	+// aWindowConstraints.gridwidth = 1;
	2810	+// // aWindowConstraints.gridheight = 3;
	2811	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2812	+// //bigThree.add(XYZPanel, aConstraints);
	2813	+// bigThree.validate();
	2814	+// scenePanel.setVisible(true);
	2815	+// centralPanel.setVisible(true);
	2816	+// XYZPanel.setVisible(false);
	2817	+ bigThree.ClearUI();
	2818	+ bigThree.add(scenePanel);
	2819	+ bigThree.add(centralPanel);
	2820	+ bigThree.FlushUI();
2767	2821	} else
2768		- if (event.getSource() == sevenButton)
	2822	+ if (source == sevenButton)
2769	2823	{
2770	2824	radio.layout = sevenButton;
2771		- bigThree.remove(scenePanel);
2772		- bigThree.remove(centralPanel);
2773		- bigThree.remove(XYZPanel);
2774		- aWindowConstraints.gridx = 0;
2775		- aWindowConstraints.gridy = 0;
2776		- aWindowConstraints.gridwidth = 1;
2777		- // aWindowConstraints.gridheight = 3;
2778		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2779		- aWindowConstraints.weightx = 0;
2780		- aWindowConstraints.weighty = 1;
2781		- bigThree.add(scenePanel, aWindowConstraints);
2782		- aWindowConstraints.weightx = 1;
2783		- aWindowConstraints.gridwidth = 3;
2784		- // aWindowConstraints.gridheight = 3;
2785		- aWindowConstraints.gridx = 1;
2786		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2787		- bigThree.add(centralPanel, aWindowConstraints);
2788		- aWindowConstraints.weightx = 0;
2789		- aWindowConstraints.gridx = 4;
2790		- aWindowConstraints.gridwidth = 1;
2791		- // aConstraints.gridheight = 3;
2792		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2793		- bigThree.add(XYZPanel, aWindowConstraints);
2794		- bigThree.revalidate();
	2825	+
	2826	+// bigThree.remove(scenePanel);
	2827	+// bigThree.remove(centralPanel);
	2828	+// bigThree.remove(XYZPanel);
	2829	+// aWindowConstraints.gridx = 0;
	2830	+// aWindowConstraints.gridy = 0;
	2831	+// aWindowConstraints.gridwidth = 1;
	2832	+// // aWindowConstraints.gridheight = 3;
	2833	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2834	+// aWindowConstraints.weightx = 0;
	2835	+// aWindowConstraints.weighty = 1;
	2836	+// bigThree.add(scenePanel, aWindowConstraints);
	2837	+// aWindowConstraints.weightx = 1;
	2838	+// aWindowConstraints.gridwidth = 3;
	2839	+// // aWindowConstraints.gridheight = 3;
	2840	+// aWindowConstraints.gridx = 1;
	2841	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2842	+// bigThree.add(centralPanel, aWindowConstraints);
	2843	+// aWindowConstraints.weightx = 0;
	2844	+// aWindowConstraints.gridx = 4;
	2845	+// aWindowConstraints.gridwidth = 1;
	2846	+// // aConstraints.gridheight = 3;
	2847	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2848	+// bigThree.add(XYZPanel, aWindowConstraints);
	2849	+// bigThree.validate();
	2850	+// scenePanel.setVisible(true);
	2851	+// centralPanel.setVisible(true);
	2852	+// XYZPanel.setVisible(true);
	2853	+ bigThree.ClearUI();
	2854	+ bigThree.add(scenePanel);
	2855	+ bigThree.add(centralPanel);
	2856	+ bigThree.add(XYZPanel);
	2857	+ bigThree.FlushUI();
2795	2858	} else
2796		- if (event.getSource() == rootButton)
	2859	+ if (source == rootButton)
2797	2860	{
2798	2861	Object3D obj;
2799	2862	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2805,7 +2868,7 @@
2805	2868
2806	2869	refreshContents(true);
2807	2870	} else
2808		- if (event.getSource() == closeButton)
	2871	+ if (source == closeButton)
2809	2872	{
2810	2873	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2811	2874	cRadio ab;
..	..	@@ -2826,11 +2889,11 @@
2826	2889	}
2827	2890	refreshContents(true);
2828	2891	} else
2829		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2892	+ if (source == editItem \|\| source == editButton)
2830	2893	{
2831	2894	EditSelection(false);
2832	2895	} else
2833		- if (event.getSource() == uneditButton)
	2896	+ if (source == uneditButton)
2834	2897	{
2835	2898	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2836	2899	{
..	..	@@ -2842,12 +2905,12 @@
2842	2905
2843	2906	child.editWindow = null; // ???????????
2844	2907	}
2845		- objEditor.ctrlPanel.revalidate();
	2908	+ objEditor.ctrlPanel.validate();
2846	2909	//objEditor.jTree.clearSelection();
2847	2910	//objEditor.ResetSliders();
2848	2911	refreshContents(true);
2849	2912	} else
2850		- if (event.getSource() == clearPanelButton)
	2913	+ if (source == clearPanelButton)
2851	2914	{
2852	2915	assert(copy == group);
2853	2916	//copy.ClearUI();
..	..	@@ -2858,7 +2921,7 @@
2858	2921	listUI.clear();
2859	2922	refreshContents(true);
2860	2923	} else
2861		- if (event.getSource() == allParamsButton)
	2924	+ if (source == allParamsButton)
2862	2925	{
2863	2926	assert(copy == group);
2864	2927
..	..	@@ -2879,19 +2942,19 @@
2879	2942
2880	2943	refreshContents(true);
2881	2944	} else
2882		- if (event.getSource() == unselectButton)
	2945	+ if (source == unselectButton)
2883	2946	{
2884	2947	objEditor.jTree.clearSelection();
2885	2948	// ?? oct 2012 GrafreeD.clipboard.clear();
2886	2949	objEditor.ResetSliders();
2887	2950	refreshContents(true);
2888	2951	} else
2889		- if(event.getSource() instanceof cRadio)
	2952	+ if(source instanceof cRadio)
2890	2953	{
2891	2954	group.parent = keepparent;
2892	2955	group.attributes = 0;
2893	2956	//group.editWindow = null;
2894		- /cRadio/ radio = (cRadio)event.getSource();
	2957	+ /cRadio/ radio = (cRadio)source;
2895	2958	Object3D obj = radio.GetObject();
2896	2959	System.out.println("Edit " + obj);
2897	2960	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2911,7 +2974,7 @@
2911	2974	}
2912	2975
2913	2976	copy = group;
2914		- //CameraPane.theRenderer.object = group;
	2977	+ //Globals.theRenderer.object = group;
2915	2978	if(!useclient)
2916	2979	{
2917	2980	cameraView.renderCamera = radio.camera;
..	..	@@ -2920,7 +2983,8 @@
2920	2983	cameraView.cameras[cameraView.cameracount] = radio.camera;
2921	2984	cameraView.targetLookAt.set(radio.camera.lookAt);
2922	2985	cameraView.object = group;
2923		- cameraView.lighttouched = true;
	2986	+ //cameraView.lighttouched = true;
	2987	+ Globals.lighttouched = true;
2924	2988	topView.object = group;
2925	2989	frontView.object = group;
2926	2990	sideView.object = group;
..	..	@@ -2956,7 +3020,7 @@
2956	3020	if (useclient)
2957	3021	{
2958	3022	cameraView.object = client;
2959		- cameraView.lighttouched = true;
	3023	+ Globals.lighttouched = true;
2960	3024	//topView.object = client;
2961	3025	//frontView.object = client;
2962	3026	//sideView.object = client;
..	..	@@ -2964,7 +3028,7 @@
2964	3028	else
2965	3029	{
2966	3030	cameraView.object = group;
2967		- cameraView.lighttouched = true;
	3031	+ Globals.lighttouched = true;
2968	3032	//topView.object = group;
2969	3033	//frontView.object = group;
2970	3034	//sideView.object = group;
..	..	@@ -3472,7 +3536,7 @@
3472	3536	String pigment = Object3D.GetPigment(tex);
3473	3537	//String bump = Object3D.GetBump(tex);
3474	3538
3475		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3539	+ com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3476	3540
3477	3541	double s = v.s;
3478	3542
..	..	@@ -3773,7 +3837,7 @@
3773	3837	group.selection.RelinkToSupport(); // july 2014
3774	3838	System.out.println("DONE.");
3775	3839	refreshContents();
3776		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3840	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3777	3841	}
3778	3842
3779	3843	void ReduceMesh(boolean reduction34)
..	..	@@ -4058,16 +4122,16 @@
4058	4122
4059	4123	objEditor.SetText(); // jan 2014
4060	4124
4061		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4125	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
4062	4126	CameraPane.flash = true;
4063	4127
4064	4128	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
4065	4129	// a camera
4066	4130	{
4067	4131	CameraPane.camerachangeframe = 0; // don't refuse it
4068		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4069		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
4070		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4132	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4133	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4134	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4071	4135	}
4072	4136
4073	4137	refreshContents();