~nbriere/GrafreeD.git - Noware Git Repository

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