~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"));
..	..	@@ -285,6 +292,10 @@
285	292	genNormalsORGANItem.addActionListener(this);
286	293	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287	294	genNormalsCADItem.addActionListener(this);
	295	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	296	+ genNormalsMESHItem.addActionListener(this);
	297	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	298	+ genNormalsMINEItem.addActionListener(this);
288	299	stripifyItem = menu.add(new MenuItem("Stripify"));
289	300	stripifyItem.addActionListener(this);
290	301	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -423,150 +434,94 @@
423	434	oe.radioPanel.add(dummyButton);
424	435	oe.buttonGroup.add(dummyButton);
425	436	*/
426		- aConstraints.gridy += 1;
427		- oe.aConstraints.gridwidth = 1;
428		- oe.aConstraints.gridx = 0;
	437	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
429	438
430		- 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");
431	441	liveCB.addItemListener(this);
432	442
433		- oe.aConstraints.gridx += 1;
434		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
435		- supportCB.addItemListener(this);
436		-
437		- // oe.aConstraints.gridx += 1;
438		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
439		- // localCB.addItemListener(this);
440		-
441		- oe.aConstraints.gridx += 1;
442		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
443		- crowdCB.addItemListener(this);
444		-
445		- oe.aConstraints.gridx += 1;
446		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
447		- smoothCB.addItemListener(this);
448		-
449		- oe.aConstraints.gridx += 1;
450		- 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");
451	445	fastCB.addItemListener(this);
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
454		- slowCB.addItemListener(this);
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
457		- boxCB.addItemListener(this);
458		-
459		-// oe.aConstraints.gridx += 1;
460		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
461		-// speakerMocapCB.addItemListener(this);
462		-
463		- if (false)
464		- {
465		- // handled in scripts
466		- oe.aConstraints.gridx += 1;
467		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
468		- speakerCameraCB.addItemListener(this);
469		-
470		- oe.aConstraints.gridx += 1;
471		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
472		- speakerFocusCB.addItemListener(this);
473		-
474		- oe.aConstraints.gridx += 1;
475		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
476		- smoothfocusCB.addItemListener(this);
477		- }
478		-
479		-//oe.aConstraints.gridx += 1;
480		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
481		-// debugCB.addItemListener(this);
482		-
483		- oe.aConstraints.gridx += 1;
484		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
485		- oeilCB.addItemListener(this);
486		-
487		- oe.aConstraints.gridx += 1;
488		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
489		- lookAtCB.addItemListener(this);
490		-
491		- oe.aConstraints.gridx += 1;
492		- 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");
493	449	trackCB.addItemListener(this);
494	450
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	451	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	452	+ screenfitButton.setToolTipText("Screen fit");
497	453	screenfitButton.addActionListener(this);
498		- oe.aConstraints.gridx += 1;
	454	+
499	455	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
500	456	// screenfitpointButton.addActionListener(this);
501		-// oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
503		- snapobjectButton.addActionListener(this);
504		- oe.aConstraints.gridx += 1;
505	457
506		- //aConstraints.gridx = 0;
507		- //aConstraints.gridy += 1;
508		- oe.aConstraints.weighty = 0;
509		- oe.aConstraints.gridwidth = 1;
510		-
511		- 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");
512	467	flashSelectionButton.addActionListener(this);
513		- oe.aConstraints.gridx += 1;
514		- oe.aConstraints.weighty = 0;
515		- oe.aConstraints.gridwidth = 1;
516	468
517		- //
518		- 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");
519	473	twoButton.addActionListener(this);
520		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	474	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
521	475	fourButton.addActionListener(this);
522		- 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");
523	479	sixButton.addActionListener(this);
524		- 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");
525	482	threeButton.addActionListener(this);
526		- 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");
527	485	sevenButton.addActionListener(this);
528	486	//
529	487
530		- 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");
531	490	rootButton.addActionListener(this);
532		- oe.aConstraints.gridx += 1;
533		- 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");
534	494	closeButton.addActionListener(this);
535	495	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536	496	//clearButton.addActionListener(this);
537		- oe.aConstraints.gridx += 1;
538	497
539		- oe.aConstraints.gridx = 1; //
540		- 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");
541	502	editButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- oe.aConstraints.weighty = 0;
544		- oe.aConstraints.gridwidth = 1;
545	503
546		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	504	+ commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	505	+ uneditButton.setToolTipText("Unedit selection");
547	506	uneditButton.addActionListener(this);
548	507
549		- oe.aConstraints.gridx += 1;
550		- oe.aConstraints.weighty = 0;
551		- oe.aConstraints.gridwidth = 1;
552		-
553		- 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");
554	510	clearPanelButton.addActionListener(this);
555	511
556		- oe.aConstraints.gridx += 1;
557		- oe.aConstraints.weighty = 0;
558		- oe.aConstraints.gridwidth = 1;
559		-
560		- 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??");
561	514	allParamsButton.addActionListener(this);
562	515
563		- oe.aConstraints.gridx += 1;
564		- oe.aConstraints.weighty = 0;
565		- oe.aConstraints.gridwidth = 1;
566		-
567		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	516	+ commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	517	+ unselectButton.setToolTipText("Unselect");
568	518	unselectButton.addActionListener(this);
569	519
	520	+ commandsPanel.preferredHeight = 1;
	521	+
	522	+ oe.treePanel.add(commandsPanel);
	523	+ oe.treePanel.Return();
	524	+
570	525	// oe.aConstraints.gridx += 1;
571	526	// oe.aConstraints.weighty = 0;
572	527	// oe.aConstraints.gridwidth = 1;
..	..	@@ -578,40 +533,37 @@
578	533	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
579	534	// gcButton.addActionListener(this);
580	535
581		- oe.aConstraints.gridx = 0;
582		- oe.aConstraints.gridy += 1;
583		-
584		- //ctrlPanel.add(objList = new List(5, true));
585		- oe.aConstraints.gridwidth = 100;
586		- // oe.aConstraints.gridheight = 100;
587		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
588		- oe.aConstraints.gridheight = 1;
589		- oe.aConstraints.weighty = 0.5;
590		- oe.aConstraints.gridx = 0;
591		- JScrollPane jSP;
	536	+ cGridBag jSPPanel = new cGridBag();
	537	+
	538	+ JScrollPane jSP;
592	539	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
593		- 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);
594	541	ResetModel();
595		- oe.aConstraints.weighty = 0.5;
596		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
597		- oe.aConstraints.gridy += 1;
598		- oe.aConstraints.gridwidth = 1;
	542	+
	543	+ oe.treePanel.add(jSPPanel);
	544	+ oe.treePanel.Return();
599	545
600		- oe.aConstraints.weighty = 0;
601		- oe.aConstraints.gridwidth = 2;
602		-
603		- 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");
604	550	colorCB.addItemListener(this);
605		- oe.aConstraints.gridx += 2;
606		- 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");
607	554	materialCB.addItemListener(this);
608		- oe.aConstraints.gridx += 2;
609		- 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");
610	558	textureCB.addItemListener(this);
611	559
612		- oe.aConstraints.gridx = 0;
613		- oe.aConstraints.gridy += 1;
	560	+ copyOptionsPanel.preferredHeight = 1;
	561	+ oe.treePanel.add(copyOptionsPanel);
	562	+ oe.treePanel.Return();
614	563
	564	+// mainPanel.setDividerLocation(0.5); //1.0);
	565	+// mainPanel.setResizeWeight(0.5);
	566	+
615	567	//jList.addListSelectionListener(this);
616	568	oe.jTree.addTreeSelectionListener(this);
617	569	//jTree.setRootVisible(false);
..	..	@@ -633,17 +585,85 @@
633	585	radio.layout = sevenButton;
634	586	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
635	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	+ }
636	656
637	657	void EditObject(Object3D obj)
638	658	{
639		- cRadio dummyButton = new cRadio(obj.name);
640		- dummyButton.SetObject(obj);
641		- dummyButton.layout = sevenButton;
642		- dummyButton.SetCamera(cameraView.renderCamera, false);
643		- dummyButton.addActionListener(this);
644		- radioPanel.add(dummyButton);
645		- buttonGroup.add(dummyButton);
646		- 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();
647	667	}
648	668	void SetupViews(ObjEditor oe)
649	669	{
..	..	@@ -663,6 +683,7 @@
663	683	JCheckBox fastCB;
664	684	JCheckBox slowCB;
665	685	JCheckBox boxCB;
	686	+ JCheckBox zoomBoxCB;
666	687	JCheckBox trackCB;
667	688	JCheckBox smoothfocusCB;
668	689	// JCheckBox speakerMocapCB;
..	..	@@ -705,8 +726,7 @@
705	726	dropAttributes \|= Object3D.TEXTURE;
706	727	else
707	728	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	729	+ } else if(e.getSource() == liveCB)
710	730	{
711	731	cameraView.ToggleLive();
712	732	}
..	..	@@ -743,6 +763,10 @@
743	763	Recompile();
744	764	cameraView.repaint();
745	765	// refreshContents();
	766	+ }
	767	+ else if(e.getSource() == zoomBoxCB)
	768	+ {
	769	+ cameraView.ToggleZoomBoxMode();
746	770	}
747	771	else if(e.getSource() == smoothfocusCB)
748	772	{
..	..	@@ -1033,6 +1057,8 @@
1033	1057	torusItem.addActionListener(this);
1034	1058	superItem = menu.add(new MenuItem("Superellipsoid"));
1035	1059	superItem.addActionListener(this);
	1060	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1061	+ kleinItem.addActionListener(this);
1036	1062	particleItem = menu.add(new MenuItem("Particle system"));
1037	1063	particleItem.addActionListener(this);
1038	1064	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1073,7 +1099,7 @@
1073	1099	{
1074	1100	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1075	1101	animationItem.addItemListener(this);
1076		- animationItem.setState(CameraPane.ANIMATION);
	1102	+ animationItem.setState(Globals.ANIMATION);
1077	1103
1078	1104	menu.add("-");
1079	1105	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
..	..	@@ -1106,6 +1132,8 @@
1106	1132	resetParentItem.addActionListener(this);
1107	1133	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	1134	repairParentItem.addActionListener(this);
	1135	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1136	+ repairShadowItem.addActionListener(this);
1109	1137	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	1138	invariantsItem.addActionListener(this);
1111	1139	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1466,6 +1494,7 @@
1466	1494	//
1467	1495	public void actionPerformed(ActionEvent event) // , Object arg)
1468	1496	{
	1497	+ Object source = event.getSource();
1469	1498	/*
1470	1499	if (event.getSource() == nameField)
1471	1500	{
..	..	@@ -1477,11 +1506,11 @@
1477	1506	}
1478	1507	else
1479	1508	*/
1480		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1509	+ if (source == lookAtItem \|\| source == lookFromItem)
1481	1510	{
1482	1511	ScreenFit();
1483	1512	} else
1484		- if (event.getSource() == switchItem)
	1513	+ if (source == switchItem)
1485	1514	{
1486	1515	cVector v1 = new cVector();
1487	1516	cVector v2 = new cVector();
..	..	@@ -1490,11 +1519,11 @@
1490	1519	objEditor.cameraView.renderCamera.setAim(v2, v1);
1491	1520	objEditor.cameraView.repaint();
1492	1521	} else
1493		- if (event.getSource() == rectoidItem)
	1522	+ if (source == rectoidItem)
1494	1523	{
1495	1524	makeSomething(new Box());
1496	1525	} else
1497		- if (event.getSource() == particleItem)
	1526	+ if (source == particleItem)
1498	1527	{
1499	1528	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1500	1529	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1515,9 +1544,9 @@
1515	1544	applyExample(particleGeom, "SMOKE");
1516	1545	makeSomething(particleGeom);
1517	1546	} else
1518		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1547	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1519	1548	{
1520		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1549	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1521	1550
1522	1551	ragdoll.toParent = LA.newMatrix();
1523	1552	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1535,7 +1564,7 @@
1535	1564	} else
1536	1565	/*
1537	1566	*/
1538		- if (event.getSource() == heightFieldItem)
	1567	+ if (source == heightFieldItem)
1539	1568	{
1540	1569	Object3D obj = new Object3D();
1541	1570
..	..	@@ -1573,27 +1602,31 @@
1573	1602
1574	1603	makeSomething(obj);
1575	1604	} else
1576		- if (event.getSource() == gridItem)
	1605	+ if (source == gridItem)
1577	1606	{
1578	1607	makeSomething(new Grid());
1579	1608	} else
1580		- if (event.getSource() == ellipsoidItem)
	1609	+ if (source == ellipsoidItem)
1581	1610	{
1582	1611	makeSomething(new Sphere());
1583	1612	} else
1584		- if (event.getSource() == coneItem)
	1613	+ if (source == coneItem)
1585	1614	{
1586	1615	makeSomething(new Cone());
1587	1616	} else
1588		- if (event.getSource() == torusItem)
	1617	+ if (source == torusItem)
1589	1618	{
1590	1619	makeSomething(new Torus());
1591	1620	} else
1592		- if (event.getSource() == superItem)
	1621	+ if (source == superItem)
1593	1622	{
1594	1623	makeSomething(new Superellipsoid());
1595	1624	} else
1596		- if (event.getSource() == blobItem)
	1625	+ if (source == kleinItem)
	1626	+ {
	1627	+ makeSomething(new Klein());
	1628	+ } else
	1629	+ if (source == blobItem)
1597	1630	{
1598	1631	Blob blob = new Blob();
1599	1632	BlobComponent comp = new BlobComponent();
..	..	@@ -1601,15 +1634,15 @@
1601	1634	//blob.retile();
1602	1635	makeSomething(blob);
1603	1636	} else
1604		- if (event.getSource() == latheItem)
	1637	+ if (source == latheItem)
1605	1638	{
1606	1639	makeSomething(new Lathe());
1607	1640	} else
1608		- if (event.getSource() == bezierItem)
	1641	+ if (source == bezierItem)
1609	1642	{
1610	1643	makeSomething(new BezierSurface());
1611	1644	} else
1612		- if (event.getSource() == checkerItem)
	1645	+ if (source == checkerItem)
1613	1646	{
1614	1647	/*
1615	1648	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1624,7 +1657,7 @@
1624	1657	*/
1625	1658	makeSomething(new Checker());
1626	1659	} else
1627		- if (event.getSource() == meshItem)
	1660	+ if (source == meshItem)
1628	1661	{
1629	1662	Object3D itemtomake = new Object3D();
1630	1663	Object3D child;
..	..	@@ -1645,35 +1678,35 @@
1645	1678	makeSomething(child);
1646	1679	}
1647	1680	} else
1648		- if (event.getSource() == springItem)
	1681	+ if (source == springItem)
1649	1682	{
1650	1683	cSpring s = new cSpring();
1651	1684	s.setup();
1652	1685	makeSomething(s);
1653	1686	} else
1654		- if (event.getSource() == flagItem)
	1687	+ if (source == flagItem)
1655	1688	{
1656	1689	cSpring s = new cFlag();
1657	1690	s.setup();
1658	1691	makeSomething(s);
1659	1692	} else
1660		- if (event.getSource() == lightItem)
	1693	+ if (source == lightItem)
1661	1694	{
1662	1695	makeSomething(new Light());
1663	1696	} else
1664		- if (event.getSource() == csgItem)
	1697	+ if (source == csgItem)
1665	1698	{
1666	1699	group(new CSG());
1667	1700	} else
1668		- if (event.getSource() == templateItem)
	1701	+ if (source == templateItem)
1669	1702	{
1670	1703	group(new cTemplate());
1671	1704	} else
1672		- if (event.getSource() == attributeItem)
	1705	+ if (source == attributeItem)
1673	1706	{
1674	1707	makeSomething(new Attribute());
1675	1708	} else
1676		- if (event.getSource() == pointflowItem)
	1709	+ if (source == pointflowItem)
1677	1710	{
1678	1711	makeSomething(new PointFlow());
1679	1712	} else
..	..	@@ -1685,7 +1718,7 @@
1685	1718	} else
1686	1719	*/
1687	1720
1688		- if (event.getSource() == superLoopItem)
	1721	+ if (source == superLoopItem)
1689	1722	{
1690	1723	Composite g = new cGroup();
1691	1724	for (int i=0; i<15; i++)
..	..	@@ -1707,7 +1740,7 @@
1707	1740
1708	1741	group(g);
1709	1742	} else
1710		- if (event.getSource() == loopItem)
	1743	+ if (source == loopItem)
1711	1744	{
1712	1745	Composite csg = new GroupLeaf();
1713	1746	csg.count = 5;
..	..	@@ -1716,7 +1749,7 @@
1716	1749	csg.addChild(child);
1717	1750	child.addChild(csg);
1718	1751	} else
1719		- if (event.getSource() == doubleItem)
	1752	+ if (source == doubleItem)
1720	1753	{
1721	1754	Composite csg = new GroupLeaf();
1722	1755	csg.count = 5;
..	..	@@ -1728,7 +1761,7 @@
1728	1761	csg.addChild(child);
1729	1762	child.addChild(csg);
1730	1763	} else
1731		- if (event.getSource() == tripleItem)
	1764	+ if (source == tripleItem)
1732	1765	{
1733	1766	Composite csg = new GroupLeaf();
1734	1767	csg.count = 4;
..	..	@@ -1744,70 +1777,70 @@
1744	1777	child.addChild(csg);
1745	1778	} else
1746	1779
1747		- if (event.getSource() == importGFDItem)
	1780	+ if (source == importGFDItem)
1748	1781	{
1749	1782	ImportGFD();
1750	1783	} else
1751		- if (event.getSource() == importVRMLX3DItem)
	1784	+ if (source == importVRMLX3DItem)
1752	1785	{
1753	1786	ImportVRMLX3D();
1754	1787	} else
1755		- if (event.getSource() == import3DSItem)
	1788	+ if (source == import3DSItem)
1756	1789	{
1757	1790	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1758	1791	} else
1759		- if (event.getSource() == importOBJItem)
	1792	+ if (source == importOBJItem)
1760	1793	{
1761	1794	objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1762	1795	} else
1763		- if (event.getSource() == computeAOItem)
	1796	+ if (source == computeAOItem)
1764	1797	{
1765		- CameraPane.drawMode = CameraPane.OCCLUSION;
1766		- CameraPane.theRenderer.repaint();
	1798	+ Globals.drawMode = CameraPane.OCCLUSION;
	1799	+ Globals.theRenderer.repaint();
1767	1800	} else
1768		- if (event.getSource() == recompileItem)
	1801	+ if (source == recompileItem)
1769	1802	{
1770	1803	Recompile();
1771	1804	refreshContents();
1772	1805	} else
1773		- if (event.getSource() == editScriptItem)
	1806	+ if (source == editScriptItem)
1774	1807	{
1775	1808	OpenDialog();
1776	1809	refreshContents();
1777	1810	} else
1778		- if (event.getSource() == invariantsItem)
	1811	+ if (source == invariantsItem)
1779	1812	{
1780	1813	System.out.println("Invariants:");
1781		- GrafreeD.theApplet3D.universe.invariants();
	1814	+ GrafreeD.grafreeD.universe.invariants();
1782	1815	} else
1783		- if (event.getSource() == memoryItem)
	1816	+ if (source == memoryItem)
1784	1817	{
1785	1818	//System.out.println("Invariants:");
1786	1819	PrintMemory();
1787	1820	} else
1788		- if (event.getSource() == pathItem)
	1821	+ if (source == pathItem)
1789	1822	{
1790	1823	PrintPath();
1791	1824	} else
1792		- if (event.getSource() == analyzeItem)
	1825	+ if (source == analyzeItem)
1793	1826	{
1794	1827	AnalyzeObject();
1795	1828	} else
1796		- if (event.getSource() == dumpItem)
	1829	+ if (source == dumpItem)
1797	1830	{
1798	1831	DumpObject();
1799	1832	} else
1800		- if (event.getSource() == screenfitButton)
	1833	+ if (source == screenfitButton)
1801	1834	{
1802	1835	//Reload(lastConverter, lastFilename, true);
1803	1836	ScreenFit();
1804	1837	} else
1805		- if (event.getSource() == screenfitpointButton)
	1838	+ if (source == screenfitpointButton)
1806	1839	{
1807	1840	//Reload(lastConverter, lastFilename, true);
1808	1841	ScreenFitPoint();
1809	1842	} else
1810		- if (event.getSource() == snapobjectButton)
	1843	+ if (source == snapobjectButton)
1811	1844	{
1812	1845	//Reload(lastConverter, lastFilename, true);
1813	1846	SnapObject();
..	..	@@ -1818,13 +1851,13 @@
1818	1851	// Recompile();
1819	1852	// refreshContents();
1820	1853	// } else
1821		- if (event.getSource() == gcButton)
	1854	+ if (source == gcButton)
1822	1855	{
1823	1856	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1824	1857	System.gc();
1825	1858	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	1859	} else
1827		- if (event.getSource() == editLeafItem)
	1860	+ if (source == editLeafItem)
1828	1861	{
1829	1862	Object3D obj;
1830	1863	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1838,62 +1871,62 @@
1838	1871	}
1839	1872	refreshContents(true);
1840	1873	} else
1841		- if (event.getSource() == openWindowItem)
	1874	+ if (source == openWindowItem)
1842	1875	{
1843	1876	EditSelection(true);
1844	1877	} else
1845		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1878	+ if (source == cutItem \|\| source == clearButton)
1846	1879	{
1847	1880	loadClipboard(true);
1848	1881	} else
1849		- if (event.getSource() == duplicateItem)
	1882	+ if (source == duplicateItem)
1850	1883	{
1851	1884	Object3D keep = GrafreeD.clipboard;
1852	1885	loadClipboard(false);
1853	1886	paste(false);
1854	1887	GrafreeD.clipboard = keep;
1855	1888	} else
1856		- if (event.getSource() == cloneItem)
	1889	+ if (source == cloneItem)
1857	1890	{
1858	1891	CloneSelection(false);
1859	1892	} else
1860		- if (event.getSource() == cloneSupportItem)
	1893	+ if (source == cloneSupportItem)
1861	1894	{
1862	1895	CloneSelection(true);
1863	1896	} else
1864		- if (event.getSource() == copyItem)
	1897	+ if (source == copyItem)
1865	1898	{
1866	1899	loadClipboard(false);
1867	1900	} else
1868		- if (event.getSource() == pasteItem)
	1901	+ if (source == pasteItem)
1869	1902	{
1870	1903	paste(false);
1871	1904	} else
1872		- if (event.getSource() == pasteLinkItem)
	1905	+ if (source == pasteLinkItem)
1873	1906	{
1874	1907	pasteInto(false);
1875	1908	} else
1876		- if (event.getSource() == pasteCloneItem)
	1909	+ if (source == pasteCloneItem)
1877	1910	{
1878	1911	pasteInto(true);
1879	1912	} else
1880		- if (event.getSource() == pasteExpandItem)
	1913	+ if (source == pasteExpandItem)
1881	1914	{
1882	1915	paste(true);
1883	1916	} else
1884		- if (event.getSource() == synchronizeItem)
	1917	+ if (source == synchronizeItem)
1885	1918	{
1886	1919	Overwrite(Object3D.TRANSFORM);
1887	1920	} else
1888		- if (event.getSource() == overwriteNameItem)
	1921	+ if (source == overwriteNameItem)
1889	1922	{
1890	1923	Overwrite(Object3D.NAME);
1891	1924	} else
1892		- if (event.getSource() == overwriteUVItem)
	1925	+ if (source == overwriteUVItem)
1893	1926	{
1894	1927	Overwrite(Object3D.UV);
1895	1928	} else
1896		- if (event.getSource() == overwriteMatItem)
	1929	+ if (source == overwriteMatItem)
1897	1930	{
1898	1931	/* july 2015
1899	1932	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1913,7 +1946,7 @@
1913	1946
1914	1947	Overwrite(dropAttributes);
1915	1948	}
1916		- if (event.getSource() == overwriteGeoItem)
	1949	+ if (source == overwriteGeoItem)
1917	1950	{
1918	1951	Overwrite(Object3D.GEOMETRY);
1919	1952	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1930,7 +1963,7 @@
1930	1963	// refreshContents();
1931	1964	// }
1932	1965	} else
1933		- if (event.getSource() == generateMeshItem)
	1966	+ if (source == generateMeshItem)
1934	1967	{
1935	1968	//if (group.selection.size() == 1)
1936	1969	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1941,7 +1974,7 @@
1941	1974	ResetModel();
1942	1975	refreshContents();
1943	1976	} else
1944		- if (event.getSource() == extractGeometriesItem)
	1977	+ if (source == extractGeometriesItem)
1945	1978	{
1946	1979	boolean one = false;
1947	1980
..	..	@@ -1968,7 +2001,7 @@
1968	2001	ResetModel();
1969	2002	refreshContents();
1970	2003	} else
1971		- if (event.getSource() == cloneGeometriesItem)
	2004	+ if (source == cloneGeometriesItem)
1972	2005	{
1973	2006	boolean one = false;
1974	2007
..	..	@@ -1994,32 +2027,37 @@
1994	2027	ResetModel();
1995	2028	refreshContents();
1996	2029	} else
1997		- if (event.getSource() == shareGeometriesItem)
	2030	+ if (source == shareGeometriesItem)
1998	2031	{
1999	2032	boolean one = false;
2000	2033
2001	2034	if (group.selection.size() == 1)
2002	2035	one = true;
2003	2036
	2037	+ Object3D merge = null;
	2038	+
2004	2039	Object3D content = new cGroup();
2005	2040
2006	2041	for (int i=0; i<group.selection.size(); i++)
2007	2042	{
2008		- Object3D sel = new Merge(group.selection.get(i));
	2043	+ merge = new Merge(group.selection.get(i));
2009	2044
2010	2045	if (one)
2011		- makeSomething(sel, false);
	2046	+ makeSomething(merge, false);
2012	2047	else
2013		- content.addChild(sel);
	2048	+ content.addChild(merge);
2014	2049	}
2015	2050
2016	2051	if (!one)
2017		- makeSomething(content, false);
2018		-
2019		- ResetModel();
2020		- refreshContents();
	2052	+ makeSomething(content, true);
	2053	+ else
	2054	+ {
	2055	+ ResetModel();
	2056	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2057	+ refreshContents();
	2058	+ }
2021	2059	} else
2022		- if (event.getSource() == mergeGeometriesItem)
	2060	+ if (source == mergeGeometriesItem)
2023	2061	{
2024	2062	boolean one = false;
2025	2063
..	..	@@ -2049,7 +2087,7 @@
2049	2087	ResetModel();
2050	2088	refreshContents();
2051	2089	} else
2052		- if (event.getSource() == linkverticesItem)
	2090	+ if (source == linkverticesItem)
2053	2091	{
2054	2092	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2055	2093	// {
..	..	@@ -2069,7 +2107,7 @@
2069	2107	if (content instanceof cGroup && ((cGroup)content).transientlink )
2070	2108	content = ((cGroup)content).get(0);
2071	2109
2072		- 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));
2073	2111	for (int i=0; i<group.selection.size(); i++)
2074	2112	{
2075	2113	boolean random = CameraPane.RANDOM;
..	..	@@ -2078,11 +2116,11 @@
2078	2116	// group.selection.get(i).setMasterThis(content); // should be identity
2079	2117	CameraPane.RANDOM = random;
2080	2118	}
2081		- 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));
2082	2120	refreshContents();
2083	2121	}
2084	2122	} else
2085		- if (event.getSource() == resetsupportItem)
	2123	+ if (source == resetsupportItem)
2086	2124	{
2087	2125	for (int i=0; i<group.selection.size(); i++)
2088	2126	{
..	..	@@ -2094,7 +2132,16 @@
2094	2132
2095	2133	refreshContents();
2096	2134	} else
2097		- 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)
2098	2145	{
2099	2146	for (int i=0; i<group.selection.size(); i++)
2100	2147	{
..	..	@@ -2103,7 +2150,7 @@
2103	2150
2104	2151	refreshContents();
2105	2152	} else
2106		- if (event.getSource() == setMasterItem)
	2153	+ if (source == setMasterItem)
2107	2154	{
2108	2155	if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2109	2156	{
..	..	@@ -2116,7 +2163,7 @@
2116	2163	refreshContents();
2117	2164	}
2118	2165	} else
2119		- if (event.getSource() == poseMeshItem)
	2166	+ if (source == poseMeshItem)
2120	2167	{
2121	2168	if (group.selection.size() == 1)
2122	2169	{
..	..	@@ -2135,19 +2182,19 @@
2135	2182	}
2136	2183
2137	2184	} else
2138		- if (event.getSource() == revertMeshItem)
	2185	+ if (source == revertMeshItem)
2139	2186	{
2140	2187	RevertMeshes();
2141	2188	} else
2142		- if (event.getSource() == resetMeshItem)
	2189	+ if (source == resetMeshItem)
2143	2190	{
2144	2191	ResetAll();
2145	2192	} else
2146		- if (event.getSource() == stepAllItem)
	2193	+ if (source == stepAllItem)
2147	2194	{
2148	2195	StepAll();
2149	2196	} else
2150		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2197	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2151	2198	{
2152	2199	//int indices[] = jList.getSelectedIndices();
2153	2200	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2155,42 +2202,46 @@
2155	2202
2156	2203	ClearSelection(false);
2157	2204	} else
2158		- if (event.getSource() == clearAllItem)
	2205	+ if (source == clearAllItem)
2159	2206	{
2160	2207	ClearSelection(true);
2161	2208	} else
2162		- if (event.getSource() == grabItem)
	2209	+ if (source == grabItem)
2163	2210	{
2164	2211	group(new cGroup(), true);
2165	2212	} else
2166		- if (event.getSource() == frontItem)
	2213	+ if (source == hideItem)
	2214	+ {
	2215	+ group(new HiddenObject());
	2216	+ } else
	2217	+ if (source == frontItem)
2167	2218	{
2168	2219	front();
2169	2220	} else
2170		- if (event.getSource() == backItem)
	2221	+ if (source == backItem)
2171	2222	{
2172	2223	back();
2173	2224	} else
2174		- if (event.getSource() == cameraItem)
	2225	+ if (source == cameraItem)
2175	2226	{
2176	2227	makeSomething(new Camera());
2177	2228	} else
2178		- if (event.getSource() == compositeItem)
	2229	+ if (source == compositeItem)
2179	2230	{
2180	2231	group(new Composite());
2181	2232	} else
2182		- if (event.getSource() == randomItem)
	2233	+ if (source == randomItem)
2183	2234	{
2184	2235	RandomNode random = new RandomNode();
2185	2236	group(random);
2186	2237	if (random.size() > 0)
2187		- random.name = random.get(0).name + "Rnd";
	2238	+ random.name = random.get(0).name + "Switch";
2188	2239	} else
2189		- if (event.getSource() == physicsItem)
	2240	+ if (source == physicsItem)
2190	2241	{
2191	2242	group(new PhysicsNode());
2192	2243	} else
2193		- if (event.getSource() == frameselectorItem)
	2244	+ if (source == frameselectorItem)
2194	2245	{
2195	2246	for (int i=0; i<group.selection.size(); i++)
2196	2247	{
..	..	@@ -2202,7 +2253,7 @@
2202	2253	ResetModel();
2203	2254	refreshContents();
2204	2255	} else
2205		- if (event.getSource() == switchGeoItem)
	2256	+ if (source == switchGeoItem)
2206	2257	{
2207	2258	for (int i=0; i<group.selection.size(); i++)
2208	2259	{
..	..	@@ -2214,7 +2265,7 @@
2214	2265	ResetModel();
2215	2266	refreshContents();
2216	2267	} else
2217		- if (event.getSource() == switchTransfoItem)
	2268	+ if (source == switchTransfoItem)
2218	2269	{
2219	2270	for (int i=0; i<group.selection.size(); i++)
2220	2271	{
..	..	@@ -2226,7 +2277,7 @@
2226	2277	ResetModel();
2227	2278	refreshContents();
2228	2279	} else
2229		- if (event.getSource() == morphItem)
	2280	+ if (source == morphItem)
2230	2281	{
2231	2282	for (int i=0; i<group.selection.size(); i++)
2232	2283	{
..	..	@@ -2238,7 +2289,7 @@
2238	2289	ResetModel();
2239	2290	refreshContents();
2240	2291	} else
2241		- if (event.getSource() == scriptNodeItem)
	2292	+ if (source == scriptNodeItem)
2242	2293	{
2243	2294	boolean atleastone = false;
2244	2295
..	..	@@ -2277,195 +2328,215 @@
2277	2328	}
2278	2329	}
2279	2330	} else
2280		- if (event.getSource() == linkerItem)
	2331	+ if (source == linkerItem)
2281	2332	{
2282	2333	group(new cLinker());
2283	2334	} else
2284		- if (event.getSource() == textureItem)
	2335	+ if (source == textureItem)
2285	2336	{
2286	2337	group(new TextureNode());
2287	2338	} else
2288		- if (event.getSource() == shadowXItem)
	2339	+ if (source == billboardItem)
	2340	+ {
	2341	+ group(new BillboardNode());
	2342	+ } else
	2343	+ if (source == shadowXItem)
2289	2344	{
2290	2345	CastShadow(0);
2291	2346	} else
2292		- if (event.getSource() == shadowYItem)
	2347	+ if (source == shadowYItem)
2293	2348	{
2294	2349	CastShadow(1);
2295	2350	} else
2296		- if (event.getSource() == shadowZItem)
	2351	+ if (source == shadowZItem)
2297	2352	{
2298	2353	CastShadow(2);
2299	2354	} else
2300		- if (event.getSource() == ungroupItem)
	2355	+ if (source == ungroupItem)
2301	2356	{
2302		- 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();
2303	2366	} else
2304		- if (event.getSource() == genUVItem)
	2367	+ if (source == genUVItem)
2305	2368	{
2306	2369	GenUV();
2307	2370	} else
2308		- if (event.getSource() == genNormalsCADItem)
	2371	+ if (source == genNormalsCADItem)
2309	2372	{
2310	2373	GenNormals(true);
2311	2374	} else
2312		- if (event.getSource() == genNormalsORGANItem)
	2375	+ if (source == genNormalsMESHItem)
	2376	+ {
	2377	+ GenNormals(true); // TODO
	2378	+ } else
	2379	+ if (source == genNormalsORGANItem)
2313	2380	{
2314	2381	GenNormals(false);
2315	2382	} else
2316		- if (event.getSource() == stripifyItem)
	2383	+ if (source == genNormalsMINEItem)
	2384	+ {
	2385	+ GenNormalsMINE();
	2386	+ } else
	2387	+ if (source == stripifyItem)
2317	2388	{
2318	2389	Stripify();
2319	2390	} else
2320		- if (event.getSource() == unstripifyItem)
	2391	+ if (source == unstripifyItem)
2321	2392	{
2322	2393	Unstripify();
2323	2394	} else
2324		- if (event.getSource() == trimItem)
	2395	+ if (source == trimItem)
2325	2396	{
2326	2397	Trim();
2327	2398	} else
2328		- if (event.getSource() == untrimItem)
	2399	+ if (source == untrimItem)
2329	2400	{
2330	2401	Untrim();
2331	2402	} else
2332		- if (event.getSource() == clearColorsItem)
	2403	+ if (source == clearColorsItem)
2333	2404	{
2334	2405	ClearColors();
2335	2406	} else
2336		- if (event.getSource() == clearMaterialsItem)
	2407	+ if (source == clearMaterialsItem)
2337	2408	{
2338	2409	ClearMaterials();
2339	2410	} else
2340		- if (event.getSource() == liveleavesItem)
	2411	+ if (source == liveleavesItem)
2341	2412	{
2342	2413	LiveLeaves(true);
2343	2414	} else
2344		- if (event.getSource() == unliveleavesItem)
	2415	+ if (source == unliveleavesItem)
2345	2416	{
2346	2417	LiveLeaves(false);
2347	2418	} else
2348		- if (event.getSource() == supportleavesItem)
	2419	+ if (source == supportleavesItem)
2349	2420	{
2350	2421	SupportLeaves(true);
2351	2422	} else
2352		- if (event.getSource() == unsupportleavesItem)
	2423	+ if (source == unsupportleavesItem)
2353	2424	{
2354	2425	SupportLeaves(false);
2355	2426	} else
2356		- if (event.getSource() == hideleavesItem)
	2427	+ if (source == hideleavesItem)
2357	2428	{
2358	2429	HideLeaves(true);
2359	2430	} else
2360		- if (event.getSource() == showleavesItem)
	2431	+ if (source == showleavesItem)
2361	2432	{
2362	2433	HideLeaves(false);
2363	2434	} else
2364		- if (event.getSource() == markleavesItem)
	2435	+ if (source == markleavesItem)
2365	2436	{
2366	2437	MarkLeaves(true);
2367	2438	} else
2368		- if (event.getSource() == unmarkleavesItem)
	2439	+ if (source == unmarkleavesItem)
2369	2440	{
2370	2441	MarkLeaves(false);
2371	2442	} else
2372		- if (event.getSource() == flipVItem)
	2443	+ if (source == flipVItem)
2373	2444	{
2374	2445	FlipV(true);
2375	2446	} else
2376		- if (event.getSource() == unflipVItem)
	2447	+ if (source == unflipVItem)
2377	2448	{
2378	2449	FlipV(false);
2379	2450	} else
2380		- if (event.getSource() == lowTexturesItem)
	2451	+ if (source == lowTexturesItem)
2381	2452	{
2382	2453	SetTexRes(0);
2383	2454	} else
2384		- if (event.getSource() == normalTexturesItem)
	2455	+ if (source == normalTexturesItem)
2385	2456	{
2386	2457	SetTexRes(1);
2387	2458	} else
2388		- if (event.getSource() == highTexturesItem)
	2459	+ if (source == highTexturesItem)
2389	2460	{
2390	2461	SetTexRes(2);
2391	2462	} else
2392		- if (event.getSource() == veryhighTexturesItem)
	2463	+ if (source == veryhighTexturesItem)
2393	2464	{
2394	2465	SetTexRes(3);
2395	2466	} else
2396		- if (event.getSource() == maxTexturesItem)
	2467	+ if (source == maxTexturesItem)
2397	2468	{
2398	2469	SetTexRes(4);
2399	2470	} else
2400		- if (event.getSource() == panoTexturesItem)
	2471	+ if (source == panoTexturesItem)
2401	2472	{
2402	2473	SetTexRes(5);
2403	2474	} else
2404		- if (event.getSource() == reverseNormalsItem)
	2475	+ if (source == reverseNormalsItem)
2405	2476	{
2406	2477	ReverseNormals();
2407	2478	} else
2408		- if (event.getSource() == parseverticesItem)
	2479	+ if (source == parseverticesItem)
2409	2480	{
2410	2481	ParseVertices();
2411	2482	} else
2412		- if (event.getSource() == textureFieldItem)
	2483	+ if (source == textureFieldItem)
2413	2484	{
2414	2485	TextureVertices();
2415	2486	} else
2416		- if (event.getSource() == alignItem)
	2487	+ if (source == alignItem)
2417	2488	{
2418	2489	Align();
2419	2490	} else
2420		- if (event.getSource() == mirrorItem)
	2491	+ if (source == mirrorItem)
2421	2492	{
2422	2493	MirrorPoses();
2423	2494	} else
2424		- if (event.getSource() == reduceMorphItem)
	2495	+ if (source == reduceMorphItem)
2425	2496	{
2426	2497	MeshReduction(false);
2427	2498	} else
2428		- if (event.getSource() == reduce34MorphItem)
	2499	+ if (source == reduce34MorphItem)
2429	2500	{
2430	2501	MeshReduction(true);
2431	2502	} else
2432		- if (event.getSource() == reverseTrianglesItem)
	2503	+ if (source == reverseTrianglesItem)
2433	2504	{
2434	2505	ReverseTriangles();
2435	2506	} else
2436		- if (event.getSource() == reduceMeshItem)
	2507	+ if (source == reduceMeshItem)
2437	2508	{
2438	2509	ReduceMesh(false);
2439	2510	} else
2440		- if (event.getSource() == reduce34MeshItem)
	2511	+ if (source == reduce34MeshItem)
2441	2512	{
2442	2513	ReduceMesh(true);
2443	2514	} else
2444		- if (event.getSource() == increaseMeshItem)
	2515	+ if (source == increaseMeshItem)
2445	2516	{
2446	2517	IncreaseMesh();
2447	2518	} else
2448		- if (event.getSource() == clipMeshItem)
	2519	+ if (source == clipMeshItem)
2449	2520	{
2450	2521	ClipMesh();
2451	2522	} else
2452		- if (event.getSource() == smoothMeshItem)
	2523	+ if (source == smoothMeshItem)
2453	2524	{
2454	2525	SmoothMesh();
2455	2526	} else
2456		- if (event.getSource() == transformgeometryItem)
	2527	+ if (source == transformgeometryItem)
2457	2528	{
2458	2529	TransformGeometry();
2459	2530	} else
2460		- if (event.getSource() == resetTransformItem)
	2531	+ if (source == resetTransformItem)
2461	2532	{
2462	2533	ResetTransform();
2463	2534	} else
2464		- if (event.getSource() == resetCentroidItem)
	2535	+ if (source == resetCentroidItem)
2465	2536	{
2466	2537	ResetCentroid();
2467	2538	} else
2468		- if (event.getSource() == resetParentItem)
	2539	+ if (source == resetParentItem)
2469	2540	{
2470	2541	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2471	2542	{
..	..	@@ -2475,7 +2546,7 @@
2475	2546
2476	2547	refreshContents();
2477	2548	} else
2478		- if (event.getSource() == repairParentItem)
	2549	+ if (source == repairParentItem)
2479	2550	{
2480	2551	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2481	2552	{
..	..	@@ -2489,7 +2560,21 @@
2489	2560
2490	2561	refreshContents();
2491	2562	} else
2492		- 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)
2493	2578	{
2494	2579	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2495	2580	{
..	..	@@ -2501,7 +2586,7 @@
2501	2586	ResetModel();
2502	2587	refreshContents();
2503	2588	} else
2504		- if (event.getSource() == sortbynameItem)
	2589	+ if (source == sortbynameItem)
2505	2590	{
2506	2591	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2507	2592	{
..	..	@@ -2513,7 +2598,7 @@
2513	2598	ResetModel();
2514	2599	refreshContents();
2515	2600	} else
2516		- if (event.getSource() == attachPigmentItem)
	2601	+ if (source == attachPigmentItem)
2517	2602	{
2518	2603	String texture = GetFile("Attach pigment");
2519	2604	Object3D obj;
..	..	@@ -2525,7 +2610,7 @@
2525	2610
2526	2611	refreshContents();
2527	2612	} else
2528		- if (event.getSource() == detachPigmentItem)
	2613	+ if (source == detachPigmentItem)
2529	2614	{
2530	2615	Object3D obj;
2531	2616	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2536,7 +2621,7 @@
2536	2621
2537	2622	refreshContents();
2538	2623	} else
2539		- if (event.getSource() == attachBumpItem)
	2624	+ if (source == attachBumpItem)
2540	2625	{
2541	2626	String texture = GetFile("Attach bump");
2542	2627	Object3D obj;
..	..	@@ -2548,7 +2633,7 @@
2548	2633
2549	2634	refreshContents();
2550	2635	} else
2551		- if (event.getSource() == detachBumpItem)
	2636	+ if (source == detachBumpItem)
2552	2637	{
2553	2638	Object3D obj;
2554	2639	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2559,7 +2644,7 @@
2559	2644
2560	2645	refreshContents();
2561	2646	} else
2562		- if (event.getSource() == pigmentBumpItem)
	2647	+ if (source == pigmentBumpItem)
2563	2648	{
2564	2649	Object3D obj;
2565	2650	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2570,158 +2655,195 @@
2570	2655
2571	2656	refreshContents();
2572	2657	} else
2573		- if (event.getSource() == flashSelectionButton)
	2658	+ if (source == flashSelectionButton)
2574	2659	{
2575	2660	CameraPane.flash = true;
2576	2661	refreshContents();
2577	2662	} else
2578		- if (event.getSource() == oneButton)
	2663	+ if (source == oneButton)
2579	2664	{
2580	2665	} else
2581		- if (event.getSource() == twoButton)
	2666	+ if (source == twoButton)
2582	2667	{
2583	2668	radio.layout = twoButton;
2584	2669	// bug
2585	2670	//gridPanel.setDividerLocation(1.0);
2586	2671	//bigPanel.setDividerLocation(0.0);
2587		- bigThree.remove(jtp);
2588		- bigThree.remove(cameraPanel);
2589		- bigThree.remove(XYZPanel);
2590		- aWindowConstraints.gridx = 0;
2591		- aWindowConstraints.gridy = 0;
2592		- aWindowConstraints.gridwidth = 1;
2593		- // aConstraints.gridheight = 3;
2594		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2595		- aWindowConstraints.weightx = 0;
2596		- aWindowConstraints.weighty = 1;
2597		- //bigThree.add(jtp, aWindowConstraints);
2598		- aWindowConstraints.weightx = 1;
2599		- aWindowConstraints.gridwidth = 3;
2600		- // aConstraints.gridheight = 3;
2601		- aWindowConstraints.gridx = 1;
2602		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2603		- bigThree.add(cameraPanel, aWindowConstraints);
2604		- aWindowConstraints.weightx = 0;
2605		- aWindowConstraints.gridx = 4;
2606		- aWindowConstraints.gridwidth = 1;
2607		- // aConstraints.gridheight = 3;
2608		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2609		- //bigThree.add(XYZPanel, aWindowConstraints);
2610		- 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();
2611	2701	} else
2612		- if (event.getSource() == threeButton)
	2702	+ if (source == threeButton)
2613	2703	{
2614	2704	radio.layout = threeButton;
2615		- bigThree.remove(jtp);
2616		- bigThree.remove(cameraPanel);
2617		- bigThree.remove(XYZPanel);
2618		- aWindowConstraints.gridx = 0;
2619		- aWindowConstraints.gridy = 0;
2620		- aWindowConstraints.gridwidth = 1;
2621		- // aConstraints.gridheight = 3;
2622		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2623		- aWindowConstraints.weightx = 0;
2624		- aWindowConstraints.weighty = 1;
2625		- //bigThree.add(jtp, aWindowConstraints);
2626		- aWindowConstraints.weightx = 1;
2627		- aWindowConstraints.gridwidth = 3;
2628		- // aConstraints.gridheight = 3;
2629		- aWindowConstraints.gridx = 1;
2630		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2631		- bigThree.add(cameraPanel, aWindowConstraints);
2632		- aWindowConstraints.weightx = 0;
2633		- aWindowConstraints.gridx = 4;
2634		- aWindowConstraints.gridwidth = 1;
2635		- // aConstraints.gridheight = 3;
2636		- aConstraints.fill = GridBagConstraints.VERTICAL;
2637		- bigThree.add(XYZPanel, aWindowConstraints);
2638		- 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();
2639	2737	} else
2640		- if (event.getSource() == fourButton)
	2738	+ if (source == fourButton)
2641	2739	{
2642	2740	radio.layout = fourButton;
2643		- bigThree.remove(jtp);
2644		- bigThree.remove(cameraPanel);
2645		- bigThree.remove(XYZPanel);
2646		- aWindowConstraints.gridx = 0;
2647		- aWindowConstraints.gridy = 0;
2648		- aWindowConstraints.gridwidth = 1;
2649		- // aWindowConstraints.gridheight = 3;
2650		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2651		- aWindowConstraints.weightx = 1;
2652		- aWindowConstraints.weighty = 1;
2653		- bigThree.add(jtp, aWindowConstraints);
2654		- aWindowConstraints.weightx = 1;
2655		- aWindowConstraints.gridwidth = 3;
2656		- // aConstraints.gridheight = 3;
2657		- aWindowConstraints.gridx = 1;
2658		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2659		- //bigThree.add(cameraPanel, aWindowConstraints);
2660		- aWindowConstraints.weightx = 0;
2661		- aWindowConstraints.gridx = 4;
2662		- aWindowConstraints.gridwidth = 1;
2663		- // aWindowConstraints.gridheight = 3;
2664		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2665		- //bigThree.add(XYZPanel, aWindowConstraints);
2666		- 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();
2667	2772	} else
2668		- if (event.getSource() == sixButton)
	2773	+ if (source == sixButton)
2669	2774	{
2670	2775	radio.layout = sixButton;
2671		- bigThree.remove(jtp);
2672		- bigThree.remove(cameraPanel);
2673		- bigThree.remove(XYZPanel);
2674		- aWindowConstraints.gridx = 0;
2675		- aWindowConstraints.gridy = 0;
2676		- aWindowConstraints.gridwidth = 1;
2677		- // aConstraints.gridheight = 3;
2678		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2679		- aWindowConstraints.weightx = 0;
2680		- aWindowConstraints.weighty = 1;
2681		- bigThree.add(jtp, aWindowConstraints);
2682		- aWindowConstraints.weightx = 1;
2683		- aWindowConstraints.gridwidth = 3;
2684		- // aWindowConstraints.gridheight = 3;
2685		- aWindowConstraints.gridx = 1;
2686		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2687		- bigThree.add(cameraPanel, aWindowConstraints);
2688		- aWindowConstraints.weightx = 0;
2689		- aWindowConstraints.gridx = 4;
2690		- aWindowConstraints.gridwidth = 1;
2691		- // aWindowConstraints.gridheight = 3;
2692		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2693		- //bigThree.add(XYZPanel, aConstraints);
2694		- 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();
2695	2808	} else
2696		- if (event.getSource() == sevenButton)
	2809	+ if (source == sevenButton)
2697	2810	{
2698	2811	radio.layout = sevenButton;
2699		- bigThree.remove(jtp);
2700		- bigThree.remove(cameraPanel);
2701		- bigThree.remove(XYZPanel);
2702		- aWindowConstraints.gridx = 0;
2703		- aWindowConstraints.gridy = 0;
2704		- aWindowConstraints.gridwidth = 1;
2705		- // aWindowConstraints.gridheight = 3;
2706		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2707		- aWindowConstraints.weightx = 0;
2708		- aWindowConstraints.weighty = 1;
2709		- bigThree.add(jtp, aWindowConstraints);
2710		- aWindowConstraints.weightx = 1;
2711		- aWindowConstraints.gridwidth = 3;
2712		- // aWindowConstraints.gridheight = 3;
2713		- aWindowConstraints.gridx = 1;
2714		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2715		- bigThree.add(cameraPanel, aWindowConstraints);
2716		- aWindowConstraints.weightx = 0;
2717		- aWindowConstraints.gridx = 4;
2718		- aWindowConstraints.gridwidth = 1;
2719		- // aConstraints.gridheight = 3;
2720		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2721		- bigThree.add(XYZPanel, aWindowConstraints);
2722		- 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();
2723	2845	} else
2724		- if (event.getSource() == rootButton)
	2846	+ if (source == rootButton)
2725	2847	{
2726	2848	Object3D obj;
2727	2849	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2733,7 +2855,7 @@
2733	2855
2734	2856	refreshContents(true);
2735	2857	} else
2736		- if (event.getSource() == closeButton)
	2858	+ if (source == closeButton)
2737	2859	{
2738	2860	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2739	2861	cRadio ab;
..	..	@@ -2754,11 +2876,11 @@
2754	2876	}
2755	2877	refreshContents(true);
2756	2878	} else
2757		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2879	+ if (source == editItem \|\| source == editButton)
2758	2880	{
2759	2881	EditSelection(false);
2760	2882	} else
2761		- if (event.getSource() == uneditButton)
	2883	+ if (source == uneditButton)
2762	2884	{
2763	2885	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2764	2886	{
..	..	@@ -2770,12 +2892,12 @@
2770	2892
2771	2893	child.editWindow = null; // ???????????
2772	2894	}
2773		- objEditor.ctrlPanel.revalidate();
	2895	+ objEditor.ctrlPanel.validate();
2774	2896	//objEditor.jTree.clearSelection();
2775	2897	//objEditor.ResetSliders();
2776	2898	refreshContents(true);
2777	2899	} else
2778		- if (event.getSource() == clearPanelButton)
	2900	+ if (source == clearPanelButton)
2779	2901	{
2780	2902	assert(copy == group);
2781	2903	//copy.ClearUI();
..	..	@@ -2786,7 +2908,7 @@
2786	2908	listUI.clear();
2787	2909	refreshContents(true);
2788	2910	} else
2789		- if (event.getSource() == allParamsButton)
	2911	+ if (source == allParamsButton)
2790	2912	{
2791	2913	assert(copy == group);
2792	2914
..	..	@@ -2807,19 +2929,19 @@
2807	2929
2808	2930	refreshContents(true);
2809	2931	} else
2810		- if (event.getSource() == unselectButton)
	2932	+ if (source == unselectButton)
2811	2933	{
2812	2934	objEditor.jTree.clearSelection();
2813	2935	// ?? oct 2012 GrafreeD.clipboard.clear();
2814	2936	objEditor.ResetSliders();
2815	2937	refreshContents(true);
2816	2938	} else
2817		- if(event.getSource() instanceof cRadio)
	2939	+ if(source instanceof cRadio)
2818	2940	{
2819	2941	group.parent = keepparent;
2820	2942	group.attributes = 0;
2821	2943	//group.editWindow = null;
2822		- /cRadio/ radio = (cRadio)event.getSource();
	2944	+ /cRadio/ radio = (cRadio)source;
2823	2945	Object3D obj = radio.GetObject();
2824	2946	System.out.println("Edit " + obj);
2825	2947	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2839,7 +2961,7 @@
2839	2961	}
2840	2962
2841	2963	copy = group;
2842		- //CameraPane.theRenderer.object = group;
	2964	+ //Globals.theRenderer.object = group;
2843	2965	if(!useclient)
2844	2966	{
2845	2967	cameraView.renderCamera = radio.camera;
..	..	@@ -2848,7 +2970,8 @@
2848	2970	cameraView.cameras[cameraView.cameracount] = radio.camera;
2849	2971	cameraView.targetLookAt.set(radio.camera.lookAt);
2850	2972	cameraView.object = group;
2851		- cameraView.lighttouched = true;
	2973	+ //cameraView.lighttouched = true;
	2974	+ Globals.lighttouched = true;
2852	2975	topView.object = group;
2853	2976	frontView.object = group;
2854	2977	sideView.object = group;
..	..	@@ -2884,7 +3007,7 @@
2884	3007	if (useclient)
2885	3008	{
2886	3009	cameraView.object = client;
2887		- cameraView.lighttouched = true;
	3010	+ Globals.lighttouched = true;
2888	3011	//topView.object = client;
2889	3012	//frontView.object = client;
2890	3013	//sideView.object = client;
..	..	@@ -2892,7 +3015,7 @@
2892	3015	else
2893	3016	{
2894	3017	cameraView.object = group;
2895		- cameraView.lighttouched = true;
	3018	+ Globals.lighttouched = true;
2896	3019	//topView.object = group;
2897	3020	//frontView.object = group;
2898	3021	//sideView.object = group;
..	..	@@ -3173,6 +3296,13 @@
3173	3296	refreshContents();
3174	3297	}
3175	3298
	3299	+ void GenNormalsMINE()
	3300	+ {
	3301	+ group.selection.GenNormalsMINE();
	3302	+
	3303	+ refreshContents();
	3304	+ }
	3305	+
3176	3306	void Stripify()
3177	3307	{
3178	3308	group.StripifyS();
..	..	@@ -3393,7 +3523,7 @@
3393	3523	String pigment = Object3D.GetPigment(tex);
3394	3524	//String bump = Object3D.GetBump(tex);
3395	3525
3396		- 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);
3397	3527
3398	3528	double s = v.s;
3399	3529
..	..	@@ -3441,12 +3571,26 @@
3441	3571
3442	3572	void Align()
3443	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	+
3444	3588	for (int i=0; i<group.selection.size(); i++)
3445	3589	{
3446	3590	Object3D obj = group.selection.get(i);
3447	3591
3448		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3449		- 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);
3450	3594	}
3451	3595
3452	3596	refreshContents();
..	..	@@ -3680,7 +3824,7 @@
3680	3824	group.selection.RelinkToSupport(); // july 2014
3681	3825	System.out.println("DONE.");
3682	3826	refreshContents();
3683		- 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));
3684	3828	}
3685	3829
3686	3830	void ReduceMesh(boolean reduction34)
..	..	@@ -3956,25 +4100,25 @@
3956	4100	System.err.println("info : " + child.GetPath());
3957	4101	}
3958	4102	}
3959		- else
3960		- {
3961		- objEditor.SetMaterial(group); // .GetMaterial());
3962		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3963		- System.err.println("info : " + group.GetPath());
3964		- }
	4103	+// else
	4104	+// {
	4105	+// objEditor.SetMaterial(group); // .GetMaterial());
	4106	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4107	+// System.err.println("info : " + group.GetPath());
	4108	+// }
3965	4109
3966	4110	objEditor.SetText(); // jan 2014
3967	4111
3968		- 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))
3969	4113	CameraPane.flash = true;
3970	4114
3971	4115	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
3972	4116	// a camera
3973	4117	{
3974	4118	CameraPane.camerachangeframe = 0; // don't refuse it
3975		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3976		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3977		- // 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;
3978	4122	}
3979	4123
3980	4124	refreshContents();
..	..	@@ -4468,6 +4612,26 @@
4468	4612	makeSomething(csg);
4469	4613	}
4470	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	+
4471	4635	void ungroup()
4472	4636	{
4473	4637	/*
..	..	@@ -4827,6 +4991,7 @@
4827	4991	private MenuItem resetsupportItem;
4828	4992	private MenuItem resetreferencesItem;
4829	4993	private MenuItem linkverticesItem;
	4994	+ private MenuItem relinkverticesItem;
4830	4995	private MenuItem setMasterItem;
4831	4996	private MenuItem resetMeshItem;
4832	4997	private MenuItem stepAllItem;
..	..	@@ -4845,8 +5010,10 @@
4845	5010	private MenuItem clearItem;
4846	5011	private MenuItem clearAllItem;
4847	5012	private MenuItem genUVItem;
	5013	+ private MenuItem genNormalsMESHItem;
4848	5014	private MenuItem genNormalsCADItem;
4849	5015	private MenuItem genNormalsORGANItem;
	5016	+ private MenuItem genNormalsMINEItem;
4850	5017	private MenuItem stripifyItem;
4851	5018	private MenuItem unstripifyItem;
4852	5019	private MenuItem trimItem;
..	..	@@ -4888,6 +5055,7 @@
4888	5055	private MenuItem resetCentroidItem;
4889	5056	private MenuItem transformgeometryItem;
4890	5057	private MenuItem resetTransformItem;
	5058	+ private MenuItem hideItem;
4891	5059	private MenuItem grabItem;
4892	5060	private MenuItem backItem;
4893	5061	private MenuItem frontItem;
..	..	@@ -4908,6 +5076,7 @@
4908	5076
4909	5077	private MenuItem resetParentItem;
4910	5078	private MenuItem repairParentItem;
	5079	+ private MenuItem repairShadowItem;
4911	5080	private MenuItem sortbysizeItem;
4912	5081	private MenuItem sortbynameItem;
4913	5082
..	..	@@ -4928,6 +5097,7 @@
4928	5097	private MenuItem coneItem;
4929	5098	private MenuItem torusItem;
4930	5099	private MenuItem superItem;
	5100	+ private MenuItem kleinItem;
4931	5101	private MenuItem blobItem;
4932	5102	private MenuItem latheItem;
4933	5103	private MenuItem bezierItem;
..	..	@@ -4940,6 +5110,7 @@
4940	5110	private MenuItem csgItem;
4941	5111	private MenuItem templateItem;
4942	5112	private MenuItem textureItem;
	5113	+ private MenuItem billboardItem;
4943	5114	private MenuItem shadowXItem;
4944	5115	private MenuItem shadowYItem;
4945	5116	private MenuItem shadowZItem;