~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,6 +12,7 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
..	..	@@ -219,6 +220,8 @@
219	220	resetsupportItem.addActionListener(this);
220	221	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	222	linkverticesItem.addActionListener(this);
	223	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	224	+ relinkverticesItem.addActionListener(this);
222	225	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	226	setMasterItem.addActionListener(this);
224	227
..	..	@@ -231,6 +234,10 @@
231	234	frontItem.addActionListener(this);
232	235	compositeItem = menu.add(new MenuItem("Composite"));
233	236	compositeItem.addActionListener(this);
	237	+ hideItem = menu.add(new MenuItem("Hide"));
	238	+ hideItem.addActionListener(this);
	239	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	240	+ ungroupItem.addActionListener(this);
234	241	menu.add("-");
235	242	randomItem = menu.add(new MenuItem("Random"));
236	243	randomItem.addActionListener(this);
..	..	@@ -252,6 +259,8 @@
252	259	oe.menuBar.add(menu = new Menu("Object"));
253	260	textureItem = menu.add(new MenuItem("Texture"));
254	261	textureItem.addActionListener(this);
	262	+ billboardItem = menu.add(new MenuItem("Billboard"));
	263	+ billboardItem.addActionListener(this);
255	264	csgItem = menu.add(new MenuItem("CSG"));
256	265	csgItem.addActionListener(this);
257	266	shadowXItem = menu.add(new MenuItem("Shadow X"));
..	..	@@ -269,14 +278,12 @@
269	278	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	279	pointflowItem.addActionListener(this);
271	280	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	281	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	282	resetTransformItem.addActionListener(this);
276	283	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	284	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	285	+ transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
	286	+ transformgeometryItem.addActionListener(this);
280	287
281	288	oe.menuBar.add(menu = new Menu("Geometry"));
282	289	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -285,6 +292,10 @@
285	292	genNormalsORGANItem.addActionListener(this);
286	293	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287	294	genNormalsCADItem.addActionListener(this);
	295	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	296	+ genNormalsMESHItem.addActionListener(this);
	297	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	298	+ genNormalsMINEItem.addActionListener(this);
288	299	stripifyItem = menu.add(new MenuItem("Stripify"));
289	300	stripifyItem.addActionListener(this);
290	301	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -423,84 +434,26 @@
423	434	oe.radioPanel.add(dummyButton);
424	435	oe.buttonGroup.add(dummyButton);
425	436	*/
426		- aConstraints.gridy += 1;
427		- oe.aConstraints.gridwidth = 1;
428		- oe.aConstraints.gridx = 0;
	437	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
429	438
430		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	439	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
	440	+ liveCB.setToolTipText("Enabled animation");
431	441	liveCB.addItemListener(this);
432	442
433		- 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);
	443	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
	444	+ trackCB.setToolTipText("Enable tracking");
493	445	trackCB.addItemListener(this);
494	446
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	447	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	448	+ screenfitButton.setToolTipText("Screen fit");
497	449	screenfitButton.addActionListener(this);
498		- oe.aConstraints.gridx += 1;
	450	+
499	451	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
500	452	// screenfitpointButton.addActionListener(this);
501	453	// oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
	454	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
503	455	snapobjectButton.addActionListener(this);
	456	+ snapobjectButton.setToolTipText("Snap Object");
504	457	oe.aConstraints.gridx += 1;
505	458
506	459	//aConstraints.gridx = 0;
..	..	@@ -508,29 +461,35 @@
508	461	oe.aConstraints.weighty = 0;
509	462	oe.aConstraints.gridwidth = 1;
510	463
511		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	464	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	465	+ flashSelectionButton.setToolTipText("Show selection");
512	466	flashSelectionButton.addActionListener(this);
513		- oe.aConstraints.gridx += 1;
514		- oe.aConstraints.weighty = 0;
515		- oe.aConstraints.gridwidth = 1;
516	467
517		- //
518		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	468	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	469	+
	470	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	471	+ twoButton.setToolTipText("Show center view only");
519	472	twoButton.addActionListener(this);
520		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	473	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
521	474	fourButton.addActionListener(this);
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	475	+ fourButton.setToolTipText("Show left panel only");
	476	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	477	+ sixButton.setToolTipText("2-column layout left");
523	478	sixButton.addActionListener(this);
524		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	479	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	480	+ threeButton.setToolTipText("2-column layout right");
525	481	threeButton.addActionListener(this);
526		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	482	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	483	+ sevenButton.setToolTipText("3-column layout");
527	484	sevenButton.addActionListener(this);
528	485	//
529	486
530		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	487	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	488	+ rootButton.setToolTipText("Edit object in new tab");
531	489	rootButton.addActionListener(this);
532	490	oe.aConstraints.gridx += 1;
533		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	491	+ oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	492	+ closeButton.setToolTipText("Close tab");
534	493	closeButton.addActionListener(this);
535	494	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536	495	//clearButton.addActionListener(this);
..	..	@@ -633,17 +592,91 @@
633	592	radio.layout = sevenButton;
634	593	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
635	594	}
	595	+
	596	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	597	+ {
	598	+ //constraints.gridx = 0;
	599	+ //constraints.gridy = 0;
	600	+ panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	601	+ fastCB.setToolTipText("Fast mode");
	602	+ fastCB.addItemListener(this);
	603	+ //constraints.gridy += 1;
	604	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	605	+ supportCB.setToolTipText("Enabled rigging");
	606	+ supportCB.addItemListener(this);
	607	+
	608	+ // constraints.gridy += 1;
	609	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	610	+ // localCB.addItemListener(this);
	611	+
	612	+ //constraints.gridy += 1;
	613	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	614	+ crowdCB.setToolTipText("Used for crowds");
	615	+ crowdCB.addItemListener(this);
	616	+
	617	+ //constraints.gridy += 1;
	618	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	619	+ smoothCB.setToolTipText("Snapping delay");
	620	+ smoothCB.addItemListener(this);
	621	+
	622	+ //constraints.gridy += 1;
	623	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	624	+ slowCB.setToolTipText("Smooth interpolation");
	625	+ slowCB.addItemListener(this);
	626	+ //constraints.gridy += 1;
	627	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	628	+ boxCB.setToolTipText("Display bounding boxes");
	629	+ boxCB.addItemListener(this);
	630	+ //constraints.gridy += 1;
	631	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	632	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	633	+ zoomBoxCB.addItemListener(this);
	634	+
	635	+// constraints.gridy += 1;
	636	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	637	+// speakerMocapCB.addItemListener(this);
	638	+
	639	+ if (false)
	640	+ {
	641	+ // handled in scripts
	642	+ //constraints.gridy += 1;
	643	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	644	+ speakerCameraCB.addItemListener(this);
	645	+
	646	+ //constraints.gridy += 1;
	647	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	648	+ speakerFocusCB.addItemListener(this);
	649	+
	650	+ //constraints.gridy += 1;
	651	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	652	+ smoothfocusCB.addItemListener(this);
	653	+ }
	654	+
	655	+//constraints.gridx += 1;
	656	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	657	+// debugCB.addItemListener(this);
	658	+
	659	+ //constraints.gridy += 1;
	660	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	661	+ oeilCB.addItemListener(this);
	662	+
	663	+ //constraints.gridy += 1;
	664	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	665	+ lookAtCB.setToolTipText("Look-at target");
	666	+ lookAtCB.addItemListener(this);
	667	+
	668	+ }
636	669
637	670	void EditObject(Object3D obj)
638	671	{
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();
	672	+ cRadio radioButton = new cRadio(obj.name);
	673	+ radioButton.SetObject(obj);
	674	+ radioButton.layout = sevenButton;
	675	+ radioButton.SetCamera(cameraView.renderCamera, false);
	676	+ radioButton.addActionListener(this);
	677	+ radioPanel.add(radioButton);
	678	+ buttonGroup.add(radioButton);
	679	+ radioButton.doClick();
647	680	}
648	681	void SetupViews(ObjEditor oe)
649	682	{
..	..	@@ -663,6 +696,7 @@
663	696	JCheckBox fastCB;
664	697	JCheckBox slowCB;
665	698	JCheckBox boxCB;
	699	+ JCheckBox zoomBoxCB;
666	700	JCheckBox trackCB;
667	701	JCheckBox smoothfocusCB;
668	702	// JCheckBox speakerMocapCB;
..	..	@@ -705,8 +739,7 @@
705	739	dropAttributes \|= Object3D.TEXTURE;
706	740	else
707	741	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	742	+ } else if(e.getSource() == liveCB)
710	743	{
711	744	cameraView.ToggleLive();
712	745	}
..	..	@@ -743,6 +776,10 @@
743	776	Recompile();
744	777	cameraView.repaint();
745	778	// refreshContents();
	779	+ }
	780	+ else if(e.getSource() == zoomBoxCB)
	781	+ {
	782	+ cameraView.ToggleZoomBoxMode();
746	783	}
747	784	else if(e.getSource() == smoothfocusCB)
748	785	{
..	..	@@ -1033,6 +1070,8 @@
1033	1070	torusItem.addActionListener(this);
1034	1071	superItem = menu.add(new MenuItem("Superellipsoid"));
1035	1072	superItem.addActionListener(this);
	1073	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1074	+ kleinItem.addActionListener(this);
1036	1075	particleItem = menu.add(new MenuItem("Particle system"));
1037	1076	particleItem.addActionListener(this);
1038	1077	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1106,6 +1145,8 @@
1106	1145	resetParentItem.addActionListener(this);
1107	1146	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	1147	repairParentItem.addActionListener(this);
	1148	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1149	+ repairShadowItem.addActionListener(this);
1109	1150	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	1151	invariantsItem.addActionListener(this);
1111	1152	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1466,6 +1507,7 @@
1466	1507	//
1467	1508	public void actionPerformed(ActionEvent event) // , Object arg)
1468	1509	{
	1510	+ Object source = event.getSource();
1469	1511	/*
1470	1512	if (event.getSource() == nameField)
1471	1513	{
..	..	@@ -1477,11 +1519,11 @@
1477	1519	}
1478	1520	else
1479	1521	*/
1480		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1522	+ if (source == lookAtItem \|\| source == lookFromItem)
1481	1523	{
1482	1524	ScreenFit();
1483	1525	} else
1484		- if (event.getSource() == switchItem)
	1526	+ if (source == switchItem)
1485	1527	{
1486	1528	cVector v1 = new cVector();
1487	1529	cVector v2 = new cVector();
..	..	@@ -1490,11 +1532,11 @@
1490	1532	objEditor.cameraView.renderCamera.setAim(v2, v1);
1491	1533	objEditor.cameraView.repaint();
1492	1534	} else
1493		- if (event.getSource() == rectoidItem)
	1535	+ if (source == rectoidItem)
1494	1536	{
1495	1537	makeSomething(new Box());
1496	1538	} else
1497		- if (event.getSource() == particleItem)
	1539	+ if (source == particleItem)
1498	1540	{
1499	1541	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1500	1542	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1515,9 +1557,9 @@
1515	1557	applyExample(particleGeom, "SMOKE");
1516	1558	makeSomething(particleGeom);
1517	1559	} else
1518		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1560	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1519	1561	{
1520		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1562	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1521	1563
1522	1564	ragdoll.toParent = LA.newMatrix();
1523	1565	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1535,7 +1577,7 @@
1535	1577	} else
1536	1578	/*
1537	1579	*/
1538		- if (event.getSource() == heightFieldItem)
	1580	+ if (source == heightFieldItem)
1539	1581	{
1540	1582	Object3D obj = new Object3D();
1541	1583
..	..	@@ -1573,27 +1615,31 @@
1573	1615
1574	1616	makeSomething(obj);
1575	1617	} else
1576		- if (event.getSource() == gridItem)
	1618	+ if (source == gridItem)
1577	1619	{
1578	1620	makeSomething(new Grid());
1579	1621	} else
1580		- if (event.getSource() == ellipsoidItem)
	1622	+ if (source == ellipsoidItem)
1581	1623	{
1582	1624	makeSomething(new Sphere());
1583	1625	} else
1584		- if (event.getSource() == coneItem)
	1626	+ if (source == coneItem)
1585	1627	{
1586	1628	makeSomething(new Cone());
1587	1629	} else
1588		- if (event.getSource() == torusItem)
	1630	+ if (source == torusItem)
1589	1631	{
1590	1632	makeSomething(new Torus());
1591	1633	} else
1592		- if (event.getSource() == superItem)
	1634	+ if (source == superItem)
1593	1635	{
1594	1636	makeSomething(new Superellipsoid());
1595	1637	} else
1596		- if (event.getSource() == blobItem)
	1638	+ if (source == kleinItem)
	1639	+ {
	1640	+ makeSomething(new Klein());
	1641	+ } else
	1642	+ if (source == blobItem)
1597	1643	{
1598	1644	Blob blob = new Blob();
1599	1645	BlobComponent comp = new BlobComponent();
..	..	@@ -1601,15 +1647,15 @@
1601	1647	//blob.retile();
1602	1648	makeSomething(blob);
1603	1649	} else
1604		- if (event.getSource() == latheItem)
	1650	+ if (source == latheItem)
1605	1651	{
1606	1652	makeSomething(new Lathe());
1607	1653	} else
1608		- if (event.getSource() == bezierItem)
	1654	+ if (source == bezierItem)
1609	1655	{
1610	1656	makeSomething(new BezierSurface());
1611	1657	} else
1612		- if (event.getSource() == checkerItem)
	1658	+ if (source == checkerItem)
1613	1659	{
1614	1660	/*
1615	1661	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1624,7 +1670,7 @@
1624	1670	*/
1625	1671	makeSomething(new Checker());
1626	1672	} else
1627		- if (event.getSource() == meshItem)
	1673	+ if (source == meshItem)
1628	1674	{
1629	1675	Object3D itemtomake = new Object3D();
1630	1676	Object3D child;
..	..	@@ -1645,35 +1691,35 @@
1645	1691	makeSomething(child);
1646	1692	}
1647	1693	} else
1648		- if (event.getSource() == springItem)
	1694	+ if (source == springItem)
1649	1695	{
1650	1696	cSpring s = new cSpring();
1651	1697	s.setup();
1652	1698	makeSomething(s);
1653	1699	} else
1654		- if (event.getSource() == flagItem)
	1700	+ if (source == flagItem)
1655	1701	{
1656	1702	cSpring s = new cFlag();
1657	1703	s.setup();
1658	1704	makeSomething(s);
1659	1705	} else
1660		- if (event.getSource() == lightItem)
	1706	+ if (source == lightItem)
1661	1707	{
1662	1708	makeSomething(new Light());
1663	1709	} else
1664		- if (event.getSource() == csgItem)
	1710	+ if (source == csgItem)
1665	1711	{
1666	1712	group(new CSG());
1667	1713	} else
1668		- if (event.getSource() == templateItem)
	1714	+ if (source == templateItem)
1669	1715	{
1670	1716	group(new cTemplate());
1671	1717	} else
1672		- if (event.getSource() == attributeItem)
	1718	+ if (source == attributeItem)
1673	1719	{
1674	1720	makeSomething(new Attribute());
1675	1721	} else
1676		- if (event.getSource() == pointflowItem)
	1722	+ if (source == pointflowItem)
1677	1723	{
1678	1724	makeSomething(new PointFlow());
1679	1725	} else
..	..	@@ -1685,7 +1731,7 @@
1685	1731	} else
1686	1732	*/
1687	1733
1688		- if (event.getSource() == superLoopItem)
	1734	+ if (source == superLoopItem)
1689	1735	{
1690	1736	Composite g = new cGroup();
1691	1737	for (int i=0; i<15; i++)
..	..	@@ -1707,7 +1753,7 @@
1707	1753
1708	1754	group(g);
1709	1755	} else
1710		- if (event.getSource() == loopItem)
	1756	+ if (source == loopItem)
1711	1757	{
1712	1758	Composite csg = new GroupLeaf();
1713	1759	csg.count = 5;
..	..	@@ -1716,7 +1762,7 @@
1716	1762	csg.addChild(child);
1717	1763	child.addChild(csg);
1718	1764	} else
1719		- if (event.getSource() == doubleItem)
	1765	+ if (source == doubleItem)
1720	1766	{
1721	1767	Composite csg = new GroupLeaf();
1722	1768	csg.count = 5;
..	..	@@ -1728,7 +1774,7 @@
1728	1774	csg.addChild(child);
1729	1775	child.addChild(csg);
1730	1776	} else
1731		- if (event.getSource() == tripleItem)
	1777	+ if (source == tripleItem)
1732	1778	{
1733	1779	Composite csg = new GroupLeaf();
1734	1780	csg.count = 4;
..	..	@@ -1744,70 +1790,70 @@
1744	1790	child.addChild(csg);
1745	1791	} else
1746	1792
1747		- if (event.getSource() == importGFDItem)
	1793	+ if (source == importGFDItem)
1748	1794	{
1749	1795	ImportGFD();
1750	1796	} else
1751		- if (event.getSource() == importVRMLX3DItem)
	1797	+ if (source == importVRMLX3DItem)
1752	1798	{
1753	1799	ImportVRMLX3D();
1754	1800	} else
1755		- if (event.getSource() == import3DSItem)
	1801	+ if (source == import3DSItem)
1756	1802	{
1757	1803	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1758	1804	} else
1759		- if (event.getSource() == importOBJItem)
	1805	+ if (source == importOBJItem)
1760	1806	{
1761	1807	objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1762	1808	} else
1763		- if (event.getSource() == computeAOItem)
	1809	+ if (source == computeAOItem)
1764	1810	{
1765		- CameraPane.drawMode = CameraPane.OCCLUSION;
1766		- CameraPane.theRenderer.repaint();
	1811	+ Globals.drawMode = CameraPane.OCCLUSION;
	1812	+ Globals.theRenderer.repaint();
1767	1813	} else
1768		- if (event.getSource() == recompileItem)
	1814	+ if (source == recompileItem)
1769	1815	{
1770	1816	Recompile();
1771	1817	refreshContents();
1772	1818	} else
1773		- if (event.getSource() == editScriptItem)
	1819	+ if (source == editScriptItem)
1774	1820	{
1775	1821	OpenDialog();
1776	1822	refreshContents();
1777	1823	} else
1778		- if (event.getSource() == invariantsItem)
	1824	+ if (source == invariantsItem)
1779	1825	{
1780	1826	System.out.println("Invariants:");
1781		- GrafreeD.theApplet3D.universe.invariants();
	1827	+ GrafreeD.grafreeD.universe.invariants();
1782	1828	} else
1783		- if (event.getSource() == memoryItem)
	1829	+ if (source == memoryItem)
1784	1830	{
1785	1831	//System.out.println("Invariants:");
1786	1832	PrintMemory();
1787	1833	} else
1788		- if (event.getSource() == pathItem)
	1834	+ if (source == pathItem)
1789	1835	{
1790	1836	PrintPath();
1791	1837	} else
1792		- if (event.getSource() == analyzeItem)
	1838	+ if (source == analyzeItem)
1793	1839	{
1794	1840	AnalyzeObject();
1795	1841	} else
1796		- if (event.getSource() == dumpItem)
	1842	+ if (source == dumpItem)
1797	1843	{
1798	1844	DumpObject();
1799	1845	} else
1800		- if (event.getSource() == screenfitButton)
	1846	+ if (source == screenfitButton)
1801	1847	{
1802	1848	//Reload(lastConverter, lastFilename, true);
1803	1849	ScreenFit();
1804	1850	} else
1805		- if (event.getSource() == screenfitpointButton)
	1851	+ if (source == screenfitpointButton)
1806	1852	{
1807	1853	//Reload(lastConverter, lastFilename, true);
1808	1854	ScreenFitPoint();
1809	1855	} else
1810		- if (event.getSource() == snapobjectButton)
	1856	+ if (source == snapobjectButton)
1811	1857	{
1812	1858	//Reload(lastConverter, lastFilename, true);
1813	1859	SnapObject();
..	..	@@ -1818,13 +1864,13 @@
1818	1864	// Recompile();
1819	1865	// refreshContents();
1820	1866	// } else
1821		- if (event.getSource() == gcButton)
	1867	+ if (source == gcButton)
1822	1868	{
1823	1869	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1824	1870	System.gc();
1825	1871	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	1872	} else
1827		- if (event.getSource() == editLeafItem)
	1873	+ if (source == editLeafItem)
1828	1874	{
1829	1875	Object3D obj;
1830	1876	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1838,62 +1884,62 @@
1838	1884	}
1839	1885	refreshContents(true);
1840	1886	} else
1841		- if (event.getSource() == openWindowItem)
	1887	+ if (source == openWindowItem)
1842	1888	{
1843	1889	EditSelection(true);
1844	1890	} else
1845		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1891	+ if (source == cutItem \|\| source == clearButton)
1846	1892	{
1847	1893	loadClipboard(true);
1848	1894	} else
1849		- if (event.getSource() == duplicateItem)
	1895	+ if (source == duplicateItem)
1850	1896	{
1851	1897	Object3D keep = GrafreeD.clipboard;
1852	1898	loadClipboard(false);
1853	1899	paste(false);
1854	1900	GrafreeD.clipboard = keep;
1855	1901	} else
1856		- if (event.getSource() == cloneItem)
	1902	+ if (source == cloneItem)
1857	1903	{
1858	1904	CloneSelection(false);
1859	1905	} else
1860		- if (event.getSource() == cloneSupportItem)
	1906	+ if (source == cloneSupportItem)
1861	1907	{
1862	1908	CloneSelection(true);
1863	1909	} else
1864		- if (event.getSource() == copyItem)
	1910	+ if (source == copyItem)
1865	1911	{
1866	1912	loadClipboard(false);
1867	1913	} else
1868		- if (event.getSource() == pasteItem)
	1914	+ if (source == pasteItem)
1869	1915	{
1870	1916	paste(false);
1871	1917	} else
1872		- if (event.getSource() == pasteLinkItem)
	1918	+ if (source == pasteLinkItem)
1873	1919	{
1874	1920	pasteInto(false);
1875	1921	} else
1876		- if (event.getSource() == pasteCloneItem)
	1922	+ if (source == pasteCloneItem)
1877	1923	{
1878	1924	pasteInto(true);
1879	1925	} else
1880		- if (event.getSource() == pasteExpandItem)
	1926	+ if (source == pasteExpandItem)
1881	1927	{
1882	1928	paste(true);
1883	1929	} else
1884		- if (event.getSource() == synchronizeItem)
	1930	+ if (source == synchronizeItem)
1885	1931	{
1886	1932	Overwrite(Object3D.TRANSFORM);
1887	1933	} else
1888		- if (event.getSource() == overwriteNameItem)
	1934	+ if (source == overwriteNameItem)
1889	1935	{
1890	1936	Overwrite(Object3D.NAME);
1891	1937	} else
1892		- if (event.getSource() == overwriteUVItem)
	1938	+ if (source == overwriteUVItem)
1893	1939	{
1894	1940	Overwrite(Object3D.UV);
1895	1941	} else
1896		- if (event.getSource() == overwriteMatItem)
	1942	+ if (source == overwriteMatItem)
1897	1943	{
1898	1944	/* july 2015
1899	1945	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1913,7 +1959,7 @@
1913	1959
1914	1960	Overwrite(dropAttributes);
1915	1961	}
1916		- if (event.getSource() == overwriteGeoItem)
	1962	+ if (source == overwriteGeoItem)
1917	1963	{
1918	1964	Overwrite(Object3D.GEOMETRY);
1919	1965	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1930,7 +1976,7 @@
1930	1976	// refreshContents();
1931	1977	// }
1932	1978	} else
1933		- if (event.getSource() == generateMeshItem)
	1979	+ if (source == generateMeshItem)
1934	1980	{
1935	1981	//if (group.selection.size() == 1)
1936	1982	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1941,7 +1987,7 @@
1941	1987	ResetModel();
1942	1988	refreshContents();
1943	1989	} else
1944		- if (event.getSource() == extractGeometriesItem)
	1990	+ if (source == extractGeometriesItem)
1945	1991	{
1946	1992	boolean one = false;
1947	1993
..	..	@@ -1968,7 +2014,7 @@
1968	2014	ResetModel();
1969	2015	refreshContents();
1970	2016	} else
1971		- if (event.getSource() == cloneGeometriesItem)
	2017	+ if (source == cloneGeometriesItem)
1972	2018	{
1973	2019	boolean one = false;
1974	2020
..	..	@@ -1994,32 +2040,37 @@
1994	2040	ResetModel();
1995	2041	refreshContents();
1996	2042	} else
1997		- if (event.getSource() == shareGeometriesItem)
	2043	+ if (source == shareGeometriesItem)
1998	2044	{
1999	2045	boolean one = false;
2000	2046
2001	2047	if (group.selection.size() == 1)
2002	2048	one = true;
2003	2049
	2050	+ Object3D merge = null;
	2051	+
2004	2052	Object3D content = new cGroup();
2005	2053
2006	2054	for (int i=0; i<group.selection.size(); i++)
2007	2055	{
2008		- Object3D sel = new Merge(group.selection.get(i));
	2056	+ merge = new Merge(group.selection.get(i));
2009	2057
2010	2058	if (one)
2011		- makeSomething(sel, false);
	2059	+ makeSomething(merge, false);
2012	2060	else
2013		- content.addChild(sel);
	2061	+ content.addChild(merge);
2014	2062	}
2015	2063
2016	2064	if (!one)
2017		- makeSomething(content, false);
2018		-
2019		- ResetModel();
2020		- refreshContents();
	2065	+ makeSomething(content, true);
	2066	+ else
	2067	+ {
	2068	+ ResetModel();
	2069	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2070	+ refreshContents();
	2071	+ }
2021	2072	} else
2022		- if (event.getSource() == mergeGeometriesItem)
	2073	+ if (source == mergeGeometriesItem)
2023	2074	{
2024	2075	boolean one = false;
2025	2076
..	..	@@ -2049,7 +2100,7 @@
2049	2100	ResetModel();
2050	2101	refreshContents();
2051	2102	} else
2052		- if (event.getSource() == linkverticesItem)
	2103	+ if (source == linkverticesItem)
2053	2104	{
2054	2105	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2055	2106	// {
..	..	@@ -2069,7 +2120,7 @@
2069	2120	if (content instanceof cGroup && ((cGroup)content).transientlink )
2070	2121	content = ((cGroup)content).get(0);
2071	2122
2072		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2123	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2073	2124	for (int i=0; i<group.selection.size(); i++)
2074	2125	{
2075	2126	boolean random = CameraPane.RANDOM;
..	..	@@ -2078,11 +2129,11 @@
2078	2129	// group.selection.get(i).setMasterThis(content); // should be identity
2079	2130	CameraPane.RANDOM = random;
2080	2131	}
2081		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2132	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2082	2133	refreshContents();
2083	2134	}
2084	2135	} else
2085		- if (event.getSource() == resetsupportItem)
	2136	+ if (source == resetsupportItem)
2086	2137	{
2087	2138	for (int i=0; i<group.selection.size(); i++)
2088	2139	{
..	..	@@ -2094,7 +2145,16 @@
2094	2145
2095	2146	refreshContents();
2096	2147	} else
2097		- if (event.getSource() == resetreferencesItem)
	2148	+ if (source == relinkverticesItem)
	2149	+ {
	2150	+ boolean random = CameraPane.RANDOM;
	2151	+ CameraPane.RANDOM = false; // parse all random nodes
	2152	+ group.selection.RelinkToSupport();
	2153	+ CameraPane.RANDOM = random;
	2154	+
	2155	+ refreshContents();
	2156	+ } else
	2157	+ if (source == resetreferencesItem)
2098	2158	{
2099	2159	for (int i=0; i<group.selection.size(); i++)
2100	2160	{
..	..	@@ -2103,7 +2163,7 @@
2103	2163
2104	2164	refreshContents();
2105	2165	} else
2106		- if (event.getSource() == setMasterItem)
	2166	+ if (source == setMasterItem)
2107	2167	{
2108	2168	if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2109	2169	{
..	..	@@ -2116,7 +2176,7 @@
2116	2176	refreshContents();
2117	2177	}
2118	2178	} else
2119		- if (event.getSource() == poseMeshItem)
	2179	+ if (source == poseMeshItem)
2120	2180	{
2121	2181	if (group.selection.size() == 1)
2122	2182	{
..	..	@@ -2135,19 +2195,19 @@
2135	2195	}
2136	2196
2137	2197	} else
2138		- if (event.getSource() == revertMeshItem)
	2198	+ if (source == revertMeshItem)
2139	2199	{
2140	2200	RevertMeshes();
2141	2201	} else
2142		- if (event.getSource() == resetMeshItem)
	2202	+ if (source == resetMeshItem)
2143	2203	{
2144	2204	ResetAll();
2145	2205	} else
2146		- if (event.getSource() == stepAllItem)
	2206	+ if (source == stepAllItem)
2147	2207	{
2148	2208	StepAll();
2149	2209	} else
2150		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2210	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2151	2211	{
2152	2212	//int indices[] = jList.getSelectedIndices();
2153	2213	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2155,42 +2215,46 @@
2155	2215
2156	2216	ClearSelection(false);
2157	2217	} else
2158		- if (event.getSource() == clearAllItem)
	2218	+ if (source == clearAllItem)
2159	2219	{
2160	2220	ClearSelection(true);
2161	2221	} else
2162		- if (event.getSource() == grabItem)
	2222	+ if (source == grabItem)
2163	2223	{
2164	2224	group(new cGroup(), true);
2165	2225	} else
2166		- if (event.getSource() == frontItem)
	2226	+ if (source == hideItem)
	2227	+ {
	2228	+ group(new HiddenObject());
	2229	+ } else
	2230	+ if (source == frontItem)
2167	2231	{
2168	2232	front();
2169	2233	} else
2170		- if (event.getSource() == backItem)
	2234	+ if (source == backItem)
2171	2235	{
2172	2236	back();
2173	2237	} else
2174		- if (event.getSource() == cameraItem)
	2238	+ if (source == cameraItem)
2175	2239	{
2176	2240	makeSomething(new Camera());
2177	2241	} else
2178		- if (event.getSource() == compositeItem)
	2242	+ if (source == compositeItem)
2179	2243	{
2180	2244	group(new Composite());
2181	2245	} else
2182		- if (event.getSource() == randomItem)
	2246	+ if (source == randomItem)
2183	2247	{
2184	2248	RandomNode random = new RandomNode();
2185	2249	group(random);
2186	2250	if (random.size() > 0)
2187	2251	random.name = random.get(0).name + "Rnd";
2188	2252	} else
2189		- if (event.getSource() == physicsItem)
	2253	+ if (source == physicsItem)
2190	2254	{
2191	2255	group(new PhysicsNode());
2192	2256	} else
2193		- if (event.getSource() == frameselectorItem)
	2257	+ if (source == frameselectorItem)
2194	2258	{
2195	2259	for (int i=0; i<group.selection.size(); i++)
2196	2260	{
..	..	@@ -2202,7 +2266,7 @@
2202	2266	ResetModel();
2203	2267	refreshContents();
2204	2268	} else
2205		- if (event.getSource() == switchGeoItem)
	2269	+ if (source == switchGeoItem)
2206	2270	{
2207	2271	for (int i=0; i<group.selection.size(); i++)
2208	2272	{
..	..	@@ -2214,7 +2278,7 @@
2214	2278	ResetModel();
2215	2279	refreshContents();
2216	2280	} else
2217		- if (event.getSource() == switchTransfoItem)
	2281	+ if (source == switchTransfoItem)
2218	2282	{
2219	2283	for (int i=0; i<group.selection.size(); i++)
2220	2284	{
..	..	@@ -2226,7 +2290,7 @@
2226	2290	ResetModel();
2227	2291	refreshContents();
2228	2292	} else
2229		- if (event.getSource() == morphItem)
	2293	+ if (source == morphItem)
2230	2294	{
2231	2295	for (int i=0; i<group.selection.size(); i++)
2232	2296	{
..	..	@@ -2238,7 +2302,7 @@
2238	2302	ResetModel();
2239	2303	refreshContents();
2240	2304	} else
2241		- if (event.getSource() == scriptNodeItem)
	2305	+ if (source == scriptNodeItem)
2242	2306	{
2243	2307	boolean atleastone = false;
2244	2308
..	..	@@ -2277,195 +2341,215 @@
2277	2341	}
2278	2342	}
2279	2343	} else
2280		- if (event.getSource() == linkerItem)
	2344	+ if (source == linkerItem)
2281	2345	{
2282	2346	group(new cLinker());
2283	2347	} else
2284		- if (event.getSource() == textureItem)
	2348	+ if (source == textureItem)
2285	2349	{
2286	2350	group(new TextureNode());
2287	2351	} else
2288		- if (event.getSource() == shadowXItem)
	2352	+ if (source == billboardItem)
	2353	+ {
	2354	+ group(new BillboardNode());
	2355	+ } else
	2356	+ if (source == shadowXItem)
2289	2357	{
2290	2358	CastShadow(0);
2291	2359	} else
2292		- if (event.getSource() == shadowYItem)
	2360	+ if (source == shadowYItem)
2293	2361	{
2294	2362	CastShadow(1);
2295	2363	} else
2296		- if (event.getSource() == shadowZItem)
	2364	+ if (source == shadowZItem)
2297	2365	{
2298	2366	CastShadow(2);
2299	2367	} else
2300		- if (event.getSource() == ungroupItem)
	2368	+ if (source == ungroupItem)
2301	2369	{
2302		- ungroup();
	2370	+ //ungroup();
	2371	+ for (int i=0; i<group.selection.size(); i++)
	2372	+ {
	2373	+ Ungroup(group.selection.get(i));
	2374	+ }
	2375	+
	2376	+ ClearSelection(false);
	2377	+
	2378	+ refreshContents();
2303	2379	} else
2304		- if (event.getSource() == genUVItem)
	2380	+ if (source == genUVItem)
2305	2381	{
2306	2382	GenUV();
2307	2383	} else
2308		- if (event.getSource() == genNormalsCADItem)
	2384	+ if (source == genNormalsCADItem)
2309	2385	{
2310	2386	GenNormals(true);
2311	2387	} else
2312		- if (event.getSource() == genNormalsORGANItem)
	2388	+ if (source == genNormalsMESHItem)
	2389	+ {
	2390	+ GenNormals(true); // TODO
	2391	+ } else
	2392	+ if (source == genNormalsORGANItem)
2313	2393	{
2314	2394	GenNormals(false);
2315	2395	} else
2316		- if (event.getSource() == stripifyItem)
	2396	+ if (source == genNormalsMINEItem)
	2397	+ {
	2398	+ GenNormalsMINE();
	2399	+ } else
	2400	+ if (source == stripifyItem)
2317	2401	{
2318	2402	Stripify();
2319	2403	} else
2320		- if (event.getSource() == unstripifyItem)
	2404	+ if (source == unstripifyItem)
2321	2405	{
2322	2406	Unstripify();
2323	2407	} else
2324		- if (event.getSource() == trimItem)
	2408	+ if (source == trimItem)
2325	2409	{
2326	2410	Trim();
2327	2411	} else
2328		- if (event.getSource() == untrimItem)
	2412	+ if (source == untrimItem)
2329	2413	{
2330	2414	Untrim();
2331	2415	} else
2332		- if (event.getSource() == clearColorsItem)
	2416	+ if (source == clearColorsItem)
2333	2417	{
2334	2418	ClearColors();
2335	2419	} else
2336		- if (event.getSource() == clearMaterialsItem)
	2420	+ if (source == clearMaterialsItem)
2337	2421	{
2338	2422	ClearMaterials();
2339	2423	} else
2340		- if (event.getSource() == liveleavesItem)
	2424	+ if (source == liveleavesItem)
2341	2425	{
2342	2426	LiveLeaves(true);
2343	2427	} else
2344		- if (event.getSource() == unliveleavesItem)
	2428	+ if (source == unliveleavesItem)
2345	2429	{
2346	2430	LiveLeaves(false);
2347	2431	} else
2348		- if (event.getSource() == supportleavesItem)
	2432	+ if (source == supportleavesItem)
2349	2433	{
2350	2434	SupportLeaves(true);
2351	2435	} else
2352		- if (event.getSource() == unsupportleavesItem)
	2436	+ if (source == unsupportleavesItem)
2353	2437	{
2354	2438	SupportLeaves(false);
2355	2439	} else
2356		- if (event.getSource() == hideleavesItem)
	2440	+ if (source == hideleavesItem)
2357	2441	{
2358	2442	HideLeaves(true);
2359	2443	} else
2360		- if (event.getSource() == showleavesItem)
	2444	+ if (source == showleavesItem)
2361	2445	{
2362	2446	HideLeaves(false);
2363	2447	} else
2364		- if (event.getSource() == markleavesItem)
	2448	+ if (source == markleavesItem)
2365	2449	{
2366	2450	MarkLeaves(true);
2367	2451	} else
2368		- if (event.getSource() == unmarkleavesItem)
	2452	+ if (source == unmarkleavesItem)
2369	2453	{
2370	2454	MarkLeaves(false);
2371	2455	} else
2372		- if (event.getSource() == flipVItem)
	2456	+ if (source == flipVItem)
2373	2457	{
2374	2458	FlipV(true);
2375	2459	} else
2376		- if (event.getSource() == unflipVItem)
	2460	+ if (source == unflipVItem)
2377	2461	{
2378	2462	FlipV(false);
2379	2463	} else
2380		- if (event.getSource() == lowTexturesItem)
	2464	+ if (source == lowTexturesItem)
2381	2465	{
2382	2466	SetTexRes(0);
2383	2467	} else
2384		- if (event.getSource() == normalTexturesItem)
	2468	+ if (source == normalTexturesItem)
2385	2469	{
2386	2470	SetTexRes(1);
2387	2471	} else
2388		- if (event.getSource() == highTexturesItem)
	2472	+ if (source == highTexturesItem)
2389	2473	{
2390	2474	SetTexRes(2);
2391	2475	} else
2392		- if (event.getSource() == veryhighTexturesItem)
	2476	+ if (source == veryhighTexturesItem)
2393	2477	{
2394	2478	SetTexRes(3);
2395	2479	} else
2396		- if (event.getSource() == maxTexturesItem)
	2480	+ if (source == maxTexturesItem)
2397	2481	{
2398	2482	SetTexRes(4);
2399	2483	} else
2400		- if (event.getSource() == panoTexturesItem)
	2484	+ if (source == panoTexturesItem)
2401	2485	{
2402	2486	SetTexRes(5);
2403	2487	} else
2404		- if (event.getSource() == reverseNormalsItem)
	2488	+ if (source == reverseNormalsItem)
2405	2489	{
2406	2490	ReverseNormals();
2407	2491	} else
2408		- if (event.getSource() == parseverticesItem)
	2492	+ if (source == parseverticesItem)
2409	2493	{
2410	2494	ParseVertices();
2411	2495	} else
2412		- if (event.getSource() == textureFieldItem)
	2496	+ if (source == textureFieldItem)
2413	2497	{
2414	2498	TextureVertices();
2415	2499	} else
2416		- if (event.getSource() == alignItem)
	2500	+ if (source == alignItem)
2417	2501	{
2418	2502	Align();
2419	2503	} else
2420		- if (event.getSource() == mirrorItem)
	2504	+ if (source == mirrorItem)
2421	2505	{
2422	2506	MirrorPoses();
2423	2507	} else
2424		- if (event.getSource() == reduceMorphItem)
	2508	+ if (source == reduceMorphItem)
2425	2509	{
2426	2510	MeshReduction(false);
2427	2511	} else
2428		- if (event.getSource() == reduce34MorphItem)
	2512	+ if (source == reduce34MorphItem)
2429	2513	{
2430	2514	MeshReduction(true);
2431	2515	} else
2432		- if (event.getSource() == reverseTrianglesItem)
	2516	+ if (source == reverseTrianglesItem)
2433	2517	{
2434	2518	ReverseTriangles();
2435	2519	} else
2436		- if (event.getSource() == reduceMeshItem)
	2520	+ if (source == reduceMeshItem)
2437	2521	{
2438	2522	ReduceMesh(false);
2439	2523	} else
2440		- if (event.getSource() == reduce34MeshItem)
	2524	+ if (source == reduce34MeshItem)
2441	2525	{
2442	2526	ReduceMesh(true);
2443	2527	} else
2444		- if (event.getSource() == increaseMeshItem)
	2528	+ if (source == increaseMeshItem)
2445	2529	{
2446	2530	IncreaseMesh();
2447	2531	} else
2448		- if (event.getSource() == clipMeshItem)
	2532	+ if (source == clipMeshItem)
2449	2533	{
2450	2534	ClipMesh();
2451	2535	} else
2452		- if (event.getSource() == smoothMeshItem)
	2536	+ if (source == smoothMeshItem)
2453	2537	{
2454	2538	SmoothMesh();
2455	2539	} else
2456		- if (event.getSource() == transformgeometryItem)
	2540	+ if (source == transformgeometryItem)
2457	2541	{
2458	2542	TransformGeometry();
2459	2543	} else
2460		- if (event.getSource() == resetTransformItem)
	2544	+ if (source == resetTransformItem)
2461	2545	{
2462	2546	ResetTransform();
2463	2547	} else
2464		- if (event.getSource() == resetCentroidItem)
	2548	+ if (source == resetCentroidItem)
2465	2549	{
2466	2550	ResetCentroid();
2467	2551	} else
2468		- if (event.getSource() == resetParentItem)
	2552	+ if (source == resetParentItem)
2469	2553	{
2470	2554	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2471	2555	{
..	..	@@ -2475,7 +2559,7 @@
2475	2559
2476	2560	refreshContents();
2477	2561	} else
2478		- if (event.getSource() == repairParentItem)
	2562	+ if (source == repairParentItem)
2479	2563	{
2480	2564	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2481	2565	{
..	..	@@ -2489,7 +2573,21 @@
2489	2573
2490	2574	refreshContents();
2491	2575	} else
2492		- if (event.getSource() == sortbysizeItem)
	2576	+ if (source == repairShadowItem)
	2577	+ {
	2578	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2579	+ {
	2580	+ Object3D obj = (Object3D)e.nextElement();
	2581	+ obj.RepairShadow();
	2582	+// for (int i=0; i<obj.size(); i++)
	2583	+// {
	2584	+// obj.get(i).parent = obj;
	2585	+// }
	2586	+ }
	2587	+
	2588	+ refreshContents();
	2589	+ } else
	2590	+ if (source == sortbysizeItem)
2493	2591	{
2494	2592	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2495	2593	{
..	..	@@ -2501,7 +2599,7 @@
2501	2599	ResetModel();
2502	2600	refreshContents();
2503	2601	} else
2504		- if (event.getSource() == sortbynameItem)
	2602	+ if (source == sortbynameItem)
2505	2603	{
2506	2604	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2507	2605	{
..	..	@@ -2513,7 +2611,7 @@
2513	2611	ResetModel();
2514	2612	refreshContents();
2515	2613	} else
2516		- if (event.getSource() == attachPigmentItem)
	2614	+ if (source == attachPigmentItem)
2517	2615	{
2518	2616	String texture = GetFile("Attach pigment");
2519	2617	Object3D obj;
..	..	@@ -2525,7 +2623,7 @@
2525	2623
2526	2624	refreshContents();
2527	2625	} else
2528		- if (event.getSource() == detachPigmentItem)
	2626	+ if (source == detachPigmentItem)
2529	2627	{
2530	2628	Object3D obj;
2531	2629	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2536,7 +2634,7 @@
2536	2634
2537	2635	refreshContents();
2538	2636	} else
2539		- if (event.getSource() == attachBumpItem)
	2637	+ if (source == attachBumpItem)
2540	2638	{
2541	2639	String texture = GetFile("Attach bump");
2542	2640	Object3D obj;
..	..	@@ -2548,7 +2646,7 @@
2548	2646
2549	2647	refreshContents();
2550	2648	} else
2551		- if (event.getSource() == detachBumpItem)
	2649	+ if (source == detachBumpItem)
2552	2650	{
2553	2651	Object3D obj;
2554	2652	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2559,7 +2657,7 @@
2559	2657
2560	2658	refreshContents();
2561	2659	} else
2562		- if (event.getSource() == pigmentBumpItem)
	2660	+ if (source == pigmentBumpItem)
2563	2661	{
2564	2662	Object3D obj;
2565	2663	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2570,158 +2668,195 @@
2570	2668
2571	2669	refreshContents();
2572	2670	} else
2573		- if (event.getSource() == flashSelectionButton)
	2671	+ if (source == flashSelectionButton)
2574	2672	{
2575	2673	CameraPane.flash = true;
2576	2674	refreshContents();
2577	2675	} else
2578		- if (event.getSource() == oneButton)
	2676	+ if (source == oneButton)
2579	2677	{
2580	2678	} else
2581		- if (event.getSource() == twoButton)
	2679	+ if (source == twoButton)
2582	2680	{
2583	2681	radio.layout = twoButton;
2584	2682	// bug
2585	2683	//gridPanel.setDividerLocation(1.0);
2586	2684	//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();
	2685	+// bigThree.remove(scenePanel);
	2686	+// bigThree.remove(centralPanel);
	2687	+// bigThree.remove(XYZPanel);
	2688	+// aWindowConstraints.gridx = 0;
	2689	+// aWindowConstraints.gridy = 0;
	2690	+// aWindowConstraints.gridwidth = 1;
	2691	+// // aConstraints.gridheight = 3;
	2692	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2693	+// aWindowConstraints.weightx = 0;
	2694	+// aWindowConstraints.weighty = 1;
	2695	+// //bigThree.add(jtp, aWindowConstraints);
	2696	+// aWindowConstraints.weightx = 1;
	2697	+// aWindowConstraints.gridwidth = 3;
	2698	+// // aConstraints.gridheight = 3;
	2699	+// aWindowConstraints.gridx = 1;
	2700	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2701	+// bigThree.add(centralPanel, aWindowConstraints);
	2702	+// aWindowConstraints.weightx = 0;
	2703	+// aWindowConstraints.gridx = 4;
	2704	+// aWindowConstraints.gridwidth = 1;
	2705	+// // aConstraints.gridheight = 3;
	2706	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2707	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2708	+// scenePanel.setVisible(false);
	2709	+// centralPanel.setVisible(true);
	2710	+// XYZPanel.setVisible(false);
	2711	+ bigThree.ClearUI();
	2712	+ bigThree.add(centralPanel);
	2713	+ bigThree.FlushUI();
2611	2714	} else
2612		- if (event.getSource() == threeButton)
	2715	+ if (source == threeButton)
2613	2716	{
2614	2717	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();
	2718	+
	2719	+// bigThree.remove(scenePanel);
	2720	+// bigThree.remove(centralPanel);
	2721	+// bigThree.remove(XYZPanel);
	2722	+// aWindowConstraints.gridx = 0;
	2723	+// aWindowConstraints.gridy = 0;
	2724	+// aWindowConstraints.gridwidth = 1;
	2725	+// // aConstraints.gridheight = 3;
	2726	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2727	+// aWindowConstraints.weightx = 0;
	2728	+// aWindowConstraints.weighty = 1;
	2729	+// //bigThree.add(jtp, aWindowConstraints);
	2730	+// aWindowConstraints.weightx = 1;
	2731	+// aWindowConstraints.gridwidth = 3;
	2732	+// // aConstraints.gridheight = 3;
	2733	+// aWindowConstraints.gridx = 1;
	2734	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2735	+// bigThree.add(centralPanel, aWindowConstraints);
	2736	+// aWindowConstraints.weightx = 0;
	2737	+// aWindowConstraints.gridx = 4;
	2738	+// aWindowConstraints.gridwidth = 1;
	2739	+// // aConstraints.gridheight = 3;
	2740	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2741	+// bigThree.add(XYZPanel, aWindowConstraints);
	2742	+// bigThree.validate();
	2743	+// scenePanel.setVisible(false);
	2744	+// centralPanel.setVisible(true);
	2745	+// XYZPanel.setVisible(true);
	2746	+ bigThree.ClearUI();
	2747	+ bigThree.add(centralPanel);
	2748	+ bigThree.add(XYZPanel);
	2749	+ bigThree.FlushUI();
2639	2750	} else
2640		- if (event.getSource() == fourButton)
	2751	+ if (source == fourButton)
2641	2752	{
2642	2753	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();
	2754	+
	2755	+// bigThree.remove(scenePanel);
	2756	+// bigThree.remove(centralPanel);
	2757	+// bigThree.remove(XYZPanel);
	2758	+// aWindowConstraints.gridx = 0;
	2759	+// aWindowConstraints.gridy = 0;
	2760	+// aWindowConstraints.gridwidth = 1;
	2761	+// // aWindowConstraints.gridheight = 3;
	2762	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2763	+// aWindowConstraints.weightx = 1;
	2764	+// aWindowConstraints.weighty = 1;
	2765	+// bigThree.add(scenePanel, aWindowConstraints);
	2766	+// aWindowConstraints.weightx = 1;
	2767	+// aWindowConstraints.gridwidth = 3;
	2768	+// // aConstraints.gridheight = 3;
	2769	+// aWindowConstraints.gridx = 1;
	2770	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2771	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2772	+// aWindowConstraints.weightx = 0;
	2773	+// aWindowConstraints.gridx = 4;
	2774	+// aWindowConstraints.gridwidth = 1;
	2775	+// // aWindowConstraints.gridheight = 3;
	2776	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2777	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2778	+// bigThree.validate();
	2779	+// scenePanel.setVisible(true);
	2780	+// centralPanel.setVisible(false);
	2781	+// XYZPanel.setVisible(false);
	2782	+ bigThree.ClearUI();
	2783	+ bigThree.add(scenePanel);
	2784	+ bigThree.FlushUI();
2667	2785	} else
2668		- if (event.getSource() == sixButton)
	2786	+ if (source == sixButton)
2669	2787	{
2670	2788	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();
	2789	+
	2790	+// bigThree.remove(scenePanel);
	2791	+// bigThree.remove(centralPanel);
	2792	+// bigThree.remove(XYZPanel);
	2793	+// aWindowConstraints.gridx = 0;
	2794	+// aWindowConstraints.gridy = 0;
	2795	+// aWindowConstraints.gridwidth = 1;
	2796	+// // aConstraints.gridheight = 3;
	2797	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2798	+// aWindowConstraints.weightx = 0;
	2799	+// aWindowConstraints.weighty = 1;
	2800	+// bigThree.add(scenePanel, aWindowConstraints);
	2801	+// aWindowConstraints.weightx = 1;
	2802	+// aWindowConstraints.gridwidth = 3;
	2803	+// // aWindowConstraints.gridheight = 3;
	2804	+// aWindowConstraints.gridx = 1;
	2805	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2806	+// bigThree.add(centralPanel, aWindowConstraints);
	2807	+// aWindowConstraints.weightx = 0;
	2808	+// aWindowConstraints.gridx = 4;
	2809	+// aWindowConstraints.gridwidth = 1;
	2810	+// // aWindowConstraints.gridheight = 3;
	2811	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2812	+// //bigThree.add(XYZPanel, aConstraints);
	2813	+// bigThree.validate();
	2814	+// scenePanel.setVisible(true);
	2815	+// centralPanel.setVisible(true);
	2816	+// XYZPanel.setVisible(false);
	2817	+ bigThree.ClearUI();
	2818	+ bigThree.add(scenePanel);
	2819	+ bigThree.add(centralPanel);
	2820	+ bigThree.FlushUI();
2695	2821	} else
2696		- if (event.getSource() == sevenButton)
	2822	+ if (source == sevenButton)
2697	2823	{
2698	2824	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();
	2825	+
	2826	+// bigThree.remove(scenePanel);
	2827	+// bigThree.remove(centralPanel);
	2828	+// bigThree.remove(XYZPanel);
	2829	+// aWindowConstraints.gridx = 0;
	2830	+// aWindowConstraints.gridy = 0;
	2831	+// aWindowConstraints.gridwidth = 1;
	2832	+// // aWindowConstraints.gridheight = 3;
	2833	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2834	+// aWindowConstraints.weightx = 0;
	2835	+// aWindowConstraints.weighty = 1;
	2836	+// bigThree.add(scenePanel, aWindowConstraints);
	2837	+// aWindowConstraints.weightx = 1;
	2838	+// aWindowConstraints.gridwidth = 3;
	2839	+// // aWindowConstraints.gridheight = 3;
	2840	+// aWindowConstraints.gridx = 1;
	2841	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2842	+// bigThree.add(centralPanel, aWindowConstraints);
	2843	+// aWindowConstraints.weightx = 0;
	2844	+// aWindowConstraints.gridx = 4;
	2845	+// aWindowConstraints.gridwidth = 1;
	2846	+// // aConstraints.gridheight = 3;
	2847	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2848	+// bigThree.add(XYZPanel, aWindowConstraints);
	2849	+// bigThree.validate();
	2850	+// scenePanel.setVisible(true);
	2851	+// centralPanel.setVisible(true);
	2852	+// XYZPanel.setVisible(true);
	2853	+ bigThree.ClearUI();
	2854	+ bigThree.add(scenePanel);
	2855	+ bigThree.add(centralPanel);
	2856	+ bigThree.add(XYZPanel);
	2857	+ bigThree.FlushUI();
2723	2858	} else
2724		- if (event.getSource() == rootButton)
	2859	+ if (source == rootButton)
2725	2860	{
2726	2861	Object3D obj;
2727	2862	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2733,7 +2868,7 @@
2733	2868
2734	2869	refreshContents(true);
2735	2870	} else
2736		- if (event.getSource() == closeButton)
	2871	+ if (source == closeButton)
2737	2872	{
2738	2873	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2739	2874	cRadio ab;
..	..	@@ -2754,11 +2889,11 @@
2754	2889	}
2755	2890	refreshContents(true);
2756	2891	} else
2757		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2892	+ if (source == editItem \|\| source == editButton)
2758	2893	{
2759	2894	EditSelection(false);
2760	2895	} else
2761		- if (event.getSource() == uneditButton)
	2896	+ if (source == uneditButton)
2762	2897	{
2763	2898	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2764	2899	{
..	..	@@ -2770,12 +2905,12 @@
2770	2905
2771	2906	child.editWindow = null; // ???????????
2772	2907	}
2773		- objEditor.ctrlPanel.revalidate();
	2908	+ objEditor.ctrlPanel.validate();
2774	2909	//objEditor.jTree.clearSelection();
2775	2910	//objEditor.ResetSliders();
2776	2911	refreshContents(true);
2777	2912	} else
2778		- if (event.getSource() == clearPanelButton)
	2913	+ if (source == clearPanelButton)
2779	2914	{
2780	2915	assert(copy == group);
2781	2916	//copy.ClearUI();
..	..	@@ -2786,7 +2921,7 @@
2786	2921	listUI.clear();
2787	2922	refreshContents(true);
2788	2923	} else
2789		- if (event.getSource() == allParamsButton)
	2924	+ if (source == allParamsButton)
2790	2925	{
2791	2926	assert(copy == group);
2792	2927
..	..	@@ -2807,19 +2942,19 @@
2807	2942
2808	2943	refreshContents(true);
2809	2944	} else
2810		- if (event.getSource() == unselectButton)
	2945	+ if (source == unselectButton)
2811	2946	{
2812	2947	objEditor.jTree.clearSelection();
2813	2948	// ?? oct 2012 GrafreeD.clipboard.clear();
2814	2949	objEditor.ResetSliders();
2815	2950	refreshContents(true);
2816	2951	} else
2817		- if(event.getSource() instanceof cRadio)
	2952	+ if(source instanceof cRadio)
2818	2953	{
2819	2954	group.parent = keepparent;
2820	2955	group.attributes = 0;
2821	2956	//group.editWindow = null;
2822		- /cRadio/ radio = (cRadio)event.getSource();
	2957	+ /cRadio/ radio = (cRadio)source;
2823	2958	Object3D obj = radio.GetObject();
2824	2959	System.out.println("Edit " + obj);
2825	2960	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2839,7 +2974,7 @@
2839	2974	}
2840	2975
2841	2976	copy = group;
2842		- //CameraPane.theRenderer.object = group;
	2977	+ //Globals.theRenderer.object = group;
2843	2978	if(!useclient)
2844	2979	{
2845	2980	cameraView.renderCamera = radio.camera;
..	..	@@ -2848,7 +2983,8 @@
2848	2983	cameraView.cameras[cameraView.cameracount] = radio.camera;
2849	2984	cameraView.targetLookAt.set(radio.camera.lookAt);
2850	2985	cameraView.object = group;
2851		- cameraView.lighttouched = true;
	2986	+ //cameraView.lighttouched = true;
	2987	+ Globals.lighttouched = true;
2852	2988	topView.object = group;
2853	2989	frontView.object = group;
2854	2990	sideView.object = group;
..	..	@@ -2884,7 +3020,7 @@
2884	3020	if (useclient)
2885	3021	{
2886	3022	cameraView.object = client;
2887		- cameraView.lighttouched = true;
	3023	+ Globals.lighttouched = true;
2888	3024	//topView.object = client;
2889	3025	//frontView.object = client;
2890	3026	//sideView.object = client;
..	..	@@ -2892,7 +3028,7 @@
2892	3028	else
2893	3029	{
2894	3030	cameraView.object = group;
2895		- cameraView.lighttouched = true;
	3031	+ Globals.lighttouched = true;
2896	3032	//topView.object = group;
2897	3033	//frontView.object = group;
2898	3034	//sideView.object = group;
..	..	@@ -3173,6 +3309,13 @@
3173	3309	refreshContents();
3174	3310	}
3175	3311
	3312	+ void GenNormalsMINE()
	3313	+ {
	3314	+ group.selection.GenNormalsMINE();
	3315	+
	3316	+ refreshContents();
	3317	+ }
	3318	+
3176	3319	void Stripify()
3177	3320	{
3178	3321	group.StripifyS();
..	..	@@ -3393,7 +3536,7 @@
3393	3536	String pigment = Object3D.GetPigment(tex);
3394	3537	//String bump = Object3D.GetBump(tex);
3395	3538
3396		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3539	+ com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3397	3540
3398	3541	double s = v.s;
3399	3542
..	..	@@ -3441,12 +3584,26 @@
3441	3584
3442	3585	void Align()
3443	3586	{
	3587	+ if (group.selection.size() == 0)
	3588	+ return;
	3589	+
	3590	+ cVector bbmin = new cVector();
	3591	+ cVector bbmax = new cVector();
	3592	+
	3593	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3594	+
	3595	+ double dx = bbmax.x - bbmin.x;
	3596	+ double dy = bbmax.y - bbmin.y;
	3597	+ double dz = bbmax.z - bbmin.z;
	3598	+
	3599	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3600	+
3444	3601	for (int i=0; i<group.selection.size(); i++)
3445	3602	{
3446	3603	Object3D obj = group.selection.get(i);
3447	3604
3448		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3449		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3605	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3606	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3450	3607	}
3451	3608
3452	3609	refreshContents();
..	..	@@ -3680,7 +3837,7 @@
3680	3837	group.selection.RelinkToSupport(); // july 2014
3681	3838	System.out.println("DONE.");
3682	3839	refreshContents();
3683		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3840	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3684	3841	}
3685	3842
3686	3843	void ReduceMesh(boolean reduction34)
..	..	@@ -3965,16 +4122,16 @@
3965	4122
3966	4123	objEditor.SetText(); // jan 2014
3967	4124
3968		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4125	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
3969	4126	CameraPane.flash = true;
3970	4127
3971	4128	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
3972	4129	// a camera
3973	4130	{
3974	4131	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;
	4132	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4133	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4134	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3978	4135	}
3979	4136
3980	4137	refreshContents();
..	..	@@ -4468,6 +4625,26 @@
4468	4625	makeSomething(csg);
4469	4626	}
4470	4627
	4628	+ void Ungroup(Object3D g)
	4629	+ {
	4630	+ if (g instanceof HiddenObject)
	4631	+ {
	4632	+ HiddenObject h = (HiddenObject) g;
	4633	+
	4634	+ for (int i=0; i<h.ActualSize(); i++)
	4635	+ {
	4636	+ objEditor.makeSomething(h.get(i), false);
	4637	+ }
	4638	+ }
	4639	+ else
	4640	+ {
	4641	+ for (int i=0; i<g.Size(); i++)
	4642	+ {
	4643	+ objEditor.makeSomething(g.get(i), false);
	4644	+ }
	4645	+ }
	4646	+ }
	4647	+
4471	4648	void ungroup()
4472	4649	{
4473	4650	/*
..	..	@@ -4827,6 +5004,7 @@
4827	5004	private MenuItem resetsupportItem;
4828	5005	private MenuItem resetreferencesItem;
4829	5006	private MenuItem linkverticesItem;
	5007	+ private MenuItem relinkverticesItem;
4830	5008	private MenuItem setMasterItem;
4831	5009	private MenuItem resetMeshItem;
4832	5010	private MenuItem stepAllItem;
..	..	@@ -4845,8 +5023,10 @@
4845	5023	private MenuItem clearItem;
4846	5024	private MenuItem clearAllItem;
4847	5025	private MenuItem genUVItem;
	5026	+ private MenuItem genNormalsMESHItem;
4848	5027	private MenuItem genNormalsCADItem;
4849	5028	private MenuItem genNormalsORGANItem;
	5029	+ private MenuItem genNormalsMINEItem;
4850	5030	private MenuItem stripifyItem;
4851	5031	private MenuItem unstripifyItem;
4852	5032	private MenuItem trimItem;
..	..	@@ -4888,6 +5068,7 @@
4888	5068	private MenuItem resetCentroidItem;
4889	5069	private MenuItem transformgeometryItem;
4890	5070	private MenuItem resetTransformItem;
	5071	+ private MenuItem hideItem;
4891	5072	private MenuItem grabItem;
4892	5073	private MenuItem backItem;
4893	5074	private MenuItem frontItem;
..	..	@@ -4908,6 +5089,7 @@
4908	5089
4909	5090	private MenuItem resetParentItem;
4910	5091	private MenuItem repairParentItem;
	5092	+ private MenuItem repairShadowItem;
4911	5093	private MenuItem sortbysizeItem;
4912	5094	private MenuItem sortbynameItem;
4913	5095
..	..	@@ -4928,6 +5110,7 @@
4928	5110	private MenuItem coneItem;
4929	5111	private MenuItem torusItem;
4930	5112	private MenuItem superItem;
	5113	+ private MenuItem kleinItem;
4931	5114	private MenuItem blobItem;
4932	5115	private MenuItem latheItem;
4933	5116	private MenuItem bezierItem;
..	..	@@ -4940,6 +5123,7 @@
4940	5123	private MenuItem csgItem;
4941	5124	private MenuItem templateItem;
4942	5125	private MenuItem textureItem;
	5126	+ private MenuItem billboardItem;
4943	5127	private MenuItem shadowXItem;
4944	5128	private MenuItem shadowYItem;
4945	5129	private MenuItem shadowZItem;