~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,17 +234,21 @@
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		- randomItem = menu.add(new MenuItem("Random"));
	242	+ randomItem = menu.add(new MenuItem("Switch node"));
236	243	randomItem.addActionListener(this);
237		- physicsItem = menu.add(new MenuItem("Physics"));
238		- physicsItem.addActionListener(this);
239		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
240		- frameselectorItem.addActionListener(this);
241	244	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	245	switchGeoItem.addActionListener(this);
243	246	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	247	switchTransfoItem.addActionListener(this);
	248	+ physicsItem = menu.add(new MenuItem("Physics"));
	249	+ physicsItem.addActionListener(this);
	250	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	251	+ frameselectorItem.addActionListener(this);
245	252	morphItem = menu.add(new MenuItem("Morph"));
246	253	morphItem.addActionListener(this);
247	254	scriptNodeItem = menu.add(new MenuItem("Script Node"));
..	..	@@ -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,150 +434,94 @@
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);
	443	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	444	+ fastCB.setToolTipText("Fast mode");
453	445	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);
	446	+
	447	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	448	+ trackCB.setToolTipText("Enable tracking");
495	449	trackCB.addItemListener(this);
496	450
497		- oe.aConstraints.gridx += 1;
498		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	451	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	452	+ screenfitButton.setToolTipText("Screen fit");
499	453	screenfitButton.addActionListener(this);
500		- oe.aConstraints.gridx += 1;
	454	+
501	455	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
502	456	// screenfitpointButton.addActionListener(this);
503		-// oe.aConstraints.gridx += 1;
504		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
505		- snapobjectButton.addActionListener(this);
506		- oe.aConstraints.gridx += 1;
507	457
508		- //aConstraints.gridx = 0;
509		- //aConstraints.gridy += 1;
510		- oe.aConstraints.weighty = 0;
511		- oe.aConstraints.gridwidth = 1;
512		-
513		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	458	+ if (Globals.ADVANCED)
	459	+ {
	460	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	461	+ snapobjectButton.addActionListener(this);
	462	+ snapobjectButton.setToolTipText("Snap Object");
	463	+ }
	464	+
	465	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	466	+ flashSelectionButton.setToolTipText("Show selection");
514	467	flashSelectionButton.addActionListener(this);
515		- oe.aConstraints.gridx += 1;
516		- oe.aConstraints.weighty = 0;
517		- oe.aConstraints.gridwidth = 1;
518	468
519		- //
520		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	469	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	470	+
	471	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	472	+ twoButton.setToolTipText("Show center view only");
521	473	twoButton.addActionListener(this);
522		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	474	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
523	475	fourButton.addActionListener(this);
524		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	476	+ fourButton.setToolTipText("Show left panel only");
	477	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	478	+ sixButton.setToolTipText("2-column layout left");
525	479	sixButton.addActionListener(this);
526		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	480	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	481	+ threeButton.setToolTipText("2-column layout right");
527	482	threeButton.addActionListener(this);
528		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	483	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	484	+ sevenButton.setToolTipText("3-column layout");
529	485	sevenButton.addActionListener(this);
530	486	//
531	487
532		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	488	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	489	+ rootButton.setToolTipText("Edit selection in new tab");
533	490	rootButton.addActionListener(this);
534		- oe.aConstraints.gridx += 1;
535		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	491	+
	492	+ oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	493	+ closeButton.setToolTipText("Close tab");
536	494	closeButton.addActionListener(this);
537	495	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
538	496	//clearButton.addActionListener(this);
539		- oe.aConstraints.gridx += 1;
540	497
541		- oe.aConstraints.gridx = 1; //
542		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	498	+ cGridBag commandsPanel = new cGridBag();
	499	+
	500	+ commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	501	+ editButton.setToolTipText("Edit selection");
543	502	editButton.addActionListener(this);
544		- oe.aConstraints.gridx += 1;
545		- oe.aConstraints.weighty = 0;
546		- oe.aConstraints.gridwidth = 1;
547	503
548		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	504	+ commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	505	+ uneditButton.setToolTipText("Unedit selection");
549	506	uneditButton.addActionListener(this);
550	507
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);
	508	+ commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	509	+ clearPanelButton.setToolTipText("Clear edit panel");
556	510	clearPanelButton.addActionListener(this);
557	511
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);
	512	+ commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	513	+ allParamsButton.setToolTipText("All params??");
563	514	allParamsButton.addActionListener(this);
564	515
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);
	516	+ commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	517	+ unselectButton.setToolTipText("Unselect");
570	518	unselectButton.addActionListener(this);
571	519
	520	+ commandsPanel.preferredHeight = 1;
	521	+
	522	+ oe.treePanel.add(commandsPanel);
	523	+ oe.treePanel.Return();
	524	+
572	525	// oe.aConstraints.gridx += 1;
573	526	// oe.aConstraints.weighty = 0;
574	527	// oe.aConstraints.gridwidth = 1;
..	..	@@ -580,40 +533,37 @@
580	533	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
581	534	// gcButton.addActionListener(this);
582	535
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;
	536	+ cGridBag jSPPanel = new cGridBag();
	537	+
	538	+ JScrollPane jSP;
594	539	//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);
	540	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
596	541	ResetModel();
597		- oe.aConstraints.weighty = 0.5;
598		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
599		- oe.aConstraints.gridy += 1;
600		- oe.aConstraints.gridwidth = 1;
	542	+
	543	+ oe.treePanel.add(jSPPanel);
	544	+ oe.treePanel.Return();
601	545
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);
	546	+ cGridBag copyOptionsPanel = new cGridBag();
	547	+
	548	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	549	+ colorCB.setToolTipText("Copy color when dropped");
606	550	colorCB.addItemListener(this);
607		- oe.aConstraints.gridx += 2;
608		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	551	+
	552	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	553	+ materialCB.setToolTipText("Copy material when dropped");
609	554	materialCB.addItemListener(this);
610		- oe.aConstraints.gridx += 2;
611		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	555	+
	556	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	557	+ textureCB.setToolTipText("Copy texture when dropped");
612	558	textureCB.addItemListener(this);
613	559
614		- oe.aConstraints.gridx = 0;
615		- oe.aConstraints.gridy += 1;
	560	+ copyOptionsPanel.preferredHeight = 1;
	561	+ oe.treePanel.add(copyOptionsPanel);
	562	+ oe.treePanel.Return();
616	563
	564	+// mainPanel.setDividerLocation(0.5); //1.0);
	565	+// mainPanel.setResizeWeight(0.5);
	566	+
617	567	//jList.addListSelectionListener(this);
618	568	oe.jTree.addTreeSelectionListener(this);
619	569	//jTree.setRootVisible(false);
..	..	@@ -635,17 +585,85 @@
635	585	radio.layout = sevenButton;
636	586	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
637	587	}
	588	+
	589	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	590	+ {
	591	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	592	+ supportCB.setToolTipText("Enabled rigging");
	593	+ supportCB.addItemListener(this);
	594	+
	595	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	596	+ // localCB.addItemListener(this);
	597	+
	598	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	599	+ crowdCB.setToolTipText("Used for crowds");
	600	+ crowdCB.addItemListener(this);
	601	+
	602	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	603	+ smoothCB.setToolTipText("Snapping delay");
	604	+ smoothCB.addItemListener(this);
	605	+
	606	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	607	+ slowCB.setToolTipText("Smooth interpolation");
	608	+ slowCB.addItemListener(this);
	609	+
	610	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	611	+ boxCB.setToolTipText("Display bounding boxes");
	612	+ boxCB.addItemListener(this);
	613	+
	614	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	615	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	616	+ zoomBoxCB.addItemListener(this);
	617	+
	618	+// constraints.gridy += 1;
	619	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	620	+// speakerMocapCB.addItemListener(this);
	621	+
	622	+ if (false)
	623	+ {
	624	+ // handled in scripts
	625	+ //constraints.gridy += 1;
	626	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	627	+ speakerCameraCB.addItemListener(this);
	628	+
	629	+ //constraints.gridy += 1;
	630	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	631	+ speakerFocusCB.addItemListener(this);
	632	+
	633	+ //constraints.gridy += 1;
	634	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	635	+ smoothfocusCB.addItemListener(this);
	636	+ }
	637	+
	638	+//constraints.gridx += 1;
	639	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	640	+// debugCB.addItemListener(this);
	641	+
	642	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	643	+ oeilCB.addItemListener(this);
	644	+
	645	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	646	+ lookAtCB.setToolTipText("Look-at target");
	647	+ lookAtCB.addItemListener(this);
	648	+
	649	+ cGridBag fill = new cGridBag();
	650	+
	651	+ fill.preferredHeight = 200;
	652	+
	653	+ panel.add(fill);
	654	+
	655	+ }
638	656
639	657	void EditObject(Object3D obj)
640	658	{
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();
	659	+ cRadio radioButton = new cRadio(obj.name);
	660	+ radioButton.SetObject(obj);
	661	+ radioButton.layout = sevenButton;
	662	+ radioButton.SetCamera(cameraView.renderCamera, false);
	663	+ radioButton.addActionListener(this);
	664	+ radioPanel.add(radioButton);
	665	+ buttonGroup.add(radioButton);
	666	+ radioButton.doClick();
649	667	}
650	668	void SetupViews(ObjEditor oe)
651	669	{
..	..	@@ -665,6 +683,7 @@
665	683	JCheckBox fastCB;
666	684	JCheckBox slowCB;
667	685	JCheckBox boxCB;
	686	+ JCheckBox zoomBoxCB;
668	687	JCheckBox trackCB;
669	688	JCheckBox smoothfocusCB;
670	689	// JCheckBox speakerMocapCB;
..	..	@@ -707,8 +726,7 @@
707	726	dropAttributes \|= Object3D.TEXTURE;
708	727	else
709	728	dropAttributes &= ~Object3D.TEXTURE;
710		- }
711		- else if(e.getSource() == liveCB)
	729	+ } else if(e.getSource() == liveCB)
712	730	{
713	731	cameraView.ToggleLive();
714	732	}
..	..	@@ -745,6 +763,10 @@
745	763	Recompile();
746	764	cameraView.repaint();
747	765	// refreshContents();
	766	+ }
	767	+ else if(e.getSource() == zoomBoxCB)
	768	+ {
	769	+ cameraView.ToggleZoomBoxMode();
748	770	}
749	771	else if(e.getSource() == smoothfocusCB)
750	772	{
..	..	@@ -1035,6 +1057,8 @@
1035	1057	torusItem.addActionListener(this);
1036	1058	superItem = menu.add(new MenuItem("Superellipsoid"));
1037	1059	superItem.addActionListener(this);
	1060	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1061	+ kleinItem.addActionListener(this);
1038	1062	particleItem = menu.add(new MenuItem("Particle system"));
1039	1063	particleItem.addActionListener(this);
1040	1064	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1075,7 +1099,7 @@
1075	1099	{
1076	1100	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1077	1101	animationItem.addItemListener(this);
1078		- animationItem.setState(CameraPane.ANIMATION);
	1102	+ animationItem.setState(Globals.ANIMATION);
1079	1103
1080	1104	menu.add("-");
1081	1105	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
..	..	@@ -1108,6 +1132,8 @@
1108	1132	resetParentItem.addActionListener(this);
1109	1133	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1110	1134	repairParentItem.addActionListener(this);
	1135	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1136	+ repairShadowItem.addActionListener(this);
1111	1137	menu.add(invariantsItem = new MenuItem("Invariants"));
1112	1138	invariantsItem.addActionListener(this);
1113	1139	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1468,6 +1494,7 @@
1468	1494	//
1469	1495	public void actionPerformed(ActionEvent event) // , Object arg)
1470	1496	{
	1497	+ Object source = event.getSource();
1471	1498	/*
1472	1499	if (event.getSource() == nameField)
1473	1500	{
..	..	@@ -1479,11 +1506,11 @@
1479	1506	}
1480	1507	else
1481	1508	*/
1482		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1509	+ if (source == lookAtItem \|\| source == lookFromItem)
1483	1510	{
1484	1511	ScreenFit();
1485	1512	} else
1486		- if (event.getSource() == switchItem)
	1513	+ if (source == switchItem)
1487	1514	{
1488	1515	cVector v1 = new cVector();
1489	1516	cVector v2 = new cVector();
..	..	@@ -1492,11 +1519,11 @@
1492	1519	objEditor.cameraView.renderCamera.setAim(v2, v1);
1493	1520	objEditor.cameraView.repaint();
1494	1521	} else
1495		- if (event.getSource() == rectoidItem)
	1522	+ if (source == rectoidItem)
1496	1523	{
1497	1524	makeSomething(new Box());
1498	1525	} else
1499		- if (event.getSource() == particleItem)
	1526	+ if (source == particleItem)
1500	1527	{
1501	1528	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1502	1529	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1517,9 +1544,9 @@
1517	1544	applyExample(particleGeom, "SMOKE");
1518	1545	makeSomething(particleGeom);
1519	1546	} else
1520		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1547	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1521	1548	{
1522		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1549	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1523	1550
1524	1551	ragdoll.toParent = LA.newMatrix();
1525	1552	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1537,7 +1564,7 @@
1537	1564	} else
1538	1565	/*
1539	1566	*/
1540		- if (event.getSource() == heightFieldItem)
	1567	+ if (source == heightFieldItem)
1541	1568	{
1542	1569	Object3D obj = new Object3D();
1543	1570
..	..	@@ -1575,27 +1602,31 @@
1575	1602
1576	1603	makeSomething(obj);
1577	1604	} else
1578		- if (event.getSource() == gridItem)
	1605	+ if (source == gridItem)
1579	1606	{
1580	1607	makeSomething(new Grid());
1581	1608	} else
1582		- if (event.getSource() == ellipsoidItem)
	1609	+ if (source == ellipsoidItem)
1583	1610	{
1584	1611	makeSomething(new Sphere());
1585	1612	} else
1586		- if (event.getSource() == coneItem)
	1613	+ if (source == coneItem)
1587	1614	{
1588	1615	makeSomething(new Cone());
1589	1616	} else
1590		- if (event.getSource() == torusItem)
	1617	+ if (source == torusItem)
1591	1618	{
1592	1619	makeSomething(new Torus());
1593	1620	} else
1594		- if (event.getSource() == superItem)
	1621	+ if (source == superItem)
1595	1622	{
1596	1623	makeSomething(new Superellipsoid());
1597	1624	} else
1598		- if (event.getSource() == blobItem)
	1625	+ if (source == kleinItem)
	1626	+ {
	1627	+ makeSomething(new Klein());
	1628	+ } else
	1629	+ if (source == blobItem)
1599	1630	{
1600	1631	Blob blob = new Blob();
1601	1632	BlobComponent comp = new BlobComponent();
..	..	@@ -1603,15 +1634,15 @@
1603	1634	//blob.retile();
1604	1635	makeSomething(blob);
1605	1636	} else
1606		- if (event.getSource() == latheItem)
	1637	+ if (source == latheItem)
1607	1638	{
1608	1639	makeSomething(new Lathe());
1609	1640	} else
1610		- if (event.getSource() == bezierItem)
	1641	+ if (source == bezierItem)
1611	1642	{
1612	1643	makeSomething(new BezierSurface());
1613	1644	} else
1614		- if (event.getSource() == checkerItem)
	1645	+ if (source == checkerItem)
1615	1646	{
1616	1647	/*
1617	1648	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1626,7 +1657,7 @@
1626	1657	*/
1627	1658	makeSomething(new Checker());
1628	1659	} else
1629		- if (event.getSource() == meshItem)
	1660	+ if (source == meshItem)
1630	1661	{
1631	1662	Object3D itemtomake = new Object3D();
1632	1663	Object3D child;
..	..	@@ -1647,35 +1678,35 @@
1647	1678	makeSomething(child);
1648	1679	}
1649	1680	} else
1650		- if (event.getSource() == springItem)
	1681	+ if (source == springItem)
1651	1682	{
1652	1683	cSpring s = new cSpring();
1653	1684	s.setup();
1654	1685	makeSomething(s);
1655	1686	} else
1656		- if (event.getSource() == flagItem)
	1687	+ if (source == flagItem)
1657	1688	{
1658	1689	cSpring s = new cFlag();
1659	1690	s.setup();
1660	1691	makeSomething(s);
1661	1692	} else
1662		- if (event.getSource() == lightItem)
	1693	+ if (source == lightItem)
1663	1694	{
1664	1695	makeSomething(new Light());
1665	1696	} else
1666		- if (event.getSource() == csgItem)
	1697	+ if (source == csgItem)
1667	1698	{
1668	1699	group(new CSG());
1669	1700	} else
1670		- if (event.getSource() == templateItem)
	1701	+ if (source == templateItem)
1671	1702	{
1672	1703	group(new cTemplate());
1673	1704	} else
1674		- if (event.getSource() == attributeItem)
	1705	+ if (source == attributeItem)
1675	1706	{
1676	1707	makeSomething(new Attribute());
1677	1708	} else
1678		- if (event.getSource() == pointflowItem)
	1709	+ if (source == pointflowItem)
1679	1710	{
1680	1711	makeSomething(new PointFlow());
1681	1712	} else
..	..	@@ -1687,7 +1718,7 @@
1687	1718	} else
1688	1719	*/
1689	1720
1690		- if (event.getSource() == superLoopItem)
	1721	+ if (source == superLoopItem)
1691	1722	{
1692	1723	Composite g = new cGroup();
1693	1724	for (int i=0; i<15; i++)
..	..	@@ -1709,7 +1740,7 @@
1709	1740
1710	1741	group(g);
1711	1742	} else
1712		- if (event.getSource() == loopItem)
	1743	+ if (source == loopItem)
1713	1744	{
1714	1745	Composite csg = new GroupLeaf();
1715	1746	csg.count = 5;
..	..	@@ -1718,7 +1749,7 @@
1718	1749	csg.addChild(child);
1719	1750	child.addChild(csg);
1720	1751	} else
1721		- if (event.getSource() == doubleItem)
	1752	+ if (source == doubleItem)
1722	1753	{
1723	1754	Composite csg = new GroupLeaf();
1724	1755	csg.count = 5;
..	..	@@ -1730,7 +1761,7 @@
1730	1761	csg.addChild(child);
1731	1762	child.addChild(csg);
1732	1763	} else
1733		- if (event.getSource() == tripleItem)
	1764	+ if (source == tripleItem)
1734	1765	{
1735	1766	Composite csg = new GroupLeaf();
1736	1767	csg.count = 4;
..	..	@@ -1746,70 +1777,70 @@
1746	1777	child.addChild(csg);
1747	1778	} else
1748	1779
1749		- if (event.getSource() == importGFDItem)
	1780	+ if (source == importGFDItem)
1750	1781	{
1751	1782	ImportGFD();
1752	1783	} else
1753		- if (event.getSource() == importVRMLX3DItem)
	1784	+ if (source == importVRMLX3DItem)
1754	1785	{
1755	1786	ImportVRMLX3D();
1756	1787	} else
1757		- if (event.getSource() == import3DSItem)
	1788	+ if (source == import3DSItem)
1758	1789	{
1759	1790	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1760	1791	} else
1761		- if (event.getSource() == importOBJItem)
	1792	+ if (source == importOBJItem)
1762	1793	{
1763	1794	objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1764	1795	} else
1765		- if (event.getSource() == computeAOItem)
	1796	+ if (source == computeAOItem)
1766	1797	{
1767		- CameraPane.drawMode = CameraPane.OCCLUSION;
1768		- CameraPane.theRenderer.repaint();
	1798	+ Globals.drawMode = CameraPane.OCCLUSION;
	1799	+ Globals.theRenderer.repaint();
1769	1800	} else
1770		- if (event.getSource() == recompileItem)
	1801	+ if (source == recompileItem)
1771	1802	{
1772	1803	Recompile();
1773	1804	refreshContents();
1774	1805	} else
1775		- if (event.getSource() == editScriptItem)
	1806	+ if (source == editScriptItem)
1776	1807	{
1777	1808	OpenDialog();
1778	1809	refreshContents();
1779	1810	} else
1780		- if (event.getSource() == invariantsItem)
	1811	+ if (source == invariantsItem)
1781	1812	{
1782	1813	System.out.println("Invariants:");
1783		- GrafreeD.theApplet3D.universe.invariants();
	1814	+ GrafreeD.grafreeD.universe.invariants();
1784	1815	} else
1785		- if (event.getSource() == memoryItem)
	1816	+ if (source == memoryItem)
1786	1817	{
1787	1818	//System.out.println("Invariants:");
1788	1819	PrintMemory();
1789	1820	} else
1790		- if (event.getSource() == pathItem)
	1821	+ if (source == pathItem)
1791	1822	{
1792	1823	PrintPath();
1793	1824	} else
1794		- if (event.getSource() == analyzeItem)
	1825	+ if (source == analyzeItem)
1795	1826	{
1796	1827	AnalyzeObject();
1797	1828	} else
1798		- if (event.getSource() == dumpItem)
	1829	+ if (source == dumpItem)
1799	1830	{
1800	1831	DumpObject();
1801	1832	} else
1802		- if (event.getSource() == screenfitButton)
	1833	+ if (source == screenfitButton)
1803	1834	{
1804	1835	//Reload(lastConverter, lastFilename, true);
1805	1836	ScreenFit();
1806	1837	} else
1807		- if (event.getSource() == screenfitpointButton)
	1838	+ if (source == screenfitpointButton)
1808	1839	{
1809	1840	//Reload(lastConverter, lastFilename, true);
1810	1841	ScreenFitPoint();
1811	1842	} else
1812		- if (event.getSource() == snapobjectButton)
	1843	+ if (source == snapobjectButton)
1813	1844	{
1814	1845	//Reload(lastConverter, lastFilename, true);
1815	1846	SnapObject();
..	..	@@ -1820,13 +1851,13 @@
1820	1851	// Recompile();
1821	1852	// refreshContents();
1822	1853	// } else
1823		- if (event.getSource() == gcButton)
	1854	+ if (source == gcButton)
1824	1855	{
1825	1856	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	1857	System.gc();
1827	1858	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1828	1859	} else
1829		- if (event.getSource() == editLeafItem)
	1860	+ if (source == editLeafItem)
1830	1861	{
1831	1862	Object3D obj;
1832	1863	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1840,62 +1871,62 @@
1840	1871	}
1841	1872	refreshContents(true);
1842	1873	} else
1843		- if (event.getSource() == openWindowItem)
	1874	+ if (source == openWindowItem)
1844	1875	{
1845	1876	EditSelection(true);
1846	1877	} else
1847		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1878	+ if (source == cutItem \|\| source == clearButton)
1848	1879	{
1849	1880	loadClipboard(true);
1850	1881	} else
1851		- if (event.getSource() == duplicateItem)
	1882	+ if (source == duplicateItem)
1852	1883	{
1853	1884	Object3D keep = GrafreeD.clipboard;
1854	1885	loadClipboard(false);
1855	1886	paste(false);
1856	1887	GrafreeD.clipboard = keep;
1857	1888	} else
1858		- if (event.getSource() == cloneItem)
	1889	+ if (source == cloneItem)
1859	1890	{
1860	1891	CloneSelection(false);
1861	1892	} else
1862		- if (event.getSource() == cloneSupportItem)
	1893	+ if (source == cloneSupportItem)
1863	1894	{
1864	1895	CloneSelection(true);
1865	1896	} else
1866		- if (event.getSource() == copyItem)
	1897	+ if (source == copyItem)
1867	1898	{
1868	1899	loadClipboard(false);
1869	1900	} else
1870		- if (event.getSource() == pasteItem)
	1901	+ if (source == pasteItem)
1871	1902	{
1872	1903	paste(false);
1873	1904	} else
1874		- if (event.getSource() == pasteLinkItem)
	1905	+ if (source == pasteLinkItem)
1875	1906	{
1876	1907	pasteInto(false);
1877	1908	} else
1878		- if (event.getSource() == pasteCloneItem)
	1909	+ if (source == pasteCloneItem)
1879	1910	{
1880	1911	pasteInto(true);
1881	1912	} else
1882		- if (event.getSource() == pasteExpandItem)
	1913	+ if (source == pasteExpandItem)
1883	1914	{
1884	1915	paste(true);
1885	1916	} else
1886		- if (event.getSource() == synchronizeItem)
	1917	+ if (source == synchronizeItem)
1887	1918	{
1888	1919	Overwrite(Object3D.TRANSFORM);
1889	1920	} else
1890		- if (event.getSource() == overwriteNameItem)
	1921	+ if (source == overwriteNameItem)
1891	1922	{
1892	1923	Overwrite(Object3D.NAME);
1893	1924	} else
1894		- if (event.getSource() == overwriteUVItem)
	1925	+ if (source == overwriteUVItem)
1895	1926	{
1896	1927	Overwrite(Object3D.UV);
1897	1928	} else
1898		- if (event.getSource() == overwriteMatItem)
	1929	+ if (source == overwriteMatItem)
1899	1930	{
1900	1931	/* july 2015
1901	1932	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1915,7 +1946,7 @@
1915	1946
1916	1947	Overwrite(dropAttributes);
1917	1948	}
1918		- if (event.getSource() == overwriteGeoItem)
	1949	+ if (source == overwriteGeoItem)
1919	1950	{
1920	1951	Overwrite(Object3D.GEOMETRY);
1921	1952	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1932,7 +1963,7 @@
1932	1963	// refreshContents();
1933	1964	// }
1934	1965	} else
1935		- if (event.getSource() == generateMeshItem)
	1966	+ if (source == generateMeshItem)
1936	1967	{
1937	1968	//if (group.selection.size() == 1)
1938	1969	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1943,7 +1974,7 @@
1943	1974	ResetModel();
1944	1975	refreshContents();
1945	1976	} else
1946		- if (event.getSource() == extractGeometriesItem)
	1977	+ if (source == extractGeometriesItem)
1947	1978	{
1948	1979	boolean one = false;
1949	1980
..	..	@@ -1970,7 +2001,7 @@
1970	2001	ResetModel();
1971	2002	refreshContents();
1972	2003	} else
1973		- if (event.getSource() == cloneGeometriesItem)
	2004	+ if (source == cloneGeometriesItem)
1974	2005	{
1975	2006	boolean one = false;
1976	2007
..	..	@@ -1996,32 +2027,37 @@
1996	2027	ResetModel();
1997	2028	refreshContents();
1998	2029	} else
1999		- if (event.getSource() == shareGeometriesItem)
	2030	+ if (source == shareGeometriesItem)
2000	2031	{
2001	2032	boolean one = false;
2002	2033
2003	2034	if (group.selection.size() == 1)
2004	2035	one = true;
2005	2036
	2037	+ Object3D merge = null;
	2038	+
2006	2039	Object3D content = new cGroup();
2007	2040
2008	2041	for (int i=0; i<group.selection.size(); i++)
2009	2042	{
2010		- Object3D sel = new Merge(group.selection.get(i));
	2043	+ merge = new Merge(group.selection.get(i));
2011	2044
2012	2045	if (one)
2013		- makeSomething(sel, false);
	2046	+ makeSomething(merge, false);
2014	2047	else
2015		- content.addChild(sel);
	2048	+ content.addChild(merge);
2016	2049	}
2017	2050
2018	2051	if (!one)
2019		- makeSomething(content, false);
2020		-
2021		- ResetModel();
2022		- refreshContents();
	2052	+ makeSomething(content, true);
	2053	+ else
	2054	+ {
	2055	+ ResetModel();
	2056	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2057	+ refreshContents();
	2058	+ }
2023	2059	} else
2024		- if (event.getSource() == mergeGeometriesItem)
	2060	+ if (source == mergeGeometriesItem)
2025	2061	{
2026	2062	boolean one = false;
2027	2063
..	..	@@ -2051,7 +2087,7 @@
2051	2087	ResetModel();
2052	2088	refreshContents();
2053	2089	} else
2054		- if (event.getSource() == linkverticesItem)
	2090	+ if (source == linkverticesItem)
2055	2091	{
2056	2092	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2057	2093	// {
..	..	@@ -2071,7 +2107,7 @@
2071	2107	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	2108	content = ((cGroup)content).get(0);
2073	2109
2074		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2110	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2075	2111	for (int i=0; i<group.selection.size(); i++)
2076	2112	{
2077	2113	boolean random = CameraPane.RANDOM;
..	..	@@ -2080,11 +2116,11 @@
2080	2116	// group.selection.get(i).setMasterThis(content); // should be identity
2081	2117	CameraPane.RANDOM = random;
2082	2118	}
2083		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2119	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2084	2120	refreshContents();
2085	2121	}
2086	2122	} else
2087		- if (event.getSource() == resetsupportItem)
	2123	+ if (source == resetsupportItem)
2088	2124	{
2089	2125	for (int i=0; i<group.selection.size(); i++)
2090	2126	{
..	..	@@ -2096,7 +2132,16 @@
2096	2132
2097	2133	refreshContents();
2098	2134	} else
2099		- if (event.getSource() == resetreferencesItem)
	2135	+ if (source == relinkverticesItem)
	2136	+ {
	2137	+ boolean random = CameraPane.RANDOM;
	2138	+ CameraPane.RANDOM = false; // parse all random nodes
	2139	+ group.selection.RelinkToSupport();
	2140	+ CameraPane.RANDOM = random;
	2141	+
	2142	+ refreshContents();
	2143	+ } else
	2144	+ if (source == resetreferencesItem)
2100	2145	{
2101	2146	for (int i=0; i<group.selection.size(); i++)
2102	2147	{
..	..	@@ -2105,7 +2150,7 @@
2105	2150
2106	2151	refreshContents();
2107	2152	} else
2108		- if (event.getSource() == setMasterItem)
	2153	+ if (source == setMasterItem)
2109	2154	{
2110	2155	if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2111	2156	{
..	..	@@ -2118,7 +2163,7 @@
2118	2163	refreshContents();
2119	2164	}
2120	2165	} else
2121		- if (event.getSource() == poseMeshItem)
	2166	+ if (source == poseMeshItem)
2122	2167	{
2123	2168	if (group.selection.size() == 1)
2124	2169	{
..	..	@@ -2137,19 +2182,19 @@
2137	2182	}
2138	2183
2139	2184	} else
2140		- if (event.getSource() == revertMeshItem)
	2185	+ if (source == revertMeshItem)
2141	2186	{
2142	2187	RevertMeshes();
2143	2188	} else
2144		- if (event.getSource() == resetMeshItem)
	2189	+ if (source == resetMeshItem)
2145	2190	{
2146	2191	ResetAll();
2147	2192	} else
2148		- if (event.getSource() == stepAllItem)
	2193	+ if (source == stepAllItem)
2149	2194	{
2150	2195	StepAll();
2151	2196	} else
2152		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2197	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2153	2198	{
2154	2199	//int indices[] = jList.getSelectedIndices();
2155	2200	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2157,42 +2202,46 @@
2157	2202
2158	2203	ClearSelection(false);
2159	2204	} else
2160		- if (event.getSource() == clearAllItem)
	2205	+ if (source == clearAllItem)
2161	2206	{
2162	2207	ClearSelection(true);
2163	2208	} else
2164		- if (event.getSource() == grabItem)
	2209	+ if (source == grabItem)
2165	2210	{
2166	2211	group(new cGroup(), true);
2167	2212	} else
2168		- if (event.getSource() == frontItem)
	2213	+ if (source == hideItem)
	2214	+ {
	2215	+ group(new HiddenObject());
	2216	+ } else
	2217	+ if (source == frontItem)
2169	2218	{
2170	2219	front();
2171	2220	} else
2172		- if (event.getSource() == backItem)
	2221	+ if (source == backItem)
2173	2222	{
2174	2223	back();
2175	2224	} else
2176		- if (event.getSource() == cameraItem)
	2225	+ if (source == cameraItem)
2177	2226	{
2178	2227	makeSomething(new Camera());
2179	2228	} else
2180		- if (event.getSource() == compositeItem)
	2229	+ if (source == compositeItem)
2181	2230	{
2182	2231	group(new Composite());
2183	2232	} else
2184		- if (event.getSource() == randomItem)
	2233	+ if (source == randomItem)
2185	2234	{
2186	2235	RandomNode random = new RandomNode();
2187	2236	group(random);
2188	2237	if (random.size() > 0)
2189		- random.name = random.get(0).name + "Rnd";
	2238	+ random.name = random.get(0).name + "Switch";
2190	2239	} else
2191		- if (event.getSource() == physicsItem)
	2240	+ if (source == physicsItem)
2192	2241	{
2193	2242	group(new PhysicsNode());
2194	2243	} else
2195		- if (event.getSource() == frameselectorItem)
	2244	+ if (source == frameselectorItem)
2196	2245	{
2197	2246	for (int i=0; i<group.selection.size(); i++)
2198	2247	{
..	..	@@ -2204,7 +2253,7 @@
2204	2253	ResetModel();
2205	2254	refreshContents();
2206	2255	} else
2207		- if (event.getSource() == switchGeoItem)
	2256	+ if (source == switchGeoItem)
2208	2257	{
2209	2258	for (int i=0; i<group.selection.size(); i++)
2210	2259	{
..	..	@@ -2216,7 +2265,7 @@
2216	2265	ResetModel();
2217	2266	refreshContents();
2218	2267	} else
2219		- if (event.getSource() == switchTransfoItem)
	2268	+ if (source == switchTransfoItem)
2220	2269	{
2221	2270	for (int i=0; i<group.selection.size(); i++)
2222	2271	{
..	..	@@ -2228,7 +2277,7 @@
2228	2277	ResetModel();
2229	2278	refreshContents();
2230	2279	} else
2231		- if (event.getSource() == morphItem)
	2280	+ if (source == morphItem)
2232	2281	{
2233	2282	for (int i=0; i<group.selection.size(); i++)
2234	2283	{
..	..	@@ -2240,7 +2289,7 @@
2240	2289	ResetModel();
2241	2290	refreshContents();
2242	2291	} else
2243		- if (event.getSource() == scriptNodeItem)
	2292	+ if (source == scriptNodeItem)
2244	2293	{
2245	2294	boolean atleastone = false;
2246	2295
..	..	@@ -2279,199 +2328,215 @@
2279	2328	}
2280	2329	}
2281	2330	} else
2282		- if (event.getSource() == linkerItem)
	2331	+ if (source == linkerItem)
2283	2332	{
2284	2333	group(new cLinker());
2285	2334	} else
2286		- if (event.getSource() == textureItem)
	2335	+ if (source == textureItem)
2287	2336	{
2288	2337	group(new TextureNode());
2289	2338	} else
2290		- if (event.getSource() == shadowXItem)
	2339	+ if (source == billboardItem)
	2340	+ {
	2341	+ group(new BillboardNode());
	2342	+ } else
	2343	+ if (source == shadowXItem)
2291	2344	{
2292	2345	CastShadow(0);
2293	2346	} else
2294		- if (event.getSource() == shadowYItem)
	2347	+ if (source == shadowYItem)
2295	2348	{
2296	2349	CastShadow(1);
2297	2350	} else
2298		- if (event.getSource() == shadowZItem)
	2351	+ if (source == shadowZItem)
2299	2352	{
2300	2353	CastShadow(2);
2301	2354	} else
2302		- if (event.getSource() == ungroupItem)
	2355	+ if (source == ungroupItem)
2303	2356	{
2304		- ungroup();
	2357	+ //ungroup();
	2358	+ for (int i=0; i<group.selection.size(); i++)
	2359	+ {
	2360	+ Ungroup(group.selection.get(i));
	2361	+ }
	2362	+
	2363	+ ClearSelection(false);
	2364	+
	2365	+ refreshContents();
2305	2366	} else
2306		- if (event.getSource() == genUVItem)
	2367	+ if (source == genUVItem)
2307	2368	{
2308	2369	GenUV();
2309	2370	} else
2310		- if (event.getSource() == genNormalsCADItem)
	2371	+ if (source == genNormalsCADItem)
2311	2372	{
2312	2373	GenNormals(true);
2313	2374	} else
2314		- if (event.getSource() == genNormalsMESHItem)
	2375	+ if (source == genNormalsMESHItem)
2315	2376	{
2316	2377	GenNormals(true); // TODO
2317	2378	} else
2318		- if (event.getSource() == genNormalsORGANItem)
	2379	+ if (source == genNormalsORGANItem)
2319	2380	{
2320	2381	GenNormals(false);
2321	2382	} else
2322		- if (event.getSource() == stripifyItem)
	2383	+ if (source == genNormalsMINEItem)
	2384	+ {
	2385	+ GenNormalsMINE();
	2386	+ } else
	2387	+ if (source == stripifyItem)
2323	2388	{
2324	2389	Stripify();
2325	2390	} else
2326		- if (event.getSource() == unstripifyItem)
	2391	+ if (source == unstripifyItem)
2327	2392	{
2328	2393	Unstripify();
2329	2394	} else
2330		- if (event.getSource() == trimItem)
	2395	+ if (source == trimItem)
2331	2396	{
2332	2397	Trim();
2333	2398	} else
2334		- if (event.getSource() == untrimItem)
	2399	+ if (source == untrimItem)
2335	2400	{
2336	2401	Untrim();
2337	2402	} else
2338		- if (event.getSource() == clearColorsItem)
	2403	+ if (source == clearColorsItem)
2339	2404	{
2340	2405	ClearColors();
2341	2406	} else
2342		- if (event.getSource() == clearMaterialsItem)
	2407	+ if (source == clearMaterialsItem)
2343	2408	{
2344	2409	ClearMaterials();
2345	2410	} else
2346		- if (event.getSource() == liveleavesItem)
	2411	+ if (source == liveleavesItem)
2347	2412	{
2348	2413	LiveLeaves(true);
2349	2414	} else
2350		- if (event.getSource() == unliveleavesItem)
	2415	+ if (source == unliveleavesItem)
2351	2416	{
2352	2417	LiveLeaves(false);
2353	2418	} else
2354		- if (event.getSource() == supportleavesItem)
	2419	+ if (source == supportleavesItem)
2355	2420	{
2356	2421	SupportLeaves(true);
2357	2422	} else
2358		- if (event.getSource() == unsupportleavesItem)
	2423	+ if (source == unsupportleavesItem)
2359	2424	{
2360	2425	SupportLeaves(false);
2361	2426	} else
2362		- if (event.getSource() == hideleavesItem)
	2427	+ if (source == hideleavesItem)
2363	2428	{
2364	2429	HideLeaves(true);
2365	2430	} else
2366		- if (event.getSource() == showleavesItem)
	2431	+ if (source == showleavesItem)
2367	2432	{
2368	2433	HideLeaves(false);
2369	2434	} else
2370		- if (event.getSource() == markleavesItem)
	2435	+ if (source == markleavesItem)
2371	2436	{
2372	2437	MarkLeaves(true);
2373	2438	} else
2374		- if (event.getSource() == unmarkleavesItem)
	2439	+ if (source == unmarkleavesItem)
2375	2440	{
2376	2441	MarkLeaves(false);
2377	2442	} else
2378		- if (event.getSource() == flipVItem)
	2443	+ if (source == flipVItem)
2379	2444	{
2380	2445	FlipV(true);
2381	2446	} else
2382		- if (event.getSource() == unflipVItem)
	2447	+ if (source == unflipVItem)
2383	2448	{
2384	2449	FlipV(false);
2385	2450	} else
2386		- if (event.getSource() == lowTexturesItem)
	2451	+ if (source == lowTexturesItem)
2387	2452	{
2388	2453	SetTexRes(0);
2389	2454	} else
2390		- if (event.getSource() == normalTexturesItem)
	2455	+ if (source == normalTexturesItem)
2391	2456	{
2392	2457	SetTexRes(1);
2393	2458	} else
2394		- if (event.getSource() == highTexturesItem)
	2459	+ if (source == highTexturesItem)
2395	2460	{
2396	2461	SetTexRes(2);
2397	2462	} else
2398		- if (event.getSource() == veryhighTexturesItem)
	2463	+ if (source == veryhighTexturesItem)
2399	2464	{
2400	2465	SetTexRes(3);
2401	2466	} else
2402		- if (event.getSource() == maxTexturesItem)
	2467	+ if (source == maxTexturesItem)
2403	2468	{
2404	2469	SetTexRes(4);
2405	2470	} else
2406		- if (event.getSource() == panoTexturesItem)
	2471	+ if (source == panoTexturesItem)
2407	2472	{
2408	2473	SetTexRes(5);
2409	2474	} else
2410		- if (event.getSource() == reverseNormalsItem)
	2475	+ if (source == reverseNormalsItem)
2411	2476	{
2412	2477	ReverseNormals();
2413	2478	} else
2414		- if (event.getSource() == parseverticesItem)
	2479	+ if (source == parseverticesItem)
2415	2480	{
2416	2481	ParseVertices();
2417	2482	} else
2418		- if (event.getSource() == textureFieldItem)
	2483	+ if (source == textureFieldItem)
2419	2484	{
2420	2485	TextureVertices();
2421	2486	} else
2422		- if (event.getSource() == alignItem)
	2487	+ if (source == alignItem)
2423	2488	{
2424	2489	Align();
2425	2490	} else
2426		- if (event.getSource() == mirrorItem)
	2491	+ if (source == mirrorItem)
2427	2492	{
2428	2493	MirrorPoses();
2429	2494	} else
2430		- if (event.getSource() == reduceMorphItem)
	2495	+ if (source == reduceMorphItem)
2431	2496	{
2432	2497	MeshReduction(false);
2433	2498	} else
2434		- if (event.getSource() == reduce34MorphItem)
	2499	+ if (source == reduce34MorphItem)
2435	2500	{
2436	2501	MeshReduction(true);
2437	2502	} else
2438		- if (event.getSource() == reverseTrianglesItem)
	2503	+ if (source == reverseTrianglesItem)
2439	2504	{
2440	2505	ReverseTriangles();
2441	2506	} else
2442		- if (event.getSource() == reduceMeshItem)
	2507	+ if (source == reduceMeshItem)
2443	2508	{
2444	2509	ReduceMesh(false);
2445	2510	} else
2446		- if (event.getSource() == reduce34MeshItem)
	2511	+ if (source == reduce34MeshItem)
2447	2512	{
2448	2513	ReduceMesh(true);
2449	2514	} else
2450		- if (event.getSource() == increaseMeshItem)
	2515	+ if (source == increaseMeshItem)
2451	2516	{
2452	2517	IncreaseMesh();
2453	2518	} else
2454		- if (event.getSource() == clipMeshItem)
	2519	+ if (source == clipMeshItem)
2455	2520	{
2456	2521	ClipMesh();
2457	2522	} else
2458		- if (event.getSource() == smoothMeshItem)
	2523	+ if (source == smoothMeshItem)
2459	2524	{
2460	2525	SmoothMesh();
2461	2526	} else
2462		- if (event.getSource() == transformgeometryItem)
	2527	+ if (source == transformgeometryItem)
2463	2528	{
2464	2529	TransformGeometry();
2465	2530	} else
2466		- if (event.getSource() == resetTransformItem)
	2531	+ if (source == resetTransformItem)
2467	2532	{
2468	2533	ResetTransform();
2469	2534	} else
2470		- if (event.getSource() == resetCentroidItem)
	2535	+ if (source == resetCentroidItem)
2471	2536	{
2472	2537	ResetCentroid();
2473	2538	} else
2474		- if (event.getSource() == resetParentItem)
	2539	+ if (source == resetParentItem)
2475	2540	{
2476	2541	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	2542	{
..	..	@@ -2481,7 +2546,7 @@
2481	2546
2482	2547	refreshContents();
2483	2548	} else
2484		- if (event.getSource() == repairParentItem)
	2549	+ if (source == repairParentItem)
2485	2550	{
2486	2551	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2487	2552	{
..	..	@@ -2495,7 +2560,21 @@
2495	2560
2496	2561	refreshContents();
2497	2562	} else
2498		- if (event.getSource() == sortbysizeItem)
	2563	+ if (source == repairShadowItem)
	2564	+ {
	2565	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2566	+ {
	2567	+ Object3D obj = (Object3D)e.nextElement();
	2568	+ obj.RepairShadow();
	2569	+// for (int i=0; i<obj.size(); i++)
	2570	+// {
	2571	+// obj.get(i).parent = obj;
	2572	+// }
	2573	+ }
	2574	+
	2575	+ refreshContents();
	2576	+ } else
	2577	+ if (source == sortbysizeItem)
2499	2578	{
2500	2579	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2501	2580	{
..	..	@@ -2507,7 +2586,7 @@
2507	2586	ResetModel();
2508	2587	refreshContents();
2509	2588	} else
2510		- if (event.getSource() == sortbynameItem)
	2589	+ if (source == sortbynameItem)
2511	2590	{
2512	2591	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2513	2592	{
..	..	@@ -2519,7 +2598,7 @@
2519	2598	ResetModel();
2520	2599	refreshContents();
2521	2600	} else
2522		- if (event.getSource() == attachPigmentItem)
	2601	+ if (source == attachPigmentItem)
2523	2602	{
2524	2603	String texture = GetFile("Attach pigment");
2525	2604	Object3D obj;
..	..	@@ -2531,7 +2610,7 @@
2531	2610
2532	2611	refreshContents();
2533	2612	} else
2534		- if (event.getSource() == detachPigmentItem)
	2613	+ if (source == detachPigmentItem)
2535	2614	{
2536	2615	Object3D obj;
2537	2616	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2542,7 +2621,7 @@
2542	2621
2543	2622	refreshContents();
2544	2623	} else
2545		- if (event.getSource() == attachBumpItem)
	2624	+ if (source == attachBumpItem)
2546	2625	{
2547	2626	String texture = GetFile("Attach bump");
2548	2627	Object3D obj;
..	..	@@ -2554,7 +2633,7 @@
2554	2633
2555	2634	refreshContents();
2556	2635	} else
2557		- if (event.getSource() == detachBumpItem)
	2636	+ if (source == detachBumpItem)
2558	2637	{
2559	2638	Object3D obj;
2560	2639	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2565,7 +2644,7 @@
2565	2644
2566	2645	refreshContents();
2567	2646	} else
2568		- if (event.getSource() == pigmentBumpItem)
	2647	+ if (source == pigmentBumpItem)
2569	2648	{
2570	2649	Object3D obj;
2571	2650	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2576,158 +2655,195 @@
2576	2655
2577	2656	refreshContents();
2578	2657	} else
2579		- if (event.getSource() == flashSelectionButton)
	2658	+ if (source == flashSelectionButton)
2580	2659	{
2581	2660	CameraPane.flash = true;
2582	2661	refreshContents();
2583	2662	} else
2584		- if (event.getSource() == oneButton)
	2663	+ if (source == oneButton)
2585	2664	{
2586	2665	} else
2587		- if (event.getSource() == twoButton)
	2666	+ if (source == twoButton)
2588	2667	{
2589	2668	radio.layout = twoButton;
2590	2669	// bug
2591	2670	//gridPanel.setDividerLocation(1.0);
2592	2671	//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();
	2672	+// bigThree.remove(scenePanel);
	2673	+// bigThree.remove(centralPanel);
	2674	+// bigThree.remove(XYZPanel);
	2675	+// aWindowConstraints.gridx = 0;
	2676	+// aWindowConstraints.gridy = 0;
	2677	+// aWindowConstraints.gridwidth = 1;
	2678	+// // aConstraints.gridheight = 3;
	2679	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2680	+// aWindowConstraints.weightx = 0;
	2681	+// aWindowConstraints.weighty = 1;
	2682	+// //bigThree.add(jtp, aWindowConstraints);
	2683	+// aWindowConstraints.weightx = 1;
	2684	+// aWindowConstraints.gridwidth = 3;
	2685	+// // aConstraints.gridheight = 3;
	2686	+// aWindowConstraints.gridx = 1;
	2687	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2688	+// bigThree.add(centralPanel, aWindowConstraints);
	2689	+// aWindowConstraints.weightx = 0;
	2690	+// aWindowConstraints.gridx = 4;
	2691	+// aWindowConstraints.gridwidth = 1;
	2692	+// // aConstraints.gridheight = 3;
	2693	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2694	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2695	+// scenePanel.setVisible(false);
	2696	+// centralPanel.setVisible(true);
	2697	+// XYZPanel.setVisible(false);
	2698	+ bigThree.ClearUI();
	2699	+ bigThree.add(centralPanel);
	2700	+ bigThree.FlushUI();
2617	2701	} else
2618		- if (event.getSource() == threeButton)
	2702	+ if (source == threeButton)
2619	2703	{
2620	2704	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();
	2705	+
	2706	+// bigThree.remove(scenePanel);
	2707	+// bigThree.remove(centralPanel);
	2708	+// bigThree.remove(XYZPanel);
	2709	+// aWindowConstraints.gridx = 0;
	2710	+// aWindowConstraints.gridy = 0;
	2711	+// aWindowConstraints.gridwidth = 1;
	2712	+// // aConstraints.gridheight = 3;
	2713	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2714	+// aWindowConstraints.weightx = 0;
	2715	+// aWindowConstraints.weighty = 1;
	2716	+// //bigThree.add(jtp, aWindowConstraints);
	2717	+// aWindowConstraints.weightx = 1;
	2718	+// aWindowConstraints.gridwidth = 3;
	2719	+// // aConstraints.gridheight = 3;
	2720	+// aWindowConstraints.gridx = 1;
	2721	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2722	+// bigThree.add(centralPanel, aWindowConstraints);
	2723	+// aWindowConstraints.weightx = 0;
	2724	+// aWindowConstraints.gridx = 4;
	2725	+// aWindowConstraints.gridwidth = 1;
	2726	+// // aConstraints.gridheight = 3;
	2727	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2728	+// bigThree.add(XYZPanel, aWindowConstraints);
	2729	+// bigThree.validate();
	2730	+// scenePanel.setVisible(false);
	2731	+// centralPanel.setVisible(true);
	2732	+// XYZPanel.setVisible(true);
	2733	+ bigThree.ClearUI();
	2734	+ bigThree.add(centralPanel);
	2735	+ bigThree.add(XYZPanel);
	2736	+ bigThree.FlushUI();
2645	2737	} else
2646		- if (event.getSource() == fourButton)
	2738	+ if (source == fourButton)
2647	2739	{
2648	2740	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();
	2741	+
	2742	+// bigThree.remove(scenePanel);
	2743	+// bigThree.remove(centralPanel);
	2744	+// bigThree.remove(XYZPanel);
	2745	+// aWindowConstraints.gridx = 0;
	2746	+// aWindowConstraints.gridy = 0;
	2747	+// aWindowConstraints.gridwidth = 1;
	2748	+// // aWindowConstraints.gridheight = 3;
	2749	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2750	+// aWindowConstraints.weightx = 1;
	2751	+// aWindowConstraints.weighty = 1;
	2752	+// bigThree.add(scenePanel, aWindowConstraints);
	2753	+// aWindowConstraints.weightx = 1;
	2754	+// aWindowConstraints.gridwidth = 3;
	2755	+// // aConstraints.gridheight = 3;
	2756	+// aWindowConstraints.gridx = 1;
	2757	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2758	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2759	+// aWindowConstraints.weightx = 0;
	2760	+// aWindowConstraints.gridx = 4;
	2761	+// aWindowConstraints.gridwidth = 1;
	2762	+// // aWindowConstraints.gridheight = 3;
	2763	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2764	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2765	+// bigThree.validate();
	2766	+// scenePanel.setVisible(true);
	2767	+// centralPanel.setVisible(false);
	2768	+// XYZPanel.setVisible(false);
	2769	+ bigThree.ClearUI();
	2770	+ bigThree.add(scenePanel);
	2771	+ bigThree.FlushUI();
2673	2772	} else
2674		- if (event.getSource() == sixButton)
	2773	+ if (source == sixButton)
2675	2774	{
2676	2775	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();
	2776	+
	2777	+// bigThree.remove(scenePanel);
	2778	+// bigThree.remove(centralPanel);
	2779	+// bigThree.remove(XYZPanel);
	2780	+// aWindowConstraints.gridx = 0;
	2781	+// aWindowConstraints.gridy = 0;
	2782	+// aWindowConstraints.gridwidth = 1;
	2783	+// // aConstraints.gridheight = 3;
	2784	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2785	+// aWindowConstraints.weightx = 0;
	2786	+// aWindowConstraints.weighty = 1;
	2787	+// bigThree.add(scenePanel, aWindowConstraints);
	2788	+// aWindowConstraints.weightx = 1;
	2789	+// aWindowConstraints.gridwidth = 3;
	2790	+// // aWindowConstraints.gridheight = 3;
	2791	+// aWindowConstraints.gridx = 1;
	2792	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2793	+// bigThree.add(centralPanel, aWindowConstraints);
	2794	+// aWindowConstraints.weightx = 0;
	2795	+// aWindowConstraints.gridx = 4;
	2796	+// aWindowConstraints.gridwidth = 1;
	2797	+// // aWindowConstraints.gridheight = 3;
	2798	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2799	+// //bigThree.add(XYZPanel, aConstraints);
	2800	+// bigThree.validate();
	2801	+// scenePanel.setVisible(true);
	2802	+// centralPanel.setVisible(true);
	2803	+// XYZPanel.setVisible(false);
	2804	+ bigThree.ClearUI();
	2805	+ bigThree.add(scenePanel);
	2806	+ bigThree.add(centralPanel);
	2807	+ bigThree.FlushUI();
2701	2808	} else
2702		- if (event.getSource() == sevenButton)
	2809	+ if (source == sevenButton)
2703	2810	{
2704	2811	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();
	2812	+
	2813	+// bigThree.remove(scenePanel);
	2814	+// bigThree.remove(centralPanel);
	2815	+// bigThree.remove(XYZPanel);
	2816	+// aWindowConstraints.gridx = 0;
	2817	+// aWindowConstraints.gridy = 0;
	2818	+// aWindowConstraints.gridwidth = 1;
	2819	+// // aWindowConstraints.gridheight = 3;
	2820	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2821	+// aWindowConstraints.weightx = 0;
	2822	+// aWindowConstraints.weighty = 1;
	2823	+// bigThree.add(scenePanel, aWindowConstraints);
	2824	+// aWindowConstraints.weightx = 1;
	2825	+// aWindowConstraints.gridwidth = 3;
	2826	+// // aWindowConstraints.gridheight = 3;
	2827	+// aWindowConstraints.gridx = 1;
	2828	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2829	+// bigThree.add(centralPanel, aWindowConstraints);
	2830	+// aWindowConstraints.weightx = 0;
	2831	+// aWindowConstraints.gridx = 4;
	2832	+// aWindowConstraints.gridwidth = 1;
	2833	+// // aConstraints.gridheight = 3;
	2834	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2835	+// bigThree.add(XYZPanel, aWindowConstraints);
	2836	+// bigThree.validate();
	2837	+// scenePanel.setVisible(true);
	2838	+// centralPanel.setVisible(true);
	2839	+// XYZPanel.setVisible(true);
	2840	+ bigThree.ClearUI();
	2841	+ bigThree.add(scenePanel);
	2842	+ bigThree.add(centralPanel);
	2843	+ bigThree.add(XYZPanel);
	2844	+ bigThree.FlushUI();
2729	2845	} else
2730		- if (event.getSource() == rootButton)
	2846	+ if (source == rootButton)
2731	2847	{
2732	2848	Object3D obj;
2733	2849	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2739,7 +2855,7 @@
2739	2855
2740	2856	refreshContents(true);
2741	2857	} else
2742		- if (event.getSource() == closeButton)
	2858	+ if (source == closeButton)
2743	2859	{
2744	2860	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2745	2861	cRadio ab;
..	..	@@ -2760,11 +2876,11 @@
2760	2876	}
2761	2877	refreshContents(true);
2762	2878	} else
2763		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2879	+ if (source == editItem \|\| source == editButton)
2764	2880	{
2765	2881	EditSelection(false);
2766	2882	} else
2767		- if (event.getSource() == uneditButton)
	2883	+ if (source == uneditButton)
2768	2884	{
2769	2885	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2770	2886	{
..	..	@@ -2776,12 +2892,12 @@
2776	2892
2777	2893	child.editWindow = null; // ???????????
2778	2894	}
2779		- objEditor.ctrlPanel.revalidate();
	2895	+ objEditor.ctrlPanel.validate();
2780	2896	//objEditor.jTree.clearSelection();
2781	2897	//objEditor.ResetSliders();
2782	2898	refreshContents(true);
2783	2899	} else
2784		- if (event.getSource() == clearPanelButton)
	2900	+ if (source == clearPanelButton)
2785	2901	{
2786	2902	assert(copy == group);
2787	2903	//copy.ClearUI();
..	..	@@ -2792,7 +2908,7 @@
2792	2908	listUI.clear();
2793	2909	refreshContents(true);
2794	2910	} else
2795		- if (event.getSource() == allParamsButton)
	2911	+ if (source == allParamsButton)
2796	2912	{
2797	2913	assert(copy == group);
2798	2914
..	..	@@ -2813,19 +2929,19 @@
2813	2929
2814	2930	refreshContents(true);
2815	2931	} else
2816		- if (event.getSource() == unselectButton)
	2932	+ if (source == unselectButton)
2817	2933	{
2818	2934	objEditor.jTree.clearSelection();
2819	2935	// ?? oct 2012 GrafreeD.clipboard.clear();
2820	2936	objEditor.ResetSliders();
2821	2937	refreshContents(true);
2822	2938	} else
2823		- if(event.getSource() instanceof cRadio)
	2939	+ if(source instanceof cRadio)
2824	2940	{
2825	2941	group.parent = keepparent;
2826	2942	group.attributes = 0;
2827	2943	//group.editWindow = null;
2828		- /cRadio/ radio = (cRadio)event.getSource();
	2944	+ /cRadio/ radio = (cRadio)source;
2829	2945	Object3D obj = radio.GetObject();
2830	2946	System.out.println("Edit " + obj);
2831	2947	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2845,7 +2961,7 @@
2845	2961	}
2846	2962
2847	2963	copy = group;
2848		- //CameraPane.theRenderer.object = group;
	2964	+ //Globals.theRenderer.object = group;
2849	2965	if(!useclient)
2850	2966	{
2851	2967	cameraView.renderCamera = radio.camera;
..	..	@@ -2854,7 +2970,8 @@
2854	2970	cameraView.cameras[cameraView.cameracount] = radio.camera;
2855	2971	cameraView.targetLookAt.set(radio.camera.lookAt);
2856	2972	cameraView.object = group;
2857		- cameraView.lighttouched = true;
	2973	+ //cameraView.lighttouched = true;
	2974	+ Globals.lighttouched = true;
2858	2975	topView.object = group;
2859	2976	frontView.object = group;
2860	2977	sideView.object = group;
..	..	@@ -2890,7 +3007,7 @@
2890	3007	if (useclient)
2891	3008	{
2892	3009	cameraView.object = client;
2893		- cameraView.lighttouched = true;
	3010	+ Globals.lighttouched = true;
2894	3011	//topView.object = client;
2895	3012	//frontView.object = client;
2896	3013	//sideView.object = client;
..	..	@@ -2898,7 +3015,7 @@
2898	3015	else
2899	3016	{
2900	3017	cameraView.object = group;
2901		- cameraView.lighttouched = true;
	3018	+ Globals.lighttouched = true;
2902	3019	//topView.object = group;
2903	3020	//frontView.object = group;
2904	3021	//sideView.object = group;
..	..	@@ -3179,6 +3296,13 @@
3179	3296	refreshContents();
3180	3297	}
3181	3298
	3299	+ void GenNormalsMINE()
	3300	+ {
	3301	+ group.selection.GenNormalsMINE();
	3302	+
	3303	+ refreshContents();
	3304	+ }
	3305	+
3182	3306	void Stripify()
3183	3307	{
3184	3308	group.StripifyS();
..	..	@@ -3399,7 +3523,7 @@
3399	3523	String pigment = Object3D.GetPigment(tex);
3400	3524	//String bump = Object3D.GetBump(tex);
3401	3525
3402		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3526	+ com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3403	3527
3404	3528	double s = v.s;
3405	3529
..	..	@@ -3447,12 +3571,26 @@
3447	3571
3448	3572	void Align()
3449	3573	{
	3574	+ if (group.selection.size() == 0)
	3575	+ return;
	3576	+
	3577	+ cVector bbmin = new cVector();
	3578	+ cVector bbmax = new cVector();
	3579	+
	3580	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3581	+
	3582	+ double dx = bbmax.x - bbmin.x;
	3583	+ double dy = bbmax.y - bbmin.y;
	3584	+ double dz = bbmax.z - bbmin.z;
	3585	+
	3586	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3587	+
3450	3588	for (int i=0; i<group.selection.size(); i++)
3451	3589	{
3452	3590	Object3D obj = group.selection.get(i);
3453	3591
3454		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3455		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3592	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3593	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3456	3594	}
3457	3595
3458	3596	refreshContents();
..	..	@@ -3686,7 +3824,7 @@
3686	3824	group.selection.RelinkToSupport(); // july 2014
3687	3825	System.out.println("DONE.");
3688	3826	refreshContents();
3689		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3827	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3690	3828	}
3691	3829
3692	3830	void ReduceMesh(boolean reduction34)
..	..	@@ -3962,25 +4100,25 @@
3962	4100	System.err.println("info : " + child.GetPath());
3963	4101	}
3964	4102	}
3965		- else
3966		- {
3967		- objEditor.SetMaterial(group); // .GetMaterial());
3968		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3969		- System.err.println("info : " + group.GetPath());
3970		- }
	4103	+// else
	4104	+// {
	4105	+// objEditor.SetMaterial(group); // .GetMaterial());
	4106	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4107	+// System.err.println("info : " + group.GetPath());
	4108	+// }
3971	4109
3972	4110	objEditor.SetText(); // jan 2014
3973	4111
3974		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4112	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
3975	4113	CameraPane.flash = true;
3976	4114
3977	4115	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
3978	4116	// a camera
3979	4117	{
3980	4118	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;
	4119	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4120	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4121	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3984	4122	}
3985	4123
3986	4124	refreshContents();
..	..	@@ -4474,6 +4612,26 @@
4474	4612	makeSomething(csg);
4475	4613	}
4476	4614
	4615	+ void Ungroup(Object3D g)
	4616	+ {
	4617	+ if (g instanceof HiddenObject)
	4618	+ {
	4619	+ HiddenObject h = (HiddenObject) g;
	4620	+
	4621	+ for (int i=0; i<h.ActualSize(); i++)
	4622	+ {
	4623	+ objEditor.makeSomething(h.get(i), false);
	4624	+ }
	4625	+ }
	4626	+ else
	4627	+ {
	4628	+ for (int i=0; i<g.Size(); i++)
	4629	+ {
	4630	+ objEditor.makeSomething(g.get(i), false);
	4631	+ }
	4632	+ }
	4633	+ }
	4634	+
4477	4635	void ungroup()
4478	4636	{
4479	4637	/*
..	..	@@ -4833,6 +4991,7 @@
4833	4991	private MenuItem resetsupportItem;
4834	4992	private MenuItem resetreferencesItem;
4835	4993	private MenuItem linkverticesItem;
	4994	+ private MenuItem relinkverticesItem;
4836	4995	private MenuItem setMasterItem;
4837	4996	private MenuItem resetMeshItem;
4838	4997	private MenuItem stepAllItem;
..	..	@@ -4854,6 +5013,7 @@
4854	5013	private MenuItem genNormalsMESHItem;
4855	5014	private MenuItem genNormalsCADItem;
4856	5015	private MenuItem genNormalsORGANItem;
	5016	+ private MenuItem genNormalsMINEItem;
4857	5017	private MenuItem stripifyItem;
4858	5018	private MenuItem unstripifyItem;
4859	5019	private MenuItem trimItem;
..	..	@@ -4895,6 +5055,7 @@
4895	5055	private MenuItem resetCentroidItem;
4896	5056	private MenuItem transformgeometryItem;
4897	5057	private MenuItem resetTransformItem;
	5058	+ private MenuItem hideItem;
4898	5059	private MenuItem grabItem;
4899	5060	private MenuItem backItem;
4900	5061	private MenuItem frontItem;
..	..	@@ -4915,6 +5076,7 @@
4915	5076
4916	5077	private MenuItem resetParentItem;
4917	5078	private MenuItem repairParentItem;
	5079	+ private MenuItem repairShadowItem;
4918	5080	private MenuItem sortbysizeItem;
4919	5081	private MenuItem sortbynameItem;
4920	5082
..	..	@@ -4935,6 +5097,7 @@
4935	5097	private MenuItem coneItem;
4936	5098	private MenuItem torusItem;
4937	5099	private MenuItem superItem;
	5100	+ private MenuItem kleinItem;
4938	5101	private MenuItem blobItem;
4939	5102	private MenuItem latheItem;
4940	5103	private MenuItem bezierItem;
..	..	@@ -4947,6 +5110,7 @@
4947	5110	private MenuItem csgItem;
4948	5111	private MenuItem templateItem;
4949	5112	private MenuItem textureItem;
	5113	+ private MenuItem billboardItem;
4950	5114	private MenuItem shadowXItem;
4951	5115	private MenuItem shadowYItem;
4952	5116	private MenuItem shadowZItem;