~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -219,6 +219,8 @@
219	219	resetsupportItem.addActionListener(this);
220	220	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	221	linkverticesItem.addActionListener(this);
	222	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	223	+ relinkverticesItem.addActionListener(this);
222	224	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	225	setMasterItem.addActionListener(this);
224	226
..	..	@@ -231,6 +233,10 @@
231	233	frontItem.addActionListener(this);
232	234	compositeItem = menu.add(new MenuItem("Composite"));
233	235	compositeItem.addActionListener(this);
	236	+ hideItem = menu.add(new MenuItem("Hide"));
	237	+ hideItem.addActionListener(this);
	238	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	239	+ ungroupItem.addActionListener(this);
234	240	menu.add("-");
235	241	randomItem = menu.add(new MenuItem("Random"));
236	242	randomItem.addActionListener(this);
..	..	@@ -252,6 +258,8 @@
252	258	oe.menuBar.add(menu = new Menu("Object"));
253	259	textureItem = menu.add(new MenuItem("Texture"));
254	260	textureItem.addActionListener(this);
	261	+ billboardItem = menu.add(new MenuItem("Billboard"));
	262	+ billboardItem.addActionListener(this);
255	263	csgItem = menu.add(new MenuItem("CSG"));
256	264	csgItem.addActionListener(this);
257	265	shadowXItem = menu.add(new MenuItem("Shadow X"));
..	..	@@ -269,14 +277,12 @@
269	277	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	278	pointflowItem.addActionListener(this);
271	279	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	280	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	281	resetTransformItem.addActionListener(this);
276	282	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	283	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	284	+ transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
	285	+ transformgeometryItem.addActionListener(this);
280	286
281	287	oe.menuBar.add(menu = new Menu("Geometry"));
282	288	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -287,6 +293,8 @@
287	293	genNormalsCADItem.addActionListener(this);
288	294	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
289	295	genNormalsMESHItem.addActionListener(this);
	296	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	297	+ genNormalsMINEItem.addActionListener(this);
290	298	stripifyItem = menu.add(new MenuItem("Stripify"));
291	299	stripifyItem.addActionListener(this);
292	300	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -426,76 +434,24 @@
426	434	oe.buttonGroup.add(dummyButton);
427	435	*/
428	436	aConstraints.gridy += 1;
	437	+
	438	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	439	+
429	440	oe.aConstraints.gridwidth = 1;
430	441	oe.aConstraints.gridx = 0;
431	442
432		- 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");
433	445	liveCB.addItemListener(this);
434	446
435	447	oe.aConstraints.gridx += 1;
436		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
437		- supportCB.addItemListener(this);
438		-
439		- // oe.aConstraints.gridx += 1;
440		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
441		- // localCB.addItemListener(this);
442		-
443		- oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
445		- crowdCB.addItemListener(this);
446		-
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
449		- smoothCB.addItemListener(this);
450		-
451		- oe.aConstraints.gridx += 1;
452		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
453		- fastCB.addItemListener(this);
454		- oe.aConstraints.gridx += 1;
455		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
456		- slowCB.addItemListener(this);
457		- oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
459		- boxCB.addItemListener(this);
460		-
461		-// oe.aConstraints.gridx += 1;
462		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
463		-// speakerMocapCB.addItemListener(this);
464		-
465		- if (false)
466		- {
467		- // handled in scripts
468		- oe.aConstraints.gridx += 1;
469		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
470		- speakerCameraCB.addItemListener(this);
471		-
472		- oe.aConstraints.gridx += 1;
473		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
474		- speakerFocusCB.addItemListener(this);
475		-
476		- oe.aConstraints.gridx += 1;
477		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
478		- smoothfocusCB.addItemListener(this);
479		- }
480		-
481		-//oe.aConstraints.gridx += 1;
482		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
483		-// debugCB.addItemListener(this);
484		-
485		- oe.aConstraints.gridx += 1;
486		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
487		- oeilCB.addItemListener(this);
488		-
489		- oe.aConstraints.gridx += 1;
490		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
491		- lookAtCB.addItemListener(this);
492		-
493		- oe.aConstraints.gridx += 1;
494		- 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");
495	450	trackCB.addItemListener(this);
496	451
497	452	oe.aConstraints.gridx += 1;
498	453	oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	454	+ screenfitButton.setToolTipText("Screen fit");
499	455	screenfitButton.addActionListener(this);
500	456	oe.aConstraints.gridx += 1;
501	457	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
..	..	@@ -503,6 +459,7 @@
503	459	// oe.aConstraints.gridx += 1;
504	460	oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
505	461	snapobjectButton.addActionListener(this);
	462	+ snapobjectButton.setToolTipText("Snap Object");
506	463	oe.aConstraints.gridx += 1;
507	464
508	465	//aConstraints.gridx = 0;
..	..	@@ -511,28 +468,39 @@
511	468	oe.aConstraints.gridwidth = 1;
512	469
513	470	oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	471	+ flashSelectionButton.setToolTipText("Show selection");
514	472	flashSelectionButton.addActionListener(this);
	473	+
	474	+ oe.toolbarPanel.add(new cButton(" ", false));
	475	+
515	476	oe.aConstraints.gridx += 1;
516	477	oe.aConstraints.weighty = 0;
517	478	oe.aConstraints.gridwidth = 1;
518	479
519	480	//
520	481	oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	482	+ twoButton.setToolTipText("Show center view only");
521	483	twoButton.addActionListener(this);
522	484	oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
523	485	fourButton.addActionListener(this);
	486	+ fourButton.setToolTipText("Show left panel only");
524	487	oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	488	+ sixButton.setToolTipText("2-column layout left");
525	489	sixButton.addActionListener(this);
526	490	oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	491	+ threeButton.setToolTipText("2-column layout right");
527	492	threeButton.addActionListener(this);
528	493	oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	494	+ sevenButton.setToolTipText("3-column layout");
529	495	sevenButton.addActionListener(this);
530	496	//
531	497
532		- 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");
533	500	rootButton.addActionListener(this);
534	501	oe.aConstraints.gridx += 1;
535	502	oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	503	+ closeButton.setToolTipText("Close tab");
536	504	closeButton.addActionListener(this);
537	505	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
538	506	//clearButton.addActionListener(this);
..	..	@@ -635,17 +603,91 @@
635	603	radio.layout = sevenButton;
636	604	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
637	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	+ }
638	680
639	681	void EditObject(Object3D obj)
640	682	{
641		- cRadio dummyButton = new cRadio(obj.name);
642		- dummyButton.SetObject(obj);
643		- dummyButton.layout = sevenButton;
644		- dummyButton.SetCamera(cameraView.renderCamera, false);
645		- dummyButton.addActionListener(this);
646		- radioPanel.add(dummyButton);
647		- buttonGroup.add(dummyButton);
648		- 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();
649	691	}
650	692	void SetupViews(ObjEditor oe)
651	693	{
..	..	@@ -665,6 +707,7 @@
665	707	JCheckBox fastCB;
666	708	JCheckBox slowCB;
667	709	JCheckBox boxCB;
	710	+ JCheckBox zoomBoxCB;
668	711	JCheckBox trackCB;
669	712	JCheckBox smoothfocusCB;
670	713	// JCheckBox speakerMocapCB;
..	..	@@ -707,8 +750,7 @@
707	750	dropAttributes \|= Object3D.TEXTURE;
708	751	else
709	752	dropAttributes &= ~Object3D.TEXTURE;
710		- }
711		- else if(e.getSource() == liveCB)
	753	+ } else if(e.getSource() == liveCB)
712	754	{
713	755	cameraView.ToggleLive();
714	756	}
..	..	@@ -745,6 +787,10 @@
745	787	Recompile();
746	788	cameraView.repaint();
747	789	// refreshContents();
	790	+ }
	791	+ else if(e.getSource() == zoomBoxCB)
	792	+ {
	793	+ cameraView.ToggleZoomBoxMode();
748	794	}
749	795	else if(e.getSource() == smoothfocusCB)
750	796	{
..	..	@@ -1035,6 +1081,8 @@
1035	1081	torusItem.addActionListener(this);
1036	1082	superItem = menu.add(new MenuItem("Superellipsoid"));
1037	1083	superItem.addActionListener(this);
	1084	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1085	+ kleinItem.addActionListener(this);
1038	1086	particleItem = menu.add(new MenuItem("Particle system"));
1039	1087	particleItem.addActionListener(this);
1040	1088	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1108,6 +1156,8 @@
1108	1156	resetParentItem.addActionListener(this);
1109	1157	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1110	1158	repairParentItem.addActionListener(this);
	1159	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1160	+ repairShadowItem.addActionListener(this);
1111	1161	menu.add(invariantsItem = new MenuItem("Invariants"));
1112	1162	invariantsItem.addActionListener(this);
1113	1163	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1468,6 +1518,7 @@
1468	1518	//
1469	1519	public void actionPerformed(ActionEvent event) // , Object arg)
1470	1520	{
	1521	+ Object source = event.getSource();
1471	1522	/*
1472	1523	if (event.getSource() == nameField)
1473	1524	{
..	..	@@ -1479,11 +1530,11 @@
1479	1530	}
1480	1531	else
1481	1532	*/
1482		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1533	+ if (source == lookAtItem \|\| source == lookFromItem)
1483	1534	{
1484	1535	ScreenFit();
1485	1536	} else
1486		- if (event.getSource() == switchItem)
	1537	+ if (source == switchItem)
1487	1538	{
1488	1539	cVector v1 = new cVector();
1489	1540	cVector v2 = new cVector();
..	..	@@ -1492,11 +1543,11 @@
1492	1543	objEditor.cameraView.renderCamera.setAim(v2, v1);
1493	1544	objEditor.cameraView.repaint();
1494	1545	} else
1495		- if (event.getSource() == rectoidItem)
	1546	+ if (source == rectoidItem)
1496	1547	{
1497	1548	makeSomething(new Box());
1498	1549	} else
1499		- if (event.getSource() == particleItem)
	1550	+ if (source == particleItem)
1500	1551	{
1501	1552	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1502	1553	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1517,9 +1568,9 @@
1517	1568	applyExample(particleGeom, "SMOKE");
1518	1569	makeSomething(particleGeom);
1519	1570	} else
1520		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1571	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1521	1572	{
1522		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1573	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1523	1574
1524	1575	ragdoll.toParent = LA.newMatrix();
1525	1576	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1537,7 +1588,7 @@
1537	1588	} else
1538	1589	/*
1539	1590	*/
1540		- if (event.getSource() == heightFieldItem)
	1591	+ if (source == heightFieldItem)
1541	1592	{
1542	1593	Object3D obj = new Object3D();
1543	1594
..	..	@@ -1575,27 +1626,31 @@
1575	1626
1576	1627	makeSomething(obj);
1577	1628	} else
1578		- if (event.getSource() == gridItem)
	1629	+ if (source == gridItem)
1579	1630	{
1580	1631	makeSomething(new Grid());
1581	1632	} else
1582		- if (event.getSource() == ellipsoidItem)
	1633	+ if (source == ellipsoidItem)
1583	1634	{
1584	1635	makeSomething(new Sphere());
1585	1636	} else
1586		- if (event.getSource() == coneItem)
	1637	+ if (source == coneItem)
1587	1638	{
1588	1639	makeSomething(new Cone());
1589	1640	} else
1590		- if (event.getSource() == torusItem)
	1641	+ if (source == torusItem)
1591	1642	{
1592	1643	makeSomething(new Torus());
1593	1644	} else
1594		- if (event.getSource() == superItem)
	1645	+ if (source == superItem)
1595	1646	{
1596	1647	makeSomething(new Superellipsoid());
1597	1648	} else
1598		- if (event.getSource() == blobItem)
	1649	+ if (source == kleinItem)
	1650	+ {
	1651	+ makeSomething(new Klein());
	1652	+ } else
	1653	+ if (source == blobItem)
1599	1654	{
1600	1655	Blob blob = new Blob();
1601	1656	BlobComponent comp = new BlobComponent();
..	..	@@ -1603,15 +1658,15 @@
1603	1658	//blob.retile();
1604	1659	makeSomething(blob);
1605	1660	} else
1606		- if (event.getSource() == latheItem)
	1661	+ if (source == latheItem)
1607	1662	{
1608	1663	makeSomething(new Lathe());
1609	1664	} else
1610		- if (event.getSource() == bezierItem)
	1665	+ if (source == bezierItem)
1611	1666	{
1612	1667	makeSomething(new BezierSurface());
1613	1668	} else
1614		- if (event.getSource() == checkerItem)
	1669	+ if (source == checkerItem)
1615	1670	{
1616	1671	/*
1617	1672	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1626,7 +1681,7 @@
1626	1681	*/
1627	1682	makeSomething(new Checker());
1628	1683	} else
1629		- if (event.getSource() == meshItem)
	1684	+ if (source == meshItem)
1630	1685	{
1631	1686	Object3D itemtomake = new Object3D();
1632	1687	Object3D child;
..	..	@@ -1647,35 +1702,35 @@
1647	1702	makeSomething(child);
1648	1703	}
1649	1704	} else
1650		- if (event.getSource() == springItem)
	1705	+ if (source == springItem)
1651	1706	{
1652	1707	cSpring s = new cSpring();
1653	1708	s.setup();
1654	1709	makeSomething(s);
1655	1710	} else
1656		- if (event.getSource() == flagItem)
	1711	+ if (source == flagItem)
1657	1712	{
1658	1713	cSpring s = new cFlag();
1659	1714	s.setup();
1660	1715	makeSomething(s);
1661	1716	} else
1662		- if (event.getSource() == lightItem)
	1717	+ if (source == lightItem)
1663	1718	{
1664	1719	makeSomething(new Light());
1665	1720	} else
1666		- if (event.getSource() == csgItem)
	1721	+ if (source == csgItem)
1667	1722	{
1668	1723	group(new CSG());
1669	1724	} else
1670		- if (event.getSource() == templateItem)
	1725	+ if (source == templateItem)
1671	1726	{
1672	1727	group(new cTemplate());
1673	1728	} else
1674		- if (event.getSource() == attributeItem)
	1729	+ if (source == attributeItem)
1675	1730	{
1676	1731	makeSomething(new Attribute());
1677	1732	} else
1678		- if (event.getSource() == pointflowItem)
	1733	+ if (source == pointflowItem)
1679	1734	{
1680	1735	makeSomething(new PointFlow());
1681	1736	} else
..	..	@@ -1687,7 +1742,7 @@
1687	1742	} else
1688	1743	*/
1689	1744
1690		- if (event.getSource() == superLoopItem)
	1745	+ if (source == superLoopItem)
1691	1746	{
1692	1747	Composite g = new cGroup();
1693	1748	for (int i=0; i<15; i++)
..	..	@@ -1709,7 +1764,7 @@
1709	1764
1710	1765	group(g);
1711	1766	} else
1712		- if (event.getSource() == loopItem)
	1767	+ if (source == loopItem)
1713	1768	{
1714	1769	Composite csg = new GroupLeaf();
1715	1770	csg.count = 5;
..	..	@@ -1718,7 +1773,7 @@
1718	1773	csg.addChild(child);
1719	1774	child.addChild(csg);
1720	1775	} else
1721		- if (event.getSource() == doubleItem)
	1776	+ if (source == doubleItem)
1722	1777	{
1723	1778	Composite csg = new GroupLeaf();
1724	1779	csg.count = 5;
..	..	@@ -1730,7 +1785,7 @@
1730	1785	csg.addChild(child);
1731	1786	child.addChild(csg);
1732	1787	} else
1733		- if (event.getSource() == tripleItem)
	1788	+ if (source == tripleItem)
1734	1789	{
1735	1790	Composite csg = new GroupLeaf();
1736	1791	csg.count = 4;
..	..	@@ -1746,70 +1801,70 @@
1746	1801	child.addChild(csg);
1747	1802	} else
1748	1803
1749		- if (event.getSource() == importGFDItem)
	1804	+ if (source == importGFDItem)
1750	1805	{
1751	1806	ImportGFD();
1752	1807	} else
1753		- if (event.getSource() == importVRMLX3DItem)
	1808	+ if (source == importVRMLX3DItem)
1754	1809	{
1755	1810	ImportVRMLX3D();
1756	1811	} else
1757		- if (event.getSource() == import3DSItem)
	1812	+ if (source == import3DSItem)
1758	1813	{
1759	1814	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1760	1815	} else
1761		- if (event.getSource() == importOBJItem)
	1816	+ if (source == importOBJItem)
1762	1817	{
1763	1818	objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1764	1819	} else
1765		- if (event.getSource() == computeAOItem)
	1820	+ if (source == computeAOItem)
1766	1821	{
1767		- CameraPane.drawMode = CameraPane.OCCLUSION;
1768		- CameraPane.theRenderer.repaint();
	1822	+ Globals.drawMode = CameraPane.OCCLUSION;
	1823	+ Globals.theRenderer.repaint();
1769	1824	} else
1770		- if (event.getSource() == recompileItem)
	1825	+ if (source == recompileItem)
1771	1826	{
1772	1827	Recompile();
1773	1828	refreshContents();
1774	1829	} else
1775		- if (event.getSource() == editScriptItem)
	1830	+ if (source == editScriptItem)
1776	1831	{
1777	1832	OpenDialog();
1778	1833	refreshContents();
1779	1834	} else
1780		- if (event.getSource() == invariantsItem)
	1835	+ if (source == invariantsItem)
1781	1836	{
1782	1837	System.out.println("Invariants:");
1783		- GrafreeD.theApplet3D.universe.invariants();
	1838	+ GrafreeD.grafreeD.universe.invariants();
1784	1839	} else
1785		- if (event.getSource() == memoryItem)
	1840	+ if (source == memoryItem)
1786	1841	{
1787	1842	//System.out.println("Invariants:");
1788	1843	PrintMemory();
1789	1844	} else
1790		- if (event.getSource() == pathItem)
	1845	+ if (source == pathItem)
1791	1846	{
1792	1847	PrintPath();
1793	1848	} else
1794		- if (event.getSource() == analyzeItem)
	1849	+ if (source == analyzeItem)
1795	1850	{
1796	1851	AnalyzeObject();
1797	1852	} else
1798		- if (event.getSource() == dumpItem)
	1853	+ if (source == dumpItem)
1799	1854	{
1800	1855	DumpObject();
1801	1856	} else
1802		- if (event.getSource() == screenfitButton)
	1857	+ if (source == screenfitButton)
1803	1858	{
1804	1859	//Reload(lastConverter, lastFilename, true);
1805	1860	ScreenFit();
1806	1861	} else
1807		- if (event.getSource() == screenfitpointButton)
	1862	+ if (source == screenfitpointButton)
1808	1863	{
1809	1864	//Reload(lastConverter, lastFilename, true);
1810	1865	ScreenFitPoint();
1811	1866	} else
1812		- if (event.getSource() == snapobjectButton)
	1867	+ if (source == snapobjectButton)
1813	1868	{
1814	1869	//Reload(lastConverter, lastFilename, true);
1815	1870	SnapObject();
..	..	@@ -1820,13 +1875,13 @@
1820	1875	// Recompile();
1821	1876	// refreshContents();
1822	1877	// } else
1823		- if (event.getSource() == gcButton)
	1878	+ if (source == gcButton)
1824	1879	{
1825	1880	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	1881	System.gc();
1827	1882	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1828	1883	} else
1829		- if (event.getSource() == editLeafItem)
	1884	+ if (source == editLeafItem)
1830	1885	{
1831	1886	Object3D obj;
1832	1887	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1840,62 +1895,62 @@
1840	1895	}
1841	1896	refreshContents(true);
1842	1897	} else
1843		- if (event.getSource() == openWindowItem)
	1898	+ if (source == openWindowItem)
1844	1899	{
1845	1900	EditSelection(true);
1846	1901	} else
1847		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1902	+ if (source == cutItem \|\| source == clearButton)
1848	1903	{
1849	1904	loadClipboard(true);
1850	1905	} else
1851		- if (event.getSource() == duplicateItem)
	1906	+ if (source == duplicateItem)
1852	1907	{
1853	1908	Object3D keep = GrafreeD.clipboard;
1854	1909	loadClipboard(false);
1855	1910	paste(false);
1856	1911	GrafreeD.clipboard = keep;
1857	1912	} else
1858		- if (event.getSource() == cloneItem)
	1913	+ if (source == cloneItem)
1859	1914	{
1860	1915	CloneSelection(false);
1861	1916	} else
1862		- if (event.getSource() == cloneSupportItem)
	1917	+ if (source == cloneSupportItem)
1863	1918	{
1864	1919	CloneSelection(true);
1865	1920	} else
1866		- if (event.getSource() == copyItem)
	1921	+ if (source == copyItem)
1867	1922	{
1868	1923	loadClipboard(false);
1869	1924	} else
1870		- if (event.getSource() == pasteItem)
	1925	+ if (source == pasteItem)
1871	1926	{
1872	1927	paste(false);
1873	1928	} else
1874		- if (event.getSource() == pasteLinkItem)
	1929	+ if (source == pasteLinkItem)
1875	1930	{
1876	1931	pasteInto(false);
1877	1932	} else
1878		- if (event.getSource() == pasteCloneItem)
	1933	+ if (source == pasteCloneItem)
1879	1934	{
1880	1935	pasteInto(true);
1881	1936	} else
1882		- if (event.getSource() == pasteExpandItem)
	1937	+ if (source == pasteExpandItem)
1883	1938	{
1884	1939	paste(true);
1885	1940	} else
1886		- if (event.getSource() == synchronizeItem)
	1941	+ if (source == synchronizeItem)
1887	1942	{
1888	1943	Overwrite(Object3D.TRANSFORM);
1889	1944	} else
1890		- if (event.getSource() == overwriteNameItem)
	1945	+ if (source == overwriteNameItem)
1891	1946	{
1892	1947	Overwrite(Object3D.NAME);
1893	1948	} else
1894		- if (event.getSource() == overwriteUVItem)
	1949	+ if (source == overwriteUVItem)
1895	1950	{
1896	1951	Overwrite(Object3D.UV);
1897	1952	} else
1898		- if (event.getSource() == overwriteMatItem)
	1953	+ if (source == overwriteMatItem)
1899	1954	{
1900	1955	/* july 2015
1901	1956	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1915,7 +1970,7 @@
1915	1970
1916	1971	Overwrite(dropAttributes);
1917	1972	}
1918		- if (event.getSource() == overwriteGeoItem)
	1973	+ if (source == overwriteGeoItem)
1919	1974	{
1920	1975	Overwrite(Object3D.GEOMETRY);
1921	1976	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1932,7 +1987,7 @@
1932	1987	// refreshContents();
1933	1988	// }
1934	1989	} else
1935		- if (event.getSource() == generateMeshItem)
	1990	+ if (source == generateMeshItem)
1936	1991	{
1937	1992	//if (group.selection.size() == 1)
1938	1993	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1943,7 +1998,7 @@
1943	1998	ResetModel();
1944	1999	refreshContents();
1945	2000	} else
1946		- if (event.getSource() == extractGeometriesItem)
	2001	+ if (source == extractGeometriesItem)
1947	2002	{
1948	2003	boolean one = false;
1949	2004
..	..	@@ -1970,7 +2025,7 @@
1970	2025	ResetModel();
1971	2026	refreshContents();
1972	2027	} else
1973		- if (event.getSource() == cloneGeometriesItem)
	2028	+ if (source == cloneGeometriesItem)
1974	2029	{
1975	2030	boolean one = false;
1976	2031
..	..	@@ -1996,32 +2051,37 @@
1996	2051	ResetModel();
1997	2052	refreshContents();
1998	2053	} else
1999		- if (event.getSource() == shareGeometriesItem)
	2054	+ if (source == shareGeometriesItem)
2000	2055	{
2001	2056	boolean one = false;
2002	2057
2003	2058	if (group.selection.size() == 1)
2004	2059	one = true;
2005	2060
	2061	+ Object3D merge = null;
	2062	+
2006	2063	Object3D content = new cGroup();
2007	2064
2008	2065	for (int i=0; i<group.selection.size(); i++)
2009	2066	{
2010		- Object3D sel = new Merge(group.selection.get(i));
	2067	+ merge = new Merge(group.selection.get(i));
2011	2068
2012	2069	if (one)
2013		- makeSomething(sel, false);
	2070	+ makeSomething(merge, false);
2014	2071	else
2015		- content.addChild(sel);
	2072	+ content.addChild(merge);
2016	2073	}
2017	2074
2018	2075	if (!one)
2019		- makeSomething(content, false);
2020		-
2021		- ResetModel();
2022		- refreshContents();
	2076	+ makeSomething(content, true);
	2077	+ else
	2078	+ {
	2079	+ ResetModel();
	2080	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2081	+ refreshContents();
	2082	+ }
2023	2083	} else
2024		- if (event.getSource() == mergeGeometriesItem)
	2084	+ if (source == mergeGeometriesItem)
2025	2085	{
2026	2086	boolean one = false;
2027	2087
..	..	@@ -2051,7 +2111,7 @@
2051	2111	ResetModel();
2052	2112	refreshContents();
2053	2113	} else
2054		- if (event.getSource() == linkverticesItem)
	2114	+ if (source == linkverticesItem)
2055	2115	{
2056	2116	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2057	2117	// {
..	..	@@ -2071,7 +2131,7 @@
2071	2131	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	2132	content = ((cGroup)content).get(0);
2073	2133
2074		- 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));
2075	2135	for (int i=0; i<group.selection.size(); i++)
2076	2136	{
2077	2137	boolean random = CameraPane.RANDOM;
..	..	@@ -2080,11 +2140,11 @@
2080	2140	// group.selection.get(i).setMasterThis(content); // should be identity
2081	2141	CameraPane.RANDOM = random;
2082	2142	}
2083		- 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));
2084	2144	refreshContents();
2085	2145	}
2086	2146	} else
2087		- if (event.getSource() == resetsupportItem)
	2147	+ if (source == resetsupportItem)
2088	2148	{
2089	2149	for (int i=0; i<group.selection.size(); i++)
2090	2150	{
..	..	@@ -2096,7 +2156,16 @@
2096	2156
2097	2157	refreshContents();
2098	2158	} else
2099		- if (event.getSource() == resetreferencesItem)
	2159	+ if (source == relinkverticesItem)
	2160	+ {
	2161	+ boolean random = CameraPane.RANDOM;
	2162	+ CameraPane.RANDOM = false; // parse all random nodes
	2163	+ group.selection.RelinkToSupport();
	2164	+ CameraPane.RANDOM = random;
	2165	+
	2166	+ refreshContents();
	2167	+ } else
	2168	+ if (source == resetreferencesItem)
2100	2169	{
2101	2170	for (int i=0; i<group.selection.size(); i++)
2102	2171	{
..	..	@@ -2105,7 +2174,7 @@
2105	2174
2106	2175	refreshContents();
2107	2176	} else
2108		- if (event.getSource() == setMasterItem)
	2177	+ if (source == setMasterItem)
2109	2178	{
2110	2179	if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2111	2180	{
..	..	@@ -2118,7 +2187,7 @@
2118	2187	refreshContents();
2119	2188	}
2120	2189	} else
2121		- if (event.getSource() == poseMeshItem)
	2190	+ if (source == poseMeshItem)
2122	2191	{
2123	2192	if (group.selection.size() == 1)
2124	2193	{
..	..	@@ -2137,19 +2206,19 @@
2137	2206	}
2138	2207
2139	2208	} else
2140		- if (event.getSource() == revertMeshItem)
	2209	+ if (source == revertMeshItem)
2141	2210	{
2142	2211	RevertMeshes();
2143	2212	} else
2144		- if (event.getSource() == resetMeshItem)
	2213	+ if (source == resetMeshItem)
2145	2214	{
2146	2215	ResetAll();
2147	2216	} else
2148		- if (event.getSource() == stepAllItem)
	2217	+ if (source == stepAllItem)
2149	2218	{
2150	2219	StepAll();
2151	2220	} else
2152		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2221	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2153	2222	{
2154	2223	//int indices[] = jList.getSelectedIndices();
2155	2224	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2157,42 +2226,46 @@
2157	2226
2158	2227	ClearSelection(false);
2159	2228	} else
2160		- if (event.getSource() == clearAllItem)
	2229	+ if (source == clearAllItem)
2161	2230	{
2162	2231	ClearSelection(true);
2163	2232	} else
2164		- if (event.getSource() == grabItem)
	2233	+ if (source == grabItem)
2165	2234	{
2166	2235	group(new cGroup(), true);
2167	2236	} else
2168		- if (event.getSource() == frontItem)
	2237	+ if (source == hideItem)
	2238	+ {
	2239	+ group(new HiddenObject());
	2240	+ } else
	2241	+ if (source == frontItem)
2169	2242	{
2170	2243	front();
2171	2244	} else
2172		- if (event.getSource() == backItem)
	2245	+ if (source == backItem)
2173	2246	{
2174	2247	back();
2175	2248	} else
2176		- if (event.getSource() == cameraItem)
	2249	+ if (source == cameraItem)
2177	2250	{
2178	2251	makeSomething(new Camera());
2179	2252	} else
2180		- if (event.getSource() == compositeItem)
	2253	+ if (source == compositeItem)
2181	2254	{
2182	2255	group(new Composite());
2183	2256	} else
2184		- if (event.getSource() == randomItem)
	2257	+ if (source == randomItem)
2185	2258	{
2186	2259	RandomNode random = new RandomNode();
2187	2260	group(random);
2188	2261	if (random.size() > 0)
2189	2262	random.name = random.get(0).name + "Rnd";
2190	2263	} else
2191		- if (event.getSource() == physicsItem)
	2264	+ if (source == physicsItem)
2192	2265	{
2193	2266	group(new PhysicsNode());
2194	2267	} else
2195		- if (event.getSource() == frameselectorItem)
	2268	+ if (source == frameselectorItem)
2196	2269	{
2197	2270	for (int i=0; i<group.selection.size(); i++)
2198	2271	{
..	..	@@ -2204,7 +2277,7 @@
2204	2277	ResetModel();
2205	2278	refreshContents();
2206	2279	} else
2207		- if (event.getSource() == switchGeoItem)
	2280	+ if (source == switchGeoItem)
2208	2281	{
2209	2282	for (int i=0; i<group.selection.size(); i++)
2210	2283	{
..	..	@@ -2216,7 +2289,7 @@
2216	2289	ResetModel();
2217	2290	refreshContents();
2218	2291	} else
2219		- if (event.getSource() == switchTransfoItem)
	2292	+ if (source == switchTransfoItem)
2220	2293	{
2221	2294	for (int i=0; i<group.selection.size(); i++)
2222	2295	{
..	..	@@ -2228,7 +2301,7 @@
2228	2301	ResetModel();
2229	2302	refreshContents();
2230	2303	} else
2231		- if (event.getSource() == morphItem)
	2304	+ if (source == morphItem)
2232	2305	{
2233	2306	for (int i=0; i<group.selection.size(); i++)
2234	2307	{
..	..	@@ -2240,7 +2313,7 @@
2240	2313	ResetModel();
2241	2314	refreshContents();
2242	2315	} else
2243		- if (event.getSource() == scriptNodeItem)
	2316	+ if (source == scriptNodeItem)
2244	2317	{
2245	2318	boolean atleastone = false;
2246	2319
..	..	@@ -2279,199 +2352,215 @@
2279	2352	}
2280	2353	}
2281	2354	} else
2282		- if (event.getSource() == linkerItem)
	2355	+ if (source == linkerItem)
2283	2356	{
2284	2357	group(new cLinker());
2285	2358	} else
2286		- if (event.getSource() == textureItem)
	2359	+ if (source == textureItem)
2287	2360	{
2288	2361	group(new TextureNode());
2289	2362	} else
2290		- if (event.getSource() == shadowXItem)
	2363	+ if (source == billboardItem)
	2364	+ {
	2365	+ group(new BillboardNode());
	2366	+ } else
	2367	+ if (source == shadowXItem)
2291	2368	{
2292	2369	CastShadow(0);
2293	2370	} else
2294		- if (event.getSource() == shadowYItem)
	2371	+ if (source == shadowYItem)
2295	2372	{
2296	2373	CastShadow(1);
2297	2374	} else
2298		- if (event.getSource() == shadowZItem)
	2375	+ if (source == shadowZItem)
2299	2376	{
2300	2377	CastShadow(2);
2301	2378	} else
2302		- if (event.getSource() == ungroupItem)
	2379	+ if (source == ungroupItem)
2303	2380	{
2304		- ungroup();
	2381	+ //ungroup();
	2382	+ for (int i=0; i<group.selection.size(); i++)
	2383	+ {
	2384	+ Ungroup(group.selection.get(i));
	2385	+ }
	2386	+
	2387	+ ClearSelection(false);
	2388	+
	2389	+ refreshContents();
2305	2390	} else
2306		- if (event.getSource() == genUVItem)
	2391	+ if (source == genUVItem)
2307	2392	{
2308	2393	GenUV();
2309	2394	} else
2310		- if (event.getSource() == genNormalsCADItem)
	2395	+ if (source == genNormalsCADItem)
2311	2396	{
2312	2397	GenNormals(true);
2313	2398	} else
2314		- if (event.getSource() == genNormalsMESHItem)
	2399	+ if (source == genNormalsMESHItem)
2315	2400	{
2316	2401	GenNormals(true); // TODO
2317	2402	} else
2318		- if (event.getSource() == genNormalsORGANItem)
	2403	+ if (source == genNormalsORGANItem)
2319	2404	{
2320	2405	GenNormals(false);
2321	2406	} else
2322		- if (event.getSource() == stripifyItem)
	2407	+ if (source == genNormalsMINEItem)
	2408	+ {
	2409	+ GenNormalsMINE();
	2410	+ } else
	2411	+ if (source == stripifyItem)
2323	2412	{
2324	2413	Stripify();
2325	2414	} else
2326		- if (event.getSource() == unstripifyItem)
	2415	+ if (source == unstripifyItem)
2327	2416	{
2328	2417	Unstripify();
2329	2418	} else
2330		- if (event.getSource() == trimItem)
	2419	+ if (source == trimItem)
2331	2420	{
2332	2421	Trim();
2333	2422	} else
2334		- if (event.getSource() == untrimItem)
	2423	+ if (source == untrimItem)
2335	2424	{
2336	2425	Untrim();
2337	2426	} else
2338		- if (event.getSource() == clearColorsItem)
	2427	+ if (source == clearColorsItem)
2339	2428	{
2340	2429	ClearColors();
2341	2430	} else
2342		- if (event.getSource() == clearMaterialsItem)
	2431	+ if (source == clearMaterialsItem)
2343	2432	{
2344	2433	ClearMaterials();
2345	2434	} else
2346		- if (event.getSource() == liveleavesItem)
	2435	+ if (source == liveleavesItem)
2347	2436	{
2348	2437	LiveLeaves(true);
2349	2438	} else
2350		- if (event.getSource() == unliveleavesItem)
	2439	+ if (source == unliveleavesItem)
2351	2440	{
2352	2441	LiveLeaves(false);
2353	2442	} else
2354		- if (event.getSource() == supportleavesItem)
	2443	+ if (source == supportleavesItem)
2355	2444	{
2356	2445	SupportLeaves(true);
2357	2446	} else
2358		- if (event.getSource() == unsupportleavesItem)
	2447	+ if (source == unsupportleavesItem)
2359	2448	{
2360	2449	SupportLeaves(false);
2361	2450	} else
2362		- if (event.getSource() == hideleavesItem)
	2451	+ if (source == hideleavesItem)
2363	2452	{
2364	2453	HideLeaves(true);
2365	2454	} else
2366		- if (event.getSource() == showleavesItem)
	2455	+ if (source == showleavesItem)
2367	2456	{
2368	2457	HideLeaves(false);
2369	2458	} else
2370		- if (event.getSource() == markleavesItem)
	2459	+ if (source == markleavesItem)
2371	2460	{
2372	2461	MarkLeaves(true);
2373	2462	} else
2374		- if (event.getSource() == unmarkleavesItem)
	2463	+ if (source == unmarkleavesItem)
2375	2464	{
2376	2465	MarkLeaves(false);
2377	2466	} else
2378		- if (event.getSource() == flipVItem)
	2467	+ if (source == flipVItem)
2379	2468	{
2380	2469	FlipV(true);
2381	2470	} else
2382		- if (event.getSource() == unflipVItem)
	2471	+ if (source == unflipVItem)
2383	2472	{
2384	2473	FlipV(false);
2385	2474	} else
2386		- if (event.getSource() == lowTexturesItem)
	2475	+ if (source == lowTexturesItem)
2387	2476	{
2388	2477	SetTexRes(0);
2389	2478	} else
2390		- if (event.getSource() == normalTexturesItem)
	2479	+ if (source == normalTexturesItem)
2391	2480	{
2392	2481	SetTexRes(1);
2393	2482	} else
2394		- if (event.getSource() == highTexturesItem)
	2483	+ if (source == highTexturesItem)
2395	2484	{
2396	2485	SetTexRes(2);
2397	2486	} else
2398		- if (event.getSource() == veryhighTexturesItem)
	2487	+ if (source == veryhighTexturesItem)
2399	2488	{
2400	2489	SetTexRes(3);
2401	2490	} else
2402		- if (event.getSource() == maxTexturesItem)
	2491	+ if (source == maxTexturesItem)
2403	2492	{
2404	2493	SetTexRes(4);
2405	2494	} else
2406		- if (event.getSource() == panoTexturesItem)
	2495	+ if (source == panoTexturesItem)
2407	2496	{
2408	2497	SetTexRes(5);
2409	2498	} else
2410		- if (event.getSource() == reverseNormalsItem)
	2499	+ if (source == reverseNormalsItem)
2411	2500	{
2412	2501	ReverseNormals();
2413	2502	} else
2414		- if (event.getSource() == parseverticesItem)
	2503	+ if (source == parseverticesItem)
2415	2504	{
2416	2505	ParseVertices();
2417	2506	} else
2418		- if (event.getSource() == textureFieldItem)
	2507	+ if (source == textureFieldItem)
2419	2508	{
2420	2509	TextureVertices();
2421	2510	} else
2422		- if (event.getSource() == alignItem)
	2511	+ if (source == alignItem)
2423	2512	{
2424	2513	Align();
2425	2514	} else
2426		- if (event.getSource() == mirrorItem)
	2515	+ if (source == mirrorItem)
2427	2516	{
2428	2517	MirrorPoses();
2429	2518	} else
2430		- if (event.getSource() == reduceMorphItem)
	2519	+ if (source == reduceMorphItem)
2431	2520	{
2432	2521	MeshReduction(false);
2433	2522	} else
2434		- if (event.getSource() == reduce34MorphItem)
	2523	+ if (source == reduce34MorphItem)
2435	2524	{
2436	2525	MeshReduction(true);
2437	2526	} else
2438		- if (event.getSource() == reverseTrianglesItem)
	2527	+ if (source == reverseTrianglesItem)
2439	2528	{
2440	2529	ReverseTriangles();
2441	2530	} else
2442		- if (event.getSource() == reduceMeshItem)
	2531	+ if (source == reduceMeshItem)
2443	2532	{
2444	2533	ReduceMesh(false);
2445	2534	} else
2446		- if (event.getSource() == reduce34MeshItem)
	2535	+ if (source == reduce34MeshItem)
2447	2536	{
2448	2537	ReduceMesh(true);
2449	2538	} else
2450		- if (event.getSource() == increaseMeshItem)
	2539	+ if (source == increaseMeshItem)
2451	2540	{
2452	2541	IncreaseMesh();
2453	2542	} else
2454		- if (event.getSource() == clipMeshItem)
	2543	+ if (source == clipMeshItem)
2455	2544	{
2456	2545	ClipMesh();
2457	2546	} else
2458		- if (event.getSource() == smoothMeshItem)
	2547	+ if (source == smoothMeshItem)
2459	2548	{
2460	2549	SmoothMesh();
2461	2550	} else
2462		- if (event.getSource() == transformgeometryItem)
	2551	+ if (source == transformgeometryItem)
2463	2552	{
2464	2553	TransformGeometry();
2465	2554	} else
2466		- if (event.getSource() == resetTransformItem)
	2555	+ if (source == resetTransformItem)
2467	2556	{
2468	2557	ResetTransform();
2469	2558	} else
2470		- if (event.getSource() == resetCentroidItem)
	2559	+ if (source == resetCentroidItem)
2471	2560	{
2472	2561	ResetCentroid();
2473	2562	} else
2474		- if (event.getSource() == resetParentItem)
	2563	+ if (source == resetParentItem)
2475	2564	{
2476	2565	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	2566	{
..	..	@@ -2481,7 +2570,7 @@
2481	2570
2482	2571	refreshContents();
2483	2572	} else
2484		- if (event.getSource() == repairParentItem)
	2573	+ if (source == repairParentItem)
2485	2574	{
2486	2575	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2487	2576	{
..	..	@@ -2495,7 +2584,21 @@
2495	2584
2496	2585	refreshContents();
2497	2586	} else
2498		- 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)
2499	2602	{
2500	2603	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2501	2604	{
..	..	@@ -2507,7 +2610,7 @@
2507	2610	ResetModel();
2508	2611	refreshContents();
2509	2612	} else
2510		- if (event.getSource() == sortbynameItem)
	2613	+ if (source == sortbynameItem)
2511	2614	{
2512	2615	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2513	2616	{
..	..	@@ -2519,7 +2622,7 @@
2519	2622	ResetModel();
2520	2623	refreshContents();
2521	2624	} else
2522		- if (event.getSource() == attachPigmentItem)
	2625	+ if (source == attachPigmentItem)
2523	2626	{
2524	2627	String texture = GetFile("Attach pigment");
2525	2628	Object3D obj;
..	..	@@ -2531,7 +2634,7 @@
2531	2634
2532	2635	refreshContents();
2533	2636	} else
2534		- if (event.getSource() == detachPigmentItem)
	2637	+ if (source == detachPigmentItem)
2535	2638	{
2536	2639	Object3D obj;
2537	2640	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2542,7 +2645,7 @@
2542	2645
2543	2646	refreshContents();
2544	2647	} else
2545		- if (event.getSource() == attachBumpItem)
	2648	+ if (source == attachBumpItem)
2546	2649	{
2547	2650	String texture = GetFile("Attach bump");
2548	2651	Object3D obj;
..	..	@@ -2554,7 +2657,7 @@
2554	2657
2555	2658	refreshContents();
2556	2659	} else
2557		- if (event.getSource() == detachBumpItem)
	2660	+ if (source == detachBumpItem)
2558	2661	{
2559	2662	Object3D obj;
2560	2663	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2565,7 +2668,7 @@
2565	2668
2566	2669	refreshContents();
2567	2670	} else
2568		- if (event.getSource() == pigmentBumpItem)
	2671	+ if (source == pigmentBumpItem)
2569	2672	{
2570	2673	Object3D obj;
2571	2674	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2576,158 +2679,195 @@
2576	2679
2577	2680	refreshContents();
2578	2681	} else
2579		- if (event.getSource() == flashSelectionButton)
	2682	+ if (source == flashSelectionButton)
2580	2683	{
2581	2684	CameraPane.flash = true;
2582	2685	refreshContents();
2583	2686	} else
2584		- if (event.getSource() == oneButton)
	2687	+ if (source == oneButton)
2585	2688	{
2586	2689	} else
2587		- if (event.getSource() == twoButton)
	2690	+ if (source == twoButton)
2588	2691	{
2589	2692	radio.layout = twoButton;
2590	2693	// bug
2591	2694	//gridPanel.setDividerLocation(1.0);
2592	2695	//bigPanel.setDividerLocation(0.0);
2593		- bigThree.remove(jtp);
2594		- bigThree.remove(cameraPanel);
2595		- bigThree.remove(XYZPanel);
2596		- aWindowConstraints.gridx = 0;
2597		- aWindowConstraints.gridy = 0;
2598		- aWindowConstraints.gridwidth = 1;
2599		- // aConstraints.gridheight = 3;
2600		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2601		- aWindowConstraints.weightx = 0;
2602		- aWindowConstraints.weighty = 1;
2603		- //bigThree.add(jtp, aWindowConstraints);
2604		- aWindowConstraints.weightx = 1;
2605		- aWindowConstraints.gridwidth = 3;
2606		- // aConstraints.gridheight = 3;
2607		- aWindowConstraints.gridx = 1;
2608		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2609		- bigThree.add(cameraPanel, aWindowConstraints);
2610		- aWindowConstraints.weightx = 0;
2611		- aWindowConstraints.gridx = 4;
2612		- aWindowConstraints.gridwidth = 1;
2613		- // aConstraints.gridheight = 3;
2614		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2615		- //bigThree.add(XYZPanel, aWindowConstraints);
2616		- 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();
2617	2725	} else
2618		- if (event.getSource() == threeButton)
	2726	+ if (source == threeButton)
2619	2727	{
2620	2728	radio.layout = threeButton;
2621		- bigThree.remove(jtp);
2622		- bigThree.remove(cameraPanel);
2623		- bigThree.remove(XYZPanel);
2624		- aWindowConstraints.gridx = 0;
2625		- aWindowConstraints.gridy = 0;
2626		- aWindowConstraints.gridwidth = 1;
2627		- // aConstraints.gridheight = 3;
2628		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2629		- aWindowConstraints.weightx = 0;
2630		- aWindowConstraints.weighty = 1;
2631		- //bigThree.add(jtp, aWindowConstraints);
2632		- aWindowConstraints.weightx = 1;
2633		- aWindowConstraints.gridwidth = 3;
2634		- // aConstraints.gridheight = 3;
2635		- aWindowConstraints.gridx = 1;
2636		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2637		- bigThree.add(cameraPanel, aWindowConstraints);
2638		- aWindowConstraints.weightx = 0;
2639		- aWindowConstraints.gridx = 4;
2640		- aWindowConstraints.gridwidth = 1;
2641		- // aConstraints.gridheight = 3;
2642		- aConstraints.fill = GridBagConstraints.VERTICAL;
2643		- bigThree.add(XYZPanel, aWindowConstraints);
2644		- 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();
2645	2761	} else
2646		- if (event.getSource() == fourButton)
	2762	+ if (source == fourButton)
2647	2763	{
2648	2764	radio.layout = fourButton;
2649		- bigThree.remove(jtp);
2650		- bigThree.remove(cameraPanel);
2651		- bigThree.remove(XYZPanel);
2652		- aWindowConstraints.gridx = 0;
2653		- aWindowConstraints.gridy = 0;
2654		- aWindowConstraints.gridwidth = 1;
2655		- // aWindowConstraints.gridheight = 3;
2656		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2657		- aWindowConstraints.weightx = 1;
2658		- aWindowConstraints.weighty = 1;
2659		- bigThree.add(jtp, aWindowConstraints);
2660		- aWindowConstraints.weightx = 1;
2661		- aWindowConstraints.gridwidth = 3;
2662		- // aConstraints.gridheight = 3;
2663		- aWindowConstraints.gridx = 1;
2664		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2665		- //bigThree.add(cameraPanel, aWindowConstraints);
2666		- aWindowConstraints.weightx = 0;
2667		- aWindowConstraints.gridx = 4;
2668		- aWindowConstraints.gridwidth = 1;
2669		- // aWindowConstraints.gridheight = 3;
2670		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2671		- //bigThree.add(XYZPanel, aWindowConstraints);
2672		- 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();
2673	2796	} else
2674		- if (event.getSource() == sixButton)
	2797	+ if (source == sixButton)
2675	2798	{
2676	2799	radio.layout = sixButton;
2677		- bigThree.remove(jtp);
2678		- bigThree.remove(cameraPanel);
2679		- bigThree.remove(XYZPanel);
2680		- aWindowConstraints.gridx = 0;
2681		- aWindowConstraints.gridy = 0;
2682		- aWindowConstraints.gridwidth = 1;
2683		- // aConstraints.gridheight = 3;
2684		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2685		- aWindowConstraints.weightx = 0;
2686		- aWindowConstraints.weighty = 1;
2687		- bigThree.add(jtp, aWindowConstraints);
2688		- aWindowConstraints.weightx = 1;
2689		- aWindowConstraints.gridwidth = 3;
2690		- // aWindowConstraints.gridheight = 3;
2691		- aWindowConstraints.gridx = 1;
2692		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2693		- bigThree.add(cameraPanel, aWindowConstraints);
2694		- aWindowConstraints.weightx = 0;
2695		- aWindowConstraints.gridx = 4;
2696		- aWindowConstraints.gridwidth = 1;
2697		- // aWindowConstraints.gridheight = 3;
2698		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2699		- //bigThree.add(XYZPanel, aConstraints);
2700		- 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();
2701	2832	} else
2702		- if (event.getSource() == sevenButton)
	2833	+ if (source == sevenButton)
2703	2834	{
2704	2835	radio.layout = sevenButton;
2705		- bigThree.remove(jtp);
2706		- bigThree.remove(cameraPanel);
2707		- bigThree.remove(XYZPanel);
2708		- aWindowConstraints.gridx = 0;
2709		- aWindowConstraints.gridy = 0;
2710		- aWindowConstraints.gridwidth = 1;
2711		- // aWindowConstraints.gridheight = 3;
2712		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2713		- aWindowConstraints.weightx = 0;
2714		- aWindowConstraints.weighty = 1;
2715		- bigThree.add(jtp, aWindowConstraints);
2716		- aWindowConstraints.weightx = 1;
2717		- aWindowConstraints.gridwidth = 3;
2718		- // aWindowConstraints.gridheight = 3;
2719		- aWindowConstraints.gridx = 1;
2720		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2721		- bigThree.add(cameraPanel, aWindowConstraints);
2722		- aWindowConstraints.weightx = 0;
2723		- aWindowConstraints.gridx = 4;
2724		- aWindowConstraints.gridwidth = 1;
2725		- // aConstraints.gridheight = 3;
2726		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2727		- bigThree.add(XYZPanel, aWindowConstraints);
2728		- 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();
2729	2869	} else
2730		- if (event.getSource() == rootButton)
	2870	+ if (source == rootButton)
2731	2871	{
2732	2872	Object3D obj;
2733	2873	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2739,7 +2879,7 @@
2739	2879
2740	2880	refreshContents(true);
2741	2881	} else
2742		- if (event.getSource() == closeButton)
	2882	+ if (source == closeButton)
2743	2883	{
2744	2884	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2745	2885	cRadio ab;
..	..	@@ -2760,11 +2900,11 @@
2760	2900	}
2761	2901	refreshContents(true);
2762	2902	} else
2763		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2903	+ if (source == editItem \|\| source == editButton)
2764	2904	{
2765	2905	EditSelection(false);
2766	2906	} else
2767		- if (event.getSource() == uneditButton)
	2907	+ if (source == uneditButton)
2768	2908	{
2769	2909	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2770	2910	{
..	..	@@ -2781,7 +2921,7 @@
2781	2921	//objEditor.ResetSliders();
2782	2922	refreshContents(true);
2783	2923	} else
2784		- if (event.getSource() == clearPanelButton)
	2924	+ if (source == clearPanelButton)
2785	2925	{
2786	2926	assert(copy == group);
2787	2927	//copy.ClearUI();
..	..	@@ -2792,7 +2932,7 @@
2792	2932	listUI.clear();
2793	2933	refreshContents(true);
2794	2934	} else
2795		- if (event.getSource() == allParamsButton)
	2935	+ if (source == allParamsButton)
2796	2936	{
2797	2937	assert(copy == group);
2798	2938
..	..	@@ -2813,19 +2953,19 @@
2813	2953
2814	2954	refreshContents(true);
2815	2955	} else
2816		- if (event.getSource() == unselectButton)
	2956	+ if (source == unselectButton)
2817	2957	{
2818	2958	objEditor.jTree.clearSelection();
2819	2959	// ?? oct 2012 GrafreeD.clipboard.clear();
2820	2960	objEditor.ResetSliders();
2821	2961	refreshContents(true);
2822	2962	} else
2823		- if(event.getSource() instanceof cRadio)
	2963	+ if(source instanceof cRadio)
2824	2964	{
2825	2965	group.parent = keepparent;
2826	2966	group.attributes = 0;
2827	2967	//group.editWindow = null;
2828		- /cRadio/ radio = (cRadio)event.getSource();
	2968	+ /cRadio/ radio = (cRadio)source;
2829	2969	Object3D obj = radio.GetObject();
2830	2970	System.out.println("Edit " + obj);
2831	2971	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2845,7 +2985,7 @@
2845	2985	}
2846	2986
2847	2987	copy = group;
2848		- //CameraPane.theRenderer.object = group;
	2988	+ //Globals.theRenderer.object = group;
2849	2989	if(!useclient)
2850	2990	{
2851	2991	cameraView.renderCamera = radio.camera;
..	..	@@ -2854,7 +2994,8 @@
2854	2994	cameraView.cameras[cameraView.cameracount] = radio.camera;
2855	2995	cameraView.targetLookAt.set(radio.camera.lookAt);
2856	2996	cameraView.object = group;
2857		- cameraView.lighttouched = true;
	2997	+ //cameraView.lighttouched = true;
	2998	+ Globals.lighttouched = true;
2858	2999	topView.object = group;
2859	3000	frontView.object = group;
2860	3001	sideView.object = group;
..	..	@@ -2890,7 +3031,7 @@
2890	3031	if (useclient)
2891	3032	{
2892	3033	cameraView.object = client;
2893		- cameraView.lighttouched = true;
	3034	+ Globals.lighttouched = true;
2894	3035	//topView.object = client;
2895	3036	//frontView.object = client;
2896	3037	//sideView.object = client;
..	..	@@ -2898,7 +3039,7 @@
2898	3039	else
2899	3040	{
2900	3041	cameraView.object = group;
2901		- cameraView.lighttouched = true;
	3042	+ Globals.lighttouched = true;
2902	3043	//topView.object = group;
2903	3044	//frontView.object = group;
2904	3045	//sideView.object = group;
..	..	@@ -3179,6 +3320,13 @@
3179	3320	refreshContents();
3180	3321	}
3181	3322
	3323	+ void GenNormalsMINE()
	3324	+ {
	3325	+ group.selection.GenNormalsMINE();
	3326	+
	3327	+ refreshContents();
	3328	+ }
	3329	+
3182	3330	void Stripify()
3183	3331	{
3184	3332	group.StripifyS();
..	..	@@ -3399,7 +3547,7 @@
3399	3547	String pigment = Object3D.GetPigment(tex);
3400	3548	//String bump = Object3D.GetBump(tex);
3401	3549
3402		- 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);
3403	3551
3404	3552	double s = v.s;
3405	3553
..	..	@@ -3447,12 +3595,26 @@
3447	3595
3448	3596	void Align()
3449	3597	{
	3598	+ if (group.selection.size() == 0)
	3599	+ return;
	3600	+
	3601	+ cVector bbmin = new cVector();
	3602	+ cVector bbmax = new cVector();
	3603	+
	3604	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3605	+
	3606	+ double dx = bbmax.x - bbmin.x;
	3607	+ double dy = bbmax.y - bbmin.y;
	3608	+ double dz = bbmax.z - bbmin.z;
	3609	+
	3610	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3611	+
3450	3612	for (int i=0; i<group.selection.size(); i++)
3451	3613	{
3452	3614	Object3D obj = group.selection.get(i);
3453	3615
3454		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3455		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3616	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3617	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3456	3618	}
3457	3619
3458	3620	refreshContents();
..	..	@@ -3686,7 +3848,7 @@
3686	3848	group.selection.RelinkToSupport(); // july 2014
3687	3849	System.out.println("DONE.");
3688	3850	refreshContents();
3689		- 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));
3690	3852	}
3691	3853
3692	3854	void ReduceMesh(boolean reduction34)
..	..	@@ -3971,16 +4133,16 @@
3971	4133
3972	4134	objEditor.SetText(); // jan 2014
3973	4135
3974		- 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))
3975	4137	CameraPane.flash = true;
3976	4138
3977	4139	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
3978	4140	// a camera
3979	4141	{
3980	4142	CameraPane.camerachangeframe = 0; // don't refuse it
3981		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3982		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3983		- // 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;
3984	4146	}
3985	4147
3986	4148	refreshContents();
..	..	@@ -4474,6 +4636,26 @@
4474	4636	makeSomething(csg);
4475	4637	}
4476	4638
	4639	+ void Ungroup(Object3D g)
	4640	+ {
	4641	+ if (g instanceof HiddenObject)
	4642	+ {
	4643	+ HiddenObject h = (HiddenObject) g;
	4644	+
	4645	+ for (int i=0; i<h.ActualSize(); i++)
	4646	+ {
	4647	+ objEditor.makeSomething(h.get(i), false);
	4648	+ }
	4649	+ }
	4650	+ else
	4651	+ {
	4652	+ for (int i=0; i<g.Size(); i++)
	4653	+ {
	4654	+ objEditor.makeSomething(g.get(i), false);
	4655	+ }
	4656	+ }
	4657	+ }
	4658	+
4477	4659	void ungroup()
4478	4660	{
4479	4661	/*
..	..	@@ -4833,6 +5015,7 @@
4833	5015	private MenuItem resetsupportItem;
4834	5016	private MenuItem resetreferencesItem;
4835	5017	private MenuItem linkverticesItem;
	5018	+ private MenuItem relinkverticesItem;
4836	5019	private MenuItem setMasterItem;
4837	5020	private MenuItem resetMeshItem;
4838	5021	private MenuItem stepAllItem;
..	..	@@ -4854,6 +5037,7 @@
4854	5037	private MenuItem genNormalsMESHItem;
4855	5038	private MenuItem genNormalsCADItem;
4856	5039	private MenuItem genNormalsORGANItem;
	5040	+ private MenuItem genNormalsMINEItem;
4857	5041	private MenuItem stripifyItem;
4858	5042	private MenuItem unstripifyItem;
4859	5043	private MenuItem trimItem;
..	..	@@ -4895,6 +5079,7 @@
4895	5079	private MenuItem resetCentroidItem;
4896	5080	private MenuItem transformgeometryItem;
4897	5081	private MenuItem resetTransformItem;
	5082	+ private MenuItem hideItem;
4898	5083	private MenuItem grabItem;
4899	5084	private MenuItem backItem;
4900	5085	private MenuItem frontItem;
..	..	@@ -4915,6 +5100,7 @@
4915	5100
4916	5101	private MenuItem resetParentItem;
4917	5102	private MenuItem repairParentItem;
	5103	+ private MenuItem repairShadowItem;
4918	5104	private MenuItem sortbysizeItem;
4919	5105	private MenuItem sortbynameItem;
4920	5106
..	..	@@ -4935,6 +5121,7 @@
4935	5121	private MenuItem coneItem;
4936	5122	private MenuItem torusItem;
4937	5123	private MenuItem superItem;
	5124	+ private MenuItem kleinItem;
4938	5125	private MenuItem blobItem;
4939	5126	private MenuItem latheItem;
4940	5127	private MenuItem bezierItem;
..	..	@@ -4947,6 +5134,7 @@
4947	5134	private MenuItem csgItem;
4948	5135	private MenuItem templateItem;
4949	5136	private MenuItem textureItem;
	5137	+ private MenuItem billboardItem;
4950	5138	private MenuItem shadowXItem;
4951	5139	private MenuItem shadowYItem;
4952	5140	private MenuItem shadowZItem;