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