~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,
..	..	@@ -238,16 +239,16 @@
238	239	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	240	ungroupItem.addActionListener(this);
240	241	menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
	242	+ randomItem = menu.add(new MenuItem("Switch node"));
242	243	randomItem.addActionListener(this);
243		- physicsItem = menu.add(new MenuItem("Physics"));
244		- physicsItem.addActionListener(this);
245		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
246		- frameselectorItem.addActionListener(this);
247	244	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	245	switchGeoItem.addActionListener(this);
249	246	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	247	switchTransfoItem.addActionListener(this);
	248	+ physicsItem = menu.add(new MenuItem("Physics"));
	249	+ physicsItem.addActionListener(this);
	250	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	251	+ frameselectorItem.addActionListener(this);
251	252	morphItem = menu.add(new MenuItem("Morph"));
252	253	morphItem.addActionListener(this);
253	254	scriptNodeItem = menu.add(new MenuItem("Script Node"));
..	..	@@ -433,153 +434,94 @@
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);
	443	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	444	+ fastCB.setToolTipText("Fast mode");
461	445	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);
	446	+
	447	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	448	+ trackCB.setToolTipText("Enable tracking");
503	449	trackCB.addItemListener(this);
504	450
505		- oe.aConstraints.gridx += 1;
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	451	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	452	+ screenfitButton.setToolTipText("Screen fit");
507	453	screenfitButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
	454	+
509	455	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
510	456	// screenfitpointButton.addActionListener(this);
511		-// oe.aConstraints.gridx += 1;
512		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
513		- snapobjectButton.addActionListener(this);
514		- oe.aConstraints.gridx += 1;
515	457
516		- //aConstraints.gridx = 0;
517		- //aConstraints.gridy += 1;
518		- oe.aConstraints.weighty = 0;
519		- oe.aConstraints.gridwidth = 1;
520		-
521		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	458	+ if (Globals.ADVANCED)
	459	+ {
	460	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	461	+ snapobjectButton.addActionListener(this);
	462	+ snapobjectButton.setToolTipText("Snap Object");
	463	+ }
	464	+
	465	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	466	+ flashSelectionButton.setToolTipText("Show selection");
522	467	flashSelectionButton.addActionListener(this);
523	468
524		- oe.toolbarPanel.add(new cButton(" ", false));
	469	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
525	470
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);
	471	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	472	+ twoButton.setToolTipText("Show center view only");
532	473	twoButton.addActionListener(this);
533		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	474	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
534	475	fourButton.addActionListener(this);
535		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	476	+ fourButton.setToolTipText("Show left panel only");
	477	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	478	+ sixButton.setToolTipText("2-column layout left");
536	479	sixButton.addActionListener(this);
537		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	480	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	481	+ threeButton.setToolTipText("2-column layout right");
538	482	threeButton.addActionListener(this);
539		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	483	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	484	+ sevenButton.setToolTipText("3-column layout");
540	485	sevenButton.addActionListener(this);
541	486	//
542	487
543		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	488	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	489	+ rootButton.setToolTipText("Edit selection in new tab");
544	490	rootButton.addActionListener(this);
545		- oe.aConstraints.gridx += 1;
546		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	491	+
	492	+ oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	493	+ closeButton.setToolTipText("Close tab");
547	494	closeButton.addActionListener(this);
548	495	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
549	496	//clearButton.addActionListener(this);
550		- oe.aConstraints.gridx += 1;
551	497
552		- oe.aConstraints.gridx = 1; //
553		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	498	+ cGridBag commandsPanel = new cGridBag();
	499	+
	500	+ commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	501	+ editButton.setToolTipText("Edit selection");
554	502	editButton.addActionListener(this);
555		- oe.aConstraints.gridx += 1;
556		- oe.aConstraints.weighty = 0;
557		- oe.aConstraints.gridwidth = 1;
558	503
559		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	504	+ commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	505	+ uneditButton.setToolTipText("Unedit selection");
560	506	uneditButton.addActionListener(this);
561	507
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);
	508	+ commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	509	+ clearPanelButton.setToolTipText("Clear edit panel");
567	510	clearPanelButton.addActionListener(this);
568	511
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);
	512	+ commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	513	+ allParamsButton.setToolTipText("All params??");
574	514	allParamsButton.addActionListener(this);
575	515
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);
	516	+ commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	517	+ unselectButton.setToolTipText("Unselect");
581	518	unselectButton.addActionListener(this);
582	519
	520	+ commandsPanel.preferredHeight = 1;
	521	+
	522	+ oe.treePanel.add(commandsPanel);
	523	+ oe.treePanel.Return();
	524	+
583	525	// oe.aConstraints.gridx += 1;
584	526	// oe.aConstraints.weighty = 0;
585	527	// oe.aConstraints.gridwidth = 1;
..	..	@@ -591,40 +533,37 @@
591	533	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
592	534	// gcButton.addActionListener(this);
593	535
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;
	536	+ cGridBag jSPPanel = new cGridBag();
	537	+
	538	+ JScrollPane jSP;
605	539	//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);
	540	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
607	541	ResetModel();
608		- oe.aConstraints.weighty = 0.5;
609		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
610		- oe.aConstraints.gridy += 1;
611		- oe.aConstraints.gridwidth = 1;
	542	+
	543	+ oe.treePanel.add(jSPPanel);
	544	+ oe.treePanel.Return();
612	545
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);
	546	+ cGridBag copyOptionsPanel = new cGridBag();
	547	+
	548	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	549	+ colorCB.setToolTipText("Copy color when dropped");
617	550	colorCB.addItemListener(this);
618		- oe.aConstraints.gridx += 2;
619		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	551	+
	552	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	553	+ materialCB.setToolTipText("Copy material when dropped");
620	554	materialCB.addItemListener(this);
621		- oe.aConstraints.gridx += 2;
622		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	555	+
	556	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	557	+ textureCB.setToolTipText("Copy texture when dropped");
623	558	textureCB.addItemListener(this);
624	559
625		- oe.aConstraints.gridx = 0;
626		- oe.aConstraints.gridy += 1;
	560	+ copyOptionsPanel.preferredHeight = 1;
	561	+ oe.treePanel.add(copyOptionsPanel);
	562	+ oe.treePanel.Return();
627	563
	564	+// mainPanel.setDividerLocation(0.5); //1.0);
	565	+// mainPanel.setResizeWeight(0.5);
	566	+
628	567	//jList.addListSelectionListener(this);
629	568	oe.jTree.addTreeSelectionListener(this);
630	569	//jTree.setRootVisible(false);
..	..	@@ -646,6 +585,74 @@
646	585	radio.layout = sevenButton;
647	586	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
648	587	}
	588	+
	589	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	590	+ {
	591	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	592	+ supportCB.setToolTipText("Enabled rigging");
	593	+ supportCB.addItemListener(this);
	594	+
	595	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	596	+ // localCB.addItemListener(this);
	597	+
	598	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	599	+ crowdCB.setToolTipText("Used for crowds");
	600	+ crowdCB.addItemListener(this);
	601	+
	602	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	603	+ smoothCB.setToolTipText("Snapping delay");
	604	+ smoothCB.addItemListener(this);
	605	+
	606	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	607	+ slowCB.setToolTipText("Smooth interpolation");
	608	+ slowCB.addItemListener(this);
	609	+
	610	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	611	+ boxCB.setToolTipText("Display bounding boxes");
	612	+ boxCB.addItemListener(this);
	613	+
	614	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	615	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	616	+ zoomBoxCB.addItemListener(this);
	617	+
	618	+// constraints.gridy += 1;
	619	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	620	+// speakerMocapCB.addItemListener(this);
	621	+
	622	+ if (false)
	623	+ {
	624	+ // handled in scripts
	625	+ //constraints.gridy += 1;
	626	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	627	+ speakerCameraCB.addItemListener(this);
	628	+
	629	+ //constraints.gridy += 1;
	630	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	631	+ speakerFocusCB.addItemListener(this);
	632	+
	633	+ //constraints.gridy += 1;
	634	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	635	+ smoothfocusCB.addItemListener(this);
	636	+ }
	637	+
	638	+//constraints.gridx += 1;
	639	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	640	+// debugCB.addItemListener(this);
	641	+
	642	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	643	+ oeilCB.addItemListener(this);
	644	+
	645	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	646	+ lookAtCB.setToolTipText("Look-at target");
	647	+ lookAtCB.addItemListener(this);
	648	+
	649	+ cGridBag fill = new cGridBag();
	650	+
	651	+ fill.preferredHeight = 200;
	652	+
	653	+ panel.add(fill);
	654	+
	655	+ }
649	656
650	657	void EditObject(Object3D obj)
651	658	{
..	..	@@ -676,6 +683,7 @@
676	683	JCheckBox fastCB;
677	684	JCheckBox slowCB;
678	685	JCheckBox boxCB;
	686	+ JCheckBox zoomBoxCB;
679	687	JCheckBox trackCB;
680	688	JCheckBox smoothfocusCB;
681	689	// JCheckBox speakerMocapCB;
..	..	@@ -755,6 +763,10 @@
755	763	Recompile();
756	764	cameraView.repaint();
757	765	// refreshContents();
	766	+ }
	767	+ else if(e.getSource() == zoomBoxCB)
	768	+ {
	769	+ cameraView.ToggleZoomBoxMode();
758	770	}
759	771	else if(e.getSource() == smoothfocusCB)
760	772	{
..	..	@@ -1087,7 +1099,7 @@
1087	1099	{
1088	1100	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1089	1101	animationItem.addItemListener(this);
1090		- animationItem.setState(CameraPane.ANIMATION);
	1102	+ animationItem.setState(Globals.ANIMATION);
1091	1103
1092	1104	menu.add("-");
1093	1105	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
..	..	@@ -1120,6 +1132,8 @@
1120	1132	resetParentItem.addActionListener(this);
1121	1133	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1122	1134	repairParentItem.addActionListener(this);
	1135	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1136	+ repairShadowItem.addActionListener(this);
1123	1137	menu.add(invariantsItem = new MenuItem("Invariants"));
1124	1138	invariantsItem.addActionListener(this);
1125	1139	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1480,6 +1494,7 @@
1480	1494	//
1481	1495	public void actionPerformed(ActionEvent event) // , Object arg)
1482	1496	{
	1497	+ Object source = event.getSource();
1483	1498	/*
1484	1499	if (event.getSource() == nameField)
1485	1500	{
..	..	@@ -1491,11 +1506,11 @@
1491	1506	}
1492	1507	else
1493	1508	*/
1494		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1509	+ if (source == lookAtItem \|\| source == lookFromItem)
1495	1510	{
1496	1511	ScreenFit();
1497	1512	} else
1498		- if (event.getSource() == switchItem)
	1513	+ if (source == switchItem)
1499	1514	{
1500	1515	cVector v1 = new cVector();
1501	1516	cVector v2 = new cVector();
..	..	@@ -1504,11 +1519,11 @@
1504	1519	objEditor.cameraView.renderCamera.setAim(v2, v1);
1505	1520	objEditor.cameraView.repaint();
1506	1521	} else
1507		- if (event.getSource() == rectoidItem)
	1522	+ if (source == rectoidItem)
1508	1523	{
1509	1524	makeSomething(new Box());
1510	1525	} else
1511		- if (event.getSource() == particleItem)
	1526	+ if (source == particleItem)
1512	1527	{
1513	1528	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1514	1529	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1529,9 +1544,9 @@
1529	1544	applyExample(particleGeom, "SMOKE");
1530	1545	makeSomething(particleGeom);
1531	1546	} else
1532		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1547	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1533	1548	{
1534		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1549	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1535	1550
1536	1551	ragdoll.toParent = LA.newMatrix();
1537	1552	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1549,7 +1564,7 @@
1549	1564	} else
1550	1565	/*
1551	1566	*/
1552		- if (event.getSource() == heightFieldItem)
	1567	+ if (source == heightFieldItem)
1553	1568	{
1554	1569	Object3D obj = new Object3D();
1555	1570
..	..	@@ -1587,31 +1602,31 @@
1587	1602
1588	1603	makeSomething(obj);
1589	1604	} else
1590		- if (event.getSource() == gridItem)
	1605	+ if (source == gridItem)
1591	1606	{
1592	1607	makeSomething(new Grid());
1593	1608	} else
1594		- if (event.getSource() == ellipsoidItem)
	1609	+ if (source == ellipsoidItem)
1595	1610	{
1596	1611	makeSomething(new Sphere());
1597	1612	} else
1598		- if (event.getSource() == coneItem)
	1613	+ if (source == coneItem)
1599	1614	{
1600	1615	makeSomething(new Cone());
1601	1616	} else
1602		- if (event.getSource() == torusItem)
	1617	+ if (source == torusItem)
1603	1618	{
1604	1619	makeSomething(new Torus());
1605	1620	} else
1606		- if (event.getSource() == superItem)
	1621	+ if (source == superItem)
1607	1622	{
1608	1623	makeSomething(new Superellipsoid());
1609	1624	} else
1610		- if (event.getSource() == kleinItem)
	1625	+ if (source == kleinItem)
1611	1626	{
1612	1627	makeSomething(new Klein());
1613	1628	} else
1614		- if (event.getSource() == blobItem)
	1629	+ if (source == blobItem)
1615	1630	{
1616	1631	Blob blob = new Blob();
1617	1632	BlobComponent comp = new BlobComponent();
..	..	@@ -1619,15 +1634,15 @@
1619	1634	//blob.retile();
1620	1635	makeSomething(blob);
1621	1636	} else
1622		- if (event.getSource() == latheItem)
	1637	+ if (source == latheItem)
1623	1638	{
1624	1639	makeSomething(new Lathe());
1625	1640	} else
1626		- if (event.getSource() == bezierItem)
	1641	+ if (source == bezierItem)
1627	1642	{
1628	1643	makeSomething(new BezierSurface());
1629	1644	} else
1630		- if (event.getSource() == checkerItem)
	1645	+ if (source == checkerItem)
1631	1646	{
1632	1647	/*
1633	1648	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1642,7 +1657,7 @@
1642	1657	*/
1643	1658	makeSomething(new Checker());
1644	1659	} else
1645		- if (event.getSource() == meshItem)
	1660	+ if (source == meshItem)
1646	1661	{
1647	1662	Object3D itemtomake = new Object3D();
1648	1663	Object3D child;
..	..	@@ -1663,35 +1678,35 @@
1663	1678	makeSomething(child);
1664	1679	}
1665	1680	} else
1666		- if (event.getSource() == springItem)
	1681	+ if (source == springItem)
1667	1682	{
1668	1683	cSpring s = new cSpring();
1669	1684	s.setup();
1670	1685	makeSomething(s);
1671	1686	} else
1672		- if (event.getSource() == flagItem)
	1687	+ if (source == flagItem)
1673	1688	{
1674	1689	cSpring s = new cFlag();
1675	1690	s.setup();
1676	1691	makeSomething(s);
1677	1692	} else
1678		- if (event.getSource() == lightItem)
	1693	+ if (source == lightItem)
1679	1694	{
1680	1695	makeSomething(new Light());
1681	1696	} else
1682		- if (event.getSource() == csgItem)
	1697	+ if (source == csgItem)
1683	1698	{
1684	1699	group(new CSG());
1685	1700	} else
1686		- if (event.getSource() == templateItem)
	1701	+ if (source == templateItem)
1687	1702	{
1688	1703	group(new cTemplate());
1689	1704	} else
1690		- if (event.getSource() == attributeItem)
	1705	+ if (source == attributeItem)
1691	1706	{
1692	1707	makeSomething(new Attribute());
1693	1708	} else
1694		- if (event.getSource() == pointflowItem)
	1709	+ if (source == pointflowItem)
1695	1710	{
1696	1711	makeSomething(new PointFlow());
1697	1712	} else
..	..	@@ -1703,7 +1718,7 @@
1703	1718	} else
1704	1719	*/
1705	1720
1706		- if (event.getSource() == superLoopItem)
	1721	+ if (source == superLoopItem)
1707	1722	{
1708	1723	Composite g = new cGroup();
1709	1724	for (int i=0; i<15; i++)
..	..	@@ -1725,7 +1740,7 @@
1725	1740
1726	1741	group(g);
1727	1742	} else
1728		- if (event.getSource() == loopItem)
	1743	+ if (source == loopItem)
1729	1744	{
1730	1745	Composite csg = new GroupLeaf();
1731	1746	csg.count = 5;
..	..	@@ -1734,7 +1749,7 @@
1734	1749	csg.addChild(child);
1735	1750	child.addChild(csg);
1736	1751	} else
1737		- if (event.getSource() == doubleItem)
	1752	+ if (source == doubleItem)
1738	1753	{
1739	1754	Composite csg = new GroupLeaf();
1740	1755	csg.count = 5;
..	..	@@ -1746,7 +1761,7 @@
1746	1761	csg.addChild(child);
1747	1762	child.addChild(csg);
1748	1763	} else
1749		- if (event.getSource() == tripleItem)
	1764	+ if (source == tripleItem)
1750	1765	{
1751	1766	Composite csg = new GroupLeaf();
1752	1767	csg.count = 4;
..	..	@@ -1762,70 +1777,70 @@
1762	1777	child.addChild(csg);
1763	1778	} else
1764	1779
1765		- if (event.getSource() == importGFDItem)
	1780	+ if (source == importGFDItem)
1766	1781	{
1767	1782	ImportGFD();
1768	1783	} else
1769		- if (event.getSource() == importVRMLX3DItem)
	1784	+ if (source == importVRMLX3DItem)
1770	1785	{
1771	1786	ImportVRMLX3D();
1772	1787	} else
1773		- if (event.getSource() == import3DSItem)
	1788	+ if (source == import3DSItem)
1774	1789	{
1775	1790	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1776	1791	} else
1777		- if (event.getSource() == importOBJItem)
	1792	+ if (source == importOBJItem)
1778	1793	{
1779	1794	objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1780	1795	} else
1781		- if (event.getSource() == computeAOItem)
	1796	+ if (source == computeAOItem)
1782	1797	{
1783		- CameraPane.drawMode = CameraPane.OCCLUSION;
1784		- CameraPane.theRenderer.repaint();
	1798	+ Globals.drawMode = CameraPane.OCCLUSION;
	1799	+ Globals.theRenderer.repaint();
1785	1800	} else
1786		- if (event.getSource() == recompileItem)
	1801	+ if (source == recompileItem)
1787	1802	{
1788	1803	Recompile();
1789	1804	refreshContents();
1790	1805	} else
1791		- if (event.getSource() == editScriptItem)
	1806	+ if (source == editScriptItem)
1792	1807	{
1793	1808	OpenDialog();
1794	1809	refreshContents();
1795	1810	} else
1796		- if (event.getSource() == invariantsItem)
	1811	+ if (source == invariantsItem)
1797	1812	{
1798	1813	System.out.println("Invariants:");
1799	1814	GrafreeD.grafreeD.universe.invariants();
1800	1815	} else
1801		- if (event.getSource() == memoryItem)
	1816	+ if (source == memoryItem)
1802	1817	{
1803	1818	//System.out.println("Invariants:");
1804	1819	PrintMemory();
1805	1820	} else
1806		- if (event.getSource() == pathItem)
	1821	+ if (source == pathItem)
1807	1822	{
1808	1823	PrintPath();
1809	1824	} else
1810		- if (event.getSource() == analyzeItem)
	1825	+ if (source == analyzeItem)
1811	1826	{
1812	1827	AnalyzeObject();
1813	1828	} else
1814		- if (event.getSource() == dumpItem)
	1829	+ if (source == dumpItem)
1815	1830	{
1816	1831	DumpObject();
1817	1832	} else
1818		- if (event.getSource() == screenfitButton)
	1833	+ if (source == screenfitButton)
1819	1834	{
1820	1835	//Reload(lastConverter, lastFilename, true);
1821	1836	ScreenFit();
1822	1837	} else
1823		- if (event.getSource() == screenfitpointButton)
	1838	+ if (source == screenfitpointButton)
1824	1839	{
1825	1840	//Reload(lastConverter, lastFilename, true);
1826	1841	ScreenFitPoint();
1827	1842	} else
1828		- if (event.getSource() == snapobjectButton)
	1843	+ if (source == snapobjectButton)
1829	1844	{
1830	1845	//Reload(lastConverter, lastFilename, true);
1831	1846	SnapObject();
..	..	@@ -1836,13 +1851,13 @@
1836	1851	// Recompile();
1837	1852	// refreshContents();
1838	1853	// } else
1839		- if (event.getSource() == gcButton)
	1854	+ if (source == gcButton)
1840	1855	{
1841	1856	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1842	1857	System.gc();
1843	1858	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1844	1859	} else
1845		- if (event.getSource() == editLeafItem)
	1860	+ if (source == editLeafItem)
1846	1861	{
1847	1862	Object3D obj;
1848	1863	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1856,62 +1871,62 @@
1856	1871	}
1857	1872	refreshContents(true);
1858	1873	} else
1859		- if (event.getSource() == openWindowItem)
	1874	+ if (source == openWindowItem)
1860	1875	{
1861	1876	EditSelection(true);
1862	1877	} else
1863		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1878	+ if (source == cutItem \|\| source == clearButton)
1864	1879	{
1865	1880	loadClipboard(true);
1866	1881	} else
1867		- if (event.getSource() == duplicateItem)
	1882	+ if (source == duplicateItem)
1868	1883	{
1869	1884	Object3D keep = GrafreeD.clipboard;
1870	1885	loadClipboard(false);
1871	1886	paste(false);
1872	1887	GrafreeD.clipboard = keep;
1873	1888	} else
1874		- if (event.getSource() == cloneItem)
	1889	+ if (source == cloneItem)
1875	1890	{
1876	1891	CloneSelection(false);
1877	1892	} else
1878		- if (event.getSource() == cloneSupportItem)
	1893	+ if (source == cloneSupportItem)
1879	1894	{
1880	1895	CloneSelection(true);
1881	1896	} else
1882		- if (event.getSource() == copyItem)
	1897	+ if (source == copyItem)
1883	1898	{
1884	1899	loadClipboard(false);
1885	1900	} else
1886		- if (event.getSource() == pasteItem)
	1901	+ if (source == pasteItem)
1887	1902	{
1888	1903	paste(false);
1889	1904	} else
1890		- if (event.getSource() == pasteLinkItem)
	1905	+ if (source == pasteLinkItem)
1891	1906	{
1892	1907	pasteInto(false);
1893	1908	} else
1894		- if (event.getSource() == pasteCloneItem)
	1909	+ if (source == pasteCloneItem)
1895	1910	{
1896	1911	pasteInto(true);
1897	1912	} else
1898		- if (event.getSource() == pasteExpandItem)
	1913	+ if (source == pasteExpandItem)
1899	1914	{
1900	1915	paste(true);
1901	1916	} else
1902		- if (event.getSource() == synchronizeItem)
	1917	+ if (source == synchronizeItem)
1903	1918	{
1904	1919	Overwrite(Object3D.TRANSFORM);
1905	1920	} else
1906		- if (event.getSource() == overwriteNameItem)
	1921	+ if (source == overwriteNameItem)
1907	1922	{
1908	1923	Overwrite(Object3D.NAME);
1909	1924	} else
1910		- if (event.getSource() == overwriteUVItem)
	1925	+ if (source == overwriteUVItem)
1911	1926	{
1912	1927	Overwrite(Object3D.UV);
1913	1928	} else
1914		- if (event.getSource() == overwriteMatItem)
	1929	+ if (source == overwriteMatItem)
1915	1930	{
1916	1931	/* july 2015
1917	1932	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1931,7 +1946,7 @@
1931	1946
1932	1947	Overwrite(dropAttributes);
1933	1948	}
1934		- if (event.getSource() == overwriteGeoItem)
	1949	+ if (source == overwriteGeoItem)
1935	1950	{
1936	1951	Overwrite(Object3D.GEOMETRY);
1937	1952	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1948,7 +1963,7 @@
1948	1963	// refreshContents();
1949	1964	// }
1950	1965	} else
1951		- if (event.getSource() == generateMeshItem)
	1966	+ if (source == generateMeshItem)
1952	1967	{
1953	1968	//if (group.selection.size() == 1)
1954	1969	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1959,7 +1974,7 @@
1959	1974	ResetModel();
1960	1975	refreshContents();
1961	1976	} else
1962		- if (event.getSource() == extractGeometriesItem)
	1977	+ if (source == extractGeometriesItem)
1963	1978	{
1964	1979	boolean one = false;
1965	1980
..	..	@@ -1986,7 +2001,7 @@
1986	2001	ResetModel();
1987	2002	refreshContents();
1988	2003	} else
1989		- if (event.getSource() == cloneGeometriesItem)
	2004	+ if (source == cloneGeometriesItem)
1990	2005	{
1991	2006	boolean one = false;
1992	2007
..	..	@@ -2012,7 +2027,7 @@
2012	2027	ResetModel();
2013	2028	refreshContents();
2014	2029	} else
2015		- if (event.getSource() == shareGeometriesItem)
	2030	+ if (source == shareGeometriesItem)
2016	2031	{
2017	2032	boolean one = false;
2018	2033
..	..	@@ -2042,7 +2057,7 @@
2042	2057	refreshContents();
2043	2058	}
2044	2059	} else
2045		- if (event.getSource() == mergeGeometriesItem)
	2060	+ if (source == mergeGeometriesItem)
2046	2061	{
2047	2062	boolean one = false;
2048	2063
..	..	@@ -2072,7 +2087,7 @@
2072	2087	ResetModel();
2073	2088	refreshContents();
2074	2089	} else
2075		- if (event.getSource() == linkverticesItem)
	2090	+ if (source == linkverticesItem)
2076	2091	{
2077	2092	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2078	2093	// {
..	..	@@ -2092,7 +2107,7 @@
2092	2107	if (content instanceof cGroup && ((cGroup)content).transientlink )
2093	2108	content = ((cGroup)content).get(0);
2094	2109
2095		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2110	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2096	2111	for (int i=0; i<group.selection.size(); i++)
2097	2112	{
2098	2113	boolean random = CameraPane.RANDOM;
..	..	@@ -2101,11 +2116,11 @@
2101	2116	// group.selection.get(i).setMasterThis(content); // should be identity
2102	2117	CameraPane.RANDOM = random;
2103	2118	}
2104		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2119	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2105	2120	refreshContents();
2106	2121	}
2107	2122	} else
2108		- if (event.getSource() == resetsupportItem)
	2123	+ if (source == resetsupportItem)
2109	2124	{
2110	2125	for (int i=0; i<group.selection.size(); i++)
2111	2126	{
..	..	@@ -2117,7 +2132,7 @@
2117	2132
2118	2133	refreshContents();
2119	2134	} else
2120		- if (event.getSource() == relinkverticesItem)
	2135	+ if (source == relinkverticesItem)
2121	2136	{
2122	2137	boolean random = CameraPane.RANDOM;
2123	2138	CameraPane.RANDOM = false; // parse all random nodes
..	..	@@ -2126,7 +2141,7 @@
2126	2141
2127	2142	refreshContents();
2128	2143	} else
2129		- if (event.getSource() == resetreferencesItem)
	2144	+ if (source == resetreferencesItem)
2130	2145	{
2131	2146	for (int i=0; i<group.selection.size(); i++)
2132	2147	{
..	..	@@ -2135,7 +2150,7 @@
2135	2150
2136	2151	refreshContents();
2137	2152	} else
2138		- if (event.getSource() == setMasterItem)
	2153	+ if (source == setMasterItem)
2139	2154	{
2140	2155	if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2141	2156	{
..	..	@@ -2148,7 +2163,7 @@
2148	2163	refreshContents();
2149	2164	}
2150	2165	} else
2151		- if (event.getSource() == poseMeshItem)
	2166	+ if (source == poseMeshItem)
2152	2167	{
2153	2168	if (group.selection.size() == 1)
2154	2169	{
..	..	@@ -2167,19 +2182,19 @@
2167	2182	}
2168	2183
2169	2184	} else
2170		- if (event.getSource() == revertMeshItem)
	2185	+ if (source == revertMeshItem)
2171	2186	{
2172	2187	RevertMeshes();
2173	2188	} else
2174		- if (event.getSource() == resetMeshItem)
	2189	+ if (source == resetMeshItem)
2175	2190	{
2176	2191	ResetAll();
2177	2192	} else
2178		- if (event.getSource() == stepAllItem)
	2193	+ if (source == stepAllItem)
2179	2194	{
2180	2195	StepAll();
2181	2196	} else
2182		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2197	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2183	2198	{
2184	2199	//int indices[] = jList.getSelectedIndices();
2185	2200	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2187,46 +2202,46 @@
2187	2202
2188	2203	ClearSelection(false);
2189	2204	} else
2190		- if (event.getSource() == clearAllItem)
	2205	+ if (source == clearAllItem)
2191	2206	{
2192	2207	ClearSelection(true);
2193	2208	} else
2194		- if (event.getSource() == grabItem)
	2209	+ if (source == grabItem)
2195	2210	{
2196	2211	group(new cGroup(), true);
2197	2212	} else
2198		- if (event.getSource() == hideItem)
	2213	+ if (source == hideItem)
2199	2214	{
2200	2215	group(new HiddenObject());
2201	2216	} else
2202		- if (event.getSource() == frontItem)
	2217	+ if (source == frontItem)
2203	2218	{
2204	2219	front();
2205	2220	} else
2206		- if (event.getSource() == backItem)
	2221	+ if (source == backItem)
2207	2222	{
2208	2223	back();
2209	2224	} else
2210		- if (event.getSource() == cameraItem)
	2225	+ if (source == cameraItem)
2211	2226	{
2212	2227	makeSomething(new Camera());
2213	2228	} else
2214		- if (event.getSource() == compositeItem)
	2229	+ if (source == compositeItem)
2215	2230	{
2216	2231	group(new Composite());
2217	2232	} else
2218		- if (event.getSource() == randomItem)
	2233	+ if (source == randomItem)
2219	2234	{
2220	2235	RandomNode random = new RandomNode();
2221	2236	group(random);
2222	2237	if (random.size() > 0)
2223		- random.name = random.get(0).name + "Rnd";
	2238	+ random.name = random.get(0).name + "Switch";
2224	2239	} else
2225		- if (event.getSource() == physicsItem)
	2240	+ if (source == physicsItem)
2226	2241	{
2227	2242	group(new PhysicsNode());
2228	2243	} else
2229		- if (event.getSource() == frameselectorItem)
	2244	+ if (source == frameselectorItem)
2230	2245	{
2231	2246	for (int i=0; i<group.selection.size(); i++)
2232	2247	{
..	..	@@ -2238,7 +2253,7 @@
2238	2253	ResetModel();
2239	2254	refreshContents();
2240	2255	} else
2241		- if (event.getSource() == switchGeoItem)
	2256	+ if (source == switchGeoItem)
2242	2257	{
2243	2258	for (int i=0; i<group.selection.size(); i++)
2244	2259	{
..	..	@@ -2250,7 +2265,7 @@
2250	2265	ResetModel();
2251	2266	refreshContents();
2252	2267	} else
2253		- if (event.getSource() == switchTransfoItem)
	2268	+ if (source == switchTransfoItem)
2254	2269	{
2255	2270	for (int i=0; i<group.selection.size(); i++)
2256	2271	{
..	..	@@ -2262,7 +2277,7 @@
2262	2277	ResetModel();
2263	2278	refreshContents();
2264	2279	} else
2265		- if (event.getSource() == morphItem)
	2280	+ if (source == morphItem)
2266	2281	{
2267	2282	for (int i=0; i<group.selection.size(); i++)
2268	2283	{
..	..	@@ -2274,7 +2289,7 @@
2274	2289	ResetModel();
2275	2290	refreshContents();
2276	2291	} else
2277		- if (event.getSource() == scriptNodeItem)
	2292	+ if (source == scriptNodeItem)
2278	2293	{
2279	2294	boolean atleastone = false;
2280	2295
..	..	@@ -2313,31 +2328,31 @@
2313	2328	}
2314	2329	}
2315	2330	} else
2316		- if (event.getSource() == linkerItem)
	2331	+ if (source == linkerItem)
2317	2332	{
2318	2333	group(new cLinker());
2319	2334	} else
2320		- if (event.getSource() == textureItem)
	2335	+ if (source == textureItem)
2321	2336	{
2322	2337	group(new TextureNode());
2323	2338	} else
2324		- if (event.getSource() == billboardItem)
	2339	+ if (source == billboardItem)
2325	2340	{
2326	2341	group(new BillboardNode());
2327	2342	} else
2328		- if (event.getSource() == shadowXItem)
	2343	+ if (source == shadowXItem)
2329	2344	{
2330	2345	CastShadow(0);
2331	2346	} else
2332		- if (event.getSource() == shadowYItem)
	2347	+ if (source == shadowYItem)
2333	2348	{
2334	2349	CastShadow(1);
2335	2350	} else
2336		- if (event.getSource() == shadowZItem)
	2351	+ if (source == shadowZItem)
2337	2352	{
2338	2353	CastShadow(2);
2339	2354	} else
2340		- if (event.getSource() == ungroupItem)
	2355	+ if (source == ungroupItem)
2341	2356	{
2342	2357	//ungroup();
2343	2358	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2349,179 +2364,179 @@
2349	2364
2350	2365	refreshContents();
2351	2366	} else
2352		- if (event.getSource() == genUVItem)
	2367	+ if (source == genUVItem)
2353	2368	{
2354	2369	GenUV();
2355	2370	} else
2356		- if (event.getSource() == genNormalsCADItem)
	2371	+ if (source == genNormalsCADItem)
2357	2372	{
2358	2373	GenNormals(true);
2359	2374	} else
2360		- if (event.getSource() == genNormalsMESHItem)
	2375	+ if (source == genNormalsMESHItem)
2361	2376	{
2362	2377	GenNormals(true); // TODO
2363	2378	} else
2364		- if (event.getSource() == genNormalsORGANItem)
	2379	+ if (source == genNormalsORGANItem)
2365	2380	{
2366	2381	GenNormals(false);
2367	2382	} else
2368		- if (event.getSource() == genNormalsMINEItem)
	2383	+ if (source == genNormalsMINEItem)
2369	2384	{
2370	2385	GenNormalsMINE();
2371	2386	} else
2372		- if (event.getSource() == stripifyItem)
	2387	+ if (source == stripifyItem)
2373	2388	{
2374	2389	Stripify();
2375	2390	} else
2376		- if (event.getSource() == unstripifyItem)
	2391	+ if (source == unstripifyItem)
2377	2392	{
2378	2393	Unstripify();
2379	2394	} else
2380		- if (event.getSource() == trimItem)
	2395	+ if (source == trimItem)
2381	2396	{
2382	2397	Trim();
2383	2398	} else
2384		- if (event.getSource() == untrimItem)
	2399	+ if (source == untrimItem)
2385	2400	{
2386	2401	Untrim();
2387	2402	} else
2388		- if (event.getSource() == clearColorsItem)
	2403	+ if (source == clearColorsItem)
2389	2404	{
2390	2405	ClearColors();
2391	2406	} else
2392		- if (event.getSource() == clearMaterialsItem)
	2407	+ if (source == clearMaterialsItem)
2393	2408	{
2394	2409	ClearMaterials();
2395	2410	} else
2396		- if (event.getSource() == liveleavesItem)
	2411	+ if (source == liveleavesItem)
2397	2412	{
2398	2413	LiveLeaves(true);
2399	2414	} else
2400		- if (event.getSource() == unliveleavesItem)
	2415	+ if (source == unliveleavesItem)
2401	2416	{
2402	2417	LiveLeaves(false);
2403	2418	} else
2404		- if (event.getSource() == supportleavesItem)
	2419	+ if (source == supportleavesItem)
2405	2420	{
2406	2421	SupportLeaves(true);
2407	2422	} else
2408		- if (event.getSource() == unsupportleavesItem)
	2423	+ if (source == unsupportleavesItem)
2409	2424	{
2410	2425	SupportLeaves(false);
2411	2426	} else
2412		- if (event.getSource() == hideleavesItem)
	2427	+ if (source == hideleavesItem)
2413	2428	{
2414	2429	HideLeaves(true);
2415	2430	} else
2416		- if (event.getSource() == showleavesItem)
	2431	+ if (source == showleavesItem)
2417	2432	{
2418	2433	HideLeaves(false);
2419	2434	} else
2420		- if (event.getSource() == markleavesItem)
	2435	+ if (source == markleavesItem)
2421	2436	{
2422	2437	MarkLeaves(true);
2423	2438	} else
2424		- if (event.getSource() == unmarkleavesItem)
	2439	+ if (source == unmarkleavesItem)
2425	2440	{
2426	2441	MarkLeaves(false);
2427	2442	} else
2428		- if (event.getSource() == flipVItem)
	2443	+ if (source == flipVItem)
2429	2444	{
2430	2445	FlipV(true);
2431	2446	} else
2432		- if (event.getSource() == unflipVItem)
	2447	+ if (source == unflipVItem)
2433	2448	{
2434	2449	FlipV(false);
2435	2450	} else
2436		- if (event.getSource() == lowTexturesItem)
	2451	+ if (source == lowTexturesItem)
2437	2452	{
2438	2453	SetTexRes(0);
2439	2454	} else
2440		- if (event.getSource() == normalTexturesItem)
	2455	+ if (source == normalTexturesItem)
2441	2456	{
2442	2457	SetTexRes(1);
2443	2458	} else
2444		- if (event.getSource() == highTexturesItem)
	2459	+ if (source == highTexturesItem)
2445	2460	{
2446	2461	SetTexRes(2);
2447	2462	} else
2448		- if (event.getSource() == veryhighTexturesItem)
	2463	+ if (source == veryhighTexturesItem)
2449	2464	{
2450	2465	SetTexRes(3);
2451	2466	} else
2452		- if (event.getSource() == maxTexturesItem)
	2467	+ if (source == maxTexturesItem)
2453	2468	{
2454	2469	SetTexRes(4);
2455	2470	} else
2456		- if (event.getSource() == panoTexturesItem)
	2471	+ if (source == panoTexturesItem)
2457	2472	{
2458	2473	SetTexRes(5);
2459	2474	} else
2460		- if (event.getSource() == reverseNormalsItem)
	2475	+ if (source == reverseNormalsItem)
2461	2476	{
2462	2477	ReverseNormals();
2463	2478	} else
2464		- if (event.getSource() == parseverticesItem)
	2479	+ if (source == parseverticesItem)
2465	2480	{
2466	2481	ParseVertices();
2467	2482	} else
2468		- if (event.getSource() == textureFieldItem)
	2483	+ if (source == textureFieldItem)
2469	2484	{
2470	2485	TextureVertices();
2471	2486	} else
2472		- if (event.getSource() == alignItem)
	2487	+ if (source == alignItem)
2473	2488	{
2474	2489	Align();
2475	2490	} else
2476		- if (event.getSource() == mirrorItem)
	2491	+ if (source == mirrorItem)
2477	2492	{
2478	2493	MirrorPoses();
2479	2494	} else
2480		- if (event.getSource() == reduceMorphItem)
	2495	+ if (source == reduceMorphItem)
2481	2496	{
2482	2497	MeshReduction(false);
2483	2498	} else
2484		- if (event.getSource() == reduce34MorphItem)
	2499	+ if (source == reduce34MorphItem)
2485	2500	{
2486	2501	MeshReduction(true);
2487	2502	} else
2488		- if (event.getSource() == reverseTrianglesItem)
	2503	+ if (source == reverseTrianglesItem)
2489	2504	{
2490	2505	ReverseTriangles();
2491	2506	} else
2492		- if (event.getSource() == reduceMeshItem)
	2507	+ if (source == reduceMeshItem)
2493	2508	{
2494	2509	ReduceMesh(false);
2495	2510	} else
2496		- if (event.getSource() == reduce34MeshItem)
	2511	+ if (source == reduce34MeshItem)
2497	2512	{
2498	2513	ReduceMesh(true);
2499	2514	} else
2500		- if (event.getSource() == increaseMeshItem)
	2515	+ if (source == increaseMeshItem)
2501	2516	{
2502	2517	IncreaseMesh();
2503	2518	} else
2504		- if (event.getSource() == clipMeshItem)
	2519	+ if (source == clipMeshItem)
2505	2520	{
2506	2521	ClipMesh();
2507	2522	} else
2508		- if (event.getSource() == smoothMeshItem)
	2523	+ if (source == smoothMeshItem)
2509	2524	{
2510	2525	SmoothMesh();
2511	2526	} else
2512		- if (event.getSource() == transformgeometryItem)
	2527	+ if (source == transformgeometryItem)
2513	2528	{
2514	2529	TransformGeometry();
2515	2530	} else
2516		- if (event.getSource() == resetTransformItem)
	2531	+ if (source == resetTransformItem)
2517	2532	{
2518	2533	ResetTransform();
2519	2534	} else
2520		- if (event.getSource() == resetCentroidItem)
	2535	+ if (source == resetCentroidItem)
2521	2536	{
2522	2537	ResetCentroid();
2523	2538	} else
2524		- if (event.getSource() == resetParentItem)
	2539	+ if (source == resetParentItem)
2525	2540	{
2526	2541	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2527	2542	{
..	..	@@ -2531,7 +2546,7 @@
2531	2546
2532	2547	refreshContents();
2533	2548	} else
2534		- if (event.getSource() == repairParentItem)
	2549	+ if (source == repairParentItem)
2535	2550	{
2536	2551	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2537	2552	{
..	..	@@ -2545,7 +2560,21 @@
2545	2560
2546	2561	refreshContents();
2547	2562	} else
2548		- if (event.getSource() == sortbysizeItem)
	2563	+ if (source == repairShadowItem)
	2564	+ {
	2565	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2566	+ {
	2567	+ Object3D obj = (Object3D)e.nextElement();
	2568	+ obj.RepairShadow();
	2569	+// for (int i=0; i<obj.size(); i++)
	2570	+// {
	2571	+// obj.get(i).parent = obj;
	2572	+// }
	2573	+ }
	2574	+
	2575	+ refreshContents();
	2576	+ } else
	2577	+ if (source == sortbysizeItem)
2549	2578	{
2550	2579	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2551	2580	{
..	..	@@ -2557,7 +2586,7 @@
2557	2586	ResetModel();
2558	2587	refreshContents();
2559	2588	} else
2560		- if (event.getSource() == sortbynameItem)
	2589	+ if (source == sortbynameItem)
2561	2590	{
2562	2591	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2563	2592	{
..	..	@@ -2569,7 +2598,7 @@
2569	2598	ResetModel();
2570	2599	refreshContents();
2571	2600	} else
2572		- if (event.getSource() == attachPigmentItem)
	2601	+ if (source == attachPigmentItem)
2573	2602	{
2574	2603	String texture = GetFile("Attach pigment");
2575	2604	Object3D obj;
..	..	@@ -2581,7 +2610,7 @@
2581	2610
2582	2611	refreshContents();
2583	2612	} else
2584		- if (event.getSource() == detachPigmentItem)
	2613	+ if (source == detachPigmentItem)
2585	2614	{
2586	2615	Object3D obj;
2587	2616	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2592,7 +2621,7 @@
2592	2621
2593	2622	refreshContents();
2594	2623	} else
2595		- if (event.getSource() == attachBumpItem)
	2624	+ if (source == attachBumpItem)
2596	2625	{
2597	2626	String texture = GetFile("Attach bump");
2598	2627	Object3D obj;
..	..	@@ -2604,7 +2633,7 @@
2604	2633
2605	2634	refreshContents();
2606	2635	} else
2607		- if (event.getSource() == detachBumpItem)
	2636	+ if (source == detachBumpItem)
2608	2637	{
2609	2638	Object3D obj;
2610	2639	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2615,7 +2644,7 @@
2615	2644
2616	2645	refreshContents();
2617	2646	} else
2618		- if (event.getSource() == pigmentBumpItem)
	2647	+ if (source == pigmentBumpItem)
2619	2648	{
2620	2649	Object3D obj;
2621	2650	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2626,158 +2655,195 @@
2626	2655
2627	2656	refreshContents();
2628	2657	} else
2629		- if (event.getSource() == flashSelectionButton)
	2658	+ if (source == flashSelectionButton)
2630	2659	{
2631	2660	CameraPane.flash = true;
2632	2661	refreshContents();
2633	2662	} else
2634		- if (event.getSource() == oneButton)
	2663	+ if (source == oneButton)
2635	2664	{
2636	2665	} else
2637		- if (event.getSource() == twoButton)
	2666	+ if (source == twoButton)
2638	2667	{
2639	2668	radio.layout = twoButton;
2640	2669	// bug
2641	2670	//gridPanel.setDividerLocation(1.0);
2642	2671	//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();
	2672	+// bigThree.remove(scenePanel);
	2673	+// bigThree.remove(centralPanel);
	2674	+// bigThree.remove(XYZPanel);
	2675	+// aWindowConstraints.gridx = 0;
	2676	+// aWindowConstraints.gridy = 0;
	2677	+// aWindowConstraints.gridwidth = 1;
	2678	+// // aConstraints.gridheight = 3;
	2679	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2680	+// aWindowConstraints.weightx = 0;
	2681	+// aWindowConstraints.weighty = 1;
	2682	+// //bigThree.add(jtp, aWindowConstraints);
	2683	+// aWindowConstraints.weightx = 1;
	2684	+// aWindowConstraints.gridwidth = 3;
	2685	+// // aConstraints.gridheight = 3;
	2686	+// aWindowConstraints.gridx = 1;
	2687	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2688	+// bigThree.add(centralPanel, aWindowConstraints);
	2689	+// aWindowConstraints.weightx = 0;
	2690	+// aWindowConstraints.gridx = 4;
	2691	+// aWindowConstraints.gridwidth = 1;
	2692	+// // aConstraints.gridheight = 3;
	2693	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2694	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2695	+// scenePanel.setVisible(false);
	2696	+// centralPanel.setVisible(true);
	2697	+// XYZPanel.setVisible(false);
	2698	+ bigThree.ClearUI();
	2699	+ bigThree.add(centralPanel);
	2700	+ bigThree.FlushUI();
2667	2701	} else
2668		- if (event.getSource() == threeButton)
	2702	+ if (source == threeButton)
2669	2703	{
2670	2704	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();
	2705	+
	2706	+// bigThree.remove(scenePanel);
	2707	+// bigThree.remove(centralPanel);
	2708	+// bigThree.remove(XYZPanel);
	2709	+// aWindowConstraints.gridx = 0;
	2710	+// aWindowConstraints.gridy = 0;
	2711	+// aWindowConstraints.gridwidth = 1;
	2712	+// // aConstraints.gridheight = 3;
	2713	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2714	+// aWindowConstraints.weightx = 0;
	2715	+// aWindowConstraints.weighty = 1;
	2716	+// //bigThree.add(jtp, aWindowConstraints);
	2717	+// aWindowConstraints.weightx = 1;
	2718	+// aWindowConstraints.gridwidth = 3;
	2719	+// // aConstraints.gridheight = 3;
	2720	+// aWindowConstraints.gridx = 1;
	2721	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2722	+// bigThree.add(centralPanel, aWindowConstraints);
	2723	+// aWindowConstraints.weightx = 0;
	2724	+// aWindowConstraints.gridx = 4;
	2725	+// aWindowConstraints.gridwidth = 1;
	2726	+// // aConstraints.gridheight = 3;
	2727	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2728	+// bigThree.add(XYZPanel, aWindowConstraints);
	2729	+// bigThree.validate();
	2730	+// scenePanel.setVisible(false);
	2731	+// centralPanel.setVisible(true);
	2732	+// XYZPanel.setVisible(true);
	2733	+ bigThree.ClearUI();
	2734	+ bigThree.add(centralPanel);
	2735	+ bigThree.add(XYZPanel);
	2736	+ bigThree.FlushUI();
2695	2737	} else
2696		- if (event.getSource() == fourButton)
	2738	+ if (source == fourButton)
2697	2739	{
2698	2740	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();
	2741	+
	2742	+// bigThree.remove(scenePanel);
	2743	+// bigThree.remove(centralPanel);
	2744	+// bigThree.remove(XYZPanel);
	2745	+// aWindowConstraints.gridx = 0;
	2746	+// aWindowConstraints.gridy = 0;
	2747	+// aWindowConstraints.gridwidth = 1;
	2748	+// // aWindowConstraints.gridheight = 3;
	2749	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2750	+// aWindowConstraints.weightx = 1;
	2751	+// aWindowConstraints.weighty = 1;
	2752	+// bigThree.add(scenePanel, aWindowConstraints);
	2753	+// aWindowConstraints.weightx = 1;
	2754	+// aWindowConstraints.gridwidth = 3;
	2755	+// // aConstraints.gridheight = 3;
	2756	+// aWindowConstraints.gridx = 1;
	2757	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2758	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2759	+// aWindowConstraints.weightx = 0;
	2760	+// aWindowConstraints.gridx = 4;
	2761	+// aWindowConstraints.gridwidth = 1;
	2762	+// // aWindowConstraints.gridheight = 3;
	2763	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2764	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2765	+// bigThree.validate();
	2766	+// scenePanel.setVisible(true);
	2767	+// centralPanel.setVisible(false);
	2768	+// XYZPanel.setVisible(false);
	2769	+ bigThree.ClearUI();
	2770	+ bigThree.add(scenePanel);
	2771	+ bigThree.FlushUI();
2723	2772	} else
2724		- if (event.getSource() == sixButton)
	2773	+ if (source == sixButton)
2725	2774	{
2726	2775	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();
	2776	+
	2777	+// bigThree.remove(scenePanel);
	2778	+// bigThree.remove(centralPanel);
	2779	+// bigThree.remove(XYZPanel);
	2780	+// aWindowConstraints.gridx = 0;
	2781	+// aWindowConstraints.gridy = 0;
	2782	+// aWindowConstraints.gridwidth = 1;
	2783	+// // aConstraints.gridheight = 3;
	2784	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2785	+// aWindowConstraints.weightx = 0;
	2786	+// aWindowConstraints.weighty = 1;
	2787	+// bigThree.add(scenePanel, aWindowConstraints);
	2788	+// aWindowConstraints.weightx = 1;
	2789	+// aWindowConstraints.gridwidth = 3;
	2790	+// // aWindowConstraints.gridheight = 3;
	2791	+// aWindowConstraints.gridx = 1;
	2792	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2793	+// bigThree.add(centralPanel, aWindowConstraints);
	2794	+// aWindowConstraints.weightx = 0;
	2795	+// aWindowConstraints.gridx = 4;
	2796	+// aWindowConstraints.gridwidth = 1;
	2797	+// // aWindowConstraints.gridheight = 3;
	2798	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2799	+// //bigThree.add(XYZPanel, aConstraints);
	2800	+// bigThree.validate();
	2801	+// scenePanel.setVisible(true);
	2802	+// centralPanel.setVisible(true);
	2803	+// XYZPanel.setVisible(false);
	2804	+ bigThree.ClearUI();
	2805	+ bigThree.add(scenePanel);
	2806	+ bigThree.add(centralPanel);
	2807	+ bigThree.FlushUI();
2751	2808	} else
2752		- if (event.getSource() == sevenButton)
	2809	+ if (source == sevenButton)
2753	2810	{
2754	2811	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();
	2812	+
	2813	+// bigThree.remove(scenePanel);
	2814	+// bigThree.remove(centralPanel);
	2815	+// bigThree.remove(XYZPanel);
	2816	+// aWindowConstraints.gridx = 0;
	2817	+// aWindowConstraints.gridy = 0;
	2818	+// aWindowConstraints.gridwidth = 1;
	2819	+// // aWindowConstraints.gridheight = 3;
	2820	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2821	+// aWindowConstraints.weightx = 0;
	2822	+// aWindowConstraints.weighty = 1;
	2823	+// bigThree.add(scenePanel, aWindowConstraints);
	2824	+// aWindowConstraints.weightx = 1;
	2825	+// aWindowConstraints.gridwidth = 3;
	2826	+// // aWindowConstraints.gridheight = 3;
	2827	+// aWindowConstraints.gridx = 1;
	2828	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2829	+// bigThree.add(centralPanel, aWindowConstraints);
	2830	+// aWindowConstraints.weightx = 0;
	2831	+// aWindowConstraints.gridx = 4;
	2832	+// aWindowConstraints.gridwidth = 1;
	2833	+// // aConstraints.gridheight = 3;
	2834	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2835	+// bigThree.add(XYZPanel, aWindowConstraints);
	2836	+// bigThree.validate();
	2837	+// scenePanel.setVisible(true);
	2838	+// centralPanel.setVisible(true);
	2839	+// XYZPanel.setVisible(true);
	2840	+ bigThree.ClearUI();
	2841	+ bigThree.add(scenePanel);
	2842	+ bigThree.add(centralPanel);
	2843	+ bigThree.add(XYZPanel);
	2844	+ bigThree.FlushUI();
2779	2845	} else
2780		- if (event.getSource() == rootButton)
	2846	+ if (source == rootButton)
2781	2847	{
2782	2848	Object3D obj;
2783	2849	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2789,7 +2855,7 @@
2789	2855
2790	2856	refreshContents(true);
2791	2857	} else
2792		- if (event.getSource() == closeButton)
	2858	+ if (source == closeButton)
2793	2859	{
2794	2860	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2795	2861	cRadio ab;
..	..	@@ -2810,11 +2876,11 @@
2810	2876	}
2811	2877	refreshContents(true);
2812	2878	} else
2813		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2879	+ if (source == editItem \|\| source == editButton)
2814	2880	{
2815	2881	EditSelection(false);
2816	2882	} else
2817		- if (event.getSource() == uneditButton)
	2883	+ if (source == uneditButton)
2818	2884	{
2819	2885	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2820	2886	{
..	..	@@ -2826,12 +2892,12 @@
2826	2892
2827	2893	child.editWindow = null; // ???????????
2828	2894	}
2829		- objEditor.ctrlPanel.revalidate();
	2895	+ objEditor.ctrlPanel.validate();
2830	2896	//objEditor.jTree.clearSelection();
2831	2897	//objEditor.ResetSliders();
2832	2898	refreshContents(true);
2833	2899	} else
2834		- if (event.getSource() == clearPanelButton)
	2900	+ if (source == clearPanelButton)
2835	2901	{
2836	2902	assert(copy == group);
2837	2903	//copy.ClearUI();
..	..	@@ -2842,7 +2908,7 @@
2842	2908	listUI.clear();
2843	2909	refreshContents(true);
2844	2910	} else
2845		- if (event.getSource() == allParamsButton)
	2911	+ if (source == allParamsButton)
2846	2912	{
2847	2913	assert(copy == group);
2848	2914
..	..	@@ -2863,19 +2929,19 @@
2863	2929
2864	2930	refreshContents(true);
2865	2931	} else
2866		- if (event.getSource() == unselectButton)
	2932	+ if (source == unselectButton)
2867	2933	{
2868	2934	objEditor.jTree.clearSelection();
2869	2935	// ?? oct 2012 GrafreeD.clipboard.clear();
2870	2936	objEditor.ResetSliders();
2871	2937	refreshContents(true);
2872	2938	} else
2873		- if(event.getSource() instanceof cRadio)
	2939	+ if(source instanceof cRadio)
2874	2940	{
2875	2941	group.parent = keepparent;
2876	2942	group.attributes = 0;
2877	2943	//group.editWindow = null;
2878		- /cRadio/ radio = (cRadio)event.getSource();
	2944	+ /cRadio/ radio = (cRadio)source;
2879	2945	Object3D obj = radio.GetObject();
2880	2946	System.out.println("Edit " + obj);
2881	2947	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2895,7 +2961,7 @@
2895	2961	}
2896	2962
2897	2963	copy = group;
2898		- //CameraPane.theRenderer.object = group;
	2964	+ //Globals.theRenderer.object = group;
2899	2965	if(!useclient)
2900	2966	{
2901	2967	cameraView.renderCamera = radio.camera;
..	..	@@ -2904,7 +2970,8 @@
2904	2970	cameraView.cameras[cameraView.cameracount] = radio.camera;
2905	2971	cameraView.targetLookAt.set(radio.camera.lookAt);
2906	2972	cameraView.object = group;
2907		- cameraView.lighttouched = true;
	2973	+ //cameraView.lighttouched = true;
	2974	+ Globals.lighttouched = true;
2908	2975	topView.object = group;
2909	2976	frontView.object = group;
2910	2977	sideView.object = group;
..	..	@@ -2940,7 +3007,7 @@
2940	3007	if (useclient)
2941	3008	{
2942	3009	cameraView.object = client;
2943		- cameraView.lighttouched = true;
	3010	+ Globals.lighttouched = true;
2944	3011	//topView.object = client;
2945	3012	//frontView.object = client;
2946	3013	//sideView.object = client;
..	..	@@ -2948,7 +3015,7 @@
2948	3015	else
2949	3016	{
2950	3017	cameraView.object = group;
2951		- cameraView.lighttouched = true;
	3018	+ Globals.lighttouched = true;
2952	3019	//topView.object = group;
2953	3020	//frontView.object = group;
2954	3021	//sideView.object = group;
..	..	@@ -3456,7 +3523,7 @@
3456	3523	String pigment = Object3D.GetPigment(tex);
3457	3524	//String bump = Object3D.GetBump(tex);
3458	3525
3459		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3526	+ com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3460	3527
3461	3528	double s = v.s;
3462	3529
..	..	@@ -3757,7 +3824,7 @@
3757	3824	group.selection.RelinkToSupport(); // july 2014
3758	3825	System.out.println("DONE.");
3759	3826	refreshContents();
3760		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3827	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3761	3828	}
3762	3829
3763	3830	void ReduceMesh(boolean reduction34)
..	..	@@ -4033,25 +4100,25 @@
4033	4100	System.err.println("info : " + child.GetPath());
4034	4101	}
4035	4102	}
4036		- else
4037		- {
4038		- objEditor.SetMaterial(group); // .GetMaterial());
4039		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4040		- System.err.println("info : " + group.GetPath());
4041		- }
	4103	+// else
	4104	+// {
	4105	+// objEditor.SetMaterial(group); // .GetMaterial());
	4106	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4107	+// System.err.println("info : " + group.GetPath());
	4108	+// }
4042	4109
4043	4110	objEditor.SetText(); // jan 2014
4044	4111
4045		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4112	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
4046	4113	CameraPane.flash = true;
4047	4114
4048	4115	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
4049	4116	// a camera
4050	4117	{
4051	4118	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;
	4119	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4120	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4121	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4055	4122	}
4056	4123
4057	4124	refreshContents();
..	..	@@ -5009,6 +5076,7 @@
5009	5076
5010	5077	private MenuItem resetParentItem;
5011	5078	private MenuItem repairParentItem;
	5079	+ private MenuItem repairShadowItem;
5012	5080	private MenuItem sortbysizeItem;
5013	5081	private MenuItem sortbynameItem;
5014	5082