~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,
..	..	@@ -83,7 +84,7 @@
83	84
84	85	void CloneSelection(boolean supports)
85	86	{
86		- // Object3D keep = GraphreeD.clipboard;
	87	+ // Object3D keep = GrafreeD.clipboard;
87	88	//Object3D obj;
88	89	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
89	90	{
..	..	@@ -97,14 +98,14 @@
97	98
98	99	void CloneClipboard(boolean supports)
99	100	{
100		- assert(GraphreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
102		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GraphreeD.clipboard.get(0), false));
	101	+ assert(GrafreeD.clipboard.parent == null);
	102	+ Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
	103	+ GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
	104	+ if (LA.isIdentity(GrafreeD.clipboard.toParent))
	105	+ makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
105	106	else
106		- makeSomething(CloneObject(GraphreeD.clipboard, false));
107		- GraphreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(GrafreeD.clipboard, false));
	108	+ GrafreeD.clipboard.get(0).parent = keepparent;
108	109	}
109	110
110	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +119,7 @@
118	119	// obj.support = null;
119	120	if (!supports)
120	121	obj.SaveSupports();
121		- Object3D clone = (Object3D)GraphreeD.clone(obj);
	122	+ Object3D clone = (Object3D)GrafreeD.clone(obj);
122	123	obj.parent = parent;
123	124	// obj.support = support;
124	125	// clone.support = support; // aout 2013
..	..	@@ -219,18 +220,24 @@
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
225	228	oe.menuBar.add(menu = new Menu("Group"));
226	229	grabItem = menu.add(new MenuItem("Grab"));
227	230	grabItem.addActionListener(this);
228		- frontItem = menu.add(new MenuItem("Front"));
229		- frontItem.addActionListener(this);
230	231	backItem = menu.add(new MenuItem("Back"));
231	232	backItem.addActionListener(this);
	233	+ frontItem = menu.add(new MenuItem("Front"));
	234	+ frontItem.addActionListener(this);
232	235	compositeItem = menu.add(new MenuItem("Composite"));
233	236	compositeItem.addActionListener(this);
	237	+ hideItem = menu.add(new MenuItem("Hide"));
	238	+ hideItem.addActionListener(this);
	239	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	240	+ ungroupItem.addActionListener(this);
234	241	menu.add("-");
235	242	randomItem = menu.add(new MenuItem("Random"));
236	243	randomItem.addActionListener(this);
..	..	@@ -252,6 +259,8 @@
252	259	oe.menuBar.add(menu = new Menu("Object"));
253	260	textureItem = menu.add(new MenuItem("Texture"));
254	261	textureItem.addActionListener(this);
	262	+ billboardItem = menu.add(new MenuItem("Billboard"));
	263	+ billboardItem.addActionListener(this);
255	264	csgItem = menu.add(new MenuItem("CSG"));
256	265	csgItem.addActionListener(this);
257	266	shadowXItem = menu.add(new MenuItem("Shadow X"));
..	..	@@ -269,14 +278,12 @@
269	278	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	279	pointflowItem.addActionListener(this);
271	280	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	281	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	282	resetTransformItem.addActionListener(this);
276	283	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	284	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	285	+ transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
	286	+ transformgeometryItem.addActionListener(this);
280	287
281	288	oe.menuBar.add(menu = new Menu("Geometry"));
282	289	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -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"));
..	..	@@ -380,7 +391,7 @@
380	391
381	392
382	393	oe.menuBar.add(menu = new Menu("Include"));
383		- importGFDItem = menu.add(new MenuItem("GraphreeD Object..."));
	394	+ importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
384	395	importGFDItem.addActionListener(this);
385	396	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
386	397	importVRMLX3DItem.addActionListener(this);
..	..	@@ -423,84 +434,26 @@
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);
451		- 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);
	443	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	444	+ trackCB.setToolTipText("Enable tracking");
493	445	trackCB.addItemListener(this);
494	446
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	447	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	448	+ screenfitButton.setToolTipText("Screen fit");
497	449	screenfitButton.addActionListener(this);
498		- oe.aConstraints.gridx += 1;
	450	+
499	451	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
500	452	// screenfitpointButton.addActionListener(this);
501	453	// oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
	454	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
503	455	snapobjectButton.addActionListener(this);
	456	+ snapobjectButton.setToolTipText("Snap Object");
504	457	oe.aConstraints.gridx += 1;
505	458
506	459	//aConstraints.gridx = 0;
..	..	@@ -508,65 +461,66 @@
508	461	oe.aConstraints.weighty = 0;
509	462	oe.aConstraints.gridwidth = 1;
510	463
511		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	464	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	465	+ flashSelectionButton.setToolTipText("Show selection");
512	466	flashSelectionButton.addActionListener(this);
513		- oe.aConstraints.gridx += 1;
514		- oe.aConstraints.weighty = 0;
515		- oe.aConstraints.gridwidth = 1;
516	467
517		- //
518		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	468	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	469	+
	470	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	471	+ twoButton.setToolTipText("Show center view only");
519	472	twoButton.addActionListener(this);
520		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	473	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
521	474	fourButton.addActionListener(this);
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	475	+ fourButton.setToolTipText("Show left panel only");
	476	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	477	+ sixButton.setToolTipText("2-column layout left");
523	478	sixButton.addActionListener(this);
524		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	479	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	480	+ threeButton.setToolTipText("2-column layout right");
525	481	threeButton.addActionListener(this);
526		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	482	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	483	+ sevenButton.setToolTipText("3-column layout");
527	484	sevenButton.addActionListener(this);
528	485	//
529	486
530		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	487	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	488	+ rootButton.setToolTipText("Edit selection in new tab");
531	489	rootButton.addActionListener(this);
532		- oe.aConstraints.gridx += 1;
533		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	490	+
	491	+ oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	492	+ closeButton.setToolTipText("Close tab");
534	493	closeButton.addActionListener(this);
535	494	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536	495	//clearButton.addActionListener(this);
537		- oe.aConstraints.gridx += 1;
538	496
539		- oe.aConstraints.gridx = 1; //
540		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	497	+ cGridBag commandsPanel = new cGridBag();
	498	+
	499	+ commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	500	+ editButton.setToolTipText("Edit selection");
541	501	editButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- oe.aConstraints.weighty = 0;
544		- oe.aConstraints.gridwidth = 1;
545	502
546		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	503	+ commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	504	+ uneditButton.setToolTipText("Unedit selection");
547	505	uneditButton.addActionListener(this);
548	506
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);
	507	+ commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	508	+ clearPanelButton.setToolTipText("Clear edit panel");
554	509	clearPanelButton.addActionListener(this);
555	510
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);
	511	+ commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	512	+ allParamsButton.setToolTipText("All params??");
561	513	allParamsButton.addActionListener(this);
562	514
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);
	515	+ commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	516	+ unselectButton.setToolTipText("Unselect");
568	517	unselectButton.addActionListener(this);
569	518
	519	+ commandsPanel.preferredHeight = 1;
	520	+
	521	+ oe.treePanel.add(commandsPanel);
	522	+ oe.treePanel.Return();
	523	+
570	524	// oe.aConstraints.gridx += 1;
571	525	// oe.aConstraints.weighty = 0;
572	526	// oe.aConstraints.gridwidth = 1;
..	..	@@ -578,40 +532,37 @@
578	532	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
579	533	// gcButton.addActionListener(this);
580	534
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;
	535	+ cGridBag jSPPanel = new cGridBag();
	536	+
	537	+ JScrollPane jSP;
592	538	//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);
	539	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
594	540	ResetModel();
595		- oe.aConstraints.weighty = 0.5;
596		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
597		- oe.aConstraints.gridy += 1;
598		- oe.aConstraints.gridwidth = 1;
	541	+
	542	+ oe.treePanel.add(jSPPanel);
	543	+ oe.treePanel.Return();
599	544
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);
	545	+ cGridBag copyOptionsPanel = new cGridBag();
	546	+
	547	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	548	+ colorCB.setToolTipText("Copy color when dropped");
604	549	colorCB.addItemListener(this);
605		- oe.aConstraints.gridx += 2;
606		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	550	+
	551	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	552	+ materialCB.setToolTipText("Copy material when dropped");
607	553	materialCB.addItemListener(this);
608		- oe.aConstraints.gridx += 2;
609		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	554	+
	555	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	556	+ textureCB.setToolTipText("Copy texture when dropped");
610	557	textureCB.addItemListener(this);
611	558
612		- oe.aConstraints.gridx = 0;
613		- oe.aConstraints.gridy += 1;
	559	+ copyOptionsPanel.preferredHeight = 1;
	560	+ oe.treePanel.add(copyOptionsPanel);
	561	+ oe.treePanel.Return();
614	562
	563	+// mainPanel.setDividerLocation(0.5); //1.0);
	564	+// mainPanel.setResizeWeight(0.5);
	565	+
615	566	//jList.addListSelectionListener(this);
616	567	oe.jTree.addTreeSelectionListener(this);
617	568	//jTree.setRootVisible(false);
..	..	@@ -633,17 +584,97 @@
633	584	radio.layout = sevenButton;
634	585	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
635	586	}
	587	+
	588	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	589	+ {
	590	+ //constraints.gridx = 0;
	591	+ //constraints.gridy = 0;
	592	+ panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	593	+ fastCB.setToolTipText("Fast mode");
	594	+ fastCB.addItemListener(this);
	595	+ //constraints.gridy += 1;
	596	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	597	+ supportCB.setToolTipText("Enabled rigging");
	598	+ supportCB.addItemListener(this);
	599	+
	600	+ // constraints.gridy += 1;
	601	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	602	+ // localCB.addItemListener(this);
	603	+
	604	+ //constraints.gridy += 1;
	605	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	606	+ crowdCB.setToolTipText("Used for crowds");
	607	+ crowdCB.addItemListener(this);
	608	+
	609	+ //constraints.gridy += 1;
	610	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	611	+ smoothCB.setToolTipText("Snapping delay");
	612	+ smoothCB.addItemListener(this);
	613	+
	614	+ //constraints.gridy += 1;
	615	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	616	+ slowCB.setToolTipText("Smooth interpolation");
	617	+ slowCB.addItemListener(this);
	618	+ //constraints.gridy += 1;
	619	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	620	+ boxCB.setToolTipText("Display bounding boxes");
	621	+ boxCB.addItemListener(this);
	622	+ //constraints.gridy += 1;
	623	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	624	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	625	+ zoomBoxCB.addItemListener(this);
	626	+
	627	+// constraints.gridy += 1;
	628	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	629	+// speakerMocapCB.addItemListener(this);
	630	+
	631	+ if (false)
	632	+ {
	633	+ // handled in scripts
	634	+ //constraints.gridy += 1;
	635	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	636	+ speakerCameraCB.addItemListener(this);
	637	+
	638	+ //constraints.gridy += 1;
	639	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	640	+ speakerFocusCB.addItemListener(this);
	641	+
	642	+ //constraints.gridy += 1;
	643	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	644	+ smoothfocusCB.addItemListener(this);
	645	+ }
	646	+
	647	+//constraints.gridx += 1;
	648	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	649	+// debugCB.addItemListener(this);
	650	+
	651	+ //constraints.gridy += 1;
	652	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	653	+ oeilCB.addItemListener(this);
	654	+
	655	+ //constraints.gridy += 1;
	656	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	657	+ lookAtCB.setToolTipText("Look-at target");
	658	+ lookAtCB.addItemListener(this);
	659	+
	660	+ cGridBag fill = new cGridBag();
	661	+
	662	+ fill.preferredHeight = 200;
	663	+
	664	+ panel.add(fill);
	665	+
	666	+ }
636	667
637	668	void EditObject(Object3D obj)
638	669	{
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();
	670	+ cRadio radioButton = new cRadio(obj.name);
	671	+ radioButton.SetObject(obj);
	672	+ radioButton.layout = sevenButton;
	673	+ radioButton.SetCamera(cameraView.renderCamera, false);
	674	+ radioButton.addActionListener(this);
	675	+ radioPanel.add(radioButton);
	676	+ buttonGroup.add(radioButton);
	677	+ radioButton.doClick();
647	678	}
648	679	void SetupViews(ObjEditor oe)
649	680	{
..	..	@@ -663,6 +694,7 @@
663	694	JCheckBox fastCB;
664	695	JCheckBox slowCB;
665	696	JCheckBox boxCB;
	697	+ JCheckBox zoomBoxCB;
666	698	JCheckBox trackCB;
667	699	JCheckBox smoothfocusCB;
668	700	// JCheckBox speakerMocapCB;
..	..	@@ -705,8 +737,7 @@
705	737	dropAttributes \|= Object3D.TEXTURE;
706	738	else
707	739	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	740	+ } else if(e.getSource() == liveCB)
710	741	{
711	742	cameraView.ToggleLive();
712	743	}
..	..	@@ -743,6 +774,10 @@
743	774	Recompile();
744	775	cameraView.repaint();
745	776	// refreshContents();
	777	+ }
	778	+ else if(e.getSource() == zoomBoxCB)
	779	+ {
	780	+ cameraView.ToggleZoomBoxMode();
746	781	}
747	782	else if(e.getSource() == smoothfocusCB)
748	783	{
..	..	@@ -1033,6 +1068,8 @@
1033	1068	torusItem.addActionListener(this);
1034	1069	superItem = menu.add(new MenuItem("Superellipsoid"));
1035	1070	superItem.addActionListener(this);
	1071	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1072	+ kleinItem.addActionListener(this);
1036	1073	particleItem = menu.add(new MenuItem("Particle system"));
1037	1074	particleItem.addActionListener(this);
1038	1075	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1106,6 +1143,8 @@
1106	1143	resetParentItem.addActionListener(this);
1107	1144	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	1145	repairParentItem.addActionListener(this);
	1146	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1147	+ repairShadowItem.addActionListener(this);
1109	1148	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	1149	invariantsItem.addActionListener(this);
1111	1150	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1441,9 +1480,9 @@
1441	1480
1442	1481	void Overwrite(int mask)
1443	1482	{
1444		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1483	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1445	1484	{
1446		- Object3D content = GraphreeD.clipboard.get(0);
	1485	+ Object3D content = GrafreeD.clipboard.get(0);
1447	1486
1448	1487	if (content instanceof cGroup && ((cGroup)content).transientlink )
1449	1488	content = ((cGroup)content).get(0);
..	..	@@ -1466,6 +1505,7 @@
1466	1505	//
1467	1506	public void actionPerformed(ActionEvent event) // , Object arg)
1468	1507	{
	1508	+ Object source = event.getSource();
1469	1509	/*
1470	1510	if (event.getSource() == nameField)
1471	1511	{
..	..	@@ -1477,11 +1517,11 @@
1477	1517	}
1478	1518	else
1479	1519	*/
1480		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1520	+ if (source == lookAtItem \|\| source == lookFromItem)
1481	1521	{
1482	1522	ScreenFit();
1483	1523	} else
1484		- if (event.getSource() == switchItem)
	1524	+ if (source == switchItem)
1485	1525	{
1486	1526	cVector v1 = new cVector();
1487	1527	cVector v2 = new cVector();
..	..	@@ -1490,11 +1530,11 @@
1490	1530	objEditor.cameraView.renderCamera.setAim(v2, v1);
1491	1531	objEditor.cameraView.repaint();
1492	1532	} else
1493		- if (event.getSource() == rectoidItem)
	1533	+ if (source == rectoidItem)
1494	1534	{
1495	1535	makeSomething(new Box());
1496	1536	} else
1497		- if (event.getSource() == particleItem)
	1537	+ if (source == particleItem)
1498	1538	{
1499	1539	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1500	1540	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1515,9 +1555,9 @@
1515	1555	applyExample(particleGeom, "SMOKE");
1516	1556	makeSomething(particleGeom);
1517	1557	} else
1518		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1558	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1519	1559	{
1520		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1560	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1521	1561
1522	1562	ragdoll.toParent = LA.newMatrix();
1523	1563	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1535,7 +1575,7 @@
1535	1575	} else
1536	1576	/*
1537	1577	*/
1538		- if (event.getSource() == heightFieldItem)
	1578	+ if (source == heightFieldItem)
1539	1579	{
1540	1580	Object3D obj = new Object3D();
1541	1581
..	..	@@ -1573,27 +1613,31 @@
1573	1613
1574	1614	makeSomething(obj);
1575	1615	} else
1576		- if (event.getSource() == gridItem)
	1616	+ if (source == gridItem)
1577	1617	{
1578	1618	makeSomething(new Grid());
1579	1619	} else
1580		- if (event.getSource() == ellipsoidItem)
	1620	+ if (source == ellipsoidItem)
1581	1621	{
1582	1622	makeSomething(new Sphere());
1583	1623	} else
1584		- if (event.getSource() == coneItem)
	1624	+ if (source == coneItem)
1585	1625	{
1586	1626	makeSomething(new Cone());
1587	1627	} else
1588		- if (event.getSource() == torusItem)
	1628	+ if (source == torusItem)
1589	1629	{
1590	1630	makeSomething(new Torus());
1591	1631	} else
1592		- if (event.getSource() == superItem)
	1632	+ if (source == superItem)
1593	1633	{
1594	1634	makeSomething(new Superellipsoid());
1595	1635	} else
1596		- if (event.getSource() == blobItem)
	1636	+ if (source == kleinItem)
	1637	+ {
	1638	+ makeSomething(new Klein());
	1639	+ } else
	1640	+ if (source == blobItem)
1597	1641	{
1598	1642	Blob blob = new Blob();
1599	1643	BlobComponent comp = new BlobComponent();
..	..	@@ -1601,15 +1645,15 @@
1601	1645	//blob.retile();
1602	1646	makeSomething(blob);
1603	1647	} else
1604		- if (event.getSource() == latheItem)
	1648	+ if (source == latheItem)
1605	1649	{
1606	1650	makeSomething(new Lathe());
1607	1651	} else
1608		- if (event.getSource() == bezierItem)
	1652	+ if (source == bezierItem)
1609	1653	{
1610	1654	makeSomething(new BezierSurface());
1611	1655	} else
1612		- if (event.getSource() == checkerItem)
	1656	+ if (source == checkerItem)
1613	1657	{
1614	1658	/*
1615	1659	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1624,7 +1668,7 @@
1624	1668	*/
1625	1669	makeSomething(new Checker());
1626	1670	} else
1627		- if (event.getSource() == meshItem)
	1671	+ if (source == meshItem)
1628	1672	{
1629	1673	Object3D itemtomake = new Object3D();
1630	1674	Object3D child;
..	..	@@ -1645,35 +1689,35 @@
1645	1689	makeSomething(child);
1646	1690	}
1647	1691	} else
1648		- if (event.getSource() == springItem)
	1692	+ if (source == springItem)
1649	1693	{
1650	1694	cSpring s = new cSpring();
1651	1695	s.setup();
1652	1696	makeSomething(s);
1653	1697	} else
1654		- if (event.getSource() == flagItem)
	1698	+ if (source == flagItem)
1655	1699	{
1656	1700	cSpring s = new cFlag();
1657	1701	s.setup();
1658	1702	makeSomething(s);
1659	1703	} else
1660		- if (event.getSource() == lightItem)
	1704	+ if (source == lightItem)
1661	1705	{
1662	1706	makeSomething(new Light());
1663	1707	} else
1664		- if (event.getSource() == csgItem)
	1708	+ if (source == csgItem)
1665	1709	{
1666	1710	group(new CSG());
1667	1711	} else
1668		- if (event.getSource() == templateItem)
	1712	+ if (source == templateItem)
1669	1713	{
1670	1714	group(new cTemplate());
1671	1715	} else
1672		- if (event.getSource() == attributeItem)
	1716	+ if (source == attributeItem)
1673	1717	{
1674	1718	makeSomething(new Attribute());
1675	1719	} else
1676		- if (event.getSource() == pointflowItem)
	1720	+ if (source == pointflowItem)
1677	1721	{
1678	1722	makeSomething(new PointFlow());
1679	1723	} else
..	..	@@ -1685,7 +1729,7 @@
1685	1729	} else
1686	1730	*/
1687	1731
1688		- if (event.getSource() == superLoopItem)
	1732	+ if (source == superLoopItem)
1689	1733	{
1690	1734	Composite g = new cGroup();
1691	1735	for (int i=0; i<15; i++)
..	..	@@ -1707,7 +1751,7 @@
1707	1751
1708	1752	group(g);
1709	1753	} else
1710		- if (event.getSource() == loopItem)
	1754	+ if (source == loopItem)
1711	1755	{
1712	1756	Composite csg = new GroupLeaf();
1713	1757	csg.count = 5;
..	..	@@ -1716,7 +1760,7 @@
1716	1760	csg.addChild(child);
1717	1761	child.addChild(csg);
1718	1762	} else
1719		- if (event.getSource() == doubleItem)
	1763	+ if (source == doubleItem)
1720	1764	{
1721	1765	Composite csg = new GroupLeaf();
1722	1766	csg.count = 5;
..	..	@@ -1728,7 +1772,7 @@
1728	1772	csg.addChild(child);
1729	1773	child.addChild(csg);
1730	1774	} else
1731		- if (event.getSource() == tripleItem)
	1775	+ if (source == tripleItem)
1732	1776	{
1733	1777	Composite csg = new GroupLeaf();
1734	1778	csg.count = 4;
..	..	@@ -1744,70 +1788,70 @@
1744	1788	child.addChild(csg);
1745	1789	} else
1746	1790
1747		- if (event.getSource() == importGFDItem)
	1791	+ if (source == importGFDItem)
1748	1792	{
1749	1793	ImportGFD();
1750	1794	} else
1751		- if (event.getSource() == importVRMLX3DItem)
	1795	+ if (source == importVRMLX3DItem)
1752	1796	{
1753	1797	ImportVRMLX3D();
1754	1798	} else
1755		- if (event.getSource() == import3DSItem)
	1799	+ if (source == import3DSItem)
1756	1800	{
1757	1801	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1758	1802	} else
1759		- if (event.getSource() == importOBJItem)
	1803	+ if (source == importOBJItem)
1760	1804	{
1761	1805	objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1762	1806	} else
1763		- if (event.getSource() == computeAOItem)
	1807	+ if (source == computeAOItem)
1764	1808	{
1765		- CameraPane.drawMode = CameraPane.OCCLUSION;
1766		- CameraPane.theRenderer.repaint();
	1809	+ Globals.drawMode = CameraPane.OCCLUSION;
	1810	+ Globals.theRenderer.repaint();
1767	1811	} else
1768		- if (event.getSource() == recompileItem)
	1812	+ if (source == recompileItem)
1769	1813	{
1770	1814	Recompile();
1771	1815	refreshContents();
1772	1816	} else
1773		- if (event.getSource() == editScriptItem)
	1817	+ if (source == editScriptItem)
1774	1818	{
1775	1819	OpenDialog();
1776	1820	refreshContents();
1777	1821	} else
1778		- if (event.getSource() == invariantsItem)
	1822	+ if (source == invariantsItem)
1779	1823	{
1780	1824	System.out.println("Invariants:");
1781		- GraphreeD.theApplet3D.universe.invariants();
	1825	+ GrafreeD.grafreeD.universe.invariants();
1782	1826	} else
1783		- if (event.getSource() == memoryItem)
	1827	+ if (source == memoryItem)
1784	1828	{
1785	1829	//System.out.println("Invariants:");
1786	1830	PrintMemory();
1787	1831	} else
1788		- if (event.getSource() == pathItem)
	1832	+ if (source == pathItem)
1789	1833	{
1790	1834	PrintPath();
1791	1835	} else
1792		- if (event.getSource() == analyzeItem)
	1836	+ if (source == analyzeItem)
1793	1837	{
1794	1838	AnalyzeObject();
1795	1839	} else
1796		- if (event.getSource() == dumpItem)
	1840	+ if (source == dumpItem)
1797	1841	{
1798	1842	DumpObject();
1799	1843	} else
1800		- if (event.getSource() == screenfitButton)
	1844	+ if (source == screenfitButton)
1801	1845	{
1802	1846	//Reload(lastConverter, lastFilename, true);
1803	1847	ScreenFit();
1804	1848	} else
1805		- if (event.getSource() == screenfitpointButton)
	1849	+ if (source == screenfitpointButton)
1806	1850	{
1807	1851	//Reload(lastConverter, lastFilename, true);
1808	1852	ScreenFitPoint();
1809	1853	} else
1810		- if (event.getSource() == snapobjectButton)
	1854	+ if (source == snapobjectButton)
1811	1855	{
1812	1856	//Reload(lastConverter, lastFilename, true);
1813	1857	SnapObject();
..	..	@@ -1818,13 +1862,13 @@
1818	1862	// Recompile();
1819	1863	// refreshContents();
1820	1864	// } else
1821		- if (event.getSource() == gcButton)
	1865	+ if (source == gcButton)
1822	1866	{
1823	1867	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1824	1868	System.gc();
1825	1869	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	1870	} else
1827		- if (event.getSource() == editLeafItem)
	1871	+ if (source == editLeafItem)
1828	1872	{
1829	1873	Object3D obj;
1830	1874	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1838,65 +1882,66 @@
1838	1882	}
1839	1883	refreshContents(true);
1840	1884	} else
1841		- if (event.getSource() == openWindowItem)
	1885	+ if (source == openWindowItem)
1842	1886	{
1843	1887	EditSelection(true);
1844	1888	} else
1845		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1889	+ if (source == cutItem \|\| source == clearButton)
1846	1890	{
1847	1891	loadClipboard(true);
1848	1892	} else
1849		- if (event.getSource() == duplicateItem)
	1893	+ if (source == duplicateItem)
1850	1894	{
1851		- Object3D keep = GraphreeD.clipboard;
	1895	+ Object3D keep = GrafreeD.clipboard;
1852	1896	loadClipboard(false);
1853	1897	paste(false);
1854		- GraphreeD.clipboard = keep;
	1898	+ GrafreeD.clipboard = keep;
1855	1899	} else
1856		- if (event.getSource() == cloneItem)
	1900	+ if (source == cloneItem)
1857	1901	{
1858	1902	CloneSelection(false);
1859	1903	} else
1860		- if (event.getSource() == cloneSupportItem)
	1904	+ if (source == cloneSupportItem)
1861	1905	{
1862	1906	CloneSelection(true);
1863	1907	} else
1864		- if (event.getSource() == copyItem)
	1908	+ if (source == copyItem)
1865	1909	{
1866	1910	loadClipboard(false);
1867	1911	} else
1868		- if (event.getSource() == pasteItem)
	1912	+ if (source == pasteItem)
1869	1913	{
1870	1914	paste(false);
1871	1915	} else
1872		- if (event.getSource() == pasteLinkItem)
	1916	+ if (source == pasteLinkItem)
1873	1917	{
1874	1918	pasteInto(false);
1875	1919	} else
1876		- if (event.getSource() == pasteCloneItem)
	1920	+ if (source == pasteCloneItem)
1877	1921	{
1878	1922	pasteInto(true);
1879	1923	} else
1880		- if (event.getSource() == pasteExpandItem)
	1924	+ if (source == pasteExpandItem)
1881	1925	{
1882	1926	paste(true);
1883	1927	} else
1884		- if (event.getSource() == synchronizeItem)
	1928	+ if (source == synchronizeItem)
1885	1929	{
1886	1930	Overwrite(Object3D.TRANSFORM);
1887	1931	} else
1888		- if (event.getSource() == overwriteNameItem)
	1932	+ if (source == overwriteNameItem)
1889	1933	{
1890	1934	Overwrite(Object3D.NAME);
1891	1935	} else
1892		- if (event.getSource() == overwriteUVItem)
	1936	+ if (source == overwriteUVItem)
1893	1937	{
1894	1938	Overwrite(Object3D.UV);
1895	1939	} else
1896		- if (event.getSource() == overwriteMatItem)
	1940	+ if (source == overwriteMatItem)
1897	1941	{
	1942	+ /* july 2015
1898	1943	if ((dropAttributes & Object3D.TEXTURE) == 0)
1899		- Overwrite(Object3D.MATERIAL);
	1944	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1900	1945	else
1901	1946	{
1902	1947	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1908,13 +1953,16 @@
1908	1953	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1909	1954	}
1910	1955	}
	1956	+ */
	1957	+
	1958	+ Overwrite(dropAttributes);
1911	1959	}
1912		- if (event.getSource() == overwriteGeoItem)
	1960	+ if (source == overwriteGeoItem)
1913	1961	{
1914	1962	Overwrite(Object3D.GEOMETRY);
1915		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1963	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1916	1964	// {
1917		-// Object3D content = GraphreeD.clipboard.get(0);
	1965	+// Object3D content = GrafreeD.clipboard.get(0);
1918	1966	//
1919	1967	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1920	1968	// content = ((cGroup)content).get(0);
..	..	@@ -1926,7 +1974,7 @@
1926	1974	// refreshContents();
1927	1975	// }
1928	1976	} else
1929		- if (event.getSource() == generateMeshItem)
	1977	+ if (source == generateMeshItem)
1930	1978	{
1931	1979	//if (group.selection.size() == 1)
1932	1980	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1937,7 +1985,7 @@
1937	1985	ResetModel();
1938	1986	refreshContents();
1939	1987	} else
1940		- if (event.getSource() == extractGeometriesItem)
	1988	+ if (source == extractGeometriesItem)
1941	1989	{
1942	1990	boolean one = false;
1943	1991
..	..	@@ -1964,7 +2012,7 @@
1964	2012	ResetModel();
1965	2013	refreshContents();
1966	2014	} else
1967		- if (event.getSource() == cloneGeometriesItem)
	2015	+ if (source == cloneGeometriesItem)
1968	2016	{
1969	2017	boolean one = false;
1970	2018
..	..	@@ -1990,32 +2038,37 @@
1990	2038	ResetModel();
1991	2039	refreshContents();
1992	2040	} else
1993		- if (event.getSource() == shareGeometriesItem)
	2041	+ if (source == shareGeometriesItem)
1994	2042	{
1995	2043	boolean one = false;
1996	2044
1997	2045	if (group.selection.size() == 1)
1998	2046	one = true;
1999	2047
	2048	+ Object3D merge = null;
	2049	+
2000	2050	Object3D content = new cGroup();
2001	2051
2002	2052	for (int i=0; i<group.selection.size(); i++)
2003	2053	{
2004		- Object3D sel = new Merge(group.selection.get(i));
	2054	+ merge = new Merge(group.selection.get(i));
2005	2055
2006	2056	if (one)
2007		- makeSomething(sel, false);
	2057	+ makeSomething(merge, false);
2008	2058	else
2009		- content.addChild(sel);
	2059	+ content.addChild(merge);
2010	2060	}
2011	2061
2012	2062	if (!one)
2013		- makeSomething(content, false);
2014		-
2015		- ResetModel();
2016		- refreshContents();
	2063	+ makeSomething(content, true);
	2064	+ else
	2065	+ {
	2066	+ ResetModel();
	2067	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2068	+ refreshContents();
	2069	+ }
2017	2070	} else
2018		- if (event.getSource() == mergeGeometriesItem)
	2071	+ if (source == mergeGeometriesItem)
2019	2072	{
2020	2073	boolean one = false;
2021	2074
..	..	@@ -2045,11 +2098,11 @@
2045	2098	ResetModel();
2046	2099	refreshContents();
2047	2100	} else
2048		- if (event.getSource() == linkverticesItem)
	2101	+ if (source == linkverticesItem)
2049	2102	{
2050		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2103	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2051	2104	// {
2052		-// Object3D content = GraphreeD.clipboard.get(0);
	2105	+// Object3D content = GrafreeD.clipboard.get(0);
2053	2106	//
2054	2107	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2055	2108	// content = ((cGroup)content).get(0);
..	..	@@ -2058,14 +2111,14 @@
2058	2111	// group.selection.get(0).setMasterThis(content); // should be identity
2059	2112	// refreshContents();
2060	2113	// }
2061		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2114	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
2062	2115	{
2063		- Object3D content = GraphreeD.clipboard.get(0);
	2116	+ Object3D content = GrafreeD.clipboard.get(0);
2064	2117
2065	2118	if (content instanceof cGroup && ((cGroup)content).transientlink )
2066	2119	content = ((cGroup)content).get(0);
2067	2120
2068		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2121	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2069	2122	for (int i=0; i<group.selection.size(); i++)
2070	2123	{
2071	2124	boolean random = CameraPane.RANDOM;
..	..	@@ -2074,11 +2127,11 @@
2074	2127	// group.selection.get(i).setMasterThis(content); // should be identity
2075	2128	CameraPane.RANDOM = random;
2076	2129	}
2077		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2130	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2078	2131	refreshContents();
2079	2132	}
2080	2133	} else
2081		- if (event.getSource() == resetsupportItem)
	2134	+ if (source == resetsupportItem)
2082	2135	{
2083	2136	for (int i=0; i<group.selection.size(); i++)
2084	2137	{
..	..	@@ -2090,7 +2143,16 @@
2090	2143
2091	2144	refreshContents();
2092	2145	} else
2093		- if (event.getSource() == resetreferencesItem)
	2146	+ if (source == relinkverticesItem)
	2147	+ {
	2148	+ boolean random = CameraPane.RANDOM;
	2149	+ CameraPane.RANDOM = false; // parse all random nodes
	2150	+ group.selection.RelinkToSupport();
	2151	+ CameraPane.RANDOM = random;
	2152	+
	2153	+ refreshContents();
	2154	+ } else
	2155	+ if (source == resetreferencesItem)
2094	2156	{
2095	2157	for (int i=0; i<group.selection.size(); i++)
2096	2158	{
..	..	@@ -2099,11 +2161,11 @@
2099	2161
2100	2162	refreshContents();
2101	2163	} else
2102		- if (event.getSource() == setMasterItem)
	2164	+ if (source == setMasterItem)
2103	2165	{
2104		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2166	+ if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2105	2167	{
2106		- Object3D content = GraphreeD.clipboard.get(0);
	2168	+ Object3D content = GrafreeD.clipboard.get(0);
2107	2169
2108	2170	if (content instanceof cGroup && ((cGroup)content).transientlink )
2109	2171	content = ((cGroup)content).get(0);
..	..	@@ -2112,13 +2174,13 @@
2112	2174	refreshContents();
2113	2175	}
2114	2176	} else
2115		- if (event.getSource() == poseMeshItem)
	2177	+ if (source == poseMeshItem)
2116	2178	{
2117	2179	if (group.selection.size() == 1)
2118	2180	{
2119		- if (GraphreeD.clipboard.size() == 1)
	2181	+ if (GrafreeD.clipboard.size() == 1)
2120	2182	{
2121		- Object3D content = GraphreeD.clipboard.get(0);
	2183	+ Object3D content = GrafreeD.clipboard.get(0);
2122	2184
2123	2185	if (content instanceof cGroup && ((cGroup)content).transientlink )
2124	2186	content = ((cGroup)content).get(0);
..	..	@@ -2131,19 +2193,19 @@
2131	2193	}
2132	2194
2133	2195	} else
2134		- if (event.getSource() == revertMeshItem)
	2196	+ if (source == revertMeshItem)
2135	2197	{
2136	2198	RevertMeshes();
2137	2199	} else
2138		- if (event.getSource() == resetMeshItem)
	2200	+ if (source == resetMeshItem)
2139	2201	{
2140	2202	ResetAll();
2141	2203	} else
2142		- if (event.getSource() == stepAllItem)
	2204	+ if (source == stepAllItem)
2143	2205	{
2144	2206	StepAll();
2145	2207	} else
2146		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2208	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2147	2209	{
2148	2210	//int indices[] = jList.getSelectedIndices();
2149	2211	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2151,42 +2213,46 @@
2151	2213
2152	2214	ClearSelection(false);
2153	2215	} else
2154		- if (event.getSource() == clearAllItem)
	2216	+ if (source == clearAllItem)
2155	2217	{
2156	2218	ClearSelection(true);
2157	2219	} else
2158		- if (event.getSource() == grabItem)
	2220	+ if (source == grabItem)
2159	2221	{
2160	2222	group(new cGroup(), true);
2161	2223	} else
2162		- if (event.getSource() == frontItem)
	2224	+ if (source == hideItem)
	2225	+ {
	2226	+ group(new HiddenObject());
	2227	+ } else
	2228	+ if (source == frontItem)
2163	2229	{
2164	2230	front();
2165	2231	} else
2166		- if (event.getSource() == backItem)
	2232	+ if (source == backItem)
2167	2233	{
2168	2234	back();
2169	2235	} else
2170		- if (event.getSource() == cameraItem)
	2236	+ if (source == cameraItem)
2171	2237	{
2172	2238	makeSomething(new Camera());
2173	2239	} else
2174		- if (event.getSource() == compositeItem)
	2240	+ if (source == compositeItem)
2175	2241	{
2176	2242	group(new Composite());
2177	2243	} else
2178		- if (event.getSource() == randomItem)
	2244	+ if (source == randomItem)
2179	2245	{
2180	2246	RandomNode random = new RandomNode();
2181	2247	group(random);
2182	2248	if (random.size() > 0)
2183	2249	random.name = random.get(0).name + "Rnd";
2184	2250	} else
2185		- if (event.getSource() == physicsItem)
	2251	+ if (source == physicsItem)
2186	2252	{
2187	2253	group(new PhysicsNode());
2188	2254	} else
2189		- if (event.getSource() == frameselectorItem)
	2255	+ if (source == frameselectorItem)
2190	2256	{
2191	2257	for (int i=0; i<group.selection.size(); i++)
2192	2258	{
..	..	@@ -2198,7 +2264,7 @@
2198	2264	ResetModel();
2199	2265	refreshContents();
2200	2266	} else
2201		- if (event.getSource() == switchGeoItem)
	2267	+ if (source == switchGeoItem)
2202	2268	{
2203	2269	for (int i=0; i<group.selection.size(); i++)
2204	2270	{
..	..	@@ -2210,7 +2276,7 @@
2210	2276	ResetModel();
2211	2277	refreshContents();
2212	2278	} else
2213		- if (event.getSource() == switchTransfoItem)
	2279	+ if (source == switchTransfoItem)
2214	2280	{
2215	2281	for (int i=0; i<group.selection.size(); i++)
2216	2282	{
..	..	@@ -2222,7 +2288,7 @@
2222	2288	ResetModel();
2223	2289	refreshContents();
2224	2290	} else
2225		- if (event.getSource() == morphItem)
	2291	+ if (source == morphItem)
2226	2292	{
2227	2293	for (int i=0; i<group.selection.size(); i++)
2228	2294	{
..	..	@@ -2234,7 +2300,7 @@
2234	2300	ResetModel();
2235	2301	refreshContents();
2236	2302	} else
2237		- if (event.getSource() == scriptNodeItem)
	2303	+ if (source == scriptNodeItem)
2238	2304	{
2239	2305	boolean atleastone = false;
2240	2306
..	..	@@ -2273,195 +2339,215 @@
2273	2339	}
2274	2340	}
2275	2341	} else
2276		- if (event.getSource() == linkerItem)
	2342	+ if (source == linkerItem)
2277	2343	{
2278	2344	group(new cLinker());
2279	2345	} else
2280		- if (event.getSource() == textureItem)
	2346	+ if (source == textureItem)
2281	2347	{
2282	2348	group(new TextureNode());
2283	2349	} else
2284		- if (event.getSource() == shadowXItem)
	2350	+ if (source == billboardItem)
	2351	+ {
	2352	+ group(new BillboardNode());
	2353	+ } else
	2354	+ if (source == shadowXItem)
2285	2355	{
2286	2356	CastShadow(0);
2287	2357	} else
2288		- if (event.getSource() == shadowYItem)
	2358	+ if (source == shadowYItem)
2289	2359	{
2290	2360	CastShadow(1);
2291	2361	} else
2292		- if (event.getSource() == shadowZItem)
	2362	+ if (source == shadowZItem)
2293	2363	{
2294	2364	CastShadow(2);
2295	2365	} else
2296		- if (event.getSource() == ungroupItem)
	2366	+ if (source == ungroupItem)
2297	2367	{
2298		- ungroup();
	2368	+ //ungroup();
	2369	+ for (int i=0; i<group.selection.size(); i++)
	2370	+ {
	2371	+ Ungroup(group.selection.get(i));
	2372	+ }
	2373	+
	2374	+ ClearSelection(false);
	2375	+
	2376	+ refreshContents();
2299	2377	} else
2300		- if (event.getSource() == genUVItem)
	2378	+ if (source == genUVItem)
2301	2379	{
2302	2380	GenUV();
2303	2381	} else
2304		- if (event.getSource() == genNormalsCADItem)
	2382	+ if (source == genNormalsCADItem)
2305	2383	{
2306	2384	GenNormals(true);
2307	2385	} else
2308		- if (event.getSource() == genNormalsORGANItem)
	2386	+ if (source == genNormalsMESHItem)
	2387	+ {
	2388	+ GenNormals(true); // TODO
	2389	+ } else
	2390	+ if (source == genNormalsORGANItem)
2309	2391	{
2310	2392	GenNormals(false);
2311	2393	} else
2312		- if (event.getSource() == stripifyItem)
	2394	+ if (source == genNormalsMINEItem)
	2395	+ {
	2396	+ GenNormalsMINE();
	2397	+ } else
	2398	+ if (source == stripifyItem)
2313	2399	{
2314	2400	Stripify();
2315	2401	} else
2316		- if (event.getSource() == unstripifyItem)
	2402	+ if (source == unstripifyItem)
2317	2403	{
2318	2404	Unstripify();
2319	2405	} else
2320		- if (event.getSource() == trimItem)
	2406	+ if (source == trimItem)
2321	2407	{
2322	2408	Trim();
2323	2409	} else
2324		- if (event.getSource() == untrimItem)
	2410	+ if (source == untrimItem)
2325	2411	{
2326	2412	Untrim();
2327	2413	} else
2328		- if (event.getSource() == clearColorsItem)
	2414	+ if (source == clearColorsItem)
2329	2415	{
2330	2416	ClearColors();
2331	2417	} else
2332		- if (event.getSource() == clearMaterialsItem)
	2418	+ if (source == clearMaterialsItem)
2333	2419	{
2334	2420	ClearMaterials();
2335	2421	} else
2336		- if (event.getSource() == liveleavesItem)
	2422	+ if (source == liveleavesItem)
2337	2423	{
2338	2424	LiveLeaves(true);
2339	2425	} else
2340		- if (event.getSource() == unliveleavesItem)
	2426	+ if (source == unliveleavesItem)
2341	2427	{
2342	2428	LiveLeaves(false);
2343	2429	} else
2344		- if (event.getSource() == supportleavesItem)
	2430	+ if (source == supportleavesItem)
2345	2431	{
2346	2432	SupportLeaves(true);
2347	2433	} else
2348		- if (event.getSource() == unsupportleavesItem)
	2434	+ if (source == unsupportleavesItem)
2349	2435	{
2350	2436	SupportLeaves(false);
2351	2437	} else
2352		- if (event.getSource() == hideleavesItem)
	2438	+ if (source == hideleavesItem)
2353	2439	{
2354	2440	HideLeaves(true);
2355	2441	} else
2356		- if (event.getSource() == showleavesItem)
	2442	+ if (source == showleavesItem)
2357	2443	{
2358	2444	HideLeaves(false);
2359	2445	} else
2360		- if (event.getSource() == markleavesItem)
	2446	+ if (source == markleavesItem)
2361	2447	{
2362	2448	MarkLeaves(true);
2363	2449	} else
2364		- if (event.getSource() == unmarkleavesItem)
	2450	+ if (source == unmarkleavesItem)
2365	2451	{
2366	2452	MarkLeaves(false);
2367	2453	} else
2368		- if (event.getSource() == flipVItem)
	2454	+ if (source == flipVItem)
2369	2455	{
2370	2456	FlipV(true);
2371	2457	} else
2372		- if (event.getSource() == unflipVItem)
	2458	+ if (source == unflipVItem)
2373	2459	{
2374	2460	FlipV(false);
2375	2461	} else
2376		- if (event.getSource() == lowTexturesItem)
	2462	+ if (source == lowTexturesItem)
2377	2463	{
2378	2464	SetTexRes(0);
2379	2465	} else
2380		- if (event.getSource() == normalTexturesItem)
	2466	+ if (source == normalTexturesItem)
2381	2467	{
2382	2468	SetTexRes(1);
2383	2469	} else
2384		- if (event.getSource() == highTexturesItem)
	2470	+ if (source == highTexturesItem)
2385	2471	{
2386	2472	SetTexRes(2);
2387	2473	} else
2388		- if (event.getSource() == veryhighTexturesItem)
	2474	+ if (source == veryhighTexturesItem)
2389	2475	{
2390	2476	SetTexRes(3);
2391	2477	} else
2392		- if (event.getSource() == maxTexturesItem)
	2478	+ if (source == maxTexturesItem)
2393	2479	{
2394	2480	SetTexRes(4);
2395	2481	} else
2396		- if (event.getSource() == panoTexturesItem)
	2482	+ if (source == panoTexturesItem)
2397	2483	{
2398	2484	SetTexRes(5);
2399	2485	} else
2400		- if (event.getSource() == reverseNormalsItem)
	2486	+ if (source == reverseNormalsItem)
2401	2487	{
2402	2488	ReverseNormals();
2403	2489	} else
2404		- if (event.getSource() == parseverticesItem)
	2490	+ if (source == parseverticesItem)
2405	2491	{
2406	2492	ParseVertices();
2407	2493	} else
2408		- if (event.getSource() == textureFieldItem)
	2494	+ if (source == textureFieldItem)
2409	2495	{
2410	2496	TextureVertices();
2411	2497	} else
2412		- if (event.getSource() == alignItem)
	2498	+ if (source == alignItem)
2413	2499	{
2414	2500	Align();
2415	2501	} else
2416		- if (event.getSource() == mirrorItem)
	2502	+ if (source == mirrorItem)
2417	2503	{
2418	2504	MirrorPoses();
2419	2505	} else
2420		- if (event.getSource() == reduceMorphItem)
	2506	+ if (source == reduceMorphItem)
2421	2507	{
2422	2508	MeshReduction(false);
2423	2509	} else
2424		- if (event.getSource() == reduce34MorphItem)
	2510	+ if (source == reduce34MorphItem)
2425	2511	{
2426	2512	MeshReduction(true);
2427	2513	} else
2428		- if (event.getSource() == reverseTrianglesItem)
	2514	+ if (source == reverseTrianglesItem)
2429	2515	{
2430	2516	ReverseTriangles();
2431	2517	} else
2432		- if (event.getSource() == reduceMeshItem)
	2518	+ if (source == reduceMeshItem)
2433	2519	{
2434	2520	ReduceMesh(false);
2435	2521	} else
2436		- if (event.getSource() == reduce34MeshItem)
	2522	+ if (source == reduce34MeshItem)
2437	2523	{
2438	2524	ReduceMesh(true);
2439	2525	} else
2440		- if (event.getSource() == increaseMeshItem)
	2526	+ if (source == increaseMeshItem)
2441	2527	{
2442	2528	IncreaseMesh();
2443	2529	} else
2444		- if (event.getSource() == clipMeshItem)
	2530	+ if (source == clipMeshItem)
2445	2531	{
2446	2532	ClipMesh();
2447	2533	} else
2448		- if (event.getSource() == smoothMeshItem)
	2534	+ if (source == smoothMeshItem)
2449	2535	{
2450	2536	SmoothMesh();
2451	2537	} else
2452		- if (event.getSource() == transformgeometryItem)
	2538	+ if (source == transformgeometryItem)
2453	2539	{
2454	2540	TransformGeometry();
2455	2541	} else
2456		- if (event.getSource() == resetTransformItem)
	2542	+ if (source == resetTransformItem)
2457	2543	{
2458	2544	ResetTransform();
2459	2545	} else
2460		- if (event.getSource() == resetCentroidItem)
	2546	+ if (source == resetCentroidItem)
2461	2547	{
2462	2548	ResetCentroid();
2463	2549	} else
2464		- if (event.getSource() == resetParentItem)
	2550	+ if (source == resetParentItem)
2465	2551	{
2466	2552	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2467	2553	{
..	..	@@ -2471,7 +2557,7 @@
2471	2557
2472	2558	refreshContents();
2473	2559	} else
2474		- if (event.getSource() == repairParentItem)
	2560	+ if (source == repairParentItem)
2475	2561	{
2476	2562	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	2563	{
..	..	@@ -2485,7 +2571,21 @@
2485	2571
2486	2572	refreshContents();
2487	2573	} else
2488		- if (event.getSource() == sortbysizeItem)
	2574	+ if (source == repairShadowItem)
	2575	+ {
	2576	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2577	+ {
	2578	+ Object3D obj = (Object3D)e.nextElement();
	2579	+ obj.RepairShadow();
	2580	+// for (int i=0; i<obj.size(); i++)
	2581	+// {
	2582	+// obj.get(i).parent = obj;
	2583	+// }
	2584	+ }
	2585	+
	2586	+ refreshContents();
	2587	+ } else
	2588	+ if (source == sortbysizeItem)
2489	2589	{
2490	2590	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2491	2591	{
..	..	@@ -2497,7 +2597,7 @@
2497	2597	ResetModel();
2498	2598	refreshContents();
2499	2599	} else
2500		- if (event.getSource() == sortbynameItem)
	2600	+ if (source == sortbynameItem)
2501	2601	{
2502	2602	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2503	2603	{
..	..	@@ -2509,7 +2609,7 @@
2509	2609	ResetModel();
2510	2610	refreshContents();
2511	2611	} else
2512		- if (event.getSource() == attachPigmentItem)
	2612	+ if (source == attachPigmentItem)
2513	2613	{
2514	2614	String texture = GetFile("Attach pigment");
2515	2615	Object3D obj;
..	..	@@ -2521,7 +2621,7 @@
2521	2621
2522	2622	refreshContents();
2523	2623	} else
2524		- if (event.getSource() == detachPigmentItem)
	2624	+ if (source == detachPigmentItem)
2525	2625	{
2526	2626	Object3D obj;
2527	2627	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2532,7 +2632,7 @@
2532	2632
2533	2633	refreshContents();
2534	2634	} else
2535		- if (event.getSource() == attachBumpItem)
	2635	+ if (source == attachBumpItem)
2536	2636	{
2537	2637	String texture = GetFile("Attach bump");
2538	2638	Object3D obj;
..	..	@@ -2544,7 +2644,7 @@
2544	2644
2545	2645	refreshContents();
2546	2646	} else
2547		- if (event.getSource() == detachBumpItem)
	2647	+ if (source == detachBumpItem)
2548	2648	{
2549	2649	Object3D obj;
2550	2650	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2555,7 +2655,7 @@
2555	2655
2556	2656	refreshContents();
2557	2657	} else
2558		- if (event.getSource() == pigmentBumpItem)
	2658	+ if (source == pigmentBumpItem)
2559	2659	{
2560	2660	Object3D obj;
2561	2661	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2566,158 +2666,195 @@
2566	2666
2567	2667	refreshContents();
2568	2668	} else
2569		- if (event.getSource() == flashSelectionButton)
	2669	+ if (source == flashSelectionButton)
2570	2670	{
2571	2671	CameraPane.flash = true;
2572	2672	refreshContents();
2573	2673	} else
2574		- if (event.getSource() == oneButton)
	2674	+ if (source == oneButton)
2575	2675	{
2576	2676	} else
2577		- if (event.getSource() == twoButton)
	2677	+ if (source == twoButton)
2578	2678	{
2579	2679	radio.layout = twoButton;
2580	2680	// bug
2581	2681	//gridPanel.setDividerLocation(1.0);
2582	2682	//bigPanel.setDividerLocation(0.0);
2583		- bigThree.remove(jtp);
2584		- bigThree.remove(cameraPanel);
2585		- bigThree.remove(XYZPanel);
2586		- aWindowConstraints.gridx = 0;
2587		- aWindowConstraints.gridy = 0;
2588		- aWindowConstraints.gridwidth = 1;
2589		- // aConstraints.gridheight = 3;
2590		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2591		- aWindowConstraints.weightx = 0;
2592		- aWindowConstraints.weighty = 1;
2593		- //bigThree.add(jtp, aWindowConstraints);
2594		- aWindowConstraints.weightx = 1;
2595		- aWindowConstraints.gridwidth = 3;
2596		- // aConstraints.gridheight = 3;
2597		- aWindowConstraints.gridx = 1;
2598		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2599		- bigThree.add(cameraPanel, aWindowConstraints);
2600		- aWindowConstraints.weightx = 0;
2601		- aWindowConstraints.gridx = 4;
2602		- aWindowConstraints.gridwidth = 1;
2603		- // aConstraints.gridheight = 3;
2604		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2605		- //bigThree.add(XYZPanel, aWindowConstraints);
2606		- bigThree.revalidate();
	2683	+// bigThree.remove(scenePanel);
	2684	+// bigThree.remove(centralPanel);
	2685	+// bigThree.remove(XYZPanel);
	2686	+// aWindowConstraints.gridx = 0;
	2687	+// aWindowConstraints.gridy = 0;
	2688	+// aWindowConstraints.gridwidth = 1;
	2689	+// // aConstraints.gridheight = 3;
	2690	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2691	+// aWindowConstraints.weightx = 0;
	2692	+// aWindowConstraints.weighty = 1;
	2693	+// //bigThree.add(jtp, aWindowConstraints);
	2694	+// aWindowConstraints.weightx = 1;
	2695	+// aWindowConstraints.gridwidth = 3;
	2696	+// // aConstraints.gridheight = 3;
	2697	+// aWindowConstraints.gridx = 1;
	2698	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2699	+// bigThree.add(centralPanel, aWindowConstraints);
	2700	+// aWindowConstraints.weightx = 0;
	2701	+// aWindowConstraints.gridx = 4;
	2702	+// aWindowConstraints.gridwidth = 1;
	2703	+// // aConstraints.gridheight = 3;
	2704	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2705	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2706	+// scenePanel.setVisible(false);
	2707	+// centralPanel.setVisible(true);
	2708	+// XYZPanel.setVisible(false);
	2709	+ bigThree.ClearUI();
	2710	+ bigThree.add(centralPanel);
	2711	+ bigThree.FlushUI();
2607	2712	} else
2608		- if (event.getSource() == threeButton)
	2713	+ if (source == threeButton)
2609	2714	{
2610	2715	radio.layout = threeButton;
2611		- bigThree.remove(jtp);
2612		- bigThree.remove(cameraPanel);
2613		- bigThree.remove(XYZPanel);
2614		- aWindowConstraints.gridx = 0;
2615		- aWindowConstraints.gridy = 0;
2616		- aWindowConstraints.gridwidth = 1;
2617		- // aConstraints.gridheight = 3;
2618		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2619		- aWindowConstraints.weightx = 0;
2620		- aWindowConstraints.weighty = 1;
2621		- //bigThree.add(jtp, aWindowConstraints);
2622		- aWindowConstraints.weightx = 1;
2623		- aWindowConstraints.gridwidth = 3;
2624		- // aConstraints.gridheight = 3;
2625		- aWindowConstraints.gridx = 1;
2626		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2627		- bigThree.add(cameraPanel, aWindowConstraints);
2628		- aWindowConstraints.weightx = 0;
2629		- aWindowConstraints.gridx = 4;
2630		- aWindowConstraints.gridwidth = 1;
2631		- // aConstraints.gridheight = 3;
2632		- aConstraints.fill = GridBagConstraints.VERTICAL;
2633		- bigThree.add(XYZPanel, aWindowConstraints);
2634		- bigThree.revalidate();
	2716	+
	2717	+// bigThree.remove(scenePanel);
	2718	+// bigThree.remove(centralPanel);
	2719	+// bigThree.remove(XYZPanel);
	2720	+// aWindowConstraints.gridx = 0;
	2721	+// aWindowConstraints.gridy = 0;
	2722	+// aWindowConstraints.gridwidth = 1;
	2723	+// // aConstraints.gridheight = 3;
	2724	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2725	+// aWindowConstraints.weightx = 0;
	2726	+// aWindowConstraints.weighty = 1;
	2727	+// //bigThree.add(jtp, aWindowConstraints);
	2728	+// aWindowConstraints.weightx = 1;
	2729	+// aWindowConstraints.gridwidth = 3;
	2730	+// // aConstraints.gridheight = 3;
	2731	+// aWindowConstraints.gridx = 1;
	2732	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2733	+// bigThree.add(centralPanel, aWindowConstraints);
	2734	+// aWindowConstraints.weightx = 0;
	2735	+// aWindowConstraints.gridx = 4;
	2736	+// aWindowConstraints.gridwidth = 1;
	2737	+// // aConstraints.gridheight = 3;
	2738	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2739	+// bigThree.add(XYZPanel, aWindowConstraints);
	2740	+// bigThree.validate();
	2741	+// scenePanel.setVisible(false);
	2742	+// centralPanel.setVisible(true);
	2743	+// XYZPanel.setVisible(true);
	2744	+ bigThree.ClearUI();
	2745	+ bigThree.add(centralPanel);
	2746	+ bigThree.add(XYZPanel);
	2747	+ bigThree.FlushUI();
2635	2748	} else
2636		- if (event.getSource() == fourButton)
	2749	+ if (source == fourButton)
2637	2750	{
2638	2751	radio.layout = fourButton;
2639		- bigThree.remove(jtp);
2640		- bigThree.remove(cameraPanel);
2641		- bigThree.remove(XYZPanel);
2642		- aWindowConstraints.gridx = 0;
2643		- aWindowConstraints.gridy = 0;
2644		- aWindowConstraints.gridwidth = 1;
2645		- // aWindowConstraints.gridheight = 3;
2646		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2647		- aWindowConstraints.weightx = 1;
2648		- aWindowConstraints.weighty = 1;
2649		- bigThree.add(jtp, aWindowConstraints);
2650		- aWindowConstraints.weightx = 1;
2651		- aWindowConstraints.gridwidth = 3;
2652		- // aConstraints.gridheight = 3;
2653		- aWindowConstraints.gridx = 1;
2654		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2655		- //bigThree.add(cameraPanel, aWindowConstraints);
2656		- aWindowConstraints.weightx = 0;
2657		- aWindowConstraints.gridx = 4;
2658		- aWindowConstraints.gridwidth = 1;
2659		- // aWindowConstraints.gridheight = 3;
2660		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2661		- //bigThree.add(XYZPanel, aWindowConstraints);
2662		- bigThree.revalidate();
	2752	+
	2753	+// bigThree.remove(scenePanel);
	2754	+// bigThree.remove(centralPanel);
	2755	+// bigThree.remove(XYZPanel);
	2756	+// aWindowConstraints.gridx = 0;
	2757	+// aWindowConstraints.gridy = 0;
	2758	+// aWindowConstraints.gridwidth = 1;
	2759	+// // aWindowConstraints.gridheight = 3;
	2760	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2761	+// aWindowConstraints.weightx = 1;
	2762	+// aWindowConstraints.weighty = 1;
	2763	+// bigThree.add(scenePanel, aWindowConstraints);
	2764	+// aWindowConstraints.weightx = 1;
	2765	+// aWindowConstraints.gridwidth = 3;
	2766	+// // aConstraints.gridheight = 3;
	2767	+// aWindowConstraints.gridx = 1;
	2768	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2769	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2770	+// aWindowConstraints.weightx = 0;
	2771	+// aWindowConstraints.gridx = 4;
	2772	+// aWindowConstraints.gridwidth = 1;
	2773	+// // aWindowConstraints.gridheight = 3;
	2774	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2775	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2776	+// bigThree.validate();
	2777	+// scenePanel.setVisible(true);
	2778	+// centralPanel.setVisible(false);
	2779	+// XYZPanel.setVisible(false);
	2780	+ bigThree.ClearUI();
	2781	+ bigThree.add(scenePanel);
	2782	+ bigThree.FlushUI();
2663	2783	} else
2664		- if (event.getSource() == sixButton)
	2784	+ if (source == sixButton)
2665	2785	{
2666	2786	radio.layout = sixButton;
2667		- bigThree.remove(jtp);
2668		- bigThree.remove(cameraPanel);
2669		- bigThree.remove(XYZPanel);
2670		- aWindowConstraints.gridx = 0;
2671		- aWindowConstraints.gridy = 0;
2672		- aWindowConstraints.gridwidth = 1;
2673		- // aConstraints.gridheight = 3;
2674		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2675		- aWindowConstraints.weightx = 0;
2676		- aWindowConstraints.weighty = 1;
2677		- bigThree.add(jtp, aWindowConstraints);
2678		- aWindowConstraints.weightx = 1;
2679		- aWindowConstraints.gridwidth = 3;
2680		- // aWindowConstraints.gridheight = 3;
2681		- aWindowConstraints.gridx = 1;
2682		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2683		- bigThree.add(cameraPanel, aWindowConstraints);
2684		- aWindowConstraints.weightx = 0;
2685		- aWindowConstraints.gridx = 4;
2686		- aWindowConstraints.gridwidth = 1;
2687		- // aWindowConstraints.gridheight = 3;
2688		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2689		- //bigThree.add(XYZPanel, aConstraints);
2690		- bigThree.revalidate();
	2787	+
	2788	+// bigThree.remove(scenePanel);
	2789	+// bigThree.remove(centralPanel);
	2790	+// bigThree.remove(XYZPanel);
	2791	+// aWindowConstraints.gridx = 0;
	2792	+// aWindowConstraints.gridy = 0;
	2793	+// aWindowConstraints.gridwidth = 1;
	2794	+// // aConstraints.gridheight = 3;
	2795	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2796	+// aWindowConstraints.weightx = 0;
	2797	+// aWindowConstraints.weighty = 1;
	2798	+// bigThree.add(scenePanel, aWindowConstraints);
	2799	+// aWindowConstraints.weightx = 1;
	2800	+// aWindowConstraints.gridwidth = 3;
	2801	+// // aWindowConstraints.gridheight = 3;
	2802	+// aWindowConstraints.gridx = 1;
	2803	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2804	+// bigThree.add(centralPanel, aWindowConstraints);
	2805	+// aWindowConstraints.weightx = 0;
	2806	+// aWindowConstraints.gridx = 4;
	2807	+// aWindowConstraints.gridwidth = 1;
	2808	+// // aWindowConstraints.gridheight = 3;
	2809	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2810	+// //bigThree.add(XYZPanel, aConstraints);
	2811	+// bigThree.validate();
	2812	+// scenePanel.setVisible(true);
	2813	+// centralPanel.setVisible(true);
	2814	+// XYZPanel.setVisible(false);
	2815	+ bigThree.ClearUI();
	2816	+ bigThree.add(scenePanel);
	2817	+ bigThree.add(centralPanel);
	2818	+ bigThree.FlushUI();
2691	2819	} else
2692		- if (event.getSource() == sevenButton)
	2820	+ if (source == sevenButton)
2693	2821	{
2694	2822	radio.layout = sevenButton;
2695		- bigThree.remove(jtp);
2696		- bigThree.remove(cameraPanel);
2697		- bigThree.remove(XYZPanel);
2698		- aWindowConstraints.gridx = 0;
2699		- aWindowConstraints.gridy = 0;
2700		- aWindowConstraints.gridwidth = 1;
2701		- // aWindowConstraints.gridheight = 3;
2702		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2703		- aWindowConstraints.weightx = 0;
2704		- aWindowConstraints.weighty = 1;
2705		- bigThree.add(jtp, aWindowConstraints);
2706		- aWindowConstraints.weightx = 1;
2707		- aWindowConstraints.gridwidth = 3;
2708		- // aWindowConstraints.gridheight = 3;
2709		- aWindowConstraints.gridx = 1;
2710		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2711		- bigThree.add(cameraPanel, aWindowConstraints);
2712		- aWindowConstraints.weightx = 0;
2713		- aWindowConstraints.gridx = 4;
2714		- aWindowConstraints.gridwidth = 1;
2715		- // aConstraints.gridheight = 3;
2716		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2717		- bigThree.add(XYZPanel, aWindowConstraints);
2718		- bigThree.revalidate();
	2823	+
	2824	+// bigThree.remove(scenePanel);
	2825	+// bigThree.remove(centralPanel);
	2826	+// bigThree.remove(XYZPanel);
	2827	+// aWindowConstraints.gridx = 0;
	2828	+// aWindowConstraints.gridy = 0;
	2829	+// aWindowConstraints.gridwidth = 1;
	2830	+// // aWindowConstraints.gridheight = 3;
	2831	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2832	+// aWindowConstraints.weightx = 0;
	2833	+// aWindowConstraints.weighty = 1;
	2834	+// bigThree.add(scenePanel, aWindowConstraints);
	2835	+// aWindowConstraints.weightx = 1;
	2836	+// aWindowConstraints.gridwidth = 3;
	2837	+// // aWindowConstraints.gridheight = 3;
	2838	+// aWindowConstraints.gridx = 1;
	2839	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2840	+// bigThree.add(centralPanel, aWindowConstraints);
	2841	+// aWindowConstraints.weightx = 0;
	2842	+// aWindowConstraints.gridx = 4;
	2843	+// aWindowConstraints.gridwidth = 1;
	2844	+// // aConstraints.gridheight = 3;
	2845	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2846	+// bigThree.add(XYZPanel, aWindowConstraints);
	2847	+// bigThree.validate();
	2848	+// scenePanel.setVisible(true);
	2849	+// centralPanel.setVisible(true);
	2850	+// XYZPanel.setVisible(true);
	2851	+ bigThree.ClearUI();
	2852	+ bigThree.add(scenePanel);
	2853	+ bigThree.add(centralPanel);
	2854	+ bigThree.add(XYZPanel);
	2855	+ bigThree.FlushUI();
2719	2856	} else
2720		- if (event.getSource() == rootButton)
	2857	+ if (source == rootButton)
2721	2858	{
2722	2859	Object3D obj;
2723	2860	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2729,7 +2866,7 @@
2729	2866
2730	2867	refreshContents(true);
2731	2868	} else
2732		- if (event.getSource() == closeButton)
	2869	+ if (source == closeButton)
2733	2870	{
2734	2871	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2735	2872	cRadio ab;
..	..	@@ -2750,11 +2887,11 @@
2750	2887	}
2751	2888	refreshContents(true);
2752	2889	} else
2753		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2890	+ if (source == editItem \|\| source == editButton)
2754	2891	{
2755	2892	EditSelection(false);
2756	2893	} else
2757		- if (event.getSource() == uneditButton)
	2894	+ if (source == uneditButton)
2758	2895	{
2759	2896	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2760	2897	{
..	..	@@ -2766,12 +2903,12 @@
2766	2903
2767	2904	child.editWindow = null; // ???????????
2768	2905	}
2769		- objEditor.ctrlPanel.revalidate();
	2906	+ objEditor.ctrlPanel.validate();
2770	2907	//objEditor.jTree.clearSelection();
2771	2908	//objEditor.ResetSliders();
2772	2909	refreshContents(true);
2773	2910	} else
2774		- if (event.getSource() == clearPanelButton)
	2911	+ if (source == clearPanelButton)
2775	2912	{
2776	2913	assert(copy == group);
2777	2914	//copy.ClearUI();
..	..	@@ -2782,7 +2919,7 @@
2782	2919	listUI.clear();
2783	2920	refreshContents(true);
2784	2921	} else
2785		- if (event.getSource() == allParamsButton)
	2922	+ if (source == allParamsButton)
2786	2923	{
2787	2924	assert(copy == group);
2788	2925
..	..	@@ -2803,19 +2940,19 @@
2803	2940
2804	2941	refreshContents(true);
2805	2942	} else
2806		- if (event.getSource() == unselectButton)
	2943	+ if (source == unselectButton)
2807	2944	{
2808	2945	objEditor.jTree.clearSelection();
2809		- // ?? oct 2012 GraphreeD.clipboard.clear();
	2946	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2810	2947	objEditor.ResetSliders();
2811	2948	refreshContents(true);
2812	2949	} else
2813		- if(event.getSource() instanceof cRadio)
	2950	+ if(source instanceof cRadio)
2814	2951	{
2815	2952	group.parent = keepparent;
2816	2953	group.attributes = 0;
2817	2954	//group.editWindow = null;
2818		- /cRadio/ radio = (cRadio)event.getSource();
	2955	+ /cRadio/ radio = (cRadio)source;
2819	2956	Object3D obj = radio.GetObject();
2820	2957	System.out.println("Edit " + obj);
2821	2958	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2835,7 +2972,7 @@
2835	2972	}
2836	2973
2837	2974	copy = group;
2838		- //CameraPane.theRenderer.object = group;
	2975	+ //Globals.theRenderer.object = group;
2839	2976	if(!useclient)
2840	2977	{
2841	2978	cameraView.renderCamera = radio.camera;
..	..	@@ -2844,7 +2981,8 @@
2844	2981	cameraView.cameras[cameraView.cameracount] = radio.camera;
2845	2982	cameraView.targetLookAt.set(radio.camera.lookAt);
2846	2983	cameraView.object = group;
2847		- cameraView.lighttouched = true;
	2984	+ //cameraView.lighttouched = true;
	2985	+ Globals.lighttouched = true;
2848	2986	topView.object = group;
2849	2987	frontView.object = group;
2850	2988	sideView.object = group;
..	..	@@ -2880,7 +3018,7 @@
2880	3018	if (useclient)
2881	3019	{
2882	3020	cameraView.object = client;
2883		- cameraView.lighttouched = true;
	3021	+ Globals.lighttouched = true;
2884	3022	//topView.object = client;
2885	3023	//frontView.object = client;
2886	3024	//sideView.object = client;
..	..	@@ -2888,7 +3026,7 @@
2888	3026	else
2889	3027	{
2890	3028	cameraView.object = group;
2891		- cameraView.lighttouched = true;
	3029	+ Globals.lighttouched = true;
2892	3030	//topView.object = group;
2893	3031	//frontView.object = group;
2894	3032	//sideView.object = group;
..	..	@@ -3121,9 +3259,9 @@
3121	3259	obj = (Object3D)e.nextElement();
3122	3260
3123	3261	System.out.println("Object is: " + obj);
3124		- GraphreeD.AnalyzeObject(obj);
	3262	+ GrafreeD.AnalyzeObject(obj);
3125	3263	System.out.println("Boundary rep: " + obj.bRep);
3126		- GraphreeD.AnalyzeObject(obj.bRep);
	3264	+ GrafreeD.AnalyzeObject(obj.bRep);
3127	3265
3128	3266	// System.err.println((size/1024) + " KB is the size of " + obj);
3129	3267	}
..	..	@@ -3165,6 +3303,13 @@
3165	3303	void GenNormals(boolean crease)
3166	3304	{
3167	3305	group.GenNormalsS(crease);
	3306	+
	3307	+ refreshContents();
	3308	+ }
	3309	+
	3310	+ void GenNormalsMINE()
	3311	+ {
	3312	+ group.selection.GenNormalsMINE();
3168	3313
3169	3314	refreshContents();
3170	3315	}
..	..	@@ -3250,7 +3395,7 @@
3250	3395	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3251	3396	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3252	3397	//
3253		-// g.add(GraphreeD.clipboard);
	3398	+// g.add(GrafreeD.clipboard);
3254	3399	//
3255	3400	// buffer.add(g);
3256	3401	// }
..	..	@@ -3269,8 +3414,8 @@
3269	3414	// nodes = new Object3D();
3270	3415	// vertices = new Vector<Vertex>();
3271	3416	//
3272		-// boolean epsequal = GraphreeD.epsequal;
3273		-// GraphreeD.epsequal = true;
	3417	+// boolean epsequal = GrafreeD.epsequal;
	3418	+// GrafreeD.epsequal = true;
3274	3419	//
3275	3420	// for (int i=0; i<group.selection.size(); i++)
3276	3421	// {
..	..	@@ -3311,7 +3456,7 @@
3311	3456	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3312	3457	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3313	3458	//
3314		-// g.add(GraphreeD.clipboard);
	3459	+// g.add(GrafreeD.clipboard);
3315	3460	//
3316	3461	// buffer.add(g);
3317	3462	// }
..	..	@@ -3319,7 +3464,7 @@
3319	3464	// makeSomething(buffer, i==group.selection.size()-1);
3320	3465	// }
3321	3466	//
3322		-// GraphreeD.epsequal = epsequal;
	3467	+// GrafreeD.epsequal = epsequal;
3323	3468	//
3324	3469	// //buffer = null;
3325	3470	// temprep = null;
..	..	@@ -3330,8 +3475,8 @@
3330	3475
3331	3476	void ParseVertices()
3332	3477	{
3333		- boolean epsequal = GraphreeD.epsequal;
3334		- GraphreeD.epsequal = true;
	3478	+ boolean epsequal = GrafreeD.epsequal;
	3479	+ GrafreeD.epsequal = true;
3335	3480
3336	3481	for (int i=0; i<group.selection.size(); i++)
3337	3482	{
..	..	@@ -3356,7 +3501,7 @@
3356	3501	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3357	3502	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3358	3503
3359		- g.add(GraphreeD.clipboard);
	3504	+ g.add(GrafreeD.clipboard);
3360	3505
3361	3506	buffer.add(g);
3362	3507	}
..	..	@@ -3371,7 +3516,7 @@
3371	3516	makeSomething(buffer, i==group.selection.size()-1);
3372	3517	}
3373	3518
3374		- GraphreeD.epsequal = epsequal;
	3519	+ GrafreeD.epsequal = epsequal;
3375	3520
3376	3521	refreshContents();
3377	3522	}
..	..	@@ -3389,7 +3534,7 @@
3389	3534	String pigment = Object3D.GetPigment(tex);
3390	3535	//String bump = Object3D.GetBump(tex);
3391	3536
3392		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3537	+ com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3393	3538
3394	3539	double s = v.s;
3395	3540
..	..	@@ -3416,7 +3561,7 @@
3416	3561	scale /= 3;
3417	3562
3418	3563	scale /= 0xFF;
3419		- scale /= 4;
	3564	+ // c'est quoi ca? scale /= 4;
3420	3565
3421	3566	//v.AO = scale;
3422	3567
..	..	@@ -3437,12 +3582,26 @@
3437	3582
3438	3583	void Align()
3439	3584	{
	3585	+ if (group.selection.size() == 0)
	3586	+ return;
	3587	+
	3588	+ cVector bbmin = new cVector();
	3589	+ cVector bbmax = new cVector();
	3590	+
	3591	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3592	+
	3593	+ double dx = bbmax.x - bbmin.x;
	3594	+ double dy = bbmax.y - bbmin.y;
	3595	+ double dz = bbmax.z - bbmin.z;
	3596	+
	3597	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3598	+
3440	3599	for (int i=0; i<group.selection.size(); i++)
3441	3600	{
3442	3601	Object3D obj = group.selection.get(i);
3443	3602
3444		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3445		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3603	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3604	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3446	3605	}
3447	3606
3448	3607	refreshContents();
..	..	@@ -3455,7 +3614,7 @@
3455	3614	// ref.SaveSupports();
3456	3615	// Object3D par = ref.parent;
3457	3616	// ref.parent = null;
3458		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	3617	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3459	3618	// ref.parent = par;
3460	3619	// ref.RestoreSupports();
3461	3620
..	..	@@ -3485,7 +3644,7 @@
3485	3644	// lowres.SaveSupports();
3486	3645	// par = lowres.parent;
3487	3646	// lowres.parent = null;
3488		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	3647	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3489	3648	Object3D newlow = CloneObject(lowres, false);
3490	3649	newlow.name = sn.switchobject.get(i).name;
3491	3650	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3507,7 +3666,7 @@
3507	3666	return;
3508	3667
3509	3668	Object3D poses = group.selection.get(0);
3510		- Object3D ref = GraphreeD.clipboard.get(0);
	3669	+ Object3D ref = GrafreeD.clipboard.get(0);
3511	3670
3512	3671	Object3D newgroup = new Object3D("Po:" + poses.name);
3513	3672
..	..	@@ -3676,7 +3835,7 @@
3676	3835	group.selection.RelinkToSupport(); // july 2014
3677	3836	System.out.println("DONE.");
3678	3837	refreshContents();
3679		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3838	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3680	3839	}
3681	3840
3682	3841	void ReduceMesh(boolean reduction34)
..	..	@@ -3701,20 +3860,20 @@
3701	3860
3702	3861	void ClipMesh()
3703	3862	{
3704		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	3863	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
3705	3864	{
3706		- Object3D content = GraphreeD.clipboard.get(0);
	3865	+ Object3D content = GrafreeD.clipboard.get(0);
3707	3866
3708	3867	if (content instanceof cGroup && ((cGroup)content).transientlink )
3709	3868	content = ((cGroup)content).get(0);
3710	3869
3711	3870	// for (int i=0; i<group.selection.size(); i++)
3712	3871	// {
3713		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	3872	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3714	3873	// }
3715		- group.selection.ClipMesh(GraphreeD.clipboard);
	3874	+ group.selection.ClipMesh(GrafreeD.clipboard);
3716	3875	}
3717		-// group.selection.ClipMesh(GraphreeD.clipboard);
	3876	+// group.selection.ClipMesh(GrafreeD.clipboard);
3718	3877	System.out.println("DONE.");
3719	3878	refreshContents();
3720	3879	}
..	..	@@ -3952,25 +4111,25 @@
3952	4111	System.err.println("info : " + child.GetPath());
3953	4112	}
3954	4113	}
3955		- else
3956		- {
3957		- objEditor.SetMaterial(group); // .GetMaterial());
3958		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3959		- System.err.println("info : " + group.GetPath());
3960		- }
	4114	+// else
	4115	+// {
	4116	+// objEditor.SetMaterial(group); // .GetMaterial());
	4117	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4118	+// System.err.println("info : " + group.GetPath());
	4119	+// }
3961	4120
3962	4121	objEditor.SetText(); // jan 2014
3963	4122
3964		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4123	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
3965	4124	CameraPane.flash = true;
3966	4125
3967	4126	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
3968	4127	// a camera
3969	4128	{
3970	4129	CameraPane.camerachangeframe = 0; // don't refuse it
3971		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3972		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3973		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4130	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4131	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4132	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3974	4133	}
3975	4134
3976	4135	refreshContents();
..	..	@@ -4052,12 +4211,12 @@
4052	4211	{
4053	4212	if (group.selection.isEmpty())
4054	4213	return;
4055		- GraphreeD.clipboardIsTempGroup = false;
	4214	+ GrafreeD.clipboardIsTempGroup = false;
4056	4215	Composite tGroup = null;
4057	4216	if (group.selection.size() > 0) // 1)
4058	4217	{
4059	4218	tGroup = new cGroup();
4060		- GraphreeD.clipboardIsTempGroup = true;
	4219	+ GrafreeD.clipboardIsTempGroup = true;
4061	4220	}
4062	4221
4063	4222	if (cut)
..	..	@@ -4097,16 +4256,16 @@
4097	4256	//System.out.println("cut " + child);
4098	4257	//System.out.println("parent = " + child.parent);
4099	4258	// tmp.addChild(child);
4100		- if (GraphreeD.clipboardIsTempGroup)
	4259	+ if (GrafreeD.clipboardIsTempGroup)
4101	4260	tGroup.add/Child/(tmp);
4102	4261	else
4103		- GraphreeD.clipboard = tmp;
	4262	+ GrafreeD.clipboard = tmp;
4104	4263	}
4105	4264	else
4106		- if (GraphreeD.clipboardIsTempGroup)
	4265	+ if (GrafreeD.clipboardIsTempGroup)
4107	4266	tGroup.add/Child/(child);
4108	4267	else
4109		- GraphreeD.clipboard = child;
	4268	+ GrafreeD.clipboard = child;
4110	4269	}
4111	4270
4112	4271	//ResetModel();
..	..	@@ -4138,21 +4297,21 @@
4138	4297	//System.out.println("cut " + elem);
4139	4298	//System.out.println("parent = " + elem.parent);
4140	4299	// tmp.addChild(elem);
4141		- if (GraphreeD.clipboardIsTempGroup)
	4300	+ if (GrafreeD.clipboardIsTempGroup)
4142	4301	tGroup.add/Child/(tmp);
4143	4302	else
4144		- GraphreeD.clipboard = tmp;
	4303	+ GrafreeD.clipboard = tmp;
4145	4304	}
4146	4305	else
4147		- if (GraphreeD.clipboardIsTempGroup)
	4306	+ if (GrafreeD.clipboardIsTempGroup)
4148	4307	tGroup.add/Child/(child);
4149	4308	else
4150		- GraphreeD.clipboard = child;
	4309	+ GrafreeD.clipboard = child;
4151	4310	}
4152	4311
4153	4312	}
4154		- if (GraphreeD.clipboardIsTempGroup)
4155		- GraphreeD.clipboard = tGroup;
	4313	+ if (GrafreeD.clipboardIsTempGroup)
	4314	+ GrafreeD.clipboard = tGroup;
4156	4315	if (cut)
4157	4316	{
4158	4317	ResetModel();
..	..	@@ -4162,11 +4321,11 @@
4162	4321
4163	4322	void paste(boolean expand)
4164	4323	{
4165		- // if (GraphreeD.clipboard == null)
	4324	+ // if (GrafreeD.clipboard == null)
4166	4325	// return;
4167	4326	boolean first = true;
4168	4327
4169		- if (GraphreeD.clipboardIsTempGroup)
	4328	+ if (GrafreeD.clipboardIsTempGroup)
4170	4329	{
4171	4330	Composite temp;
4172	4331
..	..	@@ -4177,7 +4336,7 @@
4177	4336	temp = (Composite)Applet3D.clipboard.deepCopy();
4178	4337	*/
4179	4338	Object3D elem;
4180		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4339	+ for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4181	4340	{
4182	4341	Object3D child = (Object3D)e.nextElement();
4183	4342
..	..	@@ -4191,7 +4350,7 @@
4191	4350	else
4192	4351	elem = child.deepCopy(); // ?
4193	4352	child.parent = keepparent;
4194		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	4353	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4195	4354	// elem = elem.get(0);
4196	4355	makeSomething(elem, true); // ?? first);
4197	4356	//group.addChild(elem);
..	..	@@ -4211,14 +4370,14 @@
4211	4370	//Object3D cb = Applet3D.clipboard;
4212	4371	//temp.addChild(cb);
4213	4372	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4214		- assert(GraphreeD.clipboard.parent == null);
4215		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
4216		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
4217		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
4218		- makeSomething(expand?GraphreeD.clipboard.get(0).copyExpand():GraphreeD.clipboard.get(0).deepCopy());
	4373	+ assert(GrafreeD.clipboard.parent == null);
	4374	+ Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
	4375	+ GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
	4376	+ if (LA.isIdentity(GrafreeD.clipboard.toParent))
	4377	+ makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
4219	4378	else
4220		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4221		- GraphreeD.clipboard.get(0).parent = keepparent;
	4379	+ makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
	4380	+ GrafreeD.clipboard.get(0).parent = keepparent;
4222	4381	}
4223	4382
4224	4383	ResetModel();
..	..	@@ -4227,7 +4386,7 @@
4227	4386
4228	4387	void pasteInto(boolean copyit)
4229	4388	{
4230		-// if (GraphreeD.clipboard == null)
	4389	+// if (GrafreeD.clipboard == null)
4231	4390	// return;
4232	4391
4233	4392	if (group.selection.size() != 1)
..	..	@@ -4260,9 +4419,9 @@
4260	4419	{
4261	4420	boolean first = true;
4262	4421
4263		- if (GraphreeD.clipboardIsTempGroup)
	4422	+ if (GrafreeD.clipboardIsTempGroup)
4264	4423	{
4265		- Composite temp = (Composite)GraphreeD.clipboard;
	4424	+ Composite temp = (Composite)GrafreeD.clipboard;
4266	4425	Object3D copy;
4267	4426	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4268	4427	{
..	..	@@ -4272,7 +4431,7 @@
4272	4431	}
4273	4432	} else
4274	4433	{
4275		- linkSomething(GraphreeD.clipboard); //.get(0));
	4434	+ linkSomething(GrafreeD.clipboard); //.get(0));
4276	4435	}
4277	4436	}
4278	4437	}
..	..	@@ -4464,6 +4623,26 @@
4464	4623	makeSomething(csg);
4465	4624	}
4466	4625
	4626	+ void Ungroup(Object3D g)
	4627	+ {
	4628	+ if (g instanceof HiddenObject)
	4629	+ {
	4630	+ HiddenObject h = (HiddenObject) g;
	4631	+
	4632	+ for (int i=0; i<h.ActualSize(); i++)
	4633	+ {
	4634	+ objEditor.makeSomething(h.get(i), false);
	4635	+ }
	4636	+ }
	4637	+ else
	4638	+ {
	4639	+ for (int i=0; i<g.Size(); i++)
	4640	+ {
	4641	+ objEditor.makeSomething(g.get(i), false);
	4642	+ }
	4643	+ }
	4644	+ }
	4645	+
4467	4646	void ungroup()
4468	4647	{
4469	4648	/*
..	..	@@ -4659,7 +4838,7 @@
4659	4838
4660	4839	void ImportGFD()
4661	4840	{
4662		- FileDialog browser = new FileDialog(objEditor.frame, "Import GraphreeD", FileDialog.LOAD);
	4841	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4663	4842	browser.show();
4664	4843	String filename = browser.getFile();
4665	4844	if (filename != null && filename.length() > 0)
..	..	@@ -4697,7 +4876,7 @@
4697	4876
4698	4877	void ImportVRMLX3D()
4699	4878	{
4700		- if (GraphreeD.standAlone)
	4879	+ if (GrafreeD.standAlone)
4701	4880	{
4702	4881	/**/
4703	4882	FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
..	..	@@ -4714,7 +4893,7 @@
4714	4893
4715	4894	String GetFile(String dialogName)
4716	4895	{
4717		- if (GraphreeD.standAlone)
	4896	+ if (GrafreeD.standAlone)
4718	4897	{
4719	4898	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4720	4899	browser.show();
..	..	@@ -4823,6 +5002,7 @@
4823	5002	private MenuItem resetsupportItem;
4824	5003	private MenuItem resetreferencesItem;
4825	5004	private MenuItem linkverticesItem;
	5005	+ private MenuItem relinkverticesItem;
4826	5006	private MenuItem setMasterItem;
4827	5007	private MenuItem resetMeshItem;
4828	5008	private MenuItem stepAllItem;
..	..	@@ -4841,8 +5021,10 @@
4841	5021	private MenuItem clearItem;
4842	5022	private MenuItem clearAllItem;
4843	5023	private MenuItem genUVItem;
	5024	+ private MenuItem genNormalsMESHItem;
4844	5025	private MenuItem genNormalsCADItem;
4845	5026	private MenuItem genNormalsORGANItem;
	5027	+ private MenuItem genNormalsMINEItem;
4846	5028	private MenuItem stripifyItem;
4847	5029	private MenuItem unstripifyItem;
4848	5030	private MenuItem trimItem;
..	..	@@ -4884,6 +5066,7 @@
4884	5066	private MenuItem resetCentroidItem;
4885	5067	private MenuItem transformgeometryItem;
4886	5068	private MenuItem resetTransformItem;
	5069	+ private MenuItem hideItem;
4887	5070	private MenuItem grabItem;
4888	5071	private MenuItem backItem;
4889	5072	private MenuItem frontItem;
..	..	@@ -4904,6 +5087,7 @@
4904	5087
4905	5088	private MenuItem resetParentItem;
4906	5089	private MenuItem repairParentItem;
	5090	+ private MenuItem repairShadowItem;
4907	5091	private MenuItem sortbysizeItem;
4908	5092	private MenuItem sortbynameItem;
4909	5093
..	..	@@ -4924,6 +5108,7 @@
4924	5108	private MenuItem coneItem;
4925	5109	private MenuItem torusItem;
4926	5110	private MenuItem superItem;
	5111	+ private MenuItem kleinItem;
4927	5112	private MenuItem blobItem;
4928	5113	private MenuItem latheItem;
4929	5114	private MenuItem bezierItem;
..	..	@@ -4936,6 +5121,7 @@
4936	5121	private MenuItem csgItem;
4937	5122	private MenuItem templateItem;
4938	5123	private MenuItem textureItem;
	5124	+ private MenuItem billboardItem;
4939	5125	private MenuItem shadowXItem;
4940	5126	private MenuItem shadowYItem;
4941	5127	private MenuItem shadowZItem;