~nbriere/GrafreeD.git - Noware Git Repository

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