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