~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,
..	..	@@ -219,6 +220,8 @@
219	220	resetsupportItem.addActionListener(this);
220	221	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	222	linkverticesItem.addActionListener(this);
	223	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	224	+ relinkverticesItem.addActionListener(this);
222	225	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	226	setMasterItem.addActionListener(this);
224	227
..	..	@@ -231,6 +234,10 @@
231	234	frontItem.addActionListener(this);
232	235	compositeItem = menu.add(new MenuItem("Composite"));
233	236	compositeItem.addActionListener(this);
	237	+ hideItem = menu.add(new MenuItem("Hide"));
	238	+ hideItem.addActionListener(this);
	239	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	240	+ ungroupItem.addActionListener(this);
234	241	menu.add("-");
235	242	randomItem = menu.add(new MenuItem("Random"));
236	243	randomItem.addActionListener(this);
..	..	@@ -252,6 +259,8 @@
252	259	oe.menuBar.add(menu = new Menu("Object"));
253	260	textureItem = menu.add(new MenuItem("Texture"));
254	261	textureItem.addActionListener(this);
	262	+ billboardItem = menu.add(new MenuItem("Billboard"));
	263	+ billboardItem.addActionListener(this);
255	264	csgItem = menu.add(new MenuItem("CSG"));
256	265	csgItem.addActionListener(this);
257	266	shadowXItem = menu.add(new MenuItem("Shadow X"));
..	..	@@ -269,14 +278,12 @@
269	278	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	279	pointflowItem.addActionListener(this);
271	280	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	281	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	282	resetTransformItem.addActionListener(this);
276	283	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	284	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	285	+ transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
	286	+ transformgeometryItem.addActionListener(this);
280	287
281	288	oe.menuBar.add(menu = new Menu("Geometry"));
282	289	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -287,6 +294,8 @@
287	294	genNormalsCADItem.addActionListener(this);
288	295	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
289	296	genNormalsMESHItem.addActionListener(this);
	297	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	298	+ genNormalsMINEItem.addActionListener(this);
290	299	stripifyItem = menu.add(new MenuItem("Stripify"));
291	300	stripifyItem.addActionListener(this);
292	301	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -425,84 +434,26 @@
425	434	oe.radioPanel.add(dummyButton);
426	435	oe.buttonGroup.add(dummyButton);
427	436	*/
428		- aConstraints.gridy += 1;
429		- oe.aConstraints.gridwidth = 1;
430		- oe.aConstraints.gridx = 0;
	437	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
431	438
432		- 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");
433	441	liveCB.addItemListener(this);
434	442
435		- oe.aConstraints.gridx += 1;
436		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
437		- supportCB.addItemListener(this);
438		-
439		- // oe.aConstraints.gridx += 1;
440		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
441		- // localCB.addItemListener(this);
442		-
443		- oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
445		- crowdCB.addItemListener(this);
446		-
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
449		- smoothCB.addItemListener(this);
450		-
451		- oe.aConstraints.gridx += 1;
452		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
453		- fastCB.addItemListener(this);
454		- oe.aConstraints.gridx += 1;
455		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
456		- slowCB.addItemListener(this);
457		- oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
459		- boxCB.addItemListener(this);
460		-
461		-// oe.aConstraints.gridx += 1;
462		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
463		-// speakerMocapCB.addItemListener(this);
464		-
465		- if (false)
466		- {
467		- // handled in scripts
468		- oe.aConstraints.gridx += 1;
469		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
470		- speakerCameraCB.addItemListener(this);
471		-
472		- oe.aConstraints.gridx += 1;
473		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
474		- speakerFocusCB.addItemListener(this);
475		-
476		- oe.aConstraints.gridx += 1;
477		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
478		- smoothfocusCB.addItemListener(this);
479		- }
480		-
481		-//oe.aConstraints.gridx += 1;
482		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
483		-// debugCB.addItemListener(this);
484		-
485		- oe.aConstraints.gridx += 1;
486		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
487		- oeilCB.addItemListener(this);
488		-
489		- oe.aConstraints.gridx += 1;
490		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
491		- lookAtCB.addItemListener(this);
492		-
493		- oe.aConstraints.gridx += 1;
494		- 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");
495	445	trackCB.addItemListener(this);
496	446
497		- oe.aConstraints.gridx += 1;
498		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	447	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	448	+ screenfitButton.setToolTipText("Screen fit");
499	449	screenfitButton.addActionListener(this);
500		- oe.aConstraints.gridx += 1;
	450	+
501	451	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
502	452	// screenfitpointButton.addActionListener(this);
503	453	// oe.aConstraints.gridx += 1;
504		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
	454	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
505	455	snapobjectButton.addActionListener(this);
	456	+ snapobjectButton.setToolTipText("Snap Object");
506	457	oe.aConstraints.gridx += 1;
507	458
508	459	//aConstraints.gridx = 0;
..	..	@@ -510,65 +461,66 @@
510	461	oe.aConstraints.weighty = 0;
511	462	oe.aConstraints.gridwidth = 1;
512	463
513		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	464	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	465	+ flashSelectionButton.setToolTipText("Show selection");
514	466	flashSelectionButton.addActionListener(this);
515		- oe.aConstraints.gridx += 1;
516		- oe.aConstraints.weighty = 0;
517		- oe.aConstraints.gridwidth = 1;
518	467
519		- //
520		- 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");
521	472	twoButton.addActionListener(this);
522		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	473	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
523	474	fourButton.addActionListener(this);
524		- 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");
525	478	sixButton.addActionListener(this);
526		- 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");
527	481	threeButton.addActionListener(this);
528		- 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");
529	484	sevenButton.addActionListener(this);
530	485	//
531	486
532		- 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");
533	489	rootButton.addActionListener(this);
534		- oe.aConstraints.gridx += 1;
535		- 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");
536	493	closeButton.addActionListener(this);
537	494	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
538	495	//clearButton.addActionListener(this);
539		- oe.aConstraints.gridx += 1;
540	496
541		- oe.aConstraints.gridx = 1; //
542		- 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");
543	501	editButton.addActionListener(this);
544		- oe.aConstraints.gridx += 1;
545		- oe.aConstraints.weighty = 0;
546		- oe.aConstraints.gridwidth = 1;
547	502
548		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	503	+ commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	504	+ uneditButton.setToolTipText("Unedit selection");
549	505	uneditButton.addActionListener(this);
550	506
551		- oe.aConstraints.gridx += 1;
552		- oe.aConstraints.weighty = 0;
553		- oe.aConstraints.gridwidth = 1;
554		-
555		- 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");
556	509	clearPanelButton.addActionListener(this);
557	510
558		- oe.aConstraints.gridx += 1;
559		- oe.aConstraints.weighty = 0;
560		- oe.aConstraints.gridwidth = 1;
561		-
562		- 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??");
563	513	allParamsButton.addActionListener(this);
564	514
565		- oe.aConstraints.gridx += 1;
566		- oe.aConstraints.weighty = 0;
567		- oe.aConstraints.gridwidth = 1;
568		-
569		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	515	+ commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	516	+ unselectButton.setToolTipText("Unselect");
570	517	unselectButton.addActionListener(this);
571	518
	519	+ commandsPanel.preferredHeight = 1;
	520	+
	521	+ oe.treePanel.add(commandsPanel);
	522	+ oe.treePanel.Return();
	523	+
572	524	// oe.aConstraints.gridx += 1;
573	525	// oe.aConstraints.weighty = 0;
574	526	// oe.aConstraints.gridwidth = 1;
..	..	@@ -580,40 +532,37 @@
580	532	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
581	533	// gcButton.addActionListener(this);
582	534
583		- oe.aConstraints.gridx = 0;
584		- oe.aConstraints.gridy += 1;
585		-
586		- //ctrlPanel.add(objList = new List(5, true));
587		- oe.aConstraints.gridwidth = 100;
588		- // oe.aConstraints.gridheight = 100;
589		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
590		- oe.aConstraints.gridheight = 1;
591		- oe.aConstraints.weighty = 0.5;
592		- oe.aConstraints.gridx = 0;
593		- JScrollPane jSP;
	535	+ cGridBag jSPPanel = new cGridBag();
	536	+
	537	+ JScrollPane jSP;
594	538	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
595		- 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);
596	540	ResetModel();
597		- oe.aConstraints.weighty = 0.5;
598		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
599		- oe.aConstraints.gridy += 1;
600		- oe.aConstraints.gridwidth = 1;
	541	+
	542	+ oe.treePanel.add(jSPPanel);
	543	+ oe.treePanel.Return();
601	544
602		- oe.aConstraints.weighty = 0;
603		- oe.aConstraints.gridwidth = 2;
604		-
605		- 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");
606	549	colorCB.addItemListener(this);
607		- oe.aConstraints.gridx += 2;
608		- 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");
609	553	materialCB.addItemListener(this);
610		- oe.aConstraints.gridx += 2;
611		- 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");
612	557	textureCB.addItemListener(this);
613	558
614		- oe.aConstraints.gridx = 0;
615		- oe.aConstraints.gridy += 1;
	559	+ copyOptionsPanel.preferredHeight = 1;
	560	+ oe.treePanel.add(copyOptionsPanel);
	561	+ oe.treePanel.Return();
616	562
	563	+// mainPanel.setDividerLocation(0.5); //1.0);
	564	+// mainPanel.setResizeWeight(0.5);
	565	+
617	566	//jList.addListSelectionListener(this);
618	567	oe.jTree.addTreeSelectionListener(this);
619	568	//jTree.setRootVisible(false);
..	..	@@ -635,17 +584,97 @@
635	584	radio.layout = sevenButton;
636	585	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
637	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	+ }
638	667
639	668	void EditObject(Object3D obj)
640	669	{
641		- cRadio dummyButton = new cRadio(obj.name);
642		- dummyButton.SetObject(obj);
643		- dummyButton.layout = sevenButton;
644		- dummyButton.SetCamera(cameraView.renderCamera, false);
645		- dummyButton.addActionListener(this);
646		- radioPanel.add(dummyButton);
647		- buttonGroup.add(dummyButton);
648		- 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();
649	678	}
650	679	void SetupViews(ObjEditor oe)
651	680	{
..	..	@@ -665,6 +694,7 @@
665	694	JCheckBox fastCB;
666	695	JCheckBox slowCB;
667	696	JCheckBox boxCB;
	697	+ JCheckBox zoomBoxCB;
668	698	JCheckBox trackCB;
669	699	JCheckBox smoothfocusCB;
670	700	// JCheckBox speakerMocapCB;
..	..	@@ -707,8 +737,7 @@
707	737	dropAttributes \|= Object3D.TEXTURE;
708	738	else
709	739	dropAttributes &= ~Object3D.TEXTURE;
710		- }
711		- else if(e.getSource() == liveCB)
	740	+ } else if(e.getSource() == liveCB)
712	741	{
713	742	cameraView.ToggleLive();
714	743	}
..	..	@@ -745,6 +774,10 @@
745	774	Recompile();
746	775	cameraView.repaint();
747	776	// refreshContents();
	777	+ }
	778	+ else if(e.getSource() == zoomBoxCB)
	779	+ {
	780	+ cameraView.ToggleZoomBoxMode();
748	781	}
749	782	else if(e.getSource() == smoothfocusCB)
750	783	{
..	..	@@ -1035,6 +1068,8 @@
1035	1068	torusItem.addActionListener(this);
1036	1069	superItem = menu.add(new MenuItem("Superellipsoid"));
1037	1070	superItem.addActionListener(this);
	1071	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1072	+ kleinItem.addActionListener(this);
1038	1073	particleItem = menu.add(new MenuItem("Particle system"));
1039	1074	particleItem.addActionListener(this);
1040	1075	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1108,6 +1143,8 @@
1108	1143	resetParentItem.addActionListener(this);
1109	1144	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1110	1145	repairParentItem.addActionListener(this);
	1146	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1147	+ repairShadowItem.addActionListener(this);
1111	1148	menu.add(invariantsItem = new MenuItem("Invariants"));
1112	1149	invariantsItem.addActionListener(this);
1113	1150	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1468,6 +1505,7 @@
1468	1505	//
1469	1506	public void actionPerformed(ActionEvent event) // , Object arg)
1470	1507	{
	1508	+ Object source = event.getSource();
1471	1509	/*
1472	1510	if (event.getSource() == nameField)
1473	1511	{
..	..	@@ -1479,11 +1517,11 @@
1479	1517	}
1480	1518	else
1481	1519	*/
1482		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1520	+ if (source == lookAtItem \|\| source == lookFromItem)
1483	1521	{
1484	1522	ScreenFit();
1485	1523	} else
1486		- if (event.getSource() == switchItem)
	1524	+ if (source == switchItem)
1487	1525	{
1488	1526	cVector v1 = new cVector();
1489	1527	cVector v2 = new cVector();
..	..	@@ -1492,11 +1530,11 @@
1492	1530	objEditor.cameraView.renderCamera.setAim(v2, v1);
1493	1531	objEditor.cameraView.repaint();
1494	1532	} else
1495		- if (event.getSource() == rectoidItem)
	1533	+ if (source == rectoidItem)
1496	1534	{
1497	1535	makeSomething(new Box());
1498	1536	} else
1499		- if (event.getSource() == particleItem)
	1537	+ if (source == particleItem)
1500	1538	{
1501	1539	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1502	1540	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1517,9 +1555,9 @@
1517	1555	applyExample(particleGeom, "SMOKE");
1518	1556	makeSomething(particleGeom);
1519	1557	} else
1520		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1558	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1521	1559	{
1522		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1560	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1523	1561
1524	1562	ragdoll.toParent = LA.newMatrix();
1525	1563	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1537,7 +1575,7 @@
1537	1575	} else
1538	1576	/*
1539	1577	*/
1540		- if (event.getSource() == heightFieldItem)
	1578	+ if (source == heightFieldItem)
1541	1579	{
1542	1580	Object3D obj = new Object3D();
1543	1581
..	..	@@ -1575,27 +1613,31 @@
1575	1613
1576	1614	makeSomething(obj);
1577	1615	} else
1578		- if (event.getSource() == gridItem)
	1616	+ if (source == gridItem)
1579	1617	{
1580	1618	makeSomething(new Grid());
1581	1619	} else
1582		- if (event.getSource() == ellipsoidItem)
	1620	+ if (source == ellipsoidItem)
1583	1621	{
1584	1622	makeSomething(new Sphere());
1585	1623	} else
1586		- if (event.getSource() == coneItem)
	1624	+ if (source == coneItem)
1587	1625	{
1588	1626	makeSomething(new Cone());
1589	1627	} else
1590		- if (event.getSource() == torusItem)
	1628	+ if (source == torusItem)
1591	1629	{
1592	1630	makeSomething(new Torus());
1593	1631	} else
1594		- if (event.getSource() == superItem)
	1632	+ if (source == superItem)
1595	1633	{
1596	1634	makeSomething(new Superellipsoid());
1597	1635	} else
1598		- if (event.getSource() == blobItem)
	1636	+ if (source == kleinItem)
	1637	+ {
	1638	+ makeSomething(new Klein());
	1639	+ } else
	1640	+ if (source == blobItem)
1599	1641	{
1600	1642	Blob blob = new Blob();
1601	1643	BlobComponent comp = new BlobComponent();
..	..	@@ -1603,15 +1645,15 @@
1603	1645	//blob.retile();
1604	1646	makeSomething(blob);
1605	1647	} else
1606		- if (event.getSource() == latheItem)
	1648	+ if (source == latheItem)
1607	1649	{
1608	1650	makeSomething(new Lathe());
1609	1651	} else
1610		- if (event.getSource() == bezierItem)
	1652	+ if (source == bezierItem)
1611	1653	{
1612	1654	makeSomething(new BezierSurface());
1613	1655	} else
1614		- if (event.getSource() == checkerItem)
	1656	+ if (source == checkerItem)
1615	1657	{
1616	1658	/*
1617	1659	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1626,7 +1668,7 @@
1626	1668	*/
1627	1669	makeSomething(new Checker());
1628	1670	} else
1629		- if (event.getSource() == meshItem)
	1671	+ if (source == meshItem)
1630	1672	{
1631	1673	Object3D itemtomake = new Object3D();
1632	1674	Object3D child;
..	..	@@ -1647,35 +1689,35 @@
1647	1689	makeSomething(child);
1648	1690	}
1649	1691	} else
1650		- if (event.getSource() == springItem)
	1692	+ if (source == springItem)
1651	1693	{
1652	1694	cSpring s = new cSpring();
1653	1695	s.setup();
1654	1696	makeSomething(s);
1655	1697	} else
1656		- if (event.getSource() == flagItem)
	1698	+ if (source == flagItem)
1657	1699	{
1658	1700	cSpring s = new cFlag();
1659	1701	s.setup();
1660	1702	makeSomething(s);
1661	1703	} else
1662		- if (event.getSource() == lightItem)
	1704	+ if (source == lightItem)
1663	1705	{
1664	1706	makeSomething(new Light());
1665	1707	} else
1666		- if (event.getSource() == csgItem)
	1708	+ if (source == csgItem)
1667	1709	{
1668	1710	group(new CSG());
1669	1711	} else
1670		- if (event.getSource() == templateItem)
	1712	+ if (source == templateItem)
1671	1713	{
1672	1714	group(new cTemplate());
1673	1715	} else
1674		- if (event.getSource() == attributeItem)
	1716	+ if (source == attributeItem)
1675	1717	{
1676	1718	makeSomething(new Attribute());
1677	1719	} else
1678		- if (event.getSource() == pointflowItem)
	1720	+ if (source == pointflowItem)
1679	1721	{
1680	1722	makeSomething(new PointFlow());
1681	1723	} else
..	..	@@ -1687,7 +1729,7 @@
1687	1729	} else
1688	1730	*/
1689	1731
1690		- if (event.getSource() == superLoopItem)
	1732	+ if (source == superLoopItem)
1691	1733	{
1692	1734	Composite g = new cGroup();
1693	1735	for (int i=0; i<15; i++)
..	..	@@ -1709,7 +1751,7 @@
1709	1751
1710	1752	group(g);
1711	1753	} else
1712		- if (event.getSource() == loopItem)
	1754	+ if (source == loopItem)
1713	1755	{
1714	1756	Composite csg = new GroupLeaf();
1715	1757	csg.count = 5;
..	..	@@ -1718,7 +1760,7 @@
1718	1760	csg.addChild(child);
1719	1761	child.addChild(csg);
1720	1762	} else
1721		- if (event.getSource() == doubleItem)
	1763	+ if (source == doubleItem)
1722	1764	{
1723	1765	Composite csg = new GroupLeaf();
1724	1766	csg.count = 5;
..	..	@@ -1730,7 +1772,7 @@
1730	1772	csg.addChild(child);
1731	1773	child.addChild(csg);
1732	1774	} else
1733		- if (event.getSource() == tripleItem)
	1775	+ if (source == tripleItem)
1734	1776	{
1735	1777	Composite csg = new GroupLeaf();
1736	1778	csg.count = 4;
..	..	@@ -1746,70 +1788,70 @@
1746	1788	child.addChild(csg);
1747	1789	} else
1748	1790
1749		- if (event.getSource() == importGFDItem)
	1791	+ if (source == importGFDItem)
1750	1792	{
1751	1793	ImportGFD();
1752	1794	} else
1753		- if (event.getSource() == importVRMLX3DItem)
	1795	+ if (source == importVRMLX3DItem)
1754	1796	{
1755	1797	ImportVRMLX3D();
1756	1798	} else
1757		- if (event.getSource() == import3DSItem)
	1799	+ if (source == import3DSItem)
1758	1800	{
1759	1801	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1760	1802	} else
1761		- if (event.getSource() == importOBJItem)
	1803	+ if (source == importOBJItem)
1762	1804	{
1763	1805	objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1764	1806	} else
1765		- if (event.getSource() == computeAOItem)
	1807	+ if (source == computeAOItem)
1766	1808	{
1767		- CameraPane.drawMode = CameraPane.OCCLUSION;
1768		- CameraPane.theRenderer.repaint();
	1809	+ Globals.drawMode = CameraPane.OCCLUSION;
	1810	+ Globals.theRenderer.repaint();
1769	1811	} else
1770		- if (event.getSource() == recompileItem)
	1812	+ if (source == recompileItem)
1771	1813	{
1772	1814	Recompile();
1773	1815	refreshContents();
1774	1816	} else
1775		- if (event.getSource() == editScriptItem)
	1817	+ if (source == editScriptItem)
1776	1818	{
1777	1819	OpenDialog();
1778	1820	refreshContents();
1779	1821	} else
1780		- if (event.getSource() == invariantsItem)
	1822	+ if (source == invariantsItem)
1781	1823	{
1782	1824	System.out.println("Invariants:");
1783		- GrafreeD.theApplet3D.universe.invariants();
	1825	+ GrafreeD.grafreeD.universe.invariants();
1784	1826	} else
1785		- if (event.getSource() == memoryItem)
	1827	+ if (source == memoryItem)
1786	1828	{
1787	1829	//System.out.println("Invariants:");
1788	1830	PrintMemory();
1789	1831	} else
1790		- if (event.getSource() == pathItem)
	1832	+ if (source == pathItem)
1791	1833	{
1792	1834	PrintPath();
1793	1835	} else
1794		- if (event.getSource() == analyzeItem)
	1836	+ if (source == analyzeItem)
1795	1837	{
1796	1838	AnalyzeObject();
1797	1839	} else
1798		- if (event.getSource() == dumpItem)
	1840	+ if (source == dumpItem)
1799	1841	{
1800	1842	DumpObject();
1801	1843	} else
1802		- if (event.getSource() == screenfitButton)
	1844	+ if (source == screenfitButton)
1803	1845	{
1804	1846	//Reload(lastConverter, lastFilename, true);
1805	1847	ScreenFit();
1806	1848	} else
1807		- if (event.getSource() == screenfitpointButton)
	1849	+ if (source == screenfitpointButton)
1808	1850	{
1809	1851	//Reload(lastConverter, lastFilename, true);
1810	1852	ScreenFitPoint();
1811	1853	} else
1812		- if (event.getSource() == snapobjectButton)
	1854	+ if (source == snapobjectButton)
1813	1855	{
1814	1856	//Reload(lastConverter, lastFilename, true);
1815	1857	SnapObject();
..	..	@@ -1820,13 +1862,13 @@
1820	1862	// Recompile();
1821	1863	// refreshContents();
1822	1864	// } else
1823		- if (event.getSource() == gcButton)
	1865	+ if (source == gcButton)
1824	1866	{
1825	1867	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	1868	System.gc();
1827	1869	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1828	1870	} else
1829		- if (event.getSource() == editLeafItem)
	1871	+ if (source == editLeafItem)
1830	1872	{
1831	1873	Object3D obj;
1832	1874	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1840,62 +1882,62 @@
1840	1882	}
1841	1883	refreshContents(true);
1842	1884	} else
1843		- if (event.getSource() == openWindowItem)
	1885	+ if (source == openWindowItem)
1844	1886	{
1845	1887	EditSelection(true);
1846	1888	} else
1847		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1889	+ if (source == cutItem \|\| source == clearButton)
1848	1890	{
1849	1891	loadClipboard(true);
1850	1892	} else
1851		- if (event.getSource() == duplicateItem)
	1893	+ if (source == duplicateItem)
1852	1894	{
1853	1895	Object3D keep = GrafreeD.clipboard;
1854	1896	loadClipboard(false);
1855	1897	paste(false);
1856	1898	GrafreeD.clipboard = keep;
1857	1899	} else
1858		- if (event.getSource() == cloneItem)
	1900	+ if (source == cloneItem)
1859	1901	{
1860	1902	CloneSelection(false);
1861	1903	} else
1862		- if (event.getSource() == cloneSupportItem)
	1904	+ if (source == cloneSupportItem)
1863	1905	{
1864	1906	CloneSelection(true);
1865	1907	} else
1866		- if (event.getSource() == copyItem)
	1908	+ if (source == copyItem)
1867	1909	{
1868	1910	loadClipboard(false);
1869	1911	} else
1870		- if (event.getSource() == pasteItem)
	1912	+ if (source == pasteItem)
1871	1913	{
1872	1914	paste(false);
1873	1915	} else
1874		- if (event.getSource() == pasteLinkItem)
	1916	+ if (source == pasteLinkItem)
1875	1917	{
1876	1918	pasteInto(false);
1877	1919	} else
1878		- if (event.getSource() == pasteCloneItem)
	1920	+ if (source == pasteCloneItem)
1879	1921	{
1880	1922	pasteInto(true);
1881	1923	} else
1882		- if (event.getSource() == pasteExpandItem)
	1924	+ if (source == pasteExpandItem)
1883	1925	{
1884	1926	paste(true);
1885	1927	} else
1886		- if (event.getSource() == synchronizeItem)
	1928	+ if (source == synchronizeItem)
1887	1929	{
1888	1930	Overwrite(Object3D.TRANSFORM);
1889	1931	} else
1890		- if (event.getSource() == overwriteNameItem)
	1932	+ if (source == overwriteNameItem)
1891	1933	{
1892	1934	Overwrite(Object3D.NAME);
1893	1935	} else
1894		- if (event.getSource() == overwriteUVItem)
	1936	+ if (source == overwriteUVItem)
1895	1937	{
1896	1938	Overwrite(Object3D.UV);
1897	1939	} else
1898		- if (event.getSource() == overwriteMatItem)
	1940	+ if (source == overwriteMatItem)
1899	1941	{
1900	1942	/* july 2015
1901	1943	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1915,7 +1957,7 @@
1915	1957
1916	1958	Overwrite(dropAttributes);
1917	1959	}
1918		- if (event.getSource() == overwriteGeoItem)
	1960	+ if (source == overwriteGeoItem)
1919	1961	{
1920	1962	Overwrite(Object3D.GEOMETRY);
1921	1963	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1932,7 +1974,7 @@
1932	1974	// refreshContents();
1933	1975	// }
1934	1976	} else
1935		- if (event.getSource() == generateMeshItem)
	1977	+ if (source == generateMeshItem)
1936	1978	{
1937	1979	//if (group.selection.size() == 1)
1938	1980	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1943,7 +1985,7 @@
1943	1985	ResetModel();
1944	1986	refreshContents();
1945	1987	} else
1946		- if (event.getSource() == extractGeometriesItem)
	1988	+ if (source == extractGeometriesItem)
1947	1989	{
1948	1990	boolean one = false;
1949	1991
..	..	@@ -1970,7 +2012,7 @@
1970	2012	ResetModel();
1971	2013	refreshContents();
1972	2014	} else
1973		- if (event.getSource() == cloneGeometriesItem)
	2015	+ if (source == cloneGeometriesItem)
1974	2016	{
1975	2017	boolean one = false;
1976	2018
..	..	@@ -1996,32 +2038,37 @@
1996	2038	ResetModel();
1997	2039	refreshContents();
1998	2040	} else
1999		- if (event.getSource() == shareGeometriesItem)
	2041	+ if (source == shareGeometriesItem)
2000	2042	{
2001	2043	boolean one = false;
2002	2044
2003	2045	if (group.selection.size() == 1)
2004	2046	one = true;
2005	2047
	2048	+ Object3D merge = null;
	2049	+
2006	2050	Object3D content = new cGroup();
2007	2051
2008	2052	for (int i=0; i<group.selection.size(); i++)
2009	2053	{
2010		- Object3D sel = new Merge(group.selection.get(i));
	2054	+ merge = new Merge(group.selection.get(i));
2011	2055
2012	2056	if (one)
2013		- makeSomething(sel, false);
	2057	+ makeSomething(merge, false);
2014	2058	else
2015		- content.addChild(sel);
	2059	+ content.addChild(merge);
2016	2060	}
2017	2061
2018	2062	if (!one)
2019		- makeSomething(content, false);
2020		-
2021		- ResetModel();
2022		- refreshContents();
	2063	+ makeSomething(content, true);
	2064	+ else
	2065	+ {
	2066	+ ResetModel();
	2067	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2068	+ refreshContents();
	2069	+ }
2023	2070	} else
2024		- if (event.getSource() == mergeGeometriesItem)
	2071	+ if (source == mergeGeometriesItem)
2025	2072	{
2026	2073	boolean one = false;
2027	2074
..	..	@@ -2051,7 +2098,7 @@
2051	2098	ResetModel();
2052	2099	refreshContents();
2053	2100	} else
2054		- if (event.getSource() == linkverticesItem)
	2101	+ if (source == linkverticesItem)
2055	2102	{
2056	2103	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2057	2104	// {
..	..	@@ -2071,7 +2118,7 @@
2071	2118	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	2119	content = ((cGroup)content).get(0);
2073	2120
2074		- 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));
2075	2122	for (int i=0; i<group.selection.size(); i++)
2076	2123	{
2077	2124	boolean random = CameraPane.RANDOM;
..	..	@@ -2080,11 +2127,11 @@
2080	2127	// group.selection.get(i).setMasterThis(content); // should be identity
2081	2128	CameraPane.RANDOM = random;
2082	2129	}
2083		- 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));
2084	2131	refreshContents();
2085	2132	}
2086	2133	} else
2087		- if (event.getSource() == resetsupportItem)
	2134	+ if (source == resetsupportItem)
2088	2135	{
2089	2136	for (int i=0; i<group.selection.size(); i++)
2090	2137	{
..	..	@@ -2096,7 +2143,16 @@
2096	2143
2097	2144	refreshContents();
2098	2145	} else
2099		- if (event.getSource() == resetreferencesItem)
	2146	+ if (source == relinkverticesItem)
	2147	+ {
	2148	+ boolean random = CameraPane.RANDOM;
	2149	+ CameraPane.RANDOM = false; // parse all random nodes
	2150	+ group.selection.RelinkToSupport();
	2151	+ CameraPane.RANDOM = random;
	2152	+
	2153	+ refreshContents();
	2154	+ } else
	2155	+ if (source == resetreferencesItem)
2100	2156	{
2101	2157	for (int i=0; i<group.selection.size(); i++)
2102	2158	{
..	..	@@ -2105,7 +2161,7 @@
2105	2161
2106	2162	refreshContents();
2107	2163	} else
2108		- if (event.getSource() == setMasterItem)
	2164	+ if (source == setMasterItem)
2109	2165	{
2110	2166	if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2111	2167	{
..	..	@@ -2118,7 +2174,7 @@
2118	2174	refreshContents();
2119	2175	}
2120	2176	} else
2121		- if (event.getSource() == poseMeshItem)
	2177	+ if (source == poseMeshItem)
2122	2178	{
2123	2179	if (group.selection.size() == 1)
2124	2180	{
..	..	@@ -2137,19 +2193,19 @@
2137	2193	}
2138	2194
2139	2195	} else
2140		- if (event.getSource() == revertMeshItem)
	2196	+ if (source == revertMeshItem)
2141	2197	{
2142	2198	RevertMeshes();
2143	2199	} else
2144		- if (event.getSource() == resetMeshItem)
	2200	+ if (source == resetMeshItem)
2145	2201	{
2146	2202	ResetAll();
2147	2203	} else
2148		- if (event.getSource() == stepAllItem)
	2204	+ if (source == stepAllItem)
2149	2205	{
2150	2206	StepAll();
2151	2207	} else
2152		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2208	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2153	2209	{
2154	2210	//int indices[] = jList.getSelectedIndices();
2155	2211	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2157,42 +2213,46 @@
2157	2213
2158	2214	ClearSelection(false);
2159	2215	} else
2160		- if (event.getSource() == clearAllItem)
	2216	+ if (source == clearAllItem)
2161	2217	{
2162	2218	ClearSelection(true);
2163	2219	} else
2164		- if (event.getSource() == grabItem)
	2220	+ if (source == grabItem)
2165	2221	{
2166	2222	group(new cGroup(), true);
2167	2223	} else
2168		- if (event.getSource() == frontItem)
	2224	+ if (source == hideItem)
	2225	+ {
	2226	+ group(new HiddenObject());
	2227	+ } else
	2228	+ if (source == frontItem)
2169	2229	{
2170	2230	front();
2171	2231	} else
2172		- if (event.getSource() == backItem)
	2232	+ if (source == backItem)
2173	2233	{
2174	2234	back();
2175	2235	} else
2176		- if (event.getSource() == cameraItem)
	2236	+ if (source == cameraItem)
2177	2237	{
2178	2238	makeSomething(new Camera());
2179	2239	} else
2180		- if (event.getSource() == compositeItem)
	2240	+ if (source == compositeItem)
2181	2241	{
2182	2242	group(new Composite());
2183	2243	} else
2184		- if (event.getSource() == randomItem)
	2244	+ if (source == randomItem)
2185	2245	{
2186	2246	RandomNode random = new RandomNode();
2187	2247	group(random);
2188	2248	if (random.size() > 0)
2189	2249	random.name = random.get(0).name + "Rnd";
2190	2250	} else
2191		- if (event.getSource() == physicsItem)
	2251	+ if (source == physicsItem)
2192	2252	{
2193	2253	group(new PhysicsNode());
2194	2254	} else
2195		- if (event.getSource() == frameselectorItem)
	2255	+ if (source == frameselectorItem)
2196	2256	{
2197	2257	for (int i=0; i<group.selection.size(); i++)
2198	2258	{
..	..	@@ -2204,7 +2264,7 @@
2204	2264	ResetModel();
2205	2265	refreshContents();
2206	2266	} else
2207		- if (event.getSource() == switchGeoItem)
	2267	+ if (source == switchGeoItem)
2208	2268	{
2209	2269	for (int i=0; i<group.selection.size(); i++)
2210	2270	{
..	..	@@ -2216,7 +2276,7 @@
2216	2276	ResetModel();
2217	2277	refreshContents();
2218	2278	} else
2219		- if (event.getSource() == switchTransfoItem)
	2279	+ if (source == switchTransfoItem)
2220	2280	{
2221	2281	for (int i=0; i<group.selection.size(); i++)
2222	2282	{
..	..	@@ -2228,7 +2288,7 @@
2228	2288	ResetModel();
2229	2289	refreshContents();
2230	2290	} else
2231		- if (event.getSource() == morphItem)
	2291	+ if (source == morphItem)
2232	2292	{
2233	2293	for (int i=0; i<group.selection.size(); i++)
2234	2294	{
..	..	@@ -2240,7 +2300,7 @@
2240	2300	ResetModel();
2241	2301	refreshContents();
2242	2302	} else
2243		- if (event.getSource() == scriptNodeItem)
	2303	+ if (source == scriptNodeItem)
2244	2304	{
2245	2305	boolean atleastone = false;
2246	2306
..	..	@@ -2279,199 +2339,215 @@
2279	2339	}
2280	2340	}
2281	2341	} else
2282		- if (event.getSource() == linkerItem)
	2342	+ if (source == linkerItem)
2283	2343	{
2284	2344	group(new cLinker());
2285	2345	} else
2286		- if (event.getSource() == textureItem)
	2346	+ if (source == textureItem)
2287	2347	{
2288	2348	group(new TextureNode());
2289	2349	} else
2290		- if (event.getSource() == shadowXItem)
	2350	+ if (source == billboardItem)
	2351	+ {
	2352	+ group(new BillboardNode());
	2353	+ } else
	2354	+ if (source == shadowXItem)
2291	2355	{
2292	2356	CastShadow(0);
2293	2357	} else
2294		- if (event.getSource() == shadowYItem)
	2358	+ if (source == shadowYItem)
2295	2359	{
2296	2360	CastShadow(1);
2297	2361	} else
2298		- if (event.getSource() == shadowZItem)
	2362	+ if (source == shadowZItem)
2299	2363	{
2300	2364	CastShadow(2);
2301	2365	} else
2302		- if (event.getSource() == ungroupItem)
	2366	+ if (source == ungroupItem)
2303	2367	{
2304		- ungroup();
	2368	+ //ungroup();
	2369	+ for (int i=0; i<group.selection.size(); i++)
	2370	+ {
	2371	+ Ungroup(group.selection.get(i));
	2372	+ }
	2373	+
	2374	+ ClearSelection(false);
	2375	+
	2376	+ refreshContents();
2305	2377	} else
2306		- if (event.getSource() == genUVItem)
	2378	+ if (source == genUVItem)
2307	2379	{
2308	2380	GenUV();
2309	2381	} else
2310		- if (event.getSource() == genNormalsCADItem)
	2382	+ if (source == genNormalsCADItem)
2311	2383	{
2312	2384	GenNormals(true);
2313	2385	} else
2314		- if (event.getSource() == genNormalsMESHItem)
	2386	+ if (source == genNormalsMESHItem)
2315	2387	{
2316	2388	GenNormals(true); // TODO
2317	2389	} else
2318		- if (event.getSource() == genNormalsORGANItem)
	2390	+ if (source == genNormalsORGANItem)
2319	2391	{
2320	2392	GenNormals(false);
2321	2393	} else
2322		- if (event.getSource() == stripifyItem)
	2394	+ if (source == genNormalsMINEItem)
	2395	+ {
	2396	+ GenNormalsMINE();
	2397	+ } else
	2398	+ if (source == stripifyItem)
2323	2399	{
2324	2400	Stripify();
2325	2401	} else
2326		- if (event.getSource() == unstripifyItem)
	2402	+ if (source == unstripifyItem)
2327	2403	{
2328	2404	Unstripify();
2329	2405	} else
2330		- if (event.getSource() == trimItem)
	2406	+ if (source == trimItem)
2331	2407	{
2332	2408	Trim();
2333	2409	} else
2334		- if (event.getSource() == untrimItem)
	2410	+ if (source == untrimItem)
2335	2411	{
2336	2412	Untrim();
2337	2413	} else
2338		- if (event.getSource() == clearColorsItem)
	2414	+ if (source == clearColorsItem)
2339	2415	{
2340	2416	ClearColors();
2341	2417	} else
2342		- if (event.getSource() == clearMaterialsItem)
	2418	+ if (source == clearMaterialsItem)
2343	2419	{
2344	2420	ClearMaterials();
2345	2421	} else
2346		- if (event.getSource() == liveleavesItem)
	2422	+ if (source == liveleavesItem)
2347	2423	{
2348	2424	LiveLeaves(true);
2349	2425	} else
2350		- if (event.getSource() == unliveleavesItem)
	2426	+ if (source == unliveleavesItem)
2351	2427	{
2352	2428	LiveLeaves(false);
2353	2429	} else
2354		- if (event.getSource() == supportleavesItem)
	2430	+ if (source == supportleavesItem)
2355	2431	{
2356	2432	SupportLeaves(true);
2357	2433	} else
2358		- if (event.getSource() == unsupportleavesItem)
	2434	+ if (source == unsupportleavesItem)
2359	2435	{
2360	2436	SupportLeaves(false);
2361	2437	} else
2362		- if (event.getSource() == hideleavesItem)
	2438	+ if (source == hideleavesItem)
2363	2439	{
2364	2440	HideLeaves(true);
2365	2441	} else
2366		- if (event.getSource() == showleavesItem)
	2442	+ if (source == showleavesItem)
2367	2443	{
2368	2444	HideLeaves(false);
2369	2445	} else
2370		- if (event.getSource() == markleavesItem)
	2446	+ if (source == markleavesItem)
2371	2447	{
2372	2448	MarkLeaves(true);
2373	2449	} else
2374		- if (event.getSource() == unmarkleavesItem)
	2450	+ if (source == unmarkleavesItem)
2375	2451	{
2376	2452	MarkLeaves(false);
2377	2453	} else
2378		- if (event.getSource() == flipVItem)
	2454	+ if (source == flipVItem)
2379	2455	{
2380	2456	FlipV(true);
2381	2457	} else
2382		- if (event.getSource() == unflipVItem)
	2458	+ if (source == unflipVItem)
2383	2459	{
2384	2460	FlipV(false);
2385	2461	} else
2386		- if (event.getSource() == lowTexturesItem)
	2462	+ if (source == lowTexturesItem)
2387	2463	{
2388	2464	SetTexRes(0);
2389	2465	} else
2390		- if (event.getSource() == normalTexturesItem)
	2466	+ if (source == normalTexturesItem)
2391	2467	{
2392	2468	SetTexRes(1);
2393	2469	} else
2394		- if (event.getSource() == highTexturesItem)
	2470	+ if (source == highTexturesItem)
2395	2471	{
2396	2472	SetTexRes(2);
2397	2473	} else
2398		- if (event.getSource() == veryhighTexturesItem)
	2474	+ if (source == veryhighTexturesItem)
2399	2475	{
2400	2476	SetTexRes(3);
2401	2477	} else
2402		- if (event.getSource() == maxTexturesItem)
	2478	+ if (source == maxTexturesItem)
2403	2479	{
2404	2480	SetTexRes(4);
2405	2481	} else
2406		- if (event.getSource() == panoTexturesItem)
	2482	+ if (source == panoTexturesItem)
2407	2483	{
2408	2484	SetTexRes(5);
2409	2485	} else
2410		- if (event.getSource() == reverseNormalsItem)
	2486	+ if (source == reverseNormalsItem)
2411	2487	{
2412	2488	ReverseNormals();
2413	2489	} else
2414		- if (event.getSource() == parseverticesItem)
	2490	+ if (source == parseverticesItem)
2415	2491	{
2416	2492	ParseVertices();
2417	2493	} else
2418		- if (event.getSource() == textureFieldItem)
	2494	+ if (source == textureFieldItem)
2419	2495	{
2420	2496	TextureVertices();
2421	2497	} else
2422		- if (event.getSource() == alignItem)
	2498	+ if (source == alignItem)
2423	2499	{
2424	2500	Align();
2425	2501	} else
2426		- if (event.getSource() == mirrorItem)
	2502	+ if (source == mirrorItem)
2427	2503	{
2428	2504	MirrorPoses();
2429	2505	} else
2430		- if (event.getSource() == reduceMorphItem)
	2506	+ if (source == reduceMorphItem)
2431	2507	{
2432	2508	MeshReduction(false);
2433	2509	} else
2434		- if (event.getSource() == reduce34MorphItem)
	2510	+ if (source == reduce34MorphItem)
2435	2511	{
2436	2512	MeshReduction(true);
2437	2513	} else
2438		- if (event.getSource() == reverseTrianglesItem)
	2514	+ if (source == reverseTrianglesItem)
2439	2515	{
2440	2516	ReverseTriangles();
2441	2517	} else
2442		- if (event.getSource() == reduceMeshItem)
	2518	+ if (source == reduceMeshItem)
2443	2519	{
2444	2520	ReduceMesh(false);
2445	2521	} else
2446		- if (event.getSource() == reduce34MeshItem)
	2522	+ if (source == reduce34MeshItem)
2447	2523	{
2448	2524	ReduceMesh(true);
2449	2525	} else
2450		- if (event.getSource() == increaseMeshItem)
	2526	+ if (source == increaseMeshItem)
2451	2527	{
2452	2528	IncreaseMesh();
2453	2529	} else
2454		- if (event.getSource() == clipMeshItem)
	2530	+ if (source == clipMeshItem)
2455	2531	{
2456	2532	ClipMesh();
2457	2533	} else
2458		- if (event.getSource() == smoothMeshItem)
	2534	+ if (source == smoothMeshItem)
2459	2535	{
2460	2536	SmoothMesh();
2461	2537	} else
2462		- if (event.getSource() == transformgeometryItem)
	2538	+ if (source == transformgeometryItem)
2463	2539	{
2464	2540	TransformGeometry();
2465	2541	} else
2466		- if (event.getSource() == resetTransformItem)
	2542	+ if (source == resetTransformItem)
2467	2543	{
2468	2544	ResetTransform();
2469	2545	} else
2470		- if (event.getSource() == resetCentroidItem)
	2546	+ if (source == resetCentroidItem)
2471	2547	{
2472	2548	ResetCentroid();
2473	2549	} else
2474		- if (event.getSource() == resetParentItem)
	2550	+ if (source == resetParentItem)
2475	2551	{
2476	2552	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	2553	{
..	..	@@ -2481,7 +2557,7 @@
2481	2557
2482	2558	refreshContents();
2483	2559	} else
2484		- if (event.getSource() == repairParentItem)
	2560	+ if (source == repairParentItem)
2485	2561	{
2486	2562	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2487	2563	{
..	..	@@ -2495,7 +2571,21 @@
2495	2571
2496	2572	refreshContents();
2497	2573	} else
2498		- 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)
2499	2589	{
2500	2590	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2501	2591	{
..	..	@@ -2507,7 +2597,7 @@
2507	2597	ResetModel();
2508	2598	refreshContents();
2509	2599	} else
2510		- if (event.getSource() == sortbynameItem)
	2600	+ if (source == sortbynameItem)
2511	2601	{
2512	2602	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2513	2603	{
..	..	@@ -2519,7 +2609,7 @@
2519	2609	ResetModel();
2520	2610	refreshContents();
2521	2611	} else
2522		- if (event.getSource() == attachPigmentItem)
	2612	+ if (source == attachPigmentItem)
2523	2613	{
2524	2614	String texture = GetFile("Attach pigment");
2525	2615	Object3D obj;
..	..	@@ -2531,7 +2621,7 @@
2531	2621
2532	2622	refreshContents();
2533	2623	} else
2534		- if (event.getSource() == detachPigmentItem)
	2624	+ if (source == detachPigmentItem)
2535	2625	{
2536	2626	Object3D obj;
2537	2627	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2542,7 +2632,7 @@
2542	2632
2543	2633	refreshContents();
2544	2634	} else
2545		- if (event.getSource() == attachBumpItem)
	2635	+ if (source == attachBumpItem)
2546	2636	{
2547	2637	String texture = GetFile("Attach bump");
2548	2638	Object3D obj;
..	..	@@ -2554,7 +2644,7 @@
2554	2644
2555	2645	refreshContents();
2556	2646	} else
2557		- if (event.getSource() == detachBumpItem)
	2647	+ if (source == detachBumpItem)
2558	2648	{
2559	2649	Object3D obj;
2560	2650	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2565,7 +2655,7 @@
2565	2655
2566	2656	refreshContents();
2567	2657	} else
2568		- if (event.getSource() == pigmentBumpItem)
	2658	+ if (source == pigmentBumpItem)
2569	2659	{
2570	2660	Object3D obj;
2571	2661	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2576,158 +2666,195 @@
2576	2666
2577	2667	refreshContents();
2578	2668	} else
2579		- if (event.getSource() == flashSelectionButton)
	2669	+ if (source == flashSelectionButton)
2580	2670	{
2581	2671	CameraPane.flash = true;
2582	2672	refreshContents();
2583	2673	} else
2584		- if (event.getSource() == oneButton)
	2674	+ if (source == oneButton)
2585	2675	{
2586	2676	} else
2587		- if (event.getSource() == twoButton)
	2677	+ if (source == twoButton)
2588	2678	{
2589	2679	radio.layout = twoButton;
2590	2680	// bug
2591	2681	//gridPanel.setDividerLocation(1.0);
2592	2682	//bigPanel.setDividerLocation(0.0);
2593		- bigThree.remove(jtp);
2594		- bigThree.remove(cameraPanel);
2595		- bigThree.remove(XYZPanel);
2596		- aWindowConstraints.gridx = 0;
2597		- aWindowConstraints.gridy = 0;
2598		- aWindowConstraints.gridwidth = 1;
2599		- // aConstraints.gridheight = 3;
2600		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2601		- aWindowConstraints.weightx = 0;
2602		- aWindowConstraints.weighty = 1;
2603		- //bigThree.add(jtp, aWindowConstraints);
2604		- aWindowConstraints.weightx = 1;
2605		- aWindowConstraints.gridwidth = 3;
2606		- // aConstraints.gridheight = 3;
2607		- aWindowConstraints.gridx = 1;
2608		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2609		- bigThree.add(cameraPanel, aWindowConstraints);
2610		- aWindowConstraints.weightx = 0;
2611		- aWindowConstraints.gridx = 4;
2612		- aWindowConstraints.gridwidth = 1;
2613		- // aConstraints.gridheight = 3;
2614		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2615		- //bigThree.add(XYZPanel, aWindowConstraints);
2616		- 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();
2617	2712	} else
2618		- if (event.getSource() == threeButton)
	2713	+ if (source == threeButton)
2619	2714	{
2620	2715	radio.layout = threeButton;
2621		- bigThree.remove(jtp);
2622		- bigThree.remove(cameraPanel);
2623		- bigThree.remove(XYZPanel);
2624		- aWindowConstraints.gridx = 0;
2625		- aWindowConstraints.gridy = 0;
2626		- aWindowConstraints.gridwidth = 1;
2627		- // aConstraints.gridheight = 3;
2628		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2629		- aWindowConstraints.weightx = 0;
2630		- aWindowConstraints.weighty = 1;
2631		- //bigThree.add(jtp, aWindowConstraints);
2632		- aWindowConstraints.weightx = 1;
2633		- aWindowConstraints.gridwidth = 3;
2634		- // aConstraints.gridheight = 3;
2635		- aWindowConstraints.gridx = 1;
2636		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2637		- bigThree.add(cameraPanel, aWindowConstraints);
2638		- aWindowConstraints.weightx = 0;
2639		- aWindowConstraints.gridx = 4;
2640		- aWindowConstraints.gridwidth = 1;
2641		- // aConstraints.gridheight = 3;
2642		- aConstraints.fill = GridBagConstraints.VERTICAL;
2643		- bigThree.add(XYZPanel, aWindowConstraints);
2644		- 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();
2645	2748	} else
2646		- if (event.getSource() == fourButton)
	2749	+ if (source == fourButton)
2647	2750	{
2648	2751	radio.layout = fourButton;
2649		- bigThree.remove(jtp);
2650		- bigThree.remove(cameraPanel);
2651		- bigThree.remove(XYZPanel);
2652		- aWindowConstraints.gridx = 0;
2653		- aWindowConstraints.gridy = 0;
2654		- aWindowConstraints.gridwidth = 1;
2655		- // aWindowConstraints.gridheight = 3;
2656		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2657		- aWindowConstraints.weightx = 1;
2658		- aWindowConstraints.weighty = 1;
2659		- bigThree.add(jtp, aWindowConstraints);
2660		- aWindowConstraints.weightx = 1;
2661		- aWindowConstraints.gridwidth = 3;
2662		- // aConstraints.gridheight = 3;
2663		- aWindowConstraints.gridx = 1;
2664		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2665		- //bigThree.add(cameraPanel, aWindowConstraints);
2666		- aWindowConstraints.weightx = 0;
2667		- aWindowConstraints.gridx = 4;
2668		- aWindowConstraints.gridwidth = 1;
2669		- // aWindowConstraints.gridheight = 3;
2670		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2671		- //bigThree.add(XYZPanel, aWindowConstraints);
2672		- 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();
2673	2783	} else
2674		- if (event.getSource() == sixButton)
	2784	+ if (source == sixButton)
2675	2785	{
2676	2786	radio.layout = sixButton;
2677		- bigThree.remove(jtp);
2678		- bigThree.remove(cameraPanel);
2679		- bigThree.remove(XYZPanel);
2680		- aWindowConstraints.gridx = 0;
2681		- aWindowConstraints.gridy = 0;
2682		- aWindowConstraints.gridwidth = 1;
2683		- // aConstraints.gridheight = 3;
2684		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2685		- aWindowConstraints.weightx = 0;
2686		- aWindowConstraints.weighty = 1;
2687		- bigThree.add(jtp, aWindowConstraints);
2688		- aWindowConstraints.weightx = 1;
2689		- aWindowConstraints.gridwidth = 3;
2690		- // aWindowConstraints.gridheight = 3;
2691		- aWindowConstraints.gridx = 1;
2692		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2693		- bigThree.add(cameraPanel, aWindowConstraints);
2694		- aWindowConstraints.weightx = 0;
2695		- aWindowConstraints.gridx = 4;
2696		- aWindowConstraints.gridwidth = 1;
2697		- // aWindowConstraints.gridheight = 3;
2698		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2699		- //bigThree.add(XYZPanel, aConstraints);
2700		- 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();
2701	2819	} else
2702		- if (event.getSource() == sevenButton)
	2820	+ if (source == sevenButton)
2703	2821	{
2704	2822	radio.layout = sevenButton;
2705		- bigThree.remove(jtp);
2706		- bigThree.remove(cameraPanel);
2707		- bigThree.remove(XYZPanel);
2708		- aWindowConstraints.gridx = 0;
2709		- aWindowConstraints.gridy = 0;
2710		- aWindowConstraints.gridwidth = 1;
2711		- // aWindowConstraints.gridheight = 3;
2712		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2713		- aWindowConstraints.weightx = 0;
2714		- aWindowConstraints.weighty = 1;
2715		- bigThree.add(jtp, aWindowConstraints);
2716		- aWindowConstraints.weightx = 1;
2717		- aWindowConstraints.gridwidth = 3;
2718		- // aWindowConstraints.gridheight = 3;
2719		- aWindowConstraints.gridx = 1;
2720		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2721		- bigThree.add(cameraPanel, aWindowConstraints);
2722		- aWindowConstraints.weightx = 0;
2723		- aWindowConstraints.gridx = 4;
2724		- aWindowConstraints.gridwidth = 1;
2725		- // aConstraints.gridheight = 3;
2726		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2727		- bigThree.add(XYZPanel, aWindowConstraints);
2728		- 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();
2729	2856	} else
2730		- if (event.getSource() == rootButton)
	2857	+ if (source == rootButton)
2731	2858	{
2732	2859	Object3D obj;
2733	2860	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2739,7 +2866,7 @@
2739	2866
2740	2867	refreshContents(true);
2741	2868	} else
2742		- if (event.getSource() == closeButton)
	2869	+ if (source == closeButton)
2743	2870	{
2744	2871	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2745	2872	cRadio ab;
..	..	@@ -2760,11 +2887,11 @@
2760	2887	}
2761	2888	refreshContents(true);
2762	2889	} else
2763		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2890	+ if (source == editItem \|\| source == editButton)
2764	2891	{
2765	2892	EditSelection(false);
2766	2893	} else
2767		- if (event.getSource() == uneditButton)
	2894	+ if (source == uneditButton)
2768	2895	{
2769	2896	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2770	2897	{
..	..	@@ -2776,12 +2903,12 @@
2776	2903
2777	2904	child.editWindow = null; // ???????????
2778	2905	}
2779		- objEditor.ctrlPanel.revalidate();
	2906	+ objEditor.ctrlPanel.validate();
2780	2907	//objEditor.jTree.clearSelection();
2781	2908	//objEditor.ResetSliders();
2782	2909	refreshContents(true);
2783	2910	} else
2784		- if (event.getSource() == clearPanelButton)
	2911	+ if (source == clearPanelButton)
2785	2912	{
2786	2913	assert(copy == group);
2787	2914	//copy.ClearUI();
..	..	@@ -2792,7 +2919,7 @@
2792	2919	listUI.clear();
2793	2920	refreshContents(true);
2794	2921	} else
2795		- if (event.getSource() == allParamsButton)
	2922	+ if (source == allParamsButton)
2796	2923	{
2797	2924	assert(copy == group);
2798	2925
..	..	@@ -2813,19 +2940,19 @@
2813	2940
2814	2941	refreshContents(true);
2815	2942	} else
2816		- if (event.getSource() == unselectButton)
	2943	+ if (source == unselectButton)
2817	2944	{
2818	2945	objEditor.jTree.clearSelection();
2819	2946	// ?? oct 2012 GrafreeD.clipboard.clear();
2820	2947	objEditor.ResetSliders();
2821	2948	refreshContents(true);
2822	2949	} else
2823		- if(event.getSource() instanceof cRadio)
	2950	+ if(source instanceof cRadio)
2824	2951	{
2825	2952	group.parent = keepparent;
2826	2953	group.attributes = 0;
2827	2954	//group.editWindow = null;
2828		- /cRadio/ radio = (cRadio)event.getSource();
	2955	+ /cRadio/ radio = (cRadio)source;
2829	2956	Object3D obj = radio.GetObject();
2830	2957	System.out.println("Edit " + obj);
2831	2958	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2845,7 +2972,7 @@
2845	2972	}
2846	2973
2847	2974	copy = group;
2848		- //CameraPane.theRenderer.object = group;
	2975	+ //Globals.theRenderer.object = group;
2849	2976	if(!useclient)
2850	2977	{
2851	2978	cameraView.renderCamera = radio.camera;
..	..	@@ -2854,7 +2981,8 @@
2854	2981	cameraView.cameras[cameraView.cameracount] = radio.camera;
2855	2982	cameraView.targetLookAt.set(radio.camera.lookAt);
2856	2983	cameraView.object = group;
2857		- cameraView.lighttouched = true;
	2984	+ //cameraView.lighttouched = true;
	2985	+ Globals.lighttouched = true;
2858	2986	topView.object = group;
2859	2987	frontView.object = group;
2860	2988	sideView.object = group;
..	..	@@ -2890,7 +3018,7 @@
2890	3018	if (useclient)
2891	3019	{
2892	3020	cameraView.object = client;
2893		- cameraView.lighttouched = true;
	3021	+ Globals.lighttouched = true;
2894	3022	//topView.object = client;
2895	3023	//frontView.object = client;
2896	3024	//sideView.object = client;
..	..	@@ -2898,7 +3026,7 @@
2898	3026	else
2899	3027	{
2900	3028	cameraView.object = group;
2901		- cameraView.lighttouched = true;
	3029	+ Globals.lighttouched = true;
2902	3030	//topView.object = group;
2903	3031	//frontView.object = group;
2904	3032	//sideView.object = group;
..	..	@@ -3179,6 +3307,13 @@
3179	3307	refreshContents();
3180	3308	}
3181	3309
	3310	+ void GenNormalsMINE()
	3311	+ {
	3312	+ group.selection.GenNormalsMINE();
	3313	+
	3314	+ refreshContents();
	3315	+ }
	3316	+
3182	3317	void Stripify()
3183	3318	{
3184	3319	group.StripifyS();
..	..	@@ -3399,7 +3534,7 @@
3399	3534	String pigment = Object3D.GetPigment(tex);
3400	3535	//String bump = Object3D.GetBump(tex);
3401	3536
3402		- 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);
3403	3538
3404	3539	double s = v.s;
3405	3540
..	..	@@ -3447,12 +3582,26 @@
3447	3582
3448	3583	void Align()
3449	3584	{
	3585	+ if (group.selection.size() == 0)
	3586	+ return;
	3587	+
	3588	+ cVector bbmin = new cVector();
	3589	+ cVector bbmax = new cVector();
	3590	+
	3591	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3592	+
	3593	+ double dx = bbmax.x - bbmin.x;
	3594	+ double dy = bbmax.y - bbmin.y;
	3595	+ double dz = bbmax.z - bbmin.z;
	3596	+
	3597	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3598	+
3450	3599	for (int i=0; i<group.selection.size(); i++)
3451	3600	{
3452	3601	Object3D obj = group.selection.get(i);
3453	3602
3454		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3455		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3603	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3604	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3456	3605	}
3457	3606
3458	3607	refreshContents();
..	..	@@ -3686,7 +3835,7 @@
3686	3835	group.selection.RelinkToSupport(); // july 2014
3687	3836	System.out.println("DONE.");
3688	3837	refreshContents();
3689		- 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));
3690	3839	}
3691	3840
3692	3841	void ReduceMesh(boolean reduction34)
..	..	@@ -3962,25 +4111,25 @@
3962	4111	System.err.println("info : " + child.GetPath());
3963	4112	}
3964	4113	}
3965		- else
3966		- {
3967		- objEditor.SetMaterial(group); // .GetMaterial());
3968		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3969		- System.err.println("info : " + group.GetPath());
3970		- }
	4114	+// else
	4115	+// {
	4116	+// objEditor.SetMaterial(group); // .GetMaterial());
	4117	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4118	+// System.err.println("info : " + group.GetPath());
	4119	+// }
3971	4120
3972	4121	objEditor.SetText(); // jan 2014
3973	4122
3974		- 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))
3975	4124	CameraPane.flash = true;
3976	4125
3977	4126	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
3978	4127	// a camera
3979	4128	{
3980	4129	CameraPane.camerachangeframe = 0; // don't refuse it
3981		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3982		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3983		- // 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;
3984	4133	}
3985	4134
3986	4135	refreshContents();
..	..	@@ -4474,6 +4623,26 @@
4474	4623	makeSomething(csg);
4475	4624	}
4476	4625
	4626	+ void Ungroup(Object3D g)
	4627	+ {
	4628	+ if (g instanceof HiddenObject)
	4629	+ {
	4630	+ HiddenObject h = (HiddenObject) g;
	4631	+
	4632	+ for (int i=0; i<h.ActualSize(); i++)
	4633	+ {
	4634	+ objEditor.makeSomething(h.get(i), false);
	4635	+ }
	4636	+ }
	4637	+ else
	4638	+ {
	4639	+ for (int i=0; i<g.Size(); i++)
	4640	+ {
	4641	+ objEditor.makeSomething(g.get(i), false);
	4642	+ }
	4643	+ }
	4644	+ }
	4645	+
4477	4646	void ungroup()
4478	4647	{
4479	4648	/*
..	..	@@ -4833,6 +5002,7 @@
4833	5002	private MenuItem resetsupportItem;
4834	5003	private MenuItem resetreferencesItem;
4835	5004	private MenuItem linkverticesItem;
	5005	+ private MenuItem relinkverticesItem;
4836	5006	private MenuItem setMasterItem;
4837	5007	private MenuItem resetMeshItem;
4838	5008	private MenuItem stepAllItem;
..	..	@@ -4854,6 +5024,7 @@
4854	5024	private MenuItem genNormalsMESHItem;
4855	5025	private MenuItem genNormalsCADItem;
4856	5026	private MenuItem genNormalsORGANItem;
	5027	+ private MenuItem genNormalsMINEItem;
4857	5028	private MenuItem stripifyItem;
4858	5029	private MenuItem unstripifyItem;
4859	5030	private MenuItem trimItem;
..	..	@@ -4895,6 +5066,7 @@
4895	5066	private MenuItem resetCentroidItem;
4896	5067	private MenuItem transformgeometryItem;
4897	5068	private MenuItem resetTransformItem;
	5069	+ private MenuItem hideItem;
4898	5070	private MenuItem grabItem;
4899	5071	private MenuItem backItem;
4900	5072	private MenuItem frontItem;
..	..	@@ -4915,6 +5087,7 @@
4915	5087
4916	5088	private MenuItem resetParentItem;
4917	5089	private MenuItem repairParentItem;
	5090	+ private MenuItem repairShadowItem;
4918	5091	private MenuItem sortbysizeItem;
4919	5092	private MenuItem sortbynameItem;
4920	5093
..	..	@@ -4935,6 +5108,7 @@
4935	5108	private MenuItem coneItem;
4936	5109	private MenuItem torusItem;
4937	5110	private MenuItem superItem;
	5111	+ private MenuItem kleinItem;
4938	5112	private MenuItem blobItem;
4939	5113	private MenuItem latheItem;
4940	5114	private MenuItem bezierItem;
..	..	@@ -4947,6 +5121,7 @@
4947	5121	private MenuItem csgItem;
4948	5122	private MenuItem templateItem;
4949	5123	private MenuItem textureItem;
	5124	+ private MenuItem billboardItem;
4950	5125	private MenuItem shadowXItem;
4951	5126	private MenuItem shadowYItem;
4952	5127	private MenuItem shadowZItem;