~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -434,6 +434,9 @@
434	434	oe.buttonGroup.add(dummyButton);
435	435	*/
436	436	aConstraints.gridy += 1;
	437	+
	438	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	439	+
437	440	oe.aConstraints.gridwidth = 1;
438	441	oe.aConstraints.gridx = 0;
439	442
..	..	@@ -442,76 +445,7 @@
442	445	liveCB.addItemListener(this);
443	446
444	447	oe.aConstraints.gridx += 1;
445		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
446		- fastCB.setToolTipText("Fast mode");
447		- fastCB.addItemListener(this);
448		- oe.aConstraints.gridx += 1;
449		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
450		- supportCB.setToolTipText("Enabled rigging");
451		- supportCB.addItemListener(this);
452		-
453		- // oe.aConstraints.gridx += 1;
454		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
455		- // localCB.addItemListener(this);
456		-
457		- oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), oe.aConstraints);
459		- crowdCB.setToolTipText("Used for crowds");
460		- crowdCB.addItemListener(this);
461		-
462		- oe.aConstraints.gridx += 1;
463		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
464		- smoothCB.setToolTipText("Snapping delay");
465		- smoothCB.addItemListener(this);
466		-
467		- oe.aConstraints.gridx += 1;
468		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
469		- slowCB.setToolTipText("Smooth interpolation");
470		- slowCB.addItemListener(this);
471		- oe.aConstraints.gridx += 1;
472		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), oe.aConstraints);
473		- boxCB.setToolTipText("Display bounding boxes");
474		- boxCB.addItemListener(this);
475		- oe.aConstraints.gridx += 1;
476		- oe.toolbarPanel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), oe.aConstraints);
477		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
478		- zoomBoxCB.addItemListener(this);
479		-
480		-// oe.aConstraints.gridx += 1;
481		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
482		-// speakerMocapCB.addItemListener(this);
483		-
484		- if (false)
485		- {
486		- // handled in scripts
487		- oe.aConstraints.gridx += 1;
488		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
489		- speakerCameraCB.addItemListener(this);
490		-
491		- oe.aConstraints.gridx += 1;
492		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
493		- speakerFocusCB.addItemListener(this);
494		-
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
497		- smoothfocusCB.addItemListener(this);
498		- }
499		-
500		-//oe.aConstraints.gridx += 1;
501		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
502		-// debugCB.addItemListener(this);
503		-
504		- oe.aConstraints.gridx += 1;
505		- oe.toolbarPanel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), oe.aConstraints);
506		- oeilCB.addItemListener(this);
507		-
508		- oe.aConstraints.gridx += 1;
509		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), oe.aConstraints);
510		- lookAtCB.setToolTipText("Look-at target");
511		- lookAtCB.addItemListener(this);
512		-
513		- oe.aConstraints.gridx += 1;
514		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	448	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
515	449	trackCB.setToolTipText("Enable tracking");
516	450	trackCB.addItemListener(this);
517	451
..	..	@@ -669,6 +603,80 @@
669	603	radio.layout = sevenButton;
670	604	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
671	605	}
	606	+
	607	+ void AddOptions(JPanel panel, GridBagConstraints constraints)
	608	+ {
	609	+ constraints.gridx = 0;
	610	+ constraints.gridy = 0;
	611	+ panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), constraints);
	612	+ fastCB.setToolTipText("Fast mode");
	613	+ fastCB.addItemListener(this);
	614	+ constraints.gridy += 1;
	615	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), constraints);
	616	+ supportCB.setToolTipText("Enabled rigging");
	617	+ supportCB.addItemListener(this);
	618	+
	619	+ // constraints.gridy += 1;
	620	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	621	+ // localCB.addItemListener(this);
	622	+
	623	+ constraints.gridy += 1;
	624	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), constraints);
	625	+ crowdCB.setToolTipText("Used for crowds");
	626	+ crowdCB.addItemListener(this);
	627	+
	628	+ constraints.gridy += 1;
	629	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), constraints);
	630	+ smoothCB.setToolTipText("Snapping delay");
	631	+ smoothCB.addItemListener(this);
	632	+
	633	+ constraints.gridy += 1;
	634	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), constraints);
	635	+ slowCB.setToolTipText("Smooth interpolation");
	636	+ slowCB.addItemListener(this);
	637	+ constraints.gridy += 1;
	638	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), constraints);
	639	+ boxCB.setToolTipText("Display bounding boxes");
	640	+ boxCB.addItemListener(this);
	641	+ constraints.gridy += 1;
	642	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), constraints);
	643	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	644	+ zoomBoxCB.addItemListener(this);
	645	+
	646	+// constraints.gridy += 1;
	647	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	648	+// speakerMocapCB.addItemListener(this);
	649	+
	650	+ if (false)
	651	+ {
	652	+ // handled in scripts
	653	+ constraints.gridy += 1;
	654	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), constraints);
	655	+ speakerCameraCB.addItemListener(this);
	656	+
	657	+ constraints.gridy += 1;
	658	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), constraints);
	659	+ speakerFocusCB.addItemListener(this);
	660	+
	661	+ constraints.gridy += 1;
	662	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), constraints);
	663	+ smoothfocusCB.addItemListener(this);
	664	+ }
	665	+
	666	+//constraints.gridx += 1;
	667	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	668	+// debugCB.addItemListener(this);
	669	+
	670	+ constraints.gridy += 1;
	671	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), constraints);
	672	+ oeilCB.addItemListener(this);
	673	+
	674	+ constraints.gridy += 1;
	675	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), constraints);
	676	+ lookAtCB.setToolTipText("Look-at target");
	677	+ lookAtCB.addItemListener(this);
	678	+
	679	+ }
672	680
673	681	void EditObject(Object3D obj)
674	682	{
..	..	@@ -1510,6 +1518,7 @@
1510	1518	//
1511	1519	public void actionPerformed(ActionEvent event) // , Object arg)
1512	1520	{
	1521	+ Object source = event.getSource();
1513	1522	/*
1514	1523	if (event.getSource() == nameField)
1515	1524	{
..	..	@@ -1521,11 +1530,11 @@
1521	1530	}
1522	1531	else
1523	1532	*/
1524		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1533	+ if (source == lookAtItem \|\| source == lookFromItem)
1525	1534	{
1526	1535	ScreenFit();
1527	1536	} else
1528		- if (event.getSource() == switchItem)
	1537	+ if (source == switchItem)
1529	1538	{
1530	1539	cVector v1 = new cVector();
1531	1540	cVector v2 = new cVector();
..	..	@@ -1534,11 +1543,11 @@
1534	1543	objEditor.cameraView.renderCamera.setAim(v2, v1);
1535	1544	objEditor.cameraView.repaint();
1536	1545	} else
1537		- if (event.getSource() == rectoidItem)
	1546	+ if (source == rectoidItem)
1538	1547	{
1539	1548	makeSomething(new Box());
1540	1549	} else
1541		- if (event.getSource() == particleItem)
	1550	+ if (source == particleItem)
1542	1551	{
1543	1552	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1544	1553	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1559,9 +1568,9 @@
1559	1568	applyExample(particleGeom, "SMOKE");
1560	1569	makeSomething(particleGeom);
1561	1570	} else
1562		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1571	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1563	1572	{
1564		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1573	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1565	1574
1566	1575	ragdoll.toParent = LA.newMatrix();
1567	1576	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1579,7 +1588,7 @@
1579	1588	} else
1580	1589	/*
1581	1590	*/
1582		- if (event.getSource() == heightFieldItem)
	1591	+ if (source == heightFieldItem)
1583	1592	{
1584	1593	Object3D obj = new Object3D();
1585	1594
..	..	@@ -1617,31 +1626,31 @@
1617	1626
1618	1627	makeSomething(obj);
1619	1628	} else
1620		- if (event.getSource() == gridItem)
	1629	+ if (source == gridItem)
1621	1630	{
1622	1631	makeSomething(new Grid());
1623	1632	} else
1624		- if (event.getSource() == ellipsoidItem)
	1633	+ if (source == ellipsoidItem)
1625	1634	{
1626	1635	makeSomething(new Sphere());
1627	1636	} else
1628		- if (event.getSource() == coneItem)
	1637	+ if (source == coneItem)
1629	1638	{
1630	1639	makeSomething(new Cone());
1631	1640	} else
1632		- if (event.getSource() == torusItem)
	1641	+ if (source == torusItem)
1633	1642	{
1634	1643	makeSomething(new Torus());
1635	1644	} else
1636		- if (event.getSource() == superItem)
	1645	+ if (source == superItem)
1637	1646	{
1638	1647	makeSomething(new Superellipsoid());
1639	1648	} else
1640		- if (event.getSource() == kleinItem)
	1649	+ if (source == kleinItem)
1641	1650	{
1642	1651	makeSomething(new Klein());
1643	1652	} else
1644		- if (event.getSource() == blobItem)
	1653	+ if (source == blobItem)
1645	1654	{
1646	1655	Blob blob = new Blob();
1647	1656	BlobComponent comp = new BlobComponent();
..	..	@@ -1649,15 +1658,15 @@
1649	1658	//blob.retile();
1650	1659	makeSomething(blob);
1651	1660	} else
1652		- if (event.getSource() == latheItem)
	1661	+ if (source == latheItem)
1653	1662	{
1654	1663	makeSomething(new Lathe());
1655	1664	} else
1656		- if (event.getSource() == bezierItem)
	1665	+ if (source == bezierItem)
1657	1666	{
1658	1667	makeSomething(new BezierSurface());
1659	1668	} else
1660		- if (event.getSource() == checkerItem)
	1669	+ if (source == checkerItem)
1661	1670	{
1662	1671	/*
1663	1672	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1672,7 +1681,7 @@
1672	1681	*/
1673	1682	makeSomething(new Checker());
1674	1683	} else
1675		- if (event.getSource() == meshItem)
	1684	+ if (source == meshItem)
1676	1685	{
1677	1686	Object3D itemtomake = new Object3D();
1678	1687	Object3D child;
..	..	@@ -1693,35 +1702,35 @@
1693	1702	makeSomething(child);
1694	1703	}
1695	1704	} else
1696		- if (event.getSource() == springItem)
	1705	+ if (source == springItem)
1697	1706	{
1698	1707	cSpring s = new cSpring();
1699	1708	s.setup();
1700	1709	makeSomething(s);
1701	1710	} else
1702		- if (event.getSource() == flagItem)
	1711	+ if (source == flagItem)
1703	1712	{
1704	1713	cSpring s = new cFlag();
1705	1714	s.setup();
1706	1715	makeSomething(s);
1707	1716	} else
1708		- if (event.getSource() == lightItem)
	1717	+ if (source == lightItem)
1709	1718	{
1710	1719	makeSomething(new Light());
1711	1720	} else
1712		- if (event.getSource() == csgItem)
	1721	+ if (source == csgItem)
1713	1722	{
1714	1723	group(new CSG());
1715	1724	} else
1716		- if (event.getSource() == templateItem)
	1725	+ if (source == templateItem)
1717	1726	{
1718	1727	group(new cTemplate());
1719	1728	} else
1720		- if (event.getSource() == attributeItem)
	1729	+ if (source == attributeItem)
1721	1730	{
1722	1731	makeSomething(new Attribute());
1723	1732	} else
1724		- if (event.getSource() == pointflowItem)
	1733	+ if (source == pointflowItem)
1725	1734	{
1726	1735	makeSomething(new PointFlow());
1727	1736	} else
..	..	@@ -1733,7 +1742,7 @@
1733	1742	} else
1734	1743	*/
1735	1744
1736		- if (event.getSource() == superLoopItem)
	1745	+ if (source == superLoopItem)
1737	1746	{
1738	1747	Composite g = new cGroup();
1739	1748	for (int i=0; i<15; i++)
..	..	@@ -1755,7 +1764,7 @@
1755	1764
1756	1765	group(g);
1757	1766	} else
1758		- if (event.getSource() == loopItem)
	1767	+ if (source == loopItem)
1759	1768	{
1760	1769	Composite csg = new GroupLeaf();
1761	1770	csg.count = 5;
..	..	@@ -1764,7 +1773,7 @@
1764	1773	csg.addChild(child);
1765	1774	child.addChild(csg);
1766	1775	} else
1767		- if (event.getSource() == doubleItem)
	1776	+ if (source == doubleItem)
1768	1777	{
1769	1778	Composite csg = new GroupLeaf();
1770	1779	csg.count = 5;
..	..	@@ -1776,7 +1785,7 @@
1776	1785	csg.addChild(child);
1777	1786	child.addChild(csg);
1778	1787	} else
1779		- if (event.getSource() == tripleItem)
	1788	+ if (source == tripleItem)
1780	1789	{
1781	1790	Composite csg = new GroupLeaf();
1782	1791	csg.count = 4;
..	..	@@ -1792,70 +1801,70 @@
1792	1801	child.addChild(csg);
1793	1802	} else
1794	1803
1795		- if (event.getSource() == importGFDItem)
	1804	+ if (source == importGFDItem)
1796	1805	{
1797	1806	ImportGFD();
1798	1807	} else
1799		- if (event.getSource() == importVRMLX3DItem)
	1808	+ if (source == importVRMLX3DItem)
1800	1809	{
1801	1810	ImportVRMLX3D();
1802	1811	} else
1803		- if (event.getSource() == import3DSItem)
	1812	+ if (source == import3DSItem)
1804	1813	{
1805	1814	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1806	1815	} else
1807		- if (event.getSource() == importOBJItem)
	1816	+ if (source == importOBJItem)
1808	1817	{
1809	1818	objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1810	1819	} else
1811		- if (event.getSource() == computeAOItem)
	1820	+ if (source == computeAOItem)
1812	1821	{
1813	1822	Globals.drawMode = CameraPane.OCCLUSION;
1814	1823	Globals.theRenderer.repaint();
1815	1824	} else
1816		- if (event.getSource() == recompileItem)
	1825	+ if (source == recompileItem)
1817	1826	{
1818	1827	Recompile();
1819	1828	refreshContents();
1820	1829	} else
1821		- if (event.getSource() == editScriptItem)
	1830	+ if (source == editScriptItem)
1822	1831	{
1823	1832	OpenDialog();
1824	1833	refreshContents();
1825	1834	} else
1826		- if (event.getSource() == invariantsItem)
	1835	+ if (source == invariantsItem)
1827	1836	{
1828	1837	System.out.println("Invariants:");
1829	1838	GrafreeD.grafreeD.universe.invariants();
1830	1839	} else
1831		- if (event.getSource() == memoryItem)
	1840	+ if (source == memoryItem)
1832	1841	{
1833	1842	//System.out.println("Invariants:");
1834	1843	PrintMemory();
1835	1844	} else
1836		- if (event.getSource() == pathItem)
	1845	+ if (source == pathItem)
1837	1846	{
1838	1847	PrintPath();
1839	1848	} else
1840		- if (event.getSource() == analyzeItem)
	1849	+ if (source == analyzeItem)
1841	1850	{
1842	1851	AnalyzeObject();
1843	1852	} else
1844		- if (event.getSource() == dumpItem)
	1853	+ if (source == dumpItem)
1845	1854	{
1846	1855	DumpObject();
1847	1856	} else
1848		- if (event.getSource() == screenfitButton)
	1857	+ if (source == screenfitButton)
1849	1858	{
1850	1859	//Reload(lastConverter, lastFilename, true);
1851	1860	ScreenFit();
1852	1861	} else
1853		- if (event.getSource() == screenfitpointButton)
	1862	+ if (source == screenfitpointButton)
1854	1863	{
1855	1864	//Reload(lastConverter, lastFilename, true);
1856	1865	ScreenFitPoint();
1857	1866	} else
1858		- if (event.getSource() == snapobjectButton)
	1867	+ if (source == snapobjectButton)
1859	1868	{
1860	1869	//Reload(lastConverter, lastFilename, true);
1861	1870	SnapObject();
..	..	@@ -1866,13 +1875,13 @@
1866	1875	// Recompile();
1867	1876	// refreshContents();
1868	1877	// } else
1869		- if (event.getSource() == gcButton)
	1878	+ if (source == gcButton)
1870	1879	{
1871	1880	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1872	1881	System.gc();
1873	1882	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1874	1883	} else
1875		- if (event.getSource() == editLeafItem)
	1884	+ if (source == editLeafItem)
1876	1885	{
1877	1886	Object3D obj;
1878	1887	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1886,62 +1895,62 @@
1886	1895	}
1887	1896	refreshContents(true);
1888	1897	} else
1889		- if (event.getSource() == openWindowItem)
	1898	+ if (source == openWindowItem)
1890	1899	{
1891	1900	EditSelection(true);
1892	1901	} else
1893		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1902	+ if (source == cutItem \|\| source == clearButton)
1894	1903	{
1895	1904	loadClipboard(true);
1896	1905	} else
1897		- if (event.getSource() == duplicateItem)
	1906	+ if (source == duplicateItem)
1898	1907	{
1899	1908	Object3D keep = GrafreeD.clipboard;
1900	1909	loadClipboard(false);
1901	1910	paste(false);
1902	1911	GrafreeD.clipboard = keep;
1903	1912	} else
1904		- if (event.getSource() == cloneItem)
	1913	+ if (source == cloneItem)
1905	1914	{
1906	1915	CloneSelection(false);
1907	1916	} else
1908		- if (event.getSource() == cloneSupportItem)
	1917	+ if (source == cloneSupportItem)
1909	1918	{
1910	1919	CloneSelection(true);
1911	1920	} else
1912		- if (event.getSource() == copyItem)
	1921	+ if (source == copyItem)
1913	1922	{
1914	1923	loadClipboard(false);
1915	1924	} else
1916		- if (event.getSource() == pasteItem)
	1925	+ if (source == pasteItem)
1917	1926	{
1918	1927	paste(false);
1919	1928	} else
1920		- if (event.getSource() == pasteLinkItem)
	1929	+ if (source == pasteLinkItem)
1921	1930	{
1922	1931	pasteInto(false);
1923	1932	} else
1924		- if (event.getSource() == pasteCloneItem)
	1933	+ if (source == pasteCloneItem)
1925	1934	{
1926	1935	pasteInto(true);
1927	1936	} else
1928		- if (event.getSource() == pasteExpandItem)
	1937	+ if (source == pasteExpandItem)
1929	1938	{
1930	1939	paste(true);
1931	1940	} else
1932		- if (event.getSource() == synchronizeItem)
	1941	+ if (source == synchronizeItem)
1933	1942	{
1934	1943	Overwrite(Object3D.TRANSFORM);
1935	1944	} else
1936		- if (event.getSource() == overwriteNameItem)
	1945	+ if (source == overwriteNameItem)
1937	1946	{
1938	1947	Overwrite(Object3D.NAME);
1939	1948	} else
1940		- if (event.getSource() == overwriteUVItem)
	1949	+ if (source == overwriteUVItem)
1941	1950	{
1942	1951	Overwrite(Object3D.UV);
1943	1952	} else
1944		- if (event.getSource() == overwriteMatItem)
	1953	+ if (source == overwriteMatItem)
1945	1954	{
1946	1955	/* july 2015
1947	1956	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1961,7 +1970,7 @@
1961	1970
1962	1971	Overwrite(dropAttributes);
1963	1972	}
1964		- if (event.getSource() == overwriteGeoItem)
	1973	+ if (source == overwriteGeoItem)
1965	1974	{
1966	1975	Overwrite(Object3D.GEOMETRY);
1967	1976	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1978,7 +1987,7 @@
1978	1987	// refreshContents();
1979	1988	// }
1980	1989	} else
1981		- if (event.getSource() == generateMeshItem)
	1990	+ if (source == generateMeshItem)
1982	1991	{
1983	1992	//if (group.selection.size() == 1)
1984	1993	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1989,7 +1998,7 @@
1989	1998	ResetModel();
1990	1999	refreshContents();
1991	2000	} else
1992		- if (event.getSource() == extractGeometriesItem)
	2001	+ if (source == extractGeometriesItem)
1993	2002	{
1994	2003	boolean one = false;
1995	2004
..	..	@@ -2016,7 +2025,7 @@
2016	2025	ResetModel();
2017	2026	refreshContents();
2018	2027	} else
2019		- if (event.getSource() == cloneGeometriesItem)
	2028	+ if (source == cloneGeometriesItem)
2020	2029	{
2021	2030	boolean one = false;
2022	2031
..	..	@@ -2042,7 +2051,7 @@
2042	2051	ResetModel();
2043	2052	refreshContents();
2044	2053	} else
2045		- if (event.getSource() == shareGeometriesItem)
	2054	+ if (source == shareGeometriesItem)
2046	2055	{
2047	2056	boolean one = false;
2048	2057
..	..	@@ -2072,7 +2081,7 @@
2072	2081	refreshContents();
2073	2082	}
2074	2083	} else
2075		- if (event.getSource() == mergeGeometriesItem)
	2084	+ if (source == mergeGeometriesItem)
2076	2085	{
2077	2086	boolean one = false;
2078	2087
..	..	@@ -2102,7 +2111,7 @@
2102	2111	ResetModel();
2103	2112	refreshContents();
2104	2113	} else
2105		- if (event.getSource() == linkverticesItem)
	2114	+ if (source == linkverticesItem)
2106	2115	{
2107	2116	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2108	2117	// {
..	..	@@ -2135,7 +2144,7 @@
2135	2144	refreshContents();
2136	2145	}
2137	2146	} else
2138		- if (event.getSource() == resetsupportItem)
	2147	+ if (source == resetsupportItem)
2139	2148	{
2140	2149	for (int i=0; i<group.selection.size(); i++)
2141	2150	{
..	..	@@ -2147,7 +2156,7 @@
2147	2156
2148	2157	refreshContents();
2149	2158	} else
2150		- if (event.getSource() == relinkverticesItem)
	2159	+ if (source == relinkverticesItem)
2151	2160	{
2152	2161	boolean random = CameraPane.RANDOM;
2153	2162	CameraPane.RANDOM = false; // parse all random nodes
..	..	@@ -2156,7 +2165,7 @@
2156	2165
2157	2166	refreshContents();
2158	2167	} else
2159		- if (event.getSource() == resetreferencesItem)
	2168	+ if (source == resetreferencesItem)
2160	2169	{
2161	2170	for (int i=0; i<group.selection.size(); i++)
2162	2171	{
..	..	@@ -2165,7 +2174,7 @@
2165	2174
2166	2175	refreshContents();
2167	2176	} else
2168		- if (event.getSource() == setMasterItem)
	2177	+ if (source == setMasterItem)
2169	2178	{
2170	2179	if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2171	2180	{
..	..	@@ -2178,7 +2187,7 @@
2178	2187	refreshContents();
2179	2188	}
2180	2189	} else
2181		- if (event.getSource() == poseMeshItem)
	2190	+ if (source == poseMeshItem)
2182	2191	{
2183	2192	if (group.selection.size() == 1)
2184	2193	{
..	..	@@ -2197,19 +2206,19 @@
2197	2206	}
2198	2207
2199	2208	} else
2200		- if (event.getSource() == revertMeshItem)
	2209	+ if (source == revertMeshItem)
2201	2210	{
2202	2211	RevertMeshes();
2203	2212	} else
2204		- if (event.getSource() == resetMeshItem)
	2213	+ if (source == resetMeshItem)
2205	2214	{
2206	2215	ResetAll();
2207	2216	} else
2208		- if (event.getSource() == stepAllItem)
	2217	+ if (source == stepAllItem)
2209	2218	{
2210	2219	StepAll();
2211	2220	} else
2212		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2221	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2213	2222	{
2214	2223	//int indices[] = jList.getSelectedIndices();
2215	2224	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2217,46 +2226,46 @@
2217	2226
2218	2227	ClearSelection(false);
2219	2228	} else
2220		- if (event.getSource() == clearAllItem)
	2229	+ if (source == clearAllItem)
2221	2230	{
2222	2231	ClearSelection(true);
2223	2232	} else
2224		- if (event.getSource() == grabItem)
	2233	+ if (source == grabItem)
2225	2234	{
2226	2235	group(new cGroup(), true);
2227	2236	} else
2228		- if (event.getSource() == hideItem)
	2237	+ if (source == hideItem)
2229	2238	{
2230	2239	group(new HiddenObject());
2231	2240	} else
2232		- if (event.getSource() == frontItem)
	2241	+ if (source == frontItem)
2233	2242	{
2234	2243	front();
2235	2244	} else
2236		- if (event.getSource() == backItem)
	2245	+ if (source == backItem)
2237	2246	{
2238	2247	back();
2239	2248	} else
2240		- if (event.getSource() == cameraItem)
	2249	+ if (source == cameraItem)
2241	2250	{
2242	2251	makeSomething(new Camera());
2243	2252	} else
2244		- if (event.getSource() == compositeItem)
	2253	+ if (source == compositeItem)
2245	2254	{
2246	2255	group(new Composite());
2247	2256	} else
2248		- if (event.getSource() == randomItem)
	2257	+ if (source == randomItem)
2249	2258	{
2250	2259	RandomNode random = new RandomNode();
2251	2260	group(random);
2252	2261	if (random.size() > 0)
2253	2262	random.name = random.get(0).name + "Rnd";
2254	2263	} else
2255		- if (event.getSource() == physicsItem)
	2264	+ if (source == physicsItem)
2256	2265	{
2257	2266	group(new PhysicsNode());
2258	2267	} else
2259		- if (event.getSource() == frameselectorItem)
	2268	+ if (source == frameselectorItem)
2260	2269	{
2261	2270	for (int i=0; i<group.selection.size(); i++)
2262	2271	{
..	..	@@ -2268,7 +2277,7 @@
2268	2277	ResetModel();
2269	2278	refreshContents();
2270	2279	} else
2271		- if (event.getSource() == switchGeoItem)
	2280	+ if (source == switchGeoItem)
2272	2281	{
2273	2282	for (int i=0; i<group.selection.size(); i++)
2274	2283	{
..	..	@@ -2280,7 +2289,7 @@
2280	2289	ResetModel();
2281	2290	refreshContents();
2282	2291	} else
2283		- if (event.getSource() == switchTransfoItem)
	2292	+ if (source == switchTransfoItem)
2284	2293	{
2285	2294	for (int i=0; i<group.selection.size(); i++)
2286	2295	{
..	..	@@ -2292,7 +2301,7 @@
2292	2301	ResetModel();
2293	2302	refreshContents();
2294	2303	} else
2295		- if (event.getSource() == morphItem)
	2304	+ if (source == morphItem)
2296	2305	{
2297	2306	for (int i=0; i<group.selection.size(); i++)
2298	2307	{
..	..	@@ -2304,7 +2313,7 @@
2304	2313	ResetModel();
2305	2314	refreshContents();
2306	2315	} else
2307		- if (event.getSource() == scriptNodeItem)
	2316	+ if (source == scriptNodeItem)
2308	2317	{
2309	2318	boolean atleastone = false;
2310	2319
..	..	@@ -2343,31 +2352,31 @@
2343	2352	}
2344	2353	}
2345	2354	} else
2346		- if (event.getSource() == linkerItem)
	2355	+ if (source == linkerItem)
2347	2356	{
2348	2357	group(new cLinker());
2349	2358	} else
2350		- if (event.getSource() == textureItem)
	2359	+ if (source == textureItem)
2351	2360	{
2352	2361	group(new TextureNode());
2353	2362	} else
2354		- if (event.getSource() == billboardItem)
	2363	+ if (source == billboardItem)
2355	2364	{
2356	2365	group(new BillboardNode());
2357	2366	} else
2358		- if (event.getSource() == shadowXItem)
	2367	+ if (source == shadowXItem)
2359	2368	{
2360	2369	CastShadow(0);
2361	2370	} else
2362		- if (event.getSource() == shadowYItem)
	2371	+ if (source == shadowYItem)
2363	2372	{
2364	2373	CastShadow(1);
2365	2374	} else
2366		- if (event.getSource() == shadowZItem)
	2375	+ if (source == shadowZItem)
2367	2376	{
2368	2377	CastShadow(2);
2369	2378	} else
2370		- if (event.getSource() == ungroupItem)
	2379	+ if (source == ungroupItem)
2371	2380	{
2372	2381	//ungroup();
2373	2382	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2379,179 +2388,179 @@
2379	2388
2380	2389	refreshContents();
2381	2390	} else
2382		- if (event.getSource() == genUVItem)
	2391	+ if (source == genUVItem)
2383	2392	{
2384	2393	GenUV();
2385	2394	} else
2386		- if (event.getSource() == genNormalsCADItem)
	2395	+ if (source == genNormalsCADItem)
2387	2396	{
2388	2397	GenNormals(true);
2389	2398	} else
2390		- if (event.getSource() == genNormalsMESHItem)
	2399	+ if (source == genNormalsMESHItem)
2391	2400	{
2392	2401	GenNormals(true); // TODO
2393	2402	} else
2394		- if (event.getSource() == genNormalsORGANItem)
	2403	+ if (source == genNormalsORGANItem)
2395	2404	{
2396	2405	GenNormals(false);
2397	2406	} else
2398		- if (event.getSource() == genNormalsMINEItem)
	2407	+ if (source == genNormalsMINEItem)
2399	2408	{
2400	2409	GenNormalsMINE();
2401	2410	} else
2402		- if (event.getSource() == stripifyItem)
	2411	+ if (source == stripifyItem)
2403	2412	{
2404	2413	Stripify();
2405	2414	} else
2406		- if (event.getSource() == unstripifyItem)
	2415	+ if (source == unstripifyItem)
2407	2416	{
2408	2417	Unstripify();
2409	2418	} else
2410		- if (event.getSource() == trimItem)
	2419	+ if (source == trimItem)
2411	2420	{
2412	2421	Trim();
2413	2422	} else
2414		- if (event.getSource() == untrimItem)
	2423	+ if (source == untrimItem)
2415	2424	{
2416	2425	Untrim();
2417	2426	} else
2418		- if (event.getSource() == clearColorsItem)
	2427	+ if (source == clearColorsItem)
2419	2428	{
2420	2429	ClearColors();
2421	2430	} else
2422		- if (event.getSource() == clearMaterialsItem)
	2431	+ if (source == clearMaterialsItem)
2423	2432	{
2424	2433	ClearMaterials();
2425	2434	} else
2426		- if (event.getSource() == liveleavesItem)
	2435	+ if (source == liveleavesItem)
2427	2436	{
2428	2437	LiveLeaves(true);
2429	2438	} else
2430		- if (event.getSource() == unliveleavesItem)
	2439	+ if (source == unliveleavesItem)
2431	2440	{
2432	2441	LiveLeaves(false);
2433	2442	} else
2434		- if (event.getSource() == supportleavesItem)
	2443	+ if (source == supportleavesItem)
2435	2444	{
2436	2445	SupportLeaves(true);
2437	2446	} else
2438		- if (event.getSource() == unsupportleavesItem)
	2447	+ if (source == unsupportleavesItem)
2439	2448	{
2440	2449	SupportLeaves(false);
2441	2450	} else
2442		- if (event.getSource() == hideleavesItem)
	2451	+ if (source == hideleavesItem)
2443	2452	{
2444	2453	HideLeaves(true);
2445	2454	} else
2446		- if (event.getSource() == showleavesItem)
	2455	+ if (source == showleavesItem)
2447	2456	{
2448	2457	HideLeaves(false);
2449	2458	} else
2450		- if (event.getSource() == markleavesItem)
	2459	+ if (source == markleavesItem)
2451	2460	{
2452	2461	MarkLeaves(true);
2453	2462	} else
2454		- if (event.getSource() == unmarkleavesItem)
	2463	+ if (source == unmarkleavesItem)
2455	2464	{
2456	2465	MarkLeaves(false);
2457	2466	} else
2458		- if (event.getSource() == flipVItem)
	2467	+ if (source == flipVItem)
2459	2468	{
2460	2469	FlipV(true);
2461	2470	} else
2462		- if (event.getSource() == unflipVItem)
	2471	+ if (source == unflipVItem)
2463	2472	{
2464	2473	FlipV(false);
2465	2474	} else
2466		- if (event.getSource() == lowTexturesItem)
	2475	+ if (source == lowTexturesItem)
2467	2476	{
2468	2477	SetTexRes(0);
2469	2478	} else
2470		- if (event.getSource() == normalTexturesItem)
	2479	+ if (source == normalTexturesItem)
2471	2480	{
2472	2481	SetTexRes(1);
2473	2482	} else
2474		- if (event.getSource() == highTexturesItem)
	2483	+ if (source == highTexturesItem)
2475	2484	{
2476	2485	SetTexRes(2);
2477	2486	} else
2478		- if (event.getSource() == veryhighTexturesItem)
	2487	+ if (source == veryhighTexturesItem)
2479	2488	{
2480	2489	SetTexRes(3);
2481	2490	} else
2482		- if (event.getSource() == maxTexturesItem)
	2491	+ if (source == maxTexturesItem)
2483	2492	{
2484	2493	SetTexRes(4);
2485	2494	} else
2486		- if (event.getSource() == panoTexturesItem)
	2495	+ if (source == panoTexturesItem)
2487	2496	{
2488	2497	SetTexRes(5);
2489	2498	} else
2490		- if (event.getSource() == reverseNormalsItem)
	2499	+ if (source == reverseNormalsItem)
2491	2500	{
2492	2501	ReverseNormals();
2493	2502	} else
2494		- if (event.getSource() == parseverticesItem)
	2503	+ if (source == parseverticesItem)
2495	2504	{
2496	2505	ParseVertices();
2497	2506	} else
2498		- if (event.getSource() == textureFieldItem)
	2507	+ if (source == textureFieldItem)
2499	2508	{
2500	2509	TextureVertices();
2501	2510	} else
2502		- if (event.getSource() == alignItem)
	2511	+ if (source == alignItem)
2503	2512	{
2504	2513	Align();
2505	2514	} else
2506		- if (event.getSource() == mirrorItem)
	2515	+ if (source == mirrorItem)
2507	2516	{
2508	2517	MirrorPoses();
2509	2518	} else
2510		- if (event.getSource() == reduceMorphItem)
	2519	+ if (source == reduceMorphItem)
2511	2520	{
2512	2521	MeshReduction(false);
2513	2522	} else
2514		- if (event.getSource() == reduce34MorphItem)
	2523	+ if (source == reduce34MorphItem)
2515	2524	{
2516	2525	MeshReduction(true);
2517	2526	} else
2518		- if (event.getSource() == reverseTrianglesItem)
	2527	+ if (source == reverseTrianglesItem)
2519	2528	{
2520	2529	ReverseTriangles();
2521	2530	} else
2522		- if (event.getSource() == reduceMeshItem)
	2531	+ if (source == reduceMeshItem)
2523	2532	{
2524	2533	ReduceMesh(false);
2525	2534	} else
2526		- if (event.getSource() == reduce34MeshItem)
	2535	+ if (source == reduce34MeshItem)
2527	2536	{
2528	2537	ReduceMesh(true);
2529	2538	} else
2530		- if (event.getSource() == increaseMeshItem)
	2539	+ if (source == increaseMeshItem)
2531	2540	{
2532	2541	IncreaseMesh();
2533	2542	} else
2534		- if (event.getSource() == clipMeshItem)
	2543	+ if (source == clipMeshItem)
2535	2544	{
2536	2545	ClipMesh();
2537	2546	} else
2538		- if (event.getSource() == smoothMeshItem)
	2547	+ if (source == smoothMeshItem)
2539	2548	{
2540	2549	SmoothMesh();
2541	2550	} else
2542		- if (event.getSource() == transformgeometryItem)
	2551	+ if (source == transformgeometryItem)
2543	2552	{
2544	2553	TransformGeometry();
2545	2554	} else
2546		- if (event.getSource() == resetTransformItem)
	2555	+ if (source == resetTransformItem)
2547	2556	{
2548	2557	ResetTransform();
2549	2558	} else
2550		- if (event.getSource() == resetCentroidItem)
	2559	+ if (source == resetCentroidItem)
2551	2560	{
2552	2561	ResetCentroid();
2553	2562	} else
2554		- if (event.getSource() == resetParentItem)
	2563	+ if (source == resetParentItem)
2555	2564	{
2556	2565	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2557	2566	{
..	..	@@ -2561,7 +2570,7 @@
2561	2570
2562	2571	refreshContents();
2563	2572	} else
2564		- if (event.getSource() == repairParentItem)
	2573	+ if (source == repairParentItem)
2565	2574	{
2566	2575	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2567	2576	{
..	..	@@ -2575,7 +2584,7 @@
2575	2584
2576	2585	refreshContents();
2577	2586	} else
2578		- if (event.getSource() == repairShadowItem)
	2587	+ if (source == repairShadowItem)
2579	2588	{
2580	2589	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2581	2590	{
..	..	@@ -2589,7 +2598,7 @@
2589	2598
2590	2599	refreshContents();
2591	2600	} else
2592		- if (event.getSource() == sortbysizeItem)
	2601	+ if (source == sortbysizeItem)
2593	2602	{
2594	2603	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2595	2604	{
..	..	@@ -2601,7 +2610,7 @@
2601	2610	ResetModel();
2602	2611	refreshContents();
2603	2612	} else
2604		- if (event.getSource() == sortbynameItem)
	2613	+ if (source == sortbynameItem)
2605	2614	{
2606	2615	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2607	2616	{
..	..	@@ -2613,7 +2622,7 @@
2613	2622	ResetModel();
2614	2623	refreshContents();
2615	2624	} else
2616		- if (event.getSource() == attachPigmentItem)
	2625	+ if (source == attachPigmentItem)
2617	2626	{
2618	2627	String texture = GetFile("Attach pigment");
2619	2628	Object3D obj;
..	..	@@ -2625,7 +2634,7 @@
2625	2634
2626	2635	refreshContents();
2627	2636	} else
2628		- if (event.getSource() == detachPigmentItem)
	2637	+ if (source == detachPigmentItem)
2629	2638	{
2630	2639	Object3D obj;
2631	2640	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2636,7 +2645,7 @@
2636	2645
2637	2646	refreshContents();
2638	2647	} else
2639		- if (event.getSource() == attachBumpItem)
	2648	+ if (source == attachBumpItem)
2640	2649	{
2641	2650	String texture = GetFile("Attach bump");
2642	2651	Object3D obj;
..	..	@@ -2648,7 +2657,7 @@
2648	2657
2649	2658	refreshContents();
2650	2659	} else
2651		- if (event.getSource() == detachBumpItem)
	2660	+ if (source == detachBumpItem)
2652	2661	{
2653	2662	Object3D obj;
2654	2663	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2659,7 +2668,7 @@
2659	2668
2660	2669	refreshContents();
2661	2670	} else
2662		- if (event.getSource() == pigmentBumpItem)
	2671	+ if (source == pigmentBumpItem)
2663	2672	{
2664	2673	Object3D obj;
2665	2674	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2670,158 +2679,195 @@
2670	2679
2671	2680	refreshContents();
2672	2681	} else
2673		- if (event.getSource() == flashSelectionButton)
	2682	+ if (source == flashSelectionButton)
2674	2683	{
2675	2684	CameraPane.flash = true;
2676	2685	refreshContents();
2677	2686	} else
2678		- if (event.getSource() == oneButton)
	2687	+ if (source == oneButton)
2679	2688	{
2680	2689	} else
2681		- if (event.getSource() == twoButton)
	2690	+ if (source == twoButton)
2682	2691	{
2683	2692	radio.layout = twoButton;
2684	2693	// bug
2685	2694	//gridPanel.setDividerLocation(1.0);
2686	2695	//bigPanel.setDividerLocation(0.0);
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		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2709		- //bigThree.add(XYZPanel, aWindowConstraints);
2710		- bigThree.revalidate();
	2696	+// bigThree.remove(scenePanel);
	2697	+// bigThree.remove(centralPanel);
	2698	+// bigThree.remove(XYZPanel);
	2699	+// aWindowConstraints.gridx = 0;
	2700	+// aWindowConstraints.gridy = 0;
	2701	+// aWindowConstraints.gridwidth = 1;
	2702	+// // aConstraints.gridheight = 3;
	2703	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2704	+// aWindowConstraints.weightx = 0;
	2705	+// aWindowConstraints.weighty = 1;
	2706	+// //bigThree.add(jtp, aWindowConstraints);
	2707	+// aWindowConstraints.weightx = 1;
	2708	+// aWindowConstraints.gridwidth = 3;
	2709	+// // aConstraints.gridheight = 3;
	2710	+// aWindowConstraints.gridx = 1;
	2711	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2712	+// bigThree.add(centralPanel, aWindowConstraints);
	2713	+// aWindowConstraints.weightx = 0;
	2714	+// aWindowConstraints.gridx = 4;
	2715	+// aWindowConstraints.gridwidth = 1;
	2716	+// // aConstraints.gridheight = 3;
	2717	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2718	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2719	+// scenePanel.setVisible(false);
	2720	+// centralPanel.setVisible(true);
	2721	+// XYZPanel.setVisible(false);
	2722	+ bigThree.ClearUI();
	2723	+ bigThree.add(centralPanel);
	2724	+ bigThree.FlushUI();
2711	2725	} else
2712		- if (event.getSource() == threeButton)
	2726	+ if (source == threeButton)
2713	2727	{
2714	2728	radio.layout = threeButton;
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		- // aConstraints.gridheight = 3;
2722		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2723		- aWindowConstraints.weightx = 0;
2724		- aWindowConstraints.weighty = 1;
2725		- //bigThree.add(jtp, 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(centralPanel, aWindowConstraints);
2732		- aWindowConstraints.weightx = 0;
2733		- aWindowConstraints.gridx = 4;
2734		- aWindowConstraints.gridwidth = 1;
2735		- // aConstraints.gridheight = 3;
2736		- aConstraints.fill = GridBagConstraints.VERTICAL;
2737		- bigThree.add(XYZPanel, aWindowConstraints);
2738		- bigThree.revalidate();
	2729	+
	2730	+// bigThree.remove(scenePanel);
	2731	+// bigThree.remove(centralPanel);
	2732	+// bigThree.remove(XYZPanel);
	2733	+// aWindowConstraints.gridx = 0;
	2734	+// aWindowConstraints.gridy = 0;
	2735	+// aWindowConstraints.gridwidth = 1;
	2736	+// // aConstraints.gridheight = 3;
	2737	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2738	+// aWindowConstraints.weightx = 0;
	2739	+// aWindowConstraints.weighty = 1;
	2740	+// //bigThree.add(jtp, aWindowConstraints);
	2741	+// aWindowConstraints.weightx = 1;
	2742	+// aWindowConstraints.gridwidth = 3;
	2743	+// // aConstraints.gridheight = 3;
	2744	+// aWindowConstraints.gridx = 1;
	2745	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2746	+// bigThree.add(centralPanel, aWindowConstraints);
	2747	+// aWindowConstraints.weightx = 0;
	2748	+// aWindowConstraints.gridx = 4;
	2749	+// aWindowConstraints.gridwidth = 1;
	2750	+// // aConstraints.gridheight = 3;
	2751	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2752	+// bigThree.add(XYZPanel, aWindowConstraints);
	2753	+// bigThree.validate();
	2754	+// scenePanel.setVisible(false);
	2755	+// centralPanel.setVisible(true);
	2756	+// XYZPanel.setVisible(true);
	2757	+ bigThree.ClearUI();
	2758	+ bigThree.add(centralPanel);
	2759	+ bigThree.add(XYZPanel);
	2760	+ bigThree.FlushUI();
2739	2761	} else
2740		- if (event.getSource() == fourButton)
	2762	+ if (source == fourButton)
2741	2763	{
2742	2764	radio.layout = fourButton;
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		- // aWindowConstraints.gridheight = 3;
2750		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2751		- aWindowConstraints.weightx = 1;
2752		- aWindowConstraints.weighty = 1;
2753		- bigThree.add(scenePanel, aWindowConstraints);
2754		- aWindowConstraints.weightx = 1;
2755		- aWindowConstraints.gridwidth = 3;
2756		- // aConstraints.gridheight = 3;
2757		- aWindowConstraints.gridx = 1;
2758		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2759		- //bigThree.add(cameraPanel, 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, aWindowConstraints);
2766		- bigThree.revalidate();
	2765	+
	2766	+// bigThree.remove(scenePanel);
	2767	+// bigThree.remove(centralPanel);
	2768	+// bigThree.remove(XYZPanel);
	2769	+// aWindowConstraints.gridx = 0;
	2770	+// aWindowConstraints.gridy = 0;
	2771	+// aWindowConstraints.gridwidth = 1;
	2772	+// // aWindowConstraints.gridheight = 3;
	2773	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2774	+// aWindowConstraints.weightx = 1;
	2775	+// aWindowConstraints.weighty = 1;
	2776	+// bigThree.add(scenePanel, aWindowConstraints);
	2777	+// aWindowConstraints.weightx = 1;
	2778	+// aWindowConstraints.gridwidth = 3;
	2779	+// // aConstraints.gridheight = 3;
	2780	+// aWindowConstraints.gridx = 1;
	2781	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2782	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2783	+// aWindowConstraints.weightx = 0;
	2784	+// aWindowConstraints.gridx = 4;
	2785	+// aWindowConstraints.gridwidth = 1;
	2786	+// // aWindowConstraints.gridheight = 3;
	2787	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2788	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2789	+// bigThree.validate();
	2790	+// scenePanel.setVisible(true);
	2791	+// centralPanel.setVisible(false);
	2792	+// XYZPanel.setVisible(false);
	2793	+ bigThree.ClearUI();
	2794	+ bigThree.add(scenePanel);
	2795	+ bigThree.FlushUI();
2767	2796	} else
2768		- if (event.getSource() == sixButton)
	2797	+ if (source == sixButton)
2769	2798	{
2770	2799	radio.layout = sixButton;
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		- // aConstraints.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		- // aWindowConstraints.gridheight = 3;
2792		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2793		- //bigThree.add(XYZPanel, aConstraints);
2794		- bigThree.revalidate();
	2800	+
	2801	+// bigThree.remove(scenePanel);
	2802	+// bigThree.remove(centralPanel);
	2803	+// bigThree.remove(XYZPanel);
	2804	+// aWindowConstraints.gridx = 0;
	2805	+// aWindowConstraints.gridy = 0;
	2806	+// aWindowConstraints.gridwidth = 1;
	2807	+// // aConstraints.gridheight = 3;
	2808	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2809	+// aWindowConstraints.weightx = 0;
	2810	+// aWindowConstraints.weighty = 1;
	2811	+// bigThree.add(scenePanel, aWindowConstraints);
	2812	+// aWindowConstraints.weightx = 1;
	2813	+// aWindowConstraints.gridwidth = 3;
	2814	+// // aWindowConstraints.gridheight = 3;
	2815	+// aWindowConstraints.gridx = 1;
	2816	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2817	+// bigThree.add(centralPanel, aWindowConstraints);
	2818	+// aWindowConstraints.weightx = 0;
	2819	+// aWindowConstraints.gridx = 4;
	2820	+// aWindowConstraints.gridwidth = 1;
	2821	+// // aWindowConstraints.gridheight = 3;
	2822	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2823	+// //bigThree.add(XYZPanel, aConstraints);
	2824	+// bigThree.validate();
	2825	+// scenePanel.setVisible(true);
	2826	+// centralPanel.setVisible(true);
	2827	+// XYZPanel.setVisible(false);
	2828	+ bigThree.ClearUI();
	2829	+ bigThree.add(scenePanel);
	2830	+ bigThree.add(centralPanel);
	2831	+ bigThree.FlushUI();
2795	2832	} else
2796		- if (event.getSource() == sevenButton)
	2833	+ if (source == sevenButton)
2797	2834	{
2798	2835	radio.layout = sevenButton;
2799		- bigThree.remove(scenePanel);
2800		- bigThree.remove(centralPanel);
2801		- bigThree.remove(XYZPanel);
2802		- aWindowConstraints.gridx = 0;
2803		- aWindowConstraints.gridy = 0;
2804		- aWindowConstraints.gridwidth = 1;
2805		- // aWindowConstraints.gridheight = 3;
2806		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2807		- aWindowConstraints.weightx = 0;
2808		- aWindowConstraints.weighty = 1;
2809		- bigThree.add(scenePanel, aWindowConstraints);
2810		- aWindowConstraints.weightx = 1;
2811		- aWindowConstraints.gridwidth = 3;
2812		- // aWindowConstraints.gridheight = 3;
2813		- aWindowConstraints.gridx = 1;
2814		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2815		- bigThree.add(centralPanel, aWindowConstraints);
2816		- aWindowConstraints.weightx = 0;
2817		- aWindowConstraints.gridx = 4;
2818		- aWindowConstraints.gridwidth = 1;
2819		- // aConstraints.gridheight = 3;
2820		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2821		- bigThree.add(XYZPanel, aWindowConstraints);
2822		- bigThree.revalidate();
	2836	+
	2837	+// bigThree.remove(scenePanel);
	2838	+// bigThree.remove(centralPanel);
	2839	+// bigThree.remove(XYZPanel);
	2840	+// aWindowConstraints.gridx = 0;
	2841	+// aWindowConstraints.gridy = 0;
	2842	+// aWindowConstraints.gridwidth = 1;
	2843	+// // aWindowConstraints.gridheight = 3;
	2844	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2845	+// aWindowConstraints.weightx = 0;
	2846	+// aWindowConstraints.weighty = 1;
	2847	+// bigThree.add(scenePanel, aWindowConstraints);
	2848	+// aWindowConstraints.weightx = 1;
	2849	+// aWindowConstraints.gridwidth = 3;
	2850	+// // aWindowConstraints.gridheight = 3;
	2851	+// aWindowConstraints.gridx = 1;
	2852	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2853	+// bigThree.add(centralPanel, aWindowConstraints);
	2854	+// aWindowConstraints.weightx = 0;
	2855	+// aWindowConstraints.gridx = 4;
	2856	+// aWindowConstraints.gridwidth = 1;
	2857	+// // aConstraints.gridheight = 3;
	2858	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2859	+// bigThree.add(XYZPanel, aWindowConstraints);
	2860	+// bigThree.validate();
	2861	+// scenePanel.setVisible(true);
	2862	+// centralPanel.setVisible(true);
	2863	+// XYZPanel.setVisible(true);
	2864	+ bigThree.ClearUI();
	2865	+ bigThree.add(scenePanel);
	2866	+ bigThree.add(centralPanel);
	2867	+ bigThree.add(XYZPanel);
	2868	+ bigThree.FlushUI();
2823	2869	} else
2824		- if (event.getSource() == rootButton)
	2870	+ if (source == rootButton)
2825	2871	{
2826	2872	Object3D obj;
2827	2873	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2833,7 +2879,7 @@
2833	2879
2834	2880	refreshContents(true);
2835	2881	} else
2836		- if (event.getSource() == closeButton)
	2882	+ if (source == closeButton)
2837	2883	{
2838	2884	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2839	2885	cRadio ab;
..	..	@@ -2854,11 +2900,11 @@
2854	2900	}
2855	2901	refreshContents(true);
2856	2902	} else
2857		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2903	+ if (source == editItem \|\| source == editButton)
2858	2904	{
2859	2905	EditSelection(false);
2860	2906	} else
2861		- if (event.getSource() == uneditButton)
	2907	+ if (source == uneditButton)
2862	2908	{
2863	2909	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2864	2910	{
..	..	@@ -2875,7 +2921,7 @@
2875	2921	//objEditor.ResetSliders();
2876	2922	refreshContents(true);
2877	2923	} else
2878		- if (event.getSource() == clearPanelButton)
	2924	+ if (source == clearPanelButton)
2879	2925	{
2880	2926	assert(copy == group);
2881	2927	//copy.ClearUI();
..	..	@@ -2886,7 +2932,7 @@
2886	2932	listUI.clear();
2887	2933	refreshContents(true);
2888	2934	} else
2889		- if (event.getSource() == allParamsButton)
	2935	+ if (source == allParamsButton)
2890	2936	{
2891	2937	assert(copy == group);
2892	2938
..	..	@@ -2907,19 +2953,19 @@
2907	2953
2908	2954	refreshContents(true);
2909	2955	} else
2910		- if (event.getSource() == unselectButton)
	2956	+ if (source == unselectButton)
2911	2957	{
2912	2958	objEditor.jTree.clearSelection();
2913	2959	// ?? oct 2012 GrafreeD.clipboard.clear();
2914	2960	objEditor.ResetSliders();
2915	2961	refreshContents(true);
2916	2962	} else
2917		- if(event.getSource() instanceof cRadio)
	2963	+ if(source instanceof cRadio)
2918	2964	{
2919	2965	group.parent = keepparent;
2920	2966	group.attributes = 0;
2921	2967	//group.editWindow = null;
2922		- /cRadio/ radio = (cRadio)event.getSource();
	2968	+ /cRadio/ radio = (cRadio)source;
2923	2969	Object3D obj = radio.GetObject();
2924	2970	System.out.println("Edit " + obj);
2925	2971	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)