~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,6 +12,7 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
..	..	@@ -433,84 +434,26 @@
433	434	oe.radioPanel.add(dummyButton);
434	435	oe.buttonGroup.add(dummyButton);
435	436	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	437	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	438
440		- 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");
441	441	liveCB.addItemListener(this);
442	442
443		- oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
445		- supportCB.addItemListener(this);
446		-
447		- // oe.aConstraints.gridx += 1;
448		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
449		- // localCB.addItemListener(this);
450		-
451		- oe.aConstraints.gridx += 1;
452		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
453		- crowdCB.addItemListener(this);
454		-
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
457		- smoothCB.addItemListener(this);
458		-
459		- oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
461		- fastCB.addItemListener(this);
462		- oe.aConstraints.gridx += 1;
463		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
464		- slowCB.addItemListener(this);
465		- oe.aConstraints.gridx += 1;
466		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
467		- boxCB.addItemListener(this);
468		-
469		-// oe.aConstraints.gridx += 1;
470		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
471		-// speakerMocapCB.addItemListener(this);
472		-
473		- if (false)
474		- {
475		- // handled in scripts
476		- oe.aConstraints.gridx += 1;
477		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
478		- speakerCameraCB.addItemListener(this);
479		-
480		- oe.aConstraints.gridx += 1;
481		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
482		- speakerFocusCB.addItemListener(this);
483		-
484		- oe.aConstraints.gridx += 1;
485		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
486		- smoothfocusCB.addItemListener(this);
487		- }
488		-
489		-//oe.aConstraints.gridx += 1;
490		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
491		-// debugCB.addItemListener(this);
492		-
493		- oe.aConstraints.gridx += 1;
494		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
495		- oeilCB.addItemListener(this);
496		-
497		- oe.aConstraints.gridx += 1;
498		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
499		- lookAtCB.addItemListener(this);
500		-
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	443	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	444	+ trackCB.setToolTipText("Enable tracking");
503	445	trackCB.addItemListener(this);
504	446
505		- oe.aConstraints.gridx += 1;
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	447	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	448	+ screenfitButton.setToolTipText("Screen fit");
507	449	screenfitButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
	450	+
509	451	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
510	452	// screenfitpointButton.addActionListener(this);
511	453	// oe.aConstraints.gridx += 1;
512		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
	454	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
513	455	snapobjectButton.addActionListener(this);
	456	+ snapobjectButton.setToolTipText("Snap Object");
514	457	oe.aConstraints.gridx += 1;
515	458
516	459	//aConstraints.gridx = 0;
..	..	@@ -518,68 +461,66 @@
518	461	oe.aConstraints.weighty = 0;
519	462	oe.aConstraints.gridwidth = 1;
520	463
521		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	464	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	465	+ flashSelectionButton.setToolTipText("Show selection");
522	466	flashSelectionButton.addActionListener(this);
523	467
524		- oe.toolbarPanel.add(new cButton(" ", false));
	468	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
525	469
526		- oe.aConstraints.gridx += 1;
527		- oe.aConstraints.weighty = 0;
528		- oe.aConstraints.gridwidth = 1;
529		-
530		- //
531		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	470	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	471	+ twoButton.setToolTipText("Show center view only");
532	472	twoButton.addActionListener(this);
533		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	473	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
534	474	fourButton.addActionListener(this);
535		- 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");
536	478	sixButton.addActionListener(this);
537		- 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");
538	481	threeButton.addActionListener(this);
539		- 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");
540	484	sevenButton.addActionListener(this);
541	485	//
542	486
543		- 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 selection in new tab");
544	489	rootButton.addActionListener(this);
545		- oe.aConstraints.gridx += 1;
546		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	490	+
	491	+ oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	492	+ closeButton.setToolTipText("Close tab");
547	493	closeButton.addActionListener(this);
548	494	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
549	495	//clearButton.addActionListener(this);
550		- oe.aConstraints.gridx += 1;
551	496
552		- oe.aConstraints.gridx = 1; //
553		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	497	+ cGridBag commandsPanel = new cGridBag();
	498	+
	499	+ commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	500	+ editButton.setToolTipText("Edit selection");
554	501	editButton.addActionListener(this);
555		- oe.aConstraints.gridx += 1;
556		- oe.aConstraints.weighty = 0;
557		- oe.aConstraints.gridwidth = 1;
558	502
559		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	503	+ commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	504	+ uneditButton.setToolTipText("Unedit selection");
560	505	uneditButton.addActionListener(this);
561	506
562		- oe.aConstraints.gridx += 1;
563		- oe.aConstraints.weighty = 0;
564		- oe.aConstraints.gridwidth = 1;
565		-
566		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
	507	+ commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	508	+ clearPanelButton.setToolTipText("Clear edit panel");
567	509	clearPanelButton.addActionListener(this);
568	510
569		- oe.aConstraints.gridx += 1;
570		- oe.aConstraints.weighty = 0;
571		- oe.aConstraints.gridwidth = 1;
572		-
573		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	511	+ commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	512	+ allParamsButton.setToolTipText("All params??");
574	513	allParamsButton.addActionListener(this);
575	514
576		- oe.aConstraints.gridx += 1;
577		- oe.aConstraints.weighty = 0;
578		- oe.aConstraints.gridwidth = 1;
579		-
580		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	515	+ commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	516	+ unselectButton.setToolTipText("Unselect");
581	517	unselectButton.addActionListener(this);
582	518
	519	+ commandsPanel.preferredHeight = 1;
	520	+
	521	+ oe.treePanel.add(commandsPanel);
	522	+ oe.treePanel.Return();
	523	+
583	524	// oe.aConstraints.gridx += 1;
584	525	// oe.aConstraints.weighty = 0;
585	526	// oe.aConstraints.gridwidth = 1;
..	..	@@ -591,40 +532,37 @@
591	532	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
592	533	// gcButton.addActionListener(this);
593	534
594		- oe.aConstraints.gridx = 0;
595		- oe.aConstraints.gridy += 1;
596		-
597		- //ctrlPanel.add(objList = new List(5, true));
598		- oe.aConstraints.gridwidth = 100;
599		- // oe.aConstraints.gridheight = 100;
600		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
601		- oe.aConstraints.gridheight = 1;
602		- oe.aConstraints.weighty = 0.5;
603		- oe.aConstraints.gridx = 0;
604		- JScrollPane jSP;
	535	+ cGridBag jSPPanel = new cGridBag();
	536	+
	537	+ JScrollPane jSP;
605	538	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
606		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	539	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
607	540	ResetModel();
608		- oe.aConstraints.weighty = 0.5;
609		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
610		- oe.aConstraints.gridy += 1;
611		- oe.aConstraints.gridwidth = 1;
	541	+
	542	+ oe.treePanel.add(jSPPanel);
	543	+ oe.treePanel.Return();
612	544
613		- oe.aConstraints.weighty = 0;
614		- oe.aConstraints.gridwidth = 2;
615		-
616		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
	545	+ cGridBag copyOptionsPanel = new cGridBag();
	546	+
	547	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	548	+ colorCB.setToolTipText("Copy color when dropped");
617	549	colorCB.addItemListener(this);
618		- oe.aConstraints.gridx += 2;
619		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	550	+
	551	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	552	+ materialCB.setToolTipText("Copy material when dropped");
620	553	materialCB.addItemListener(this);
621		- oe.aConstraints.gridx += 2;
622		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	554	+
	555	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	556	+ textureCB.setToolTipText("Copy texture when dropped");
623	557	textureCB.addItemListener(this);
624	558
625		- oe.aConstraints.gridx = 0;
626		- oe.aConstraints.gridy += 1;
	559	+ copyOptionsPanel.preferredHeight = 1;
	560	+ oe.treePanel.add(copyOptionsPanel);
	561	+ oe.treePanel.Return();
627	562
	563	+// mainPanel.setDividerLocation(0.5); //1.0);
	564	+// mainPanel.setResizeWeight(0.5);
	565	+
628	566	//jList.addListSelectionListener(this);
629	567	oe.jTree.addTreeSelectionListener(this);
630	568	//jTree.setRootVisible(false);
..	..	@@ -646,6 +584,86 @@
646	584	radio.layout = sevenButton;
647	585	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
648	586	}
	587	+
	588	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	589	+ {
	590	+ //constraints.gridx = 0;
	591	+ //constraints.gridy = 0;
	592	+ panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	593	+ fastCB.setToolTipText("Fast mode");
	594	+ fastCB.addItemListener(this);
	595	+ //constraints.gridy += 1;
	596	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	597	+ supportCB.setToolTipText("Enabled rigging");
	598	+ supportCB.addItemListener(this);
	599	+
	600	+ // constraints.gridy += 1;
	601	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	602	+ // localCB.addItemListener(this);
	603	+
	604	+ //constraints.gridy += 1;
	605	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	606	+ crowdCB.setToolTipText("Used for crowds");
	607	+ crowdCB.addItemListener(this);
	608	+
	609	+ //constraints.gridy += 1;
	610	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	611	+ smoothCB.setToolTipText("Snapping delay");
	612	+ smoothCB.addItemListener(this);
	613	+
	614	+ //constraints.gridy += 1;
	615	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	616	+ slowCB.setToolTipText("Smooth interpolation");
	617	+ slowCB.addItemListener(this);
	618	+ //constraints.gridy += 1;
	619	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	620	+ boxCB.setToolTipText("Display bounding boxes");
	621	+ boxCB.addItemListener(this);
	622	+ //constraints.gridy += 1;
	623	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	624	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	625	+ zoomBoxCB.addItemListener(this);
	626	+
	627	+// constraints.gridy += 1;
	628	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	629	+// speakerMocapCB.addItemListener(this);
	630	+
	631	+ if (false)
	632	+ {
	633	+ // handled in scripts
	634	+ //constraints.gridy += 1;
	635	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	636	+ speakerCameraCB.addItemListener(this);
	637	+
	638	+ //constraints.gridy += 1;
	639	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	640	+ speakerFocusCB.addItemListener(this);
	641	+
	642	+ //constraints.gridy += 1;
	643	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	644	+ smoothfocusCB.addItemListener(this);
	645	+ }
	646	+
	647	+//constraints.gridx += 1;
	648	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	649	+// debugCB.addItemListener(this);
	650	+
	651	+ //constraints.gridy += 1;
	652	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	653	+ oeilCB.addItemListener(this);
	654	+
	655	+ //constraints.gridy += 1;
	656	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	657	+ lookAtCB.setToolTipText("Look-at target");
	658	+ lookAtCB.addItemListener(this);
	659	+
	660	+ cGridBag fill = new cGridBag();
	661	+
	662	+ fill.preferredHeight = 200;
	663	+
	664	+ panel.add(fill);
	665	+
	666	+ }
649	667
650	668	void EditObject(Object3D obj)
651	669	{
..	..	@@ -676,6 +694,7 @@
676	694	JCheckBox fastCB;
677	695	JCheckBox slowCB;
678	696	JCheckBox boxCB;
	697	+ JCheckBox zoomBoxCB;
679	698	JCheckBox trackCB;
680	699	JCheckBox smoothfocusCB;
681	700	// JCheckBox speakerMocapCB;
..	..	@@ -755,6 +774,10 @@
755	774	Recompile();
756	775	cameraView.repaint();
757	776	// refreshContents();
	777	+ }
	778	+ else if(e.getSource() == zoomBoxCB)
	779	+ {
	780	+ cameraView.ToggleZoomBoxMode();
758	781	}
759	782	else if(e.getSource() == smoothfocusCB)
760	783	{
..	..	@@ -1482,6 +1505,7 @@
1482	1505	//
1483	1506	public void actionPerformed(ActionEvent event) // , Object arg)
1484	1507	{
	1508	+ Object source = event.getSource();
1485	1509	/*
1486	1510	if (event.getSource() == nameField)
1487	1511	{
..	..	@@ -1493,11 +1517,11 @@
1493	1517	}
1494	1518	else
1495	1519	*/
1496		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1520	+ if (source == lookAtItem \|\| source == lookFromItem)
1497	1521	{
1498	1522	ScreenFit();
1499	1523	} else
1500		- if (event.getSource() == switchItem)
	1524	+ if (source == switchItem)
1501	1525	{
1502	1526	cVector v1 = new cVector();
1503	1527	cVector v2 = new cVector();
..	..	@@ -1506,11 +1530,11 @@
1506	1530	objEditor.cameraView.renderCamera.setAim(v2, v1);
1507	1531	objEditor.cameraView.repaint();
1508	1532	} else
1509		- if (event.getSource() == rectoidItem)
	1533	+ if (source == rectoidItem)
1510	1534	{
1511	1535	makeSomething(new Box());
1512	1536	} else
1513		- if (event.getSource() == particleItem)
	1537	+ if (source == particleItem)
1514	1538	{
1515	1539	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1516	1540	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1531,9 +1555,9 @@
1531	1555	applyExample(particleGeom, "SMOKE");
1532	1556	makeSomething(particleGeom);
1533	1557	} else
1534		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1558	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1535	1559	{
1536		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1560	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1537	1561
1538	1562	ragdoll.toParent = LA.newMatrix();
1539	1563	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1551,7 +1575,7 @@
1551	1575	} else
1552	1576	/*
1553	1577	*/
1554		- if (event.getSource() == heightFieldItem)
	1578	+ if (source == heightFieldItem)
1555	1579	{
1556	1580	Object3D obj = new Object3D();
1557	1581
..	..	@@ -1589,31 +1613,31 @@
1589	1613
1590	1614	makeSomething(obj);
1591	1615	} else
1592		- if (event.getSource() == gridItem)
	1616	+ if (source == gridItem)
1593	1617	{
1594	1618	makeSomething(new Grid());
1595	1619	} else
1596		- if (event.getSource() == ellipsoidItem)
	1620	+ if (source == ellipsoidItem)
1597	1621	{
1598	1622	makeSomething(new Sphere());
1599	1623	} else
1600		- if (event.getSource() == coneItem)
	1624	+ if (source == coneItem)
1601	1625	{
1602	1626	makeSomething(new Cone());
1603	1627	} else
1604		- if (event.getSource() == torusItem)
	1628	+ if (source == torusItem)
1605	1629	{
1606	1630	makeSomething(new Torus());
1607	1631	} else
1608		- if (event.getSource() == superItem)
	1632	+ if (source == superItem)
1609	1633	{
1610	1634	makeSomething(new Superellipsoid());
1611	1635	} else
1612		- if (event.getSource() == kleinItem)
	1636	+ if (source == kleinItem)
1613	1637	{
1614	1638	makeSomething(new Klein());
1615	1639	} else
1616		- if (event.getSource() == blobItem)
	1640	+ if (source == blobItem)
1617	1641	{
1618	1642	Blob blob = new Blob();
1619	1643	BlobComponent comp = new BlobComponent();
..	..	@@ -1621,15 +1645,15 @@
1621	1645	//blob.retile();
1622	1646	makeSomething(blob);
1623	1647	} else
1624		- if (event.getSource() == latheItem)
	1648	+ if (source == latheItem)
1625	1649	{
1626	1650	makeSomething(new Lathe());
1627	1651	} else
1628		- if (event.getSource() == bezierItem)
	1652	+ if (source == bezierItem)
1629	1653	{
1630	1654	makeSomething(new BezierSurface());
1631	1655	} else
1632		- if (event.getSource() == checkerItem)
	1656	+ if (source == checkerItem)
1633	1657	{
1634	1658	/*
1635	1659	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1644,7 +1668,7 @@
1644	1668	*/
1645	1669	makeSomething(new Checker());
1646	1670	} else
1647		- if (event.getSource() == meshItem)
	1671	+ if (source == meshItem)
1648	1672	{
1649	1673	Object3D itemtomake = new Object3D();
1650	1674	Object3D child;
..	..	@@ -1665,35 +1689,35 @@
1665	1689	makeSomething(child);
1666	1690	}
1667	1691	} else
1668		- if (event.getSource() == springItem)
	1692	+ if (source == springItem)
1669	1693	{
1670	1694	cSpring s = new cSpring();
1671	1695	s.setup();
1672	1696	makeSomething(s);
1673	1697	} else
1674		- if (event.getSource() == flagItem)
	1698	+ if (source == flagItem)
1675	1699	{
1676	1700	cSpring s = new cFlag();
1677	1701	s.setup();
1678	1702	makeSomething(s);
1679	1703	} else
1680		- if (event.getSource() == lightItem)
	1704	+ if (source == lightItem)
1681	1705	{
1682	1706	makeSomething(new Light());
1683	1707	} else
1684		- if (event.getSource() == csgItem)
	1708	+ if (source == csgItem)
1685	1709	{
1686	1710	group(new CSG());
1687	1711	} else
1688		- if (event.getSource() == templateItem)
	1712	+ if (source == templateItem)
1689	1713	{
1690	1714	group(new cTemplate());
1691	1715	} else
1692		- if (event.getSource() == attributeItem)
	1716	+ if (source == attributeItem)
1693	1717	{
1694	1718	makeSomething(new Attribute());
1695	1719	} else
1696		- if (event.getSource() == pointflowItem)
	1720	+ if (source == pointflowItem)
1697	1721	{
1698	1722	makeSomething(new PointFlow());
1699	1723	} else
..	..	@@ -1705,7 +1729,7 @@
1705	1729	} else
1706	1730	*/
1707	1731
1708		- if (event.getSource() == superLoopItem)
	1732	+ if (source == superLoopItem)
1709	1733	{
1710	1734	Composite g = new cGroup();
1711	1735	for (int i=0; i<15; i++)
..	..	@@ -1727,7 +1751,7 @@
1727	1751
1728	1752	group(g);
1729	1753	} else
1730		- if (event.getSource() == loopItem)
	1754	+ if (source == loopItem)
1731	1755	{
1732	1756	Composite csg = new GroupLeaf();
1733	1757	csg.count = 5;
..	..	@@ -1736,7 +1760,7 @@
1736	1760	csg.addChild(child);
1737	1761	child.addChild(csg);
1738	1762	} else
1739		- if (event.getSource() == doubleItem)
	1763	+ if (source == doubleItem)
1740	1764	{
1741	1765	Composite csg = new GroupLeaf();
1742	1766	csg.count = 5;
..	..	@@ -1748,7 +1772,7 @@
1748	1772	csg.addChild(child);
1749	1773	child.addChild(csg);
1750	1774	} else
1751		- if (event.getSource() == tripleItem)
	1775	+ if (source == tripleItem)
1752	1776	{
1753	1777	Composite csg = new GroupLeaf();
1754	1778	csg.count = 4;
..	..	@@ -1764,70 +1788,70 @@
1764	1788	child.addChild(csg);
1765	1789	} else
1766	1790
1767		- if (event.getSource() == importGFDItem)
	1791	+ if (source == importGFDItem)
1768	1792	{
1769	1793	ImportGFD();
1770	1794	} else
1771		- if (event.getSource() == importVRMLX3DItem)
	1795	+ if (source == importVRMLX3DItem)
1772	1796	{
1773	1797	ImportVRMLX3D();
1774	1798	} else
1775		- if (event.getSource() == import3DSItem)
	1799	+ if (source == import3DSItem)
1776	1800	{
1777	1801	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1778	1802	} else
1779		- if (event.getSource() == importOBJItem)
	1803	+ if (source == importOBJItem)
1780	1804	{
1781	1805	objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1782	1806	} else
1783		- if (event.getSource() == computeAOItem)
	1807	+ if (source == computeAOItem)
1784	1808	{
1785		- CameraPane.drawMode = CameraPane.OCCLUSION;
1786		- CameraPane.theRenderer.repaint();
	1809	+ Globals.drawMode = CameraPane.OCCLUSION;
	1810	+ Globals.theRenderer.repaint();
1787	1811	} else
1788		- if (event.getSource() == recompileItem)
	1812	+ if (source == recompileItem)
1789	1813	{
1790	1814	Recompile();
1791	1815	refreshContents();
1792	1816	} else
1793		- if (event.getSource() == editScriptItem)
	1817	+ if (source == editScriptItem)
1794	1818	{
1795	1819	OpenDialog();
1796	1820	refreshContents();
1797	1821	} else
1798		- if (event.getSource() == invariantsItem)
	1822	+ if (source == invariantsItem)
1799	1823	{
1800	1824	System.out.println("Invariants:");
1801	1825	GrafreeD.grafreeD.universe.invariants();
1802	1826	} else
1803		- if (event.getSource() == memoryItem)
	1827	+ if (source == memoryItem)
1804	1828	{
1805	1829	//System.out.println("Invariants:");
1806	1830	PrintMemory();
1807	1831	} else
1808		- if (event.getSource() == pathItem)
	1832	+ if (source == pathItem)
1809	1833	{
1810	1834	PrintPath();
1811	1835	} else
1812		- if (event.getSource() == analyzeItem)
	1836	+ if (source == analyzeItem)
1813	1837	{
1814	1838	AnalyzeObject();
1815	1839	} else
1816		- if (event.getSource() == dumpItem)
	1840	+ if (source == dumpItem)
1817	1841	{
1818	1842	DumpObject();
1819	1843	} else
1820		- if (event.getSource() == screenfitButton)
	1844	+ if (source == screenfitButton)
1821	1845	{
1822	1846	//Reload(lastConverter, lastFilename, true);
1823	1847	ScreenFit();
1824	1848	} else
1825		- if (event.getSource() == screenfitpointButton)
	1849	+ if (source == screenfitpointButton)
1826	1850	{
1827	1851	//Reload(lastConverter, lastFilename, true);
1828	1852	ScreenFitPoint();
1829	1853	} else
1830		- if (event.getSource() == snapobjectButton)
	1854	+ if (source == snapobjectButton)
1831	1855	{
1832	1856	//Reload(lastConverter, lastFilename, true);
1833	1857	SnapObject();
..	..	@@ -1838,13 +1862,13 @@
1838	1862	// Recompile();
1839	1863	// refreshContents();
1840	1864	// } else
1841		- if (event.getSource() == gcButton)
	1865	+ if (source == gcButton)
1842	1866	{
1843	1867	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1844	1868	System.gc();
1845	1869	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1846	1870	} else
1847		- if (event.getSource() == editLeafItem)
	1871	+ if (source == editLeafItem)
1848	1872	{
1849	1873	Object3D obj;
1850	1874	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1858,62 +1882,62 @@
1858	1882	}
1859	1883	refreshContents(true);
1860	1884	} else
1861		- if (event.getSource() == openWindowItem)
	1885	+ if (source == openWindowItem)
1862	1886	{
1863	1887	EditSelection(true);
1864	1888	} else
1865		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1889	+ if (source == cutItem \|\| source == clearButton)
1866	1890	{
1867	1891	loadClipboard(true);
1868	1892	} else
1869		- if (event.getSource() == duplicateItem)
	1893	+ if (source == duplicateItem)
1870	1894	{
1871	1895	Object3D keep = GrafreeD.clipboard;
1872	1896	loadClipboard(false);
1873	1897	paste(false);
1874	1898	GrafreeD.clipboard = keep;
1875	1899	} else
1876		- if (event.getSource() == cloneItem)
	1900	+ if (source == cloneItem)
1877	1901	{
1878	1902	CloneSelection(false);
1879	1903	} else
1880		- if (event.getSource() == cloneSupportItem)
	1904	+ if (source == cloneSupportItem)
1881	1905	{
1882	1906	CloneSelection(true);
1883	1907	} else
1884		- if (event.getSource() == copyItem)
	1908	+ if (source == copyItem)
1885	1909	{
1886	1910	loadClipboard(false);
1887	1911	} else
1888		- if (event.getSource() == pasteItem)
	1912	+ if (source == pasteItem)
1889	1913	{
1890	1914	paste(false);
1891	1915	} else
1892		- if (event.getSource() == pasteLinkItem)
	1916	+ if (source == pasteLinkItem)
1893	1917	{
1894	1918	pasteInto(false);
1895	1919	} else
1896		- if (event.getSource() == pasteCloneItem)
	1920	+ if (source == pasteCloneItem)
1897	1921	{
1898	1922	pasteInto(true);
1899	1923	} else
1900		- if (event.getSource() == pasteExpandItem)
	1924	+ if (source == pasteExpandItem)
1901	1925	{
1902	1926	paste(true);
1903	1927	} else
1904		- if (event.getSource() == synchronizeItem)
	1928	+ if (source == synchronizeItem)
1905	1929	{
1906	1930	Overwrite(Object3D.TRANSFORM);
1907	1931	} else
1908		- if (event.getSource() == overwriteNameItem)
	1932	+ if (source == overwriteNameItem)
1909	1933	{
1910	1934	Overwrite(Object3D.NAME);
1911	1935	} else
1912		- if (event.getSource() == overwriteUVItem)
	1936	+ if (source == overwriteUVItem)
1913	1937	{
1914	1938	Overwrite(Object3D.UV);
1915	1939	} else
1916		- if (event.getSource() == overwriteMatItem)
	1940	+ if (source == overwriteMatItem)
1917	1941	{
1918	1942	/* july 2015
1919	1943	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1933,7 +1957,7 @@
1933	1957
1934	1958	Overwrite(dropAttributes);
1935	1959	}
1936		- if (event.getSource() == overwriteGeoItem)
	1960	+ if (source == overwriteGeoItem)
1937	1961	{
1938	1962	Overwrite(Object3D.GEOMETRY);
1939	1963	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1950,7 +1974,7 @@
1950	1974	// refreshContents();
1951	1975	// }
1952	1976	} else
1953		- if (event.getSource() == generateMeshItem)
	1977	+ if (source == generateMeshItem)
1954	1978	{
1955	1979	//if (group.selection.size() == 1)
1956	1980	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1961,7 +1985,7 @@
1961	1985	ResetModel();
1962	1986	refreshContents();
1963	1987	} else
1964		- if (event.getSource() == extractGeometriesItem)
	1988	+ if (source == extractGeometriesItem)
1965	1989	{
1966	1990	boolean one = false;
1967	1991
..	..	@@ -1988,7 +2012,7 @@
1988	2012	ResetModel();
1989	2013	refreshContents();
1990	2014	} else
1991		- if (event.getSource() == cloneGeometriesItem)
	2015	+ if (source == cloneGeometriesItem)
1992	2016	{
1993	2017	boolean one = false;
1994	2018
..	..	@@ -2014,7 +2038,7 @@
2014	2038	ResetModel();
2015	2039	refreshContents();
2016	2040	} else
2017		- if (event.getSource() == shareGeometriesItem)
	2041	+ if (source == shareGeometriesItem)
2018	2042	{
2019	2043	boolean one = false;
2020	2044
..	..	@@ -2044,7 +2068,7 @@
2044	2068	refreshContents();
2045	2069	}
2046	2070	} else
2047		- if (event.getSource() == mergeGeometriesItem)
	2071	+ if (source == mergeGeometriesItem)
2048	2072	{
2049	2073	boolean one = false;
2050	2074
..	..	@@ -2074,7 +2098,7 @@
2074	2098	ResetModel();
2075	2099	refreshContents();
2076	2100	} else
2077		- if (event.getSource() == linkverticesItem)
	2101	+ if (source == linkverticesItem)
2078	2102	{
2079	2103	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2080	2104	// {
..	..	@@ -2094,7 +2118,7 @@
2094	2118	if (content instanceof cGroup && ((cGroup)content).transientlink )
2095	2119	content = ((cGroup)content).get(0);
2096	2120
2097		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2121	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2098	2122	for (int i=0; i<group.selection.size(); i++)
2099	2123	{
2100	2124	boolean random = CameraPane.RANDOM;
..	..	@@ -2103,11 +2127,11 @@
2103	2127	// group.selection.get(i).setMasterThis(content); // should be identity
2104	2128	CameraPane.RANDOM = random;
2105	2129	}
2106		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2130	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2107	2131	refreshContents();
2108	2132	}
2109	2133	} else
2110		- if (event.getSource() == resetsupportItem)
	2134	+ if (source == resetsupportItem)
2111	2135	{
2112	2136	for (int i=0; i<group.selection.size(); i++)
2113	2137	{
..	..	@@ -2119,7 +2143,7 @@
2119	2143
2120	2144	refreshContents();
2121	2145	} else
2122		- if (event.getSource() == relinkverticesItem)
	2146	+ if (source == relinkverticesItem)
2123	2147	{
2124	2148	boolean random = CameraPane.RANDOM;
2125	2149	CameraPane.RANDOM = false; // parse all random nodes
..	..	@@ -2128,7 +2152,7 @@
2128	2152
2129	2153	refreshContents();
2130	2154	} else
2131		- if (event.getSource() == resetreferencesItem)
	2155	+ if (source == resetreferencesItem)
2132	2156	{
2133	2157	for (int i=0; i<group.selection.size(); i++)
2134	2158	{
..	..	@@ -2137,7 +2161,7 @@
2137	2161
2138	2162	refreshContents();
2139	2163	} else
2140		- if (event.getSource() == setMasterItem)
	2164	+ if (source == setMasterItem)
2141	2165	{
2142	2166	if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2143	2167	{
..	..	@@ -2150,7 +2174,7 @@
2150	2174	refreshContents();
2151	2175	}
2152	2176	} else
2153		- if (event.getSource() == poseMeshItem)
	2177	+ if (source == poseMeshItem)
2154	2178	{
2155	2179	if (group.selection.size() == 1)
2156	2180	{
..	..	@@ -2169,19 +2193,19 @@
2169	2193	}
2170	2194
2171	2195	} else
2172		- if (event.getSource() == revertMeshItem)
	2196	+ if (source == revertMeshItem)
2173	2197	{
2174	2198	RevertMeshes();
2175	2199	} else
2176		- if (event.getSource() == resetMeshItem)
	2200	+ if (source == resetMeshItem)
2177	2201	{
2178	2202	ResetAll();
2179	2203	} else
2180		- if (event.getSource() == stepAllItem)
	2204	+ if (source == stepAllItem)
2181	2205	{
2182	2206	StepAll();
2183	2207	} else
2184		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2208	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2185	2209	{
2186	2210	//int indices[] = jList.getSelectedIndices();
2187	2211	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2189,46 +2213,46 @@
2189	2213
2190	2214	ClearSelection(false);
2191	2215	} else
2192		- if (event.getSource() == clearAllItem)
	2216	+ if (source == clearAllItem)
2193	2217	{
2194	2218	ClearSelection(true);
2195	2219	} else
2196		- if (event.getSource() == grabItem)
	2220	+ if (source == grabItem)
2197	2221	{
2198	2222	group(new cGroup(), true);
2199	2223	} else
2200		- if (event.getSource() == hideItem)
	2224	+ if (source == hideItem)
2201	2225	{
2202	2226	group(new HiddenObject());
2203	2227	} else
2204		- if (event.getSource() == frontItem)
	2228	+ if (source == frontItem)
2205	2229	{
2206	2230	front();
2207	2231	} else
2208		- if (event.getSource() == backItem)
	2232	+ if (source == backItem)
2209	2233	{
2210	2234	back();
2211	2235	} else
2212		- if (event.getSource() == cameraItem)
	2236	+ if (source == cameraItem)
2213	2237	{
2214	2238	makeSomething(new Camera());
2215	2239	} else
2216		- if (event.getSource() == compositeItem)
	2240	+ if (source == compositeItem)
2217	2241	{
2218	2242	group(new Composite());
2219	2243	} else
2220		- if (event.getSource() == randomItem)
	2244	+ if (source == randomItem)
2221	2245	{
2222	2246	RandomNode random = new RandomNode();
2223	2247	group(random);
2224	2248	if (random.size() > 0)
2225	2249	random.name = random.get(0).name + "Rnd";
2226	2250	} else
2227		- if (event.getSource() == physicsItem)
	2251	+ if (source == physicsItem)
2228	2252	{
2229	2253	group(new PhysicsNode());
2230	2254	} else
2231		- if (event.getSource() == frameselectorItem)
	2255	+ if (source == frameselectorItem)
2232	2256	{
2233	2257	for (int i=0; i<group.selection.size(); i++)
2234	2258	{
..	..	@@ -2240,7 +2264,7 @@
2240	2264	ResetModel();
2241	2265	refreshContents();
2242	2266	} else
2243		- if (event.getSource() == switchGeoItem)
	2267	+ if (source == switchGeoItem)
2244	2268	{
2245	2269	for (int i=0; i<group.selection.size(); i++)
2246	2270	{
..	..	@@ -2252,7 +2276,7 @@
2252	2276	ResetModel();
2253	2277	refreshContents();
2254	2278	} else
2255		- if (event.getSource() == switchTransfoItem)
	2279	+ if (source == switchTransfoItem)
2256	2280	{
2257	2281	for (int i=0; i<group.selection.size(); i++)
2258	2282	{
..	..	@@ -2264,7 +2288,7 @@
2264	2288	ResetModel();
2265	2289	refreshContents();
2266	2290	} else
2267		- if (event.getSource() == morphItem)
	2291	+ if (source == morphItem)
2268	2292	{
2269	2293	for (int i=0; i<group.selection.size(); i++)
2270	2294	{
..	..	@@ -2276,7 +2300,7 @@
2276	2300	ResetModel();
2277	2301	refreshContents();
2278	2302	} else
2279		- if (event.getSource() == scriptNodeItem)
	2303	+ if (source == scriptNodeItem)
2280	2304	{
2281	2305	boolean atleastone = false;
2282	2306
..	..	@@ -2315,31 +2339,31 @@
2315	2339	}
2316	2340	}
2317	2341	} else
2318		- if (event.getSource() == linkerItem)
	2342	+ if (source == linkerItem)
2319	2343	{
2320	2344	group(new cLinker());
2321	2345	} else
2322		- if (event.getSource() == textureItem)
	2346	+ if (source == textureItem)
2323	2347	{
2324	2348	group(new TextureNode());
2325	2349	} else
2326		- if (event.getSource() == billboardItem)
	2350	+ if (source == billboardItem)
2327	2351	{
2328	2352	group(new BillboardNode());
2329	2353	} else
2330		- if (event.getSource() == shadowXItem)
	2354	+ if (source == shadowXItem)
2331	2355	{
2332	2356	CastShadow(0);
2333	2357	} else
2334		- if (event.getSource() == shadowYItem)
	2358	+ if (source == shadowYItem)
2335	2359	{
2336	2360	CastShadow(1);
2337	2361	} else
2338		- if (event.getSource() == shadowZItem)
	2362	+ if (source == shadowZItem)
2339	2363	{
2340	2364	CastShadow(2);
2341	2365	} else
2342		- if (event.getSource() == ungroupItem)
	2366	+ if (source == ungroupItem)
2343	2367	{
2344	2368	//ungroup();
2345	2369	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2351,179 +2375,179 @@
2351	2375
2352	2376	refreshContents();
2353	2377	} else
2354		- if (event.getSource() == genUVItem)
	2378	+ if (source == genUVItem)
2355	2379	{
2356	2380	GenUV();
2357	2381	} else
2358		- if (event.getSource() == genNormalsCADItem)
	2382	+ if (source == genNormalsCADItem)
2359	2383	{
2360	2384	GenNormals(true);
2361	2385	} else
2362		- if (event.getSource() == genNormalsMESHItem)
	2386	+ if (source == genNormalsMESHItem)
2363	2387	{
2364	2388	GenNormals(true); // TODO
2365	2389	} else
2366		- if (event.getSource() == genNormalsORGANItem)
	2390	+ if (source == genNormalsORGANItem)
2367	2391	{
2368	2392	GenNormals(false);
2369	2393	} else
2370		- if (event.getSource() == genNormalsMINEItem)
	2394	+ if (source == genNormalsMINEItem)
2371	2395	{
2372	2396	GenNormalsMINE();
2373	2397	} else
2374		- if (event.getSource() == stripifyItem)
	2398	+ if (source == stripifyItem)
2375	2399	{
2376	2400	Stripify();
2377	2401	} else
2378		- if (event.getSource() == unstripifyItem)
	2402	+ if (source == unstripifyItem)
2379	2403	{
2380	2404	Unstripify();
2381	2405	} else
2382		- if (event.getSource() == trimItem)
	2406	+ if (source == trimItem)
2383	2407	{
2384	2408	Trim();
2385	2409	} else
2386		- if (event.getSource() == untrimItem)
	2410	+ if (source == untrimItem)
2387	2411	{
2388	2412	Untrim();
2389	2413	} else
2390		- if (event.getSource() == clearColorsItem)
	2414	+ if (source == clearColorsItem)
2391	2415	{
2392	2416	ClearColors();
2393	2417	} else
2394		- if (event.getSource() == clearMaterialsItem)
	2418	+ if (source == clearMaterialsItem)
2395	2419	{
2396	2420	ClearMaterials();
2397	2421	} else
2398		- if (event.getSource() == liveleavesItem)
	2422	+ if (source == liveleavesItem)
2399	2423	{
2400	2424	LiveLeaves(true);
2401	2425	} else
2402		- if (event.getSource() == unliveleavesItem)
	2426	+ if (source == unliveleavesItem)
2403	2427	{
2404	2428	LiveLeaves(false);
2405	2429	} else
2406		- if (event.getSource() == supportleavesItem)
	2430	+ if (source == supportleavesItem)
2407	2431	{
2408	2432	SupportLeaves(true);
2409	2433	} else
2410		- if (event.getSource() == unsupportleavesItem)
	2434	+ if (source == unsupportleavesItem)
2411	2435	{
2412	2436	SupportLeaves(false);
2413	2437	} else
2414		- if (event.getSource() == hideleavesItem)
	2438	+ if (source == hideleavesItem)
2415	2439	{
2416	2440	HideLeaves(true);
2417	2441	} else
2418		- if (event.getSource() == showleavesItem)
	2442	+ if (source == showleavesItem)
2419	2443	{
2420	2444	HideLeaves(false);
2421	2445	} else
2422		- if (event.getSource() == markleavesItem)
	2446	+ if (source == markleavesItem)
2423	2447	{
2424	2448	MarkLeaves(true);
2425	2449	} else
2426		- if (event.getSource() == unmarkleavesItem)
	2450	+ if (source == unmarkleavesItem)
2427	2451	{
2428	2452	MarkLeaves(false);
2429	2453	} else
2430		- if (event.getSource() == flipVItem)
	2454	+ if (source == flipVItem)
2431	2455	{
2432	2456	FlipV(true);
2433	2457	} else
2434		- if (event.getSource() == unflipVItem)
	2458	+ if (source == unflipVItem)
2435	2459	{
2436	2460	FlipV(false);
2437	2461	} else
2438		- if (event.getSource() == lowTexturesItem)
	2462	+ if (source == lowTexturesItem)
2439	2463	{
2440	2464	SetTexRes(0);
2441	2465	} else
2442		- if (event.getSource() == normalTexturesItem)
	2466	+ if (source == normalTexturesItem)
2443	2467	{
2444	2468	SetTexRes(1);
2445	2469	} else
2446		- if (event.getSource() == highTexturesItem)
	2470	+ if (source == highTexturesItem)
2447	2471	{
2448	2472	SetTexRes(2);
2449	2473	} else
2450		- if (event.getSource() == veryhighTexturesItem)
	2474	+ if (source == veryhighTexturesItem)
2451	2475	{
2452	2476	SetTexRes(3);
2453	2477	} else
2454		- if (event.getSource() == maxTexturesItem)
	2478	+ if (source == maxTexturesItem)
2455	2479	{
2456	2480	SetTexRes(4);
2457	2481	} else
2458		- if (event.getSource() == panoTexturesItem)
	2482	+ if (source == panoTexturesItem)
2459	2483	{
2460	2484	SetTexRes(5);
2461	2485	} else
2462		- if (event.getSource() == reverseNormalsItem)
	2486	+ if (source == reverseNormalsItem)
2463	2487	{
2464	2488	ReverseNormals();
2465	2489	} else
2466		- if (event.getSource() == parseverticesItem)
	2490	+ if (source == parseverticesItem)
2467	2491	{
2468	2492	ParseVertices();
2469	2493	} else
2470		- if (event.getSource() == textureFieldItem)
	2494	+ if (source == textureFieldItem)
2471	2495	{
2472	2496	TextureVertices();
2473	2497	} else
2474		- if (event.getSource() == alignItem)
	2498	+ if (source == alignItem)
2475	2499	{
2476	2500	Align();
2477	2501	} else
2478		- if (event.getSource() == mirrorItem)
	2502	+ if (source == mirrorItem)
2479	2503	{
2480	2504	MirrorPoses();
2481	2505	} else
2482		- if (event.getSource() == reduceMorphItem)
	2506	+ if (source == reduceMorphItem)
2483	2507	{
2484	2508	MeshReduction(false);
2485	2509	} else
2486		- if (event.getSource() == reduce34MorphItem)
	2510	+ if (source == reduce34MorphItem)
2487	2511	{
2488	2512	MeshReduction(true);
2489	2513	} else
2490		- if (event.getSource() == reverseTrianglesItem)
	2514	+ if (source == reverseTrianglesItem)
2491	2515	{
2492	2516	ReverseTriangles();
2493	2517	} else
2494		- if (event.getSource() == reduceMeshItem)
	2518	+ if (source == reduceMeshItem)
2495	2519	{
2496	2520	ReduceMesh(false);
2497	2521	} else
2498		- if (event.getSource() == reduce34MeshItem)
	2522	+ if (source == reduce34MeshItem)
2499	2523	{
2500	2524	ReduceMesh(true);
2501	2525	} else
2502		- if (event.getSource() == increaseMeshItem)
	2526	+ if (source == increaseMeshItem)
2503	2527	{
2504	2528	IncreaseMesh();
2505	2529	} else
2506		- if (event.getSource() == clipMeshItem)
	2530	+ if (source == clipMeshItem)
2507	2531	{
2508	2532	ClipMesh();
2509	2533	} else
2510		- if (event.getSource() == smoothMeshItem)
	2534	+ if (source == smoothMeshItem)
2511	2535	{
2512	2536	SmoothMesh();
2513	2537	} else
2514		- if (event.getSource() == transformgeometryItem)
	2538	+ if (source == transformgeometryItem)
2515	2539	{
2516	2540	TransformGeometry();
2517	2541	} else
2518		- if (event.getSource() == resetTransformItem)
	2542	+ if (source == resetTransformItem)
2519	2543	{
2520	2544	ResetTransform();
2521	2545	} else
2522		- if (event.getSource() == resetCentroidItem)
	2546	+ if (source == resetCentroidItem)
2523	2547	{
2524	2548	ResetCentroid();
2525	2549	} else
2526		- if (event.getSource() == resetParentItem)
	2550	+ if (source == resetParentItem)
2527	2551	{
2528	2552	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2529	2553	{
..	..	@@ -2533,7 +2557,7 @@
2533	2557
2534	2558	refreshContents();
2535	2559	} else
2536		- if (event.getSource() == repairParentItem)
	2560	+ if (source == repairParentItem)
2537	2561	{
2538	2562	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2539	2563	{
..	..	@@ -2547,7 +2571,7 @@
2547	2571
2548	2572	refreshContents();
2549	2573	} else
2550		- if (event.getSource() == repairShadowItem)
	2574	+ if (source == repairShadowItem)
2551	2575	{
2552	2576	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2553	2577	{
..	..	@@ -2561,7 +2585,7 @@
2561	2585
2562	2586	refreshContents();
2563	2587	} else
2564		- if (event.getSource() == sortbysizeItem)
	2588	+ if (source == sortbysizeItem)
2565	2589	{
2566	2590	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2567	2591	{
..	..	@@ -2573,7 +2597,7 @@
2573	2597	ResetModel();
2574	2598	refreshContents();
2575	2599	} else
2576		- if (event.getSource() == sortbynameItem)
	2600	+ if (source == sortbynameItem)
2577	2601	{
2578	2602	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2579	2603	{
..	..	@@ -2585,7 +2609,7 @@
2585	2609	ResetModel();
2586	2610	refreshContents();
2587	2611	} else
2588		- if (event.getSource() == attachPigmentItem)
	2612	+ if (source == attachPigmentItem)
2589	2613	{
2590	2614	String texture = GetFile("Attach pigment");
2591	2615	Object3D obj;
..	..	@@ -2597,7 +2621,7 @@
2597	2621
2598	2622	refreshContents();
2599	2623	} else
2600		- if (event.getSource() == detachPigmentItem)
	2624	+ if (source == detachPigmentItem)
2601	2625	{
2602	2626	Object3D obj;
2603	2627	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2608,7 +2632,7 @@
2608	2632
2609	2633	refreshContents();
2610	2634	} else
2611		- if (event.getSource() == attachBumpItem)
	2635	+ if (source == attachBumpItem)
2612	2636	{
2613	2637	String texture = GetFile("Attach bump");
2614	2638	Object3D obj;
..	..	@@ -2620,7 +2644,7 @@
2620	2644
2621	2645	refreshContents();
2622	2646	} else
2623		- if (event.getSource() == detachBumpItem)
	2647	+ if (source == detachBumpItem)
2624	2648	{
2625	2649	Object3D obj;
2626	2650	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2631,7 +2655,7 @@
2631	2655
2632	2656	refreshContents();
2633	2657	} else
2634		- if (event.getSource() == pigmentBumpItem)
	2658	+ if (source == pigmentBumpItem)
2635	2659	{
2636	2660	Object3D obj;
2637	2661	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2642,158 +2666,195 @@
2642	2666
2643	2667	refreshContents();
2644	2668	} else
2645		- if (event.getSource() == flashSelectionButton)
	2669	+ if (source == flashSelectionButton)
2646	2670	{
2647	2671	CameraPane.flash = true;
2648	2672	refreshContents();
2649	2673	} else
2650		- if (event.getSource() == oneButton)
	2674	+ if (source == oneButton)
2651	2675	{
2652	2676	} else
2653		- if (event.getSource() == twoButton)
	2677	+ if (source == twoButton)
2654	2678	{
2655	2679	radio.layout = twoButton;
2656	2680	// bug
2657	2681	//gridPanel.setDividerLocation(1.0);
2658	2682	//bigPanel.setDividerLocation(0.0);
2659		- bigThree.remove(scenePanel);
2660		- bigThree.remove(centralPanel);
2661		- bigThree.remove(XYZPanel);
2662		- aWindowConstraints.gridx = 0;
2663		- aWindowConstraints.gridy = 0;
2664		- aWindowConstraints.gridwidth = 1;
2665		- // aConstraints.gridheight = 3;
2666		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2667		- aWindowConstraints.weightx = 0;
2668		- aWindowConstraints.weighty = 1;
2669		- //bigThree.add(jtp, aWindowConstraints);
2670		- aWindowConstraints.weightx = 1;
2671		- aWindowConstraints.gridwidth = 3;
2672		- // aConstraints.gridheight = 3;
2673		- aWindowConstraints.gridx = 1;
2674		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2675		- bigThree.add(centralPanel, aWindowConstraints);
2676		- aWindowConstraints.weightx = 0;
2677		- aWindowConstraints.gridx = 4;
2678		- aWindowConstraints.gridwidth = 1;
2679		- // aConstraints.gridheight = 3;
2680		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2681		- //bigThree.add(XYZPanel, aWindowConstraints);
2682		- bigThree.revalidate();
	2683	+// bigThree.remove(scenePanel);
	2684	+// bigThree.remove(centralPanel);
	2685	+// bigThree.remove(XYZPanel);
	2686	+// aWindowConstraints.gridx = 0;
	2687	+// aWindowConstraints.gridy = 0;
	2688	+// aWindowConstraints.gridwidth = 1;
	2689	+// // aConstraints.gridheight = 3;
	2690	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2691	+// aWindowConstraints.weightx = 0;
	2692	+// aWindowConstraints.weighty = 1;
	2693	+// //bigThree.add(jtp, aWindowConstraints);
	2694	+// aWindowConstraints.weightx = 1;
	2695	+// aWindowConstraints.gridwidth = 3;
	2696	+// // aConstraints.gridheight = 3;
	2697	+// aWindowConstraints.gridx = 1;
	2698	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2699	+// bigThree.add(centralPanel, aWindowConstraints);
	2700	+// aWindowConstraints.weightx = 0;
	2701	+// aWindowConstraints.gridx = 4;
	2702	+// aWindowConstraints.gridwidth = 1;
	2703	+// // aConstraints.gridheight = 3;
	2704	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2705	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2706	+// scenePanel.setVisible(false);
	2707	+// centralPanel.setVisible(true);
	2708	+// XYZPanel.setVisible(false);
	2709	+ bigThree.ClearUI();
	2710	+ bigThree.add(centralPanel);
	2711	+ bigThree.FlushUI();
2683	2712	} else
2684		- if (event.getSource() == threeButton)
	2713	+ if (source == threeButton)
2685	2714	{
2686	2715	radio.layout = threeButton;
2687		- bigThree.remove(scenePanel);
2688		- bigThree.remove(centralPanel);
2689		- bigThree.remove(XYZPanel);
2690		- aWindowConstraints.gridx = 0;
2691		- aWindowConstraints.gridy = 0;
2692		- aWindowConstraints.gridwidth = 1;
2693		- // aConstraints.gridheight = 3;
2694		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2695		- aWindowConstraints.weightx = 0;
2696		- aWindowConstraints.weighty = 1;
2697		- //bigThree.add(jtp, aWindowConstraints);
2698		- aWindowConstraints.weightx = 1;
2699		- aWindowConstraints.gridwidth = 3;
2700		- // aConstraints.gridheight = 3;
2701		- aWindowConstraints.gridx = 1;
2702		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2703		- bigThree.add(centralPanel, aWindowConstraints);
2704		- aWindowConstraints.weightx = 0;
2705		- aWindowConstraints.gridx = 4;
2706		- aWindowConstraints.gridwidth = 1;
2707		- // aConstraints.gridheight = 3;
2708		- aConstraints.fill = GridBagConstraints.VERTICAL;
2709		- bigThree.add(XYZPanel, aWindowConstraints);
2710		- bigThree.revalidate();
	2716	+
	2717	+// bigThree.remove(scenePanel);
	2718	+// bigThree.remove(centralPanel);
	2719	+// bigThree.remove(XYZPanel);
	2720	+// aWindowConstraints.gridx = 0;
	2721	+// aWindowConstraints.gridy = 0;
	2722	+// aWindowConstraints.gridwidth = 1;
	2723	+// // aConstraints.gridheight = 3;
	2724	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2725	+// aWindowConstraints.weightx = 0;
	2726	+// aWindowConstraints.weighty = 1;
	2727	+// //bigThree.add(jtp, aWindowConstraints);
	2728	+// aWindowConstraints.weightx = 1;
	2729	+// aWindowConstraints.gridwidth = 3;
	2730	+// // aConstraints.gridheight = 3;
	2731	+// aWindowConstraints.gridx = 1;
	2732	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2733	+// bigThree.add(centralPanel, aWindowConstraints);
	2734	+// aWindowConstraints.weightx = 0;
	2735	+// aWindowConstraints.gridx = 4;
	2736	+// aWindowConstraints.gridwidth = 1;
	2737	+// // aConstraints.gridheight = 3;
	2738	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2739	+// bigThree.add(XYZPanel, aWindowConstraints);
	2740	+// bigThree.validate();
	2741	+// scenePanel.setVisible(false);
	2742	+// centralPanel.setVisible(true);
	2743	+// XYZPanel.setVisible(true);
	2744	+ bigThree.ClearUI();
	2745	+ bigThree.add(centralPanel);
	2746	+ bigThree.add(XYZPanel);
	2747	+ bigThree.FlushUI();
2711	2748	} else
2712		- if (event.getSource() == fourButton)
	2749	+ if (source == fourButton)
2713	2750	{
2714	2751	radio.layout = fourButton;
2715		- bigThree.remove(scenePanel);
2716		- bigThree.remove(centralPanel);
2717		- bigThree.remove(XYZPanel);
2718		- aWindowConstraints.gridx = 0;
2719		- aWindowConstraints.gridy = 0;
2720		- aWindowConstraints.gridwidth = 1;
2721		- // aWindowConstraints.gridheight = 3;
2722		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2723		- aWindowConstraints.weightx = 1;
2724		- aWindowConstraints.weighty = 1;
2725		- bigThree.add(scenePanel, aWindowConstraints);
2726		- aWindowConstraints.weightx = 1;
2727		- aWindowConstraints.gridwidth = 3;
2728		- // aConstraints.gridheight = 3;
2729		- aWindowConstraints.gridx = 1;
2730		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2731		- //bigThree.add(cameraPanel, aWindowConstraints);
2732		- aWindowConstraints.weightx = 0;
2733		- aWindowConstraints.gridx = 4;
2734		- aWindowConstraints.gridwidth = 1;
2735		- // aWindowConstraints.gridheight = 3;
2736		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2737		- //bigThree.add(XYZPanel, aWindowConstraints);
2738		- bigThree.revalidate();
	2752	+
	2753	+// bigThree.remove(scenePanel);
	2754	+// bigThree.remove(centralPanel);
	2755	+// bigThree.remove(XYZPanel);
	2756	+// aWindowConstraints.gridx = 0;
	2757	+// aWindowConstraints.gridy = 0;
	2758	+// aWindowConstraints.gridwidth = 1;
	2759	+// // aWindowConstraints.gridheight = 3;
	2760	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2761	+// aWindowConstraints.weightx = 1;
	2762	+// aWindowConstraints.weighty = 1;
	2763	+// bigThree.add(scenePanel, aWindowConstraints);
	2764	+// aWindowConstraints.weightx = 1;
	2765	+// aWindowConstraints.gridwidth = 3;
	2766	+// // aConstraints.gridheight = 3;
	2767	+// aWindowConstraints.gridx = 1;
	2768	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2769	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2770	+// aWindowConstraints.weightx = 0;
	2771	+// aWindowConstraints.gridx = 4;
	2772	+// aWindowConstraints.gridwidth = 1;
	2773	+// // aWindowConstraints.gridheight = 3;
	2774	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2775	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2776	+// bigThree.validate();
	2777	+// scenePanel.setVisible(true);
	2778	+// centralPanel.setVisible(false);
	2779	+// XYZPanel.setVisible(false);
	2780	+ bigThree.ClearUI();
	2781	+ bigThree.add(scenePanel);
	2782	+ bigThree.FlushUI();
2739	2783	} else
2740		- if (event.getSource() == sixButton)
	2784	+ if (source == sixButton)
2741	2785	{
2742	2786	radio.layout = sixButton;
2743		- bigThree.remove(scenePanel);
2744		- bigThree.remove(centralPanel);
2745		- bigThree.remove(XYZPanel);
2746		- aWindowConstraints.gridx = 0;
2747		- aWindowConstraints.gridy = 0;
2748		- aWindowConstraints.gridwidth = 1;
2749		- // aConstraints.gridheight = 3;
2750		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2751		- aWindowConstraints.weightx = 0;
2752		- aWindowConstraints.weighty = 1;
2753		- bigThree.add(scenePanel, aWindowConstraints);
2754		- aWindowConstraints.weightx = 1;
2755		- aWindowConstraints.gridwidth = 3;
2756		- // aWindowConstraints.gridheight = 3;
2757		- aWindowConstraints.gridx = 1;
2758		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2759		- bigThree.add(centralPanel, aWindowConstraints);
2760		- aWindowConstraints.weightx = 0;
2761		- aWindowConstraints.gridx = 4;
2762		- aWindowConstraints.gridwidth = 1;
2763		- // aWindowConstraints.gridheight = 3;
2764		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2765		- //bigThree.add(XYZPanel, aConstraints);
2766		- bigThree.revalidate();
	2787	+
	2788	+// bigThree.remove(scenePanel);
	2789	+// bigThree.remove(centralPanel);
	2790	+// bigThree.remove(XYZPanel);
	2791	+// aWindowConstraints.gridx = 0;
	2792	+// aWindowConstraints.gridy = 0;
	2793	+// aWindowConstraints.gridwidth = 1;
	2794	+// // aConstraints.gridheight = 3;
	2795	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2796	+// aWindowConstraints.weightx = 0;
	2797	+// aWindowConstraints.weighty = 1;
	2798	+// bigThree.add(scenePanel, aWindowConstraints);
	2799	+// aWindowConstraints.weightx = 1;
	2800	+// aWindowConstraints.gridwidth = 3;
	2801	+// // aWindowConstraints.gridheight = 3;
	2802	+// aWindowConstraints.gridx = 1;
	2803	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2804	+// bigThree.add(centralPanel, aWindowConstraints);
	2805	+// aWindowConstraints.weightx = 0;
	2806	+// aWindowConstraints.gridx = 4;
	2807	+// aWindowConstraints.gridwidth = 1;
	2808	+// // aWindowConstraints.gridheight = 3;
	2809	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2810	+// //bigThree.add(XYZPanel, aConstraints);
	2811	+// bigThree.validate();
	2812	+// scenePanel.setVisible(true);
	2813	+// centralPanel.setVisible(true);
	2814	+// XYZPanel.setVisible(false);
	2815	+ bigThree.ClearUI();
	2816	+ bigThree.add(scenePanel);
	2817	+ bigThree.add(centralPanel);
	2818	+ bigThree.FlushUI();
2767	2819	} else
2768		- if (event.getSource() == sevenButton)
	2820	+ if (source == sevenButton)
2769	2821	{
2770	2822	radio.layout = sevenButton;
2771		- bigThree.remove(scenePanel);
2772		- bigThree.remove(centralPanel);
2773		- bigThree.remove(XYZPanel);
2774		- aWindowConstraints.gridx = 0;
2775		- aWindowConstraints.gridy = 0;
2776		- aWindowConstraints.gridwidth = 1;
2777		- // aWindowConstraints.gridheight = 3;
2778		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2779		- aWindowConstraints.weightx = 0;
2780		- aWindowConstraints.weighty = 1;
2781		- bigThree.add(scenePanel, aWindowConstraints);
2782		- aWindowConstraints.weightx = 1;
2783		- aWindowConstraints.gridwidth = 3;
2784		- // aWindowConstraints.gridheight = 3;
2785		- aWindowConstraints.gridx = 1;
2786		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2787		- bigThree.add(centralPanel, aWindowConstraints);
2788		- aWindowConstraints.weightx = 0;
2789		- aWindowConstraints.gridx = 4;
2790		- aWindowConstraints.gridwidth = 1;
2791		- // aConstraints.gridheight = 3;
2792		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2793		- bigThree.add(XYZPanel, aWindowConstraints);
2794		- bigThree.revalidate();
	2823	+
	2824	+// bigThree.remove(scenePanel);
	2825	+// bigThree.remove(centralPanel);
	2826	+// bigThree.remove(XYZPanel);
	2827	+// aWindowConstraints.gridx = 0;
	2828	+// aWindowConstraints.gridy = 0;
	2829	+// aWindowConstraints.gridwidth = 1;
	2830	+// // aWindowConstraints.gridheight = 3;
	2831	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2832	+// aWindowConstraints.weightx = 0;
	2833	+// aWindowConstraints.weighty = 1;
	2834	+// bigThree.add(scenePanel, aWindowConstraints);
	2835	+// aWindowConstraints.weightx = 1;
	2836	+// aWindowConstraints.gridwidth = 3;
	2837	+// // aWindowConstraints.gridheight = 3;
	2838	+// aWindowConstraints.gridx = 1;
	2839	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2840	+// bigThree.add(centralPanel, aWindowConstraints);
	2841	+// aWindowConstraints.weightx = 0;
	2842	+// aWindowConstraints.gridx = 4;
	2843	+// aWindowConstraints.gridwidth = 1;
	2844	+// // aConstraints.gridheight = 3;
	2845	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2846	+// bigThree.add(XYZPanel, aWindowConstraints);
	2847	+// bigThree.validate();
	2848	+// scenePanel.setVisible(true);
	2849	+// centralPanel.setVisible(true);
	2850	+// XYZPanel.setVisible(true);
	2851	+ bigThree.ClearUI();
	2852	+ bigThree.add(scenePanel);
	2853	+ bigThree.add(centralPanel);
	2854	+ bigThree.add(XYZPanel);
	2855	+ bigThree.FlushUI();
2795	2856	} else
2796		- if (event.getSource() == rootButton)
	2857	+ if (source == rootButton)
2797	2858	{
2798	2859	Object3D obj;
2799	2860	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2805,7 +2866,7 @@
2805	2866
2806	2867	refreshContents(true);
2807	2868	} else
2808		- if (event.getSource() == closeButton)
	2869	+ if (source == closeButton)
2809	2870	{
2810	2871	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2811	2872	cRadio ab;
..	..	@@ -2826,11 +2887,11 @@
2826	2887	}
2827	2888	refreshContents(true);
2828	2889	} else
2829		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2890	+ if (source == editItem \|\| source == editButton)
2830	2891	{
2831	2892	EditSelection(false);
2832	2893	} else
2833		- if (event.getSource() == uneditButton)
	2894	+ if (source == uneditButton)
2834	2895	{
2835	2896	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2836	2897	{
..	..	@@ -2842,12 +2903,12 @@
2842	2903
2843	2904	child.editWindow = null; // ???????????
2844	2905	}
2845		- objEditor.ctrlPanel.revalidate();
	2906	+ objEditor.ctrlPanel.validate();
2846	2907	//objEditor.jTree.clearSelection();
2847	2908	//objEditor.ResetSliders();
2848	2909	refreshContents(true);
2849	2910	} else
2850		- if (event.getSource() == clearPanelButton)
	2911	+ if (source == clearPanelButton)
2851	2912	{
2852	2913	assert(copy == group);
2853	2914	//copy.ClearUI();
..	..	@@ -2858,7 +2919,7 @@
2858	2919	listUI.clear();
2859	2920	refreshContents(true);
2860	2921	} else
2861		- if (event.getSource() == allParamsButton)
	2922	+ if (source == allParamsButton)
2862	2923	{
2863	2924	assert(copy == group);
2864	2925
..	..	@@ -2879,19 +2940,19 @@
2879	2940
2880	2941	refreshContents(true);
2881	2942	} else
2882		- if (event.getSource() == unselectButton)
	2943	+ if (source == unselectButton)
2883	2944	{
2884	2945	objEditor.jTree.clearSelection();
2885	2946	// ?? oct 2012 GrafreeD.clipboard.clear();
2886	2947	objEditor.ResetSliders();
2887	2948	refreshContents(true);
2888	2949	} else
2889		- if(event.getSource() instanceof cRadio)
	2950	+ if(source instanceof cRadio)
2890	2951	{
2891	2952	group.parent = keepparent;
2892	2953	group.attributes = 0;
2893	2954	//group.editWindow = null;
2894		- /cRadio/ radio = (cRadio)event.getSource();
	2955	+ /cRadio/ radio = (cRadio)source;
2895	2956	Object3D obj = radio.GetObject();
2896	2957	System.out.println("Edit " + obj);
2897	2958	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2911,7 +2972,7 @@
2911	2972	}
2912	2973
2913	2974	copy = group;
2914		- //CameraPane.theRenderer.object = group;
	2975	+ //Globals.theRenderer.object = group;
2915	2976	if(!useclient)
2916	2977	{
2917	2978	cameraView.renderCamera = radio.camera;
..	..	@@ -2920,7 +2981,8 @@
2920	2981	cameraView.cameras[cameraView.cameracount] = radio.camera;
2921	2982	cameraView.targetLookAt.set(radio.camera.lookAt);
2922	2983	cameraView.object = group;
2923		- cameraView.lighttouched = true;
	2984	+ //cameraView.lighttouched = true;
	2985	+ Globals.lighttouched = true;
2924	2986	topView.object = group;
2925	2987	frontView.object = group;
2926	2988	sideView.object = group;
..	..	@@ -2956,7 +3018,7 @@
2956	3018	if (useclient)
2957	3019	{
2958	3020	cameraView.object = client;
2959		- cameraView.lighttouched = true;
	3021	+ Globals.lighttouched = true;
2960	3022	//topView.object = client;
2961	3023	//frontView.object = client;
2962	3024	//sideView.object = client;
..	..	@@ -2964,7 +3026,7 @@
2964	3026	else
2965	3027	{
2966	3028	cameraView.object = group;
2967		- cameraView.lighttouched = true;
	3029	+ Globals.lighttouched = true;
2968	3030	//topView.object = group;
2969	3031	//frontView.object = group;
2970	3032	//sideView.object = group;
..	..	@@ -3472,7 +3534,7 @@
3472	3534	String pigment = Object3D.GetPigment(tex);
3473	3535	//String bump = Object3D.GetBump(tex);
3474	3536
3475		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3537	+ com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3476	3538
3477	3539	double s = v.s;
3478	3540
..	..	@@ -3773,7 +3835,7 @@
3773	3835	group.selection.RelinkToSupport(); // july 2014
3774	3836	System.out.println("DONE.");
3775	3837	refreshContents();
3776		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3838	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3777	3839	}
3778	3840
3779	3841	void ReduceMesh(boolean reduction34)
..	..	@@ -4049,25 +4111,25 @@
4049	4111	System.err.println("info : " + child.GetPath());
4050	4112	}
4051	4113	}
4052		- else
4053		- {
4054		- objEditor.SetMaterial(group); // .GetMaterial());
4055		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4056		- System.err.println("info : " + group.GetPath());
4057		- }
	4114	+// else
	4115	+// {
	4116	+// objEditor.SetMaterial(group); // .GetMaterial());
	4117	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4118	+// System.err.println("info : " + group.GetPath());
	4119	+// }
4058	4120
4059	4121	objEditor.SetText(); // jan 2014
4060	4122
4061		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4123	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
4062	4124	CameraPane.flash = true;
4063	4125
4064	4126	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
4065	4127	// a camera
4066	4128	{
4067	4129	CameraPane.camerachangeframe = 0; // don't refuse it
4068		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4069		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
4070		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4130	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4131	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4132	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4071	4133	}
4072	4134
4073	4135	refreshContents();