~nbriere/GrafreeD.git - Noware Git Repository

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