~nbriere/GrafreeD.git - Noware Git Repository

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