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