~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	{
..	..	@@ -1120,6 +1143,8 @@
1120	1143	resetParentItem.addActionListener(this);
1121	1144	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1122	1145	repairParentItem.addActionListener(this);
	1146	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1147	+ repairShadowItem.addActionListener(this);
1123	1148	menu.add(invariantsItem = new MenuItem("Invariants"));
1124	1149	invariantsItem.addActionListener(this);
1125	1150	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1480,6 +1505,7 @@
1480	1505	//
1481	1506	public void actionPerformed(ActionEvent event) // , Object arg)
1482	1507	{
	1508	+ Object source = event.getSource();
1483	1509	/*
1484	1510	if (event.getSource() == nameField)
1485	1511	{
..	..	@@ -1491,11 +1517,11 @@
1491	1517	}
1492	1518	else
1493	1519	*/
1494		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1520	+ if (source == lookAtItem \|\| source == lookFromItem)
1495	1521	{
1496	1522	ScreenFit();
1497	1523	} else
1498		- if (event.getSource() == switchItem)
	1524	+ if (source == switchItem)
1499	1525	{
1500	1526	cVector v1 = new cVector();
1501	1527	cVector v2 = new cVector();
..	..	@@ -1504,11 +1530,11 @@
1504	1530	objEditor.cameraView.renderCamera.setAim(v2, v1);
1505	1531	objEditor.cameraView.repaint();
1506	1532	} else
1507		- if (event.getSource() == rectoidItem)
	1533	+ if (source == rectoidItem)
1508	1534	{
1509	1535	makeSomething(new Box());
1510	1536	} else
1511		- if (event.getSource() == particleItem)
	1537	+ if (source == particleItem)
1512	1538	{
1513	1539	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1514	1540	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1529,9 +1555,9 @@
1529	1555	applyExample(particleGeom, "SMOKE");
1530	1556	makeSomething(particleGeom);
1531	1557	} else
1532		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1558	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1533	1559	{
1534		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1560	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1535	1561
1536	1562	ragdoll.toParent = LA.newMatrix();
1537	1563	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1549,7 +1575,7 @@
1549	1575	} else
1550	1576	/*
1551	1577	*/
1552		- if (event.getSource() == heightFieldItem)
	1578	+ if (source == heightFieldItem)
1553	1579	{
1554	1580	Object3D obj = new Object3D();
1555	1581
..	..	@@ -1587,31 +1613,31 @@
1587	1613
1588	1614	makeSomething(obj);
1589	1615	} else
1590		- if (event.getSource() == gridItem)
	1616	+ if (source == gridItem)
1591	1617	{
1592	1618	makeSomething(new Grid());
1593	1619	} else
1594		- if (event.getSource() == ellipsoidItem)
	1620	+ if (source == ellipsoidItem)
1595	1621	{
1596	1622	makeSomething(new Sphere());
1597	1623	} else
1598		- if (event.getSource() == coneItem)
	1624	+ if (source == coneItem)
1599	1625	{
1600	1626	makeSomething(new Cone());
1601	1627	} else
1602		- if (event.getSource() == torusItem)
	1628	+ if (source == torusItem)
1603	1629	{
1604	1630	makeSomething(new Torus());
1605	1631	} else
1606		- if (event.getSource() == superItem)
	1632	+ if (source == superItem)
1607	1633	{
1608	1634	makeSomething(new Superellipsoid());
1609	1635	} else
1610		- if (event.getSource() == kleinItem)
	1636	+ if (source == kleinItem)
1611	1637	{
1612	1638	makeSomething(new Klein());
1613	1639	} else
1614		- if (event.getSource() == blobItem)
	1640	+ if (source == blobItem)
1615	1641	{
1616	1642	Blob blob = new Blob();
1617	1643	BlobComponent comp = new BlobComponent();
..	..	@@ -1619,15 +1645,15 @@
1619	1645	//blob.retile();
1620	1646	makeSomething(blob);
1621	1647	} else
1622		- if (event.getSource() == latheItem)
	1648	+ if (source == latheItem)
1623	1649	{
1624	1650	makeSomething(new Lathe());
1625	1651	} else
1626		- if (event.getSource() == bezierItem)
	1652	+ if (source == bezierItem)
1627	1653	{
1628	1654	makeSomething(new BezierSurface());
1629	1655	} else
1630		- if (event.getSource() == checkerItem)
	1656	+ if (source == checkerItem)
1631	1657	{
1632	1658	/*
1633	1659	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1642,7 +1668,7 @@
1642	1668	*/
1643	1669	makeSomething(new Checker());
1644	1670	} else
1645		- if (event.getSource() == meshItem)
	1671	+ if (source == meshItem)
1646	1672	{
1647	1673	Object3D itemtomake = new Object3D();
1648	1674	Object3D child;
..	..	@@ -1663,35 +1689,35 @@
1663	1689	makeSomething(child);
1664	1690	}
1665	1691	} else
1666		- if (event.getSource() == springItem)
	1692	+ if (source == springItem)
1667	1693	{
1668	1694	cSpring s = new cSpring();
1669	1695	s.setup();
1670	1696	makeSomething(s);
1671	1697	} else
1672		- if (event.getSource() == flagItem)
	1698	+ if (source == flagItem)
1673	1699	{
1674	1700	cSpring s = new cFlag();
1675	1701	s.setup();
1676	1702	makeSomething(s);
1677	1703	} else
1678		- if (event.getSource() == lightItem)
	1704	+ if (source == lightItem)
1679	1705	{
1680	1706	makeSomething(new Light());
1681	1707	} else
1682		- if (event.getSource() == csgItem)
	1708	+ if (source == csgItem)
1683	1709	{
1684	1710	group(new CSG());
1685	1711	} else
1686		- if (event.getSource() == templateItem)
	1712	+ if (source == templateItem)
1687	1713	{
1688	1714	group(new cTemplate());
1689	1715	} else
1690		- if (event.getSource() == attributeItem)
	1716	+ if (source == attributeItem)
1691	1717	{
1692	1718	makeSomething(new Attribute());
1693	1719	} else
1694		- if (event.getSource() == pointflowItem)
	1720	+ if (source == pointflowItem)
1695	1721	{
1696	1722	makeSomething(new PointFlow());
1697	1723	} else
..	..	@@ -1703,7 +1729,7 @@
1703	1729	} else
1704	1730	*/
1705	1731
1706		- if (event.getSource() == superLoopItem)
	1732	+ if (source == superLoopItem)
1707	1733	{
1708	1734	Composite g = new cGroup();
1709	1735	for (int i=0; i<15; i++)
..	..	@@ -1725,7 +1751,7 @@
1725	1751
1726	1752	group(g);
1727	1753	} else
1728		- if (event.getSource() == loopItem)
	1754	+ if (source == loopItem)
1729	1755	{
1730	1756	Composite csg = new GroupLeaf();
1731	1757	csg.count = 5;
..	..	@@ -1734,7 +1760,7 @@
1734	1760	csg.addChild(child);
1735	1761	child.addChild(csg);
1736	1762	} else
1737		- if (event.getSource() == doubleItem)
	1763	+ if (source == doubleItem)
1738	1764	{
1739	1765	Composite csg = new GroupLeaf();
1740	1766	csg.count = 5;
..	..	@@ -1746,7 +1772,7 @@
1746	1772	csg.addChild(child);
1747	1773	child.addChild(csg);
1748	1774	} else
1749		- if (event.getSource() == tripleItem)
	1775	+ if (source == tripleItem)
1750	1776	{
1751	1777	Composite csg = new GroupLeaf();
1752	1778	csg.count = 4;
..	..	@@ -1762,70 +1788,70 @@
1762	1788	child.addChild(csg);
1763	1789	} else
1764	1790
1765		- if (event.getSource() == importGFDItem)
	1791	+ if (source == importGFDItem)
1766	1792	{
1767	1793	ImportGFD();
1768	1794	} else
1769		- if (event.getSource() == importVRMLX3DItem)
	1795	+ if (source == importVRMLX3DItem)
1770	1796	{
1771	1797	ImportVRMLX3D();
1772	1798	} else
1773		- if (event.getSource() == import3DSItem)
	1799	+ if (source == import3DSItem)
1774	1800	{
1775	1801	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1776	1802	} else
1777		- if (event.getSource() == importOBJItem)
	1803	+ if (source == importOBJItem)
1778	1804	{
1779	1805	objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1780	1806	} else
1781		- if (event.getSource() == computeAOItem)
	1807	+ if (source == computeAOItem)
1782	1808	{
1783		- CameraPane.drawMode = CameraPane.OCCLUSION;
1784		- CameraPane.theRenderer.repaint();
	1809	+ Globals.drawMode = CameraPane.OCCLUSION;
	1810	+ Globals.theRenderer.repaint();
1785	1811	} else
1786		- if (event.getSource() == recompileItem)
	1812	+ if (source == recompileItem)
1787	1813	{
1788	1814	Recompile();
1789	1815	refreshContents();
1790	1816	} else
1791		- if (event.getSource() == editScriptItem)
	1817	+ if (source == editScriptItem)
1792	1818	{
1793	1819	OpenDialog();
1794	1820	refreshContents();
1795	1821	} else
1796		- if (event.getSource() == invariantsItem)
	1822	+ if (source == invariantsItem)
1797	1823	{
1798	1824	System.out.println("Invariants:");
1799	1825	GrafreeD.grafreeD.universe.invariants();
1800	1826	} else
1801		- if (event.getSource() == memoryItem)
	1827	+ if (source == memoryItem)
1802	1828	{
1803	1829	//System.out.println("Invariants:");
1804	1830	PrintMemory();
1805	1831	} else
1806		- if (event.getSource() == pathItem)
	1832	+ if (source == pathItem)
1807	1833	{
1808	1834	PrintPath();
1809	1835	} else
1810		- if (event.getSource() == analyzeItem)
	1836	+ if (source == analyzeItem)
1811	1837	{
1812	1838	AnalyzeObject();
1813	1839	} else
1814		- if (event.getSource() == dumpItem)
	1840	+ if (source == dumpItem)
1815	1841	{
1816	1842	DumpObject();
1817	1843	} else
1818		- if (event.getSource() == screenfitButton)
	1844	+ if (source == screenfitButton)
1819	1845	{
1820	1846	//Reload(lastConverter, lastFilename, true);
1821	1847	ScreenFit();
1822	1848	} else
1823		- if (event.getSource() == screenfitpointButton)
	1849	+ if (source == screenfitpointButton)
1824	1850	{
1825	1851	//Reload(lastConverter, lastFilename, true);
1826	1852	ScreenFitPoint();
1827	1853	} else
1828		- if (event.getSource() == snapobjectButton)
	1854	+ if (source == snapobjectButton)
1829	1855	{
1830	1856	//Reload(lastConverter, lastFilename, true);
1831	1857	SnapObject();
..	..	@@ -1836,13 +1862,13 @@
1836	1862	// Recompile();
1837	1863	// refreshContents();
1838	1864	// } else
1839		- if (event.getSource() == gcButton)
	1865	+ if (source == gcButton)
1840	1866	{
1841	1867	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1842	1868	System.gc();
1843	1869	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1844	1870	} else
1845		- if (event.getSource() == editLeafItem)
	1871	+ if (source == editLeafItem)
1846	1872	{
1847	1873	Object3D obj;
1848	1874	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1856,62 +1882,62 @@
1856	1882	}
1857	1883	refreshContents(true);
1858	1884	} else
1859		- if (event.getSource() == openWindowItem)
	1885	+ if (source == openWindowItem)
1860	1886	{
1861	1887	EditSelection(true);
1862	1888	} else
1863		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1889	+ if (source == cutItem \|\| source == clearButton)
1864	1890	{
1865	1891	loadClipboard(true);
1866	1892	} else
1867		- if (event.getSource() == duplicateItem)
	1893	+ if (source == duplicateItem)
1868	1894	{
1869	1895	Object3D keep = GrafreeD.clipboard;
1870	1896	loadClipboard(false);
1871	1897	paste(false);
1872	1898	GrafreeD.clipboard = keep;
1873	1899	} else
1874		- if (event.getSource() == cloneItem)
	1900	+ if (source == cloneItem)
1875	1901	{
1876	1902	CloneSelection(false);
1877	1903	} else
1878		- if (event.getSource() == cloneSupportItem)
	1904	+ if (source == cloneSupportItem)
1879	1905	{
1880	1906	CloneSelection(true);
1881	1907	} else
1882		- if (event.getSource() == copyItem)
	1908	+ if (source == copyItem)
1883	1909	{
1884	1910	loadClipboard(false);
1885	1911	} else
1886		- if (event.getSource() == pasteItem)
	1912	+ if (source == pasteItem)
1887	1913	{
1888	1914	paste(false);
1889	1915	} else
1890		- if (event.getSource() == pasteLinkItem)
	1916	+ if (source == pasteLinkItem)
1891	1917	{
1892	1918	pasteInto(false);
1893	1919	} else
1894		- if (event.getSource() == pasteCloneItem)
	1920	+ if (source == pasteCloneItem)
1895	1921	{
1896	1922	pasteInto(true);
1897	1923	} else
1898		- if (event.getSource() == pasteExpandItem)
	1924	+ if (source == pasteExpandItem)
1899	1925	{
1900	1926	paste(true);
1901	1927	} else
1902		- if (event.getSource() == synchronizeItem)
	1928	+ if (source == synchronizeItem)
1903	1929	{
1904	1930	Overwrite(Object3D.TRANSFORM);
1905	1931	} else
1906		- if (event.getSource() == overwriteNameItem)
	1932	+ if (source == overwriteNameItem)
1907	1933	{
1908	1934	Overwrite(Object3D.NAME);
1909	1935	} else
1910		- if (event.getSource() == overwriteUVItem)
	1936	+ if (source == overwriteUVItem)
1911	1937	{
1912	1938	Overwrite(Object3D.UV);
1913	1939	} else
1914		- if (event.getSource() == overwriteMatItem)
	1940	+ if (source == overwriteMatItem)
1915	1941	{
1916	1942	/* july 2015
1917	1943	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1931,7 +1957,7 @@
1931	1957
1932	1958	Overwrite(dropAttributes);
1933	1959	}
1934		- if (event.getSource() == overwriteGeoItem)
	1960	+ if (source == overwriteGeoItem)
1935	1961	{
1936	1962	Overwrite(Object3D.GEOMETRY);
1937	1963	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1948,7 +1974,7 @@
1948	1974	// refreshContents();
1949	1975	// }
1950	1976	} else
1951		- if (event.getSource() == generateMeshItem)
	1977	+ if (source == generateMeshItem)
1952	1978	{
1953	1979	//if (group.selection.size() == 1)
1954	1980	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1959,7 +1985,7 @@
1959	1985	ResetModel();
1960	1986	refreshContents();
1961	1987	} else
1962		- if (event.getSource() == extractGeometriesItem)
	1988	+ if (source == extractGeometriesItem)
1963	1989	{
1964	1990	boolean one = false;
1965	1991
..	..	@@ -1986,7 +2012,7 @@
1986	2012	ResetModel();
1987	2013	refreshContents();
1988	2014	} else
1989		- if (event.getSource() == cloneGeometriesItem)
	2015	+ if (source == cloneGeometriesItem)
1990	2016	{
1991	2017	boolean one = false;
1992	2018
..	..	@@ -2012,7 +2038,7 @@
2012	2038	ResetModel();
2013	2039	refreshContents();
2014	2040	} else
2015		- if (event.getSource() == shareGeometriesItem)
	2041	+ if (source == shareGeometriesItem)
2016	2042	{
2017	2043	boolean one = false;
2018	2044
..	..	@@ -2042,7 +2068,7 @@
2042	2068	refreshContents();
2043	2069	}
2044	2070	} else
2045		- if (event.getSource() == mergeGeometriesItem)
	2071	+ if (source == mergeGeometriesItem)
2046	2072	{
2047	2073	boolean one = false;
2048	2074
..	..	@@ -2072,7 +2098,7 @@
2072	2098	ResetModel();
2073	2099	refreshContents();
2074	2100	} else
2075		- if (event.getSource() == linkverticesItem)
	2101	+ if (source == linkverticesItem)
2076	2102	{
2077	2103	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2078	2104	// {
..	..	@@ -2092,7 +2118,7 @@
2092	2118	if (content instanceof cGroup && ((cGroup)content).transientlink )
2093	2119	content = ((cGroup)content).get(0);
2094	2120
2095		- 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));
2096	2122	for (int i=0; i<group.selection.size(); i++)
2097	2123	{
2098	2124	boolean random = CameraPane.RANDOM;
..	..	@@ -2101,11 +2127,11 @@
2101	2127	// group.selection.get(i).setMasterThis(content); // should be identity
2102	2128	CameraPane.RANDOM = random;
2103	2129	}
2104		- 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));
2105	2131	refreshContents();
2106	2132	}
2107	2133	} else
2108		- if (event.getSource() == resetsupportItem)
	2134	+ if (source == resetsupportItem)
2109	2135	{
2110	2136	for (int i=0; i<group.selection.size(); i++)
2111	2137	{
..	..	@@ -2117,7 +2143,7 @@
2117	2143
2118	2144	refreshContents();
2119	2145	} else
2120		- if (event.getSource() == relinkverticesItem)
	2146	+ if (source == relinkverticesItem)
2121	2147	{
2122	2148	boolean random = CameraPane.RANDOM;
2123	2149	CameraPane.RANDOM = false; // parse all random nodes
..	..	@@ -2126,7 +2152,7 @@
2126	2152
2127	2153	refreshContents();
2128	2154	} else
2129		- if (event.getSource() == resetreferencesItem)
	2155	+ if (source == resetreferencesItem)
2130	2156	{
2131	2157	for (int i=0; i<group.selection.size(); i++)
2132	2158	{
..	..	@@ -2135,7 +2161,7 @@
2135	2161
2136	2162	refreshContents();
2137	2163	} else
2138		- if (event.getSource() == setMasterItem)
	2164	+ if (source == setMasterItem)
2139	2165	{
2140	2166	if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2141	2167	{
..	..	@@ -2148,7 +2174,7 @@
2148	2174	refreshContents();
2149	2175	}
2150	2176	} else
2151		- if (event.getSource() == poseMeshItem)
	2177	+ if (source == poseMeshItem)
2152	2178	{
2153	2179	if (group.selection.size() == 1)
2154	2180	{
..	..	@@ -2167,19 +2193,19 @@
2167	2193	}
2168	2194
2169	2195	} else
2170		- if (event.getSource() == revertMeshItem)
	2196	+ if (source == revertMeshItem)
2171	2197	{
2172	2198	RevertMeshes();
2173	2199	} else
2174		- if (event.getSource() == resetMeshItem)
	2200	+ if (source == resetMeshItem)
2175	2201	{
2176	2202	ResetAll();
2177	2203	} else
2178		- if (event.getSource() == stepAllItem)
	2204	+ if (source == stepAllItem)
2179	2205	{
2180	2206	StepAll();
2181	2207	} else
2182		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2208	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2183	2209	{
2184	2210	//int indices[] = jList.getSelectedIndices();
2185	2211	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2187,46 +2213,46 @@
2187	2213
2188	2214	ClearSelection(false);
2189	2215	} else
2190		- if (event.getSource() == clearAllItem)
	2216	+ if (source == clearAllItem)
2191	2217	{
2192	2218	ClearSelection(true);
2193	2219	} else
2194		- if (event.getSource() == grabItem)
	2220	+ if (source == grabItem)
2195	2221	{
2196	2222	group(new cGroup(), true);
2197	2223	} else
2198		- if (event.getSource() == hideItem)
	2224	+ if (source == hideItem)
2199	2225	{
2200	2226	group(new HiddenObject());
2201	2227	} else
2202		- if (event.getSource() == frontItem)
	2228	+ if (source == frontItem)
2203	2229	{
2204	2230	front();
2205	2231	} else
2206		- if (event.getSource() == backItem)
	2232	+ if (source == backItem)
2207	2233	{
2208	2234	back();
2209	2235	} else
2210		- if (event.getSource() == cameraItem)
	2236	+ if (source == cameraItem)
2211	2237	{
2212	2238	makeSomething(new Camera());
2213	2239	} else
2214		- if (event.getSource() == compositeItem)
	2240	+ if (source == compositeItem)
2215	2241	{
2216	2242	group(new Composite());
2217	2243	} else
2218		- if (event.getSource() == randomItem)
	2244	+ if (source == randomItem)
2219	2245	{
2220	2246	RandomNode random = new RandomNode();
2221	2247	group(random);
2222	2248	if (random.size() > 0)
2223	2249	random.name = random.get(0).name + "Rnd";
2224	2250	} else
2225		- if (event.getSource() == physicsItem)
	2251	+ if (source == physicsItem)
2226	2252	{
2227	2253	group(new PhysicsNode());
2228	2254	} else
2229		- if (event.getSource() == frameselectorItem)
	2255	+ if (source == frameselectorItem)
2230	2256	{
2231	2257	for (int i=0; i<group.selection.size(); i++)
2232	2258	{
..	..	@@ -2238,7 +2264,7 @@
2238	2264	ResetModel();
2239	2265	refreshContents();
2240	2266	} else
2241		- if (event.getSource() == switchGeoItem)
	2267	+ if (source == switchGeoItem)
2242	2268	{
2243	2269	for (int i=0; i<group.selection.size(); i++)
2244	2270	{
..	..	@@ -2250,7 +2276,7 @@
2250	2276	ResetModel();
2251	2277	refreshContents();
2252	2278	} else
2253		- if (event.getSource() == switchTransfoItem)
	2279	+ if (source == switchTransfoItem)
2254	2280	{
2255	2281	for (int i=0; i<group.selection.size(); i++)
2256	2282	{
..	..	@@ -2262,7 +2288,7 @@
2262	2288	ResetModel();
2263	2289	refreshContents();
2264	2290	} else
2265		- if (event.getSource() == morphItem)
	2291	+ if (source == morphItem)
2266	2292	{
2267	2293	for (int i=0; i<group.selection.size(); i++)
2268	2294	{
..	..	@@ -2274,7 +2300,7 @@
2274	2300	ResetModel();
2275	2301	refreshContents();
2276	2302	} else
2277		- if (event.getSource() == scriptNodeItem)
	2303	+ if (source == scriptNodeItem)
2278	2304	{
2279	2305	boolean atleastone = false;
2280	2306
..	..	@@ -2313,31 +2339,31 @@
2313	2339	}
2314	2340	}
2315	2341	} else
2316		- if (event.getSource() == linkerItem)
	2342	+ if (source == linkerItem)
2317	2343	{
2318	2344	group(new cLinker());
2319	2345	} else
2320		- if (event.getSource() == textureItem)
	2346	+ if (source == textureItem)
2321	2347	{
2322	2348	group(new TextureNode());
2323	2349	} else
2324		- if (event.getSource() == billboardItem)
	2350	+ if (source == billboardItem)
2325	2351	{
2326	2352	group(new BillboardNode());
2327	2353	} else
2328		- if (event.getSource() == shadowXItem)
	2354	+ if (source == shadowXItem)
2329	2355	{
2330	2356	CastShadow(0);
2331	2357	} else
2332		- if (event.getSource() == shadowYItem)
	2358	+ if (source == shadowYItem)
2333	2359	{
2334	2360	CastShadow(1);
2335	2361	} else
2336		- if (event.getSource() == shadowZItem)
	2362	+ if (source == shadowZItem)
2337	2363	{
2338	2364	CastShadow(2);
2339	2365	} else
2340		- if (event.getSource() == ungroupItem)
	2366	+ if (source == ungroupItem)
2341	2367	{
2342	2368	//ungroup();
2343	2369	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2349,179 +2375,179 @@
2349	2375
2350	2376	refreshContents();
2351	2377	} else
2352		- if (event.getSource() == genUVItem)
	2378	+ if (source == genUVItem)
2353	2379	{
2354	2380	GenUV();
2355	2381	} else
2356		- if (event.getSource() == genNormalsCADItem)
	2382	+ if (source == genNormalsCADItem)
2357	2383	{
2358	2384	GenNormals(true);
2359	2385	} else
2360		- if (event.getSource() == genNormalsMESHItem)
	2386	+ if (source == genNormalsMESHItem)
2361	2387	{
2362	2388	GenNormals(true); // TODO
2363	2389	} else
2364		- if (event.getSource() == genNormalsORGANItem)
	2390	+ if (source == genNormalsORGANItem)
2365	2391	{
2366	2392	GenNormals(false);
2367	2393	} else
2368		- if (event.getSource() == genNormalsMINEItem)
	2394	+ if (source == genNormalsMINEItem)
2369	2395	{
2370	2396	GenNormalsMINE();
2371	2397	} else
2372		- if (event.getSource() == stripifyItem)
	2398	+ if (source == stripifyItem)
2373	2399	{
2374	2400	Stripify();
2375	2401	} else
2376		- if (event.getSource() == unstripifyItem)
	2402	+ if (source == unstripifyItem)
2377	2403	{
2378	2404	Unstripify();
2379	2405	} else
2380		- if (event.getSource() == trimItem)
	2406	+ if (source == trimItem)
2381	2407	{
2382	2408	Trim();
2383	2409	} else
2384		- if (event.getSource() == untrimItem)
	2410	+ if (source == untrimItem)
2385	2411	{
2386	2412	Untrim();
2387	2413	} else
2388		- if (event.getSource() == clearColorsItem)
	2414	+ if (source == clearColorsItem)
2389	2415	{
2390	2416	ClearColors();
2391	2417	} else
2392		- if (event.getSource() == clearMaterialsItem)
	2418	+ if (source == clearMaterialsItem)
2393	2419	{
2394	2420	ClearMaterials();
2395	2421	} else
2396		- if (event.getSource() == liveleavesItem)
	2422	+ if (source == liveleavesItem)
2397	2423	{
2398	2424	LiveLeaves(true);
2399	2425	} else
2400		- if (event.getSource() == unliveleavesItem)
	2426	+ if (source == unliveleavesItem)
2401	2427	{
2402	2428	LiveLeaves(false);
2403	2429	} else
2404		- if (event.getSource() == supportleavesItem)
	2430	+ if (source == supportleavesItem)
2405	2431	{
2406	2432	SupportLeaves(true);
2407	2433	} else
2408		- if (event.getSource() == unsupportleavesItem)
	2434	+ if (source == unsupportleavesItem)
2409	2435	{
2410	2436	SupportLeaves(false);
2411	2437	} else
2412		- if (event.getSource() == hideleavesItem)
	2438	+ if (source == hideleavesItem)
2413	2439	{
2414	2440	HideLeaves(true);
2415	2441	} else
2416		- if (event.getSource() == showleavesItem)
	2442	+ if (source == showleavesItem)
2417	2443	{
2418	2444	HideLeaves(false);
2419	2445	} else
2420		- if (event.getSource() == markleavesItem)
	2446	+ if (source == markleavesItem)
2421	2447	{
2422	2448	MarkLeaves(true);
2423	2449	} else
2424		- if (event.getSource() == unmarkleavesItem)
	2450	+ if (source == unmarkleavesItem)
2425	2451	{
2426	2452	MarkLeaves(false);
2427	2453	} else
2428		- if (event.getSource() == flipVItem)
	2454	+ if (source == flipVItem)
2429	2455	{
2430	2456	FlipV(true);
2431	2457	} else
2432		- if (event.getSource() == unflipVItem)
	2458	+ if (source == unflipVItem)
2433	2459	{
2434	2460	FlipV(false);
2435	2461	} else
2436		- if (event.getSource() == lowTexturesItem)
	2462	+ if (source == lowTexturesItem)
2437	2463	{
2438	2464	SetTexRes(0);
2439	2465	} else
2440		- if (event.getSource() == normalTexturesItem)
	2466	+ if (source == normalTexturesItem)
2441	2467	{
2442	2468	SetTexRes(1);
2443	2469	} else
2444		- if (event.getSource() == highTexturesItem)
	2470	+ if (source == highTexturesItem)
2445	2471	{
2446	2472	SetTexRes(2);
2447	2473	} else
2448		- if (event.getSource() == veryhighTexturesItem)
	2474	+ if (source == veryhighTexturesItem)
2449	2475	{
2450	2476	SetTexRes(3);
2451	2477	} else
2452		- if (event.getSource() == maxTexturesItem)
	2478	+ if (source == maxTexturesItem)
2453	2479	{
2454	2480	SetTexRes(4);
2455	2481	} else
2456		- if (event.getSource() == panoTexturesItem)
	2482	+ if (source == panoTexturesItem)
2457	2483	{
2458	2484	SetTexRes(5);
2459	2485	} else
2460		- if (event.getSource() == reverseNormalsItem)
	2486	+ if (source == reverseNormalsItem)
2461	2487	{
2462	2488	ReverseNormals();
2463	2489	} else
2464		- if (event.getSource() == parseverticesItem)
	2490	+ if (source == parseverticesItem)
2465	2491	{
2466	2492	ParseVertices();
2467	2493	} else
2468		- if (event.getSource() == textureFieldItem)
	2494	+ if (source == textureFieldItem)
2469	2495	{
2470	2496	TextureVertices();
2471	2497	} else
2472		- if (event.getSource() == alignItem)
	2498	+ if (source == alignItem)
2473	2499	{
2474	2500	Align();
2475	2501	} else
2476		- if (event.getSource() == mirrorItem)
	2502	+ if (source == mirrorItem)
2477	2503	{
2478	2504	MirrorPoses();
2479	2505	} else
2480		- if (event.getSource() == reduceMorphItem)
	2506	+ if (source == reduceMorphItem)
2481	2507	{
2482	2508	MeshReduction(false);
2483	2509	} else
2484		- if (event.getSource() == reduce34MorphItem)
	2510	+ if (source == reduce34MorphItem)
2485	2511	{
2486	2512	MeshReduction(true);
2487	2513	} else
2488		- if (event.getSource() == reverseTrianglesItem)
	2514	+ if (source == reverseTrianglesItem)
2489	2515	{
2490	2516	ReverseTriangles();
2491	2517	} else
2492		- if (event.getSource() == reduceMeshItem)
	2518	+ if (source == reduceMeshItem)
2493	2519	{
2494	2520	ReduceMesh(false);
2495	2521	} else
2496		- if (event.getSource() == reduce34MeshItem)
	2522	+ if (source == reduce34MeshItem)
2497	2523	{
2498	2524	ReduceMesh(true);
2499	2525	} else
2500		- if (event.getSource() == increaseMeshItem)
	2526	+ if (source == increaseMeshItem)
2501	2527	{
2502	2528	IncreaseMesh();
2503	2529	} else
2504		- if (event.getSource() == clipMeshItem)
	2530	+ if (source == clipMeshItem)
2505	2531	{
2506	2532	ClipMesh();
2507	2533	} else
2508		- if (event.getSource() == smoothMeshItem)
	2534	+ if (source == smoothMeshItem)
2509	2535	{
2510	2536	SmoothMesh();
2511	2537	} else
2512		- if (event.getSource() == transformgeometryItem)
	2538	+ if (source == transformgeometryItem)
2513	2539	{
2514	2540	TransformGeometry();
2515	2541	} else
2516		- if (event.getSource() == resetTransformItem)
	2542	+ if (source == resetTransformItem)
2517	2543	{
2518	2544	ResetTransform();
2519	2545	} else
2520		- if (event.getSource() == resetCentroidItem)
	2546	+ if (source == resetCentroidItem)
2521	2547	{
2522	2548	ResetCentroid();
2523	2549	} else
2524		- if (event.getSource() == resetParentItem)
	2550	+ if (source == resetParentItem)
2525	2551	{
2526	2552	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2527	2553	{
..	..	@@ -2531,7 +2557,7 @@
2531	2557
2532	2558	refreshContents();
2533	2559	} else
2534		- if (event.getSource() == repairParentItem)
	2560	+ if (source == repairParentItem)
2535	2561	{
2536	2562	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2537	2563	{
..	..	@@ -2545,7 +2571,21 @@
2545	2571
2546	2572	refreshContents();
2547	2573	} else
2548		- if (event.getSource() == sortbysizeItem)
	2574	+ if (source == repairShadowItem)
	2575	+ {
	2576	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2577	+ {
	2578	+ Object3D obj = (Object3D)e.nextElement();
	2579	+ obj.RepairShadow();
	2580	+// for (int i=0; i<obj.size(); i++)
	2581	+// {
	2582	+// obj.get(i).parent = obj;
	2583	+// }
	2584	+ }
	2585	+
	2586	+ refreshContents();
	2587	+ } else
	2588	+ if (source == sortbysizeItem)
2549	2589	{
2550	2590	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2551	2591	{
..	..	@@ -2557,7 +2597,7 @@
2557	2597	ResetModel();
2558	2598	refreshContents();
2559	2599	} else
2560		- if (event.getSource() == sortbynameItem)
	2600	+ if (source == sortbynameItem)
2561	2601	{
2562	2602	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2563	2603	{
..	..	@@ -2569,7 +2609,7 @@
2569	2609	ResetModel();
2570	2610	refreshContents();
2571	2611	} else
2572		- if (event.getSource() == attachPigmentItem)
	2612	+ if (source == attachPigmentItem)
2573	2613	{
2574	2614	String texture = GetFile("Attach pigment");
2575	2615	Object3D obj;
..	..	@@ -2581,7 +2621,7 @@
2581	2621
2582	2622	refreshContents();
2583	2623	} else
2584		- if (event.getSource() == detachPigmentItem)
	2624	+ if (source == detachPigmentItem)
2585	2625	{
2586	2626	Object3D obj;
2587	2627	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2592,7 +2632,7 @@
2592	2632
2593	2633	refreshContents();
2594	2634	} else
2595		- if (event.getSource() == attachBumpItem)
	2635	+ if (source == attachBumpItem)
2596	2636	{
2597	2637	String texture = GetFile("Attach bump");
2598	2638	Object3D obj;
..	..	@@ -2604,7 +2644,7 @@
2604	2644
2605	2645	refreshContents();
2606	2646	} else
2607		- if (event.getSource() == detachBumpItem)
	2647	+ if (source == detachBumpItem)
2608	2648	{
2609	2649	Object3D obj;
2610	2650	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2615,7 +2655,7 @@
2615	2655
2616	2656	refreshContents();
2617	2657	} else
2618		- if (event.getSource() == pigmentBumpItem)
	2658	+ if (source == pigmentBumpItem)
2619	2659	{
2620	2660	Object3D obj;
2621	2661	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2626,158 +2666,195 @@
2626	2666
2627	2667	refreshContents();
2628	2668	} else
2629		- if (event.getSource() == flashSelectionButton)
	2669	+ if (source == flashSelectionButton)
2630	2670	{
2631	2671	CameraPane.flash = true;
2632	2672	refreshContents();
2633	2673	} else
2634		- if (event.getSource() == oneButton)
	2674	+ if (source == oneButton)
2635	2675	{
2636	2676	} else
2637		- if (event.getSource() == twoButton)
	2677	+ if (source == twoButton)
2638	2678	{
2639	2679	radio.layout = twoButton;
2640	2680	// bug
2641	2681	//gridPanel.setDividerLocation(1.0);
2642	2682	//bigPanel.setDividerLocation(0.0);
2643		- bigThree.remove(scenePanel);
2644		- bigThree.remove(centralPanel);
2645		- bigThree.remove(XYZPanel);
2646		- aWindowConstraints.gridx = 0;
2647		- aWindowConstraints.gridy = 0;
2648		- aWindowConstraints.gridwidth = 1;
2649		- // aConstraints.gridheight = 3;
2650		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2651		- aWindowConstraints.weightx = 0;
2652		- aWindowConstraints.weighty = 1;
2653		- //bigThree.add(jtp, aWindowConstraints);
2654		- aWindowConstraints.weightx = 1;
2655		- aWindowConstraints.gridwidth = 3;
2656		- // aConstraints.gridheight = 3;
2657		- aWindowConstraints.gridx = 1;
2658		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2659		- bigThree.add(centralPanel, aWindowConstraints);
2660		- aWindowConstraints.weightx = 0;
2661		- aWindowConstraints.gridx = 4;
2662		- aWindowConstraints.gridwidth = 1;
2663		- // aConstraints.gridheight = 3;
2664		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2665		- //bigThree.add(XYZPanel, aWindowConstraints);
2666		- bigThree.revalidate();
	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();
2667	2712	} else
2668		- if (event.getSource() == threeButton)
	2713	+ if (source == threeButton)
2669	2714	{
2670	2715	radio.layout = threeButton;
2671		- bigThree.remove(scenePanel);
2672		- bigThree.remove(centralPanel);
2673		- bigThree.remove(XYZPanel);
2674		- aWindowConstraints.gridx = 0;
2675		- aWindowConstraints.gridy = 0;
2676		- aWindowConstraints.gridwidth = 1;
2677		- // aConstraints.gridheight = 3;
2678		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2679		- aWindowConstraints.weightx = 0;
2680		- aWindowConstraints.weighty = 1;
2681		- //bigThree.add(jtp, aWindowConstraints);
2682		- aWindowConstraints.weightx = 1;
2683		- aWindowConstraints.gridwidth = 3;
2684		- // aConstraints.gridheight = 3;
2685		- aWindowConstraints.gridx = 1;
2686		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2687		- bigThree.add(centralPanel, aWindowConstraints);
2688		- aWindowConstraints.weightx = 0;
2689		- aWindowConstraints.gridx = 4;
2690		- aWindowConstraints.gridwidth = 1;
2691		- // aConstraints.gridheight = 3;
2692		- aConstraints.fill = GridBagConstraints.VERTICAL;
2693		- bigThree.add(XYZPanel, aWindowConstraints);
2694		- bigThree.revalidate();
	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();
2695	2748	} else
2696		- if (event.getSource() == fourButton)
	2749	+ if (source == fourButton)
2697	2750	{
2698	2751	radio.layout = fourButton;
2699		- bigThree.remove(scenePanel);
2700		- bigThree.remove(centralPanel);
2701		- bigThree.remove(XYZPanel);
2702		- aWindowConstraints.gridx = 0;
2703		- aWindowConstraints.gridy = 0;
2704		- aWindowConstraints.gridwidth = 1;
2705		- // aWindowConstraints.gridheight = 3;
2706		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2707		- aWindowConstraints.weightx = 1;
2708		- aWindowConstraints.weighty = 1;
2709		- bigThree.add(scenePanel, aWindowConstraints);
2710		- aWindowConstraints.weightx = 1;
2711		- aWindowConstraints.gridwidth = 3;
2712		- // aConstraints.gridheight = 3;
2713		- aWindowConstraints.gridx = 1;
2714		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2715		- //bigThree.add(cameraPanel, aWindowConstraints);
2716		- aWindowConstraints.weightx = 0;
2717		- aWindowConstraints.gridx = 4;
2718		- aWindowConstraints.gridwidth = 1;
2719		- // aWindowConstraints.gridheight = 3;
2720		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2721		- //bigThree.add(XYZPanel, aWindowConstraints);
2722		- bigThree.revalidate();
	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();
2723	2783	} else
2724		- if (event.getSource() == sixButton)
	2784	+ if (source == sixButton)
2725	2785	{
2726	2786	radio.layout = sixButton;
2727		- bigThree.remove(scenePanel);
2728		- bigThree.remove(centralPanel);
2729		- bigThree.remove(XYZPanel);
2730		- aWindowConstraints.gridx = 0;
2731		- aWindowConstraints.gridy = 0;
2732		- aWindowConstraints.gridwidth = 1;
2733		- // aConstraints.gridheight = 3;
2734		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2735		- aWindowConstraints.weightx = 0;
2736		- aWindowConstraints.weighty = 1;
2737		- bigThree.add(scenePanel, aWindowConstraints);
2738		- aWindowConstraints.weightx = 1;
2739		- aWindowConstraints.gridwidth = 3;
2740		- // aWindowConstraints.gridheight = 3;
2741		- aWindowConstraints.gridx = 1;
2742		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2743		- bigThree.add(centralPanel, aWindowConstraints);
2744		- aWindowConstraints.weightx = 0;
2745		- aWindowConstraints.gridx = 4;
2746		- aWindowConstraints.gridwidth = 1;
2747		- // aWindowConstraints.gridheight = 3;
2748		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2749		- //bigThree.add(XYZPanel, aConstraints);
2750		- bigThree.revalidate();
	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();
2751	2819	} else
2752		- if (event.getSource() == sevenButton)
	2820	+ if (source == sevenButton)
2753	2821	{
2754	2822	radio.layout = sevenButton;
2755		- bigThree.remove(scenePanel);
2756		- bigThree.remove(centralPanel);
2757		- bigThree.remove(XYZPanel);
2758		- aWindowConstraints.gridx = 0;
2759		- aWindowConstraints.gridy = 0;
2760		- aWindowConstraints.gridwidth = 1;
2761		- // aWindowConstraints.gridheight = 3;
2762		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2763		- aWindowConstraints.weightx = 0;
2764		- aWindowConstraints.weighty = 1;
2765		- bigThree.add(scenePanel, aWindowConstraints);
2766		- aWindowConstraints.weightx = 1;
2767		- aWindowConstraints.gridwidth = 3;
2768		- // aWindowConstraints.gridheight = 3;
2769		- aWindowConstraints.gridx = 1;
2770		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2771		- bigThree.add(centralPanel, aWindowConstraints);
2772		- aWindowConstraints.weightx = 0;
2773		- aWindowConstraints.gridx = 4;
2774		- aWindowConstraints.gridwidth = 1;
2775		- // aConstraints.gridheight = 3;
2776		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2777		- bigThree.add(XYZPanel, aWindowConstraints);
2778		- bigThree.revalidate();
	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();
2779	2856	} else
2780		- if (event.getSource() == rootButton)
	2857	+ if (source == rootButton)
2781	2858	{
2782	2859	Object3D obj;
2783	2860	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2789,7 +2866,7 @@
2789	2866
2790	2867	refreshContents(true);
2791	2868	} else
2792		- if (event.getSource() == closeButton)
	2869	+ if (source == closeButton)
2793	2870	{
2794	2871	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2795	2872	cRadio ab;
..	..	@@ -2810,11 +2887,11 @@
2810	2887	}
2811	2888	refreshContents(true);
2812	2889	} else
2813		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2890	+ if (source == editItem \|\| source == editButton)
2814	2891	{
2815	2892	EditSelection(false);
2816	2893	} else
2817		- if (event.getSource() == uneditButton)
	2894	+ if (source == uneditButton)
2818	2895	{
2819	2896	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2820	2897	{
..	..	@@ -2826,12 +2903,12 @@
2826	2903
2827	2904	child.editWindow = null; // ???????????
2828	2905	}
2829		- objEditor.ctrlPanel.revalidate();
	2906	+ objEditor.ctrlPanel.validate();
2830	2907	//objEditor.jTree.clearSelection();
2831	2908	//objEditor.ResetSliders();
2832	2909	refreshContents(true);
2833	2910	} else
2834		- if (event.getSource() == clearPanelButton)
	2911	+ if (source == clearPanelButton)
2835	2912	{
2836	2913	assert(copy == group);
2837	2914	//copy.ClearUI();
..	..	@@ -2842,7 +2919,7 @@
2842	2919	listUI.clear();
2843	2920	refreshContents(true);
2844	2921	} else
2845		- if (event.getSource() == allParamsButton)
	2922	+ if (source == allParamsButton)
2846	2923	{
2847	2924	assert(copy == group);
2848	2925
..	..	@@ -2863,19 +2940,19 @@
2863	2940
2864	2941	refreshContents(true);
2865	2942	} else
2866		- if (event.getSource() == unselectButton)
	2943	+ if (source == unselectButton)
2867	2944	{
2868	2945	objEditor.jTree.clearSelection();
2869	2946	// ?? oct 2012 GrafreeD.clipboard.clear();
2870	2947	objEditor.ResetSliders();
2871	2948	refreshContents(true);
2872	2949	} else
2873		- if(event.getSource() instanceof cRadio)
	2950	+ if(source instanceof cRadio)
2874	2951	{
2875	2952	group.parent = keepparent;
2876	2953	group.attributes = 0;
2877	2954	//group.editWindow = null;
2878		- /cRadio/ radio = (cRadio)event.getSource();
	2955	+ /cRadio/ radio = (cRadio)source;
2879	2956	Object3D obj = radio.GetObject();
2880	2957	System.out.println("Edit " + obj);
2881	2958	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2895,7 +2972,7 @@
2895	2972	}
2896	2973
2897	2974	copy = group;
2898		- //CameraPane.theRenderer.object = group;
	2975	+ //Globals.theRenderer.object = group;
2899	2976	if(!useclient)
2900	2977	{
2901	2978	cameraView.renderCamera = radio.camera;
..	..	@@ -2904,7 +2981,8 @@
2904	2981	cameraView.cameras[cameraView.cameracount] = radio.camera;
2905	2982	cameraView.targetLookAt.set(radio.camera.lookAt);
2906	2983	cameraView.object = group;
2907		- cameraView.lighttouched = true;
	2984	+ //cameraView.lighttouched = true;
	2985	+ Globals.lighttouched = true;
2908	2986	topView.object = group;
2909	2987	frontView.object = group;
2910	2988	sideView.object = group;
..	..	@@ -2940,7 +3018,7 @@
2940	3018	if (useclient)
2941	3019	{
2942	3020	cameraView.object = client;
2943		- cameraView.lighttouched = true;
	3021	+ Globals.lighttouched = true;
2944	3022	//topView.object = client;
2945	3023	//frontView.object = client;
2946	3024	//sideView.object = client;
..	..	@@ -2948,7 +3026,7 @@
2948	3026	else
2949	3027	{
2950	3028	cameraView.object = group;
2951		- cameraView.lighttouched = true;
	3029	+ Globals.lighttouched = true;
2952	3030	//topView.object = group;
2953	3031	//frontView.object = group;
2954	3032	//sideView.object = group;
..	..	@@ -3456,7 +3534,7 @@
3456	3534	String pigment = Object3D.GetPigment(tex);
3457	3535	//String bump = Object3D.GetBump(tex);
3458	3536
3459		- 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);
3460	3538
3461	3539	double s = v.s;
3462	3540
..	..	@@ -3757,7 +3835,7 @@
3757	3835	group.selection.RelinkToSupport(); // july 2014
3758	3836	System.out.println("DONE.");
3759	3837	refreshContents();
3760		- 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));
3761	3839	}
3762	3840
3763	3841	void ReduceMesh(boolean reduction34)
..	..	@@ -4033,25 +4111,25 @@
4033	4111	System.err.println("info : " + child.GetPath());
4034	4112	}
4035	4113	}
4036		- else
4037		- {
4038		- objEditor.SetMaterial(group); // .GetMaterial());
4039		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4040		- System.err.println("info : " + group.GetPath());
4041		- }
	4114	+// else
	4115	+// {
	4116	+// objEditor.SetMaterial(group); // .GetMaterial());
	4117	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4118	+// System.err.println("info : " + group.GetPath());
	4119	+// }
4042	4120
4043	4121	objEditor.SetText(); // jan 2014
4044	4122
4045		- 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))
4046	4124	CameraPane.flash = true;
4047	4125
4048	4126	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
4049	4127	// a camera
4050	4128	{
4051	4129	CameraPane.camerachangeframe = 0; // don't refuse it
4052		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4053		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
4054		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4130	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4131	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4132	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4055	4133	}
4056	4134
4057	4135	refreshContents();
..	..	@@ -5009,6 +5087,7 @@
5009	5087
5010	5088	private MenuItem resetParentItem;
5011	5089	private MenuItem repairParentItem;
	5090	+ private MenuItem repairShadowItem;
5012	5091	private MenuItem sortbysizeItem;
5013	5092	private MenuItem sortbynameItem;
5014	5093