~nbriere/GrafreeD.git - Noware Git Repository

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