~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,9 +12,10 @@
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		-class GroupEditor extends ObjEditor implements iParse, //iCallBack,
	18	+class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
18	19	ObjectUI,
19	20	Runnable,
20	21	ActionListener,
..	..	@@ -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
..	..	@@ -188,8 +189,9 @@
188	189	clearItem.addActionListener(this);
189	190	clearAllItem = menu.add(new MenuItem("Clear All"));
190	191	clearAllItem.addActionListener(this);
191		- menu.add("-");
192		- resetMeshItem = menu.add(new MenuItem("Reset All"));
	192	+
	193	+ oe.menuBar.add(menu = new Menu("Setting"));
	194	+ resetMeshItem = menu.add(new MenuItem("Reset All"));
193	195	resetMeshItem.addActionListener(this);
194	196	stepAllItem = menu.add(new MenuItem("Step All"));
195	197	stepAllItem.addActionListener(this);
..	..	@@ -218,18 +220,24 @@
218	220	resetsupportItem.addActionListener(this);
219	221	linkverticesItem = menu.add(new MenuItem("Link to Support"));
220	222	linkverticesItem.addActionListener(this);
	223	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	224	+ relinkverticesItem.addActionListener(this);
221	225	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
222	226	setMasterItem.addActionListener(this);
223	227
224		- oe.menuBar.add(menu = new Menu("Object"));
	228	+ oe.menuBar.add(menu = new Menu("Group"));
225	229	grabItem = menu.add(new MenuItem("Grab"));
226	230	grabItem.addActionListener(this);
227		- frontItem = menu.add(new MenuItem("Front"));
228		- frontItem.addActionListener(this);
229	231	backItem = menu.add(new MenuItem("Back"));
230	232	backItem.addActionListener(this);
	233	+ frontItem = menu.add(new MenuItem("Front"));
	234	+ frontItem.addActionListener(this);
231	235	compositeItem = menu.add(new MenuItem("Composite"));
232	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);
233	241	menu.add("-");
234	242	randomItem = menu.add(new MenuItem("Random"));
235	243	randomItem.addActionListener(this);
..	..	@@ -247,9 +255,12 @@
247	255	scriptNodeItem.addActionListener(this);
248	256	cameraItem = menu.add(new MenuItem("Camera"));
249	257	cameraItem.addActionListener(this);
250		- menu.add("-");
	258	+
	259	+ oe.menuBar.add(menu = new Menu("Object"));
251	260	textureItem = menu.add(new MenuItem("Texture"));
252	261	textureItem.addActionListener(this);
	262	+ billboardItem = menu.add(new MenuItem("Billboard"));
	263	+ billboardItem.addActionListener(this);
253	264	csgItem = menu.add(new MenuItem("CSG"));
254	265	csgItem.addActionListener(this);
255	266	shadowXItem = menu.add(new MenuItem("Shadow X"));
..	..	@@ -267,14 +278,12 @@
267	278	pointflowItem = menu.add(new MenuItem("Point Flow"));
268	279	pointflowItem.addActionListener(this);
269	280	menu.add("-");
270		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
271		- transformgeometryItem.addActionListener(this);
272	281	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
273	282	resetTransformItem.addActionListener(this);
274	283	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
275	284	resetCentroidItem.addActionListener(this);
276		- ungroupItem = menu.add(new MenuItem("Ungroup"));
277		- ungroupItem.addActionListener(this);
	285	+ transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
	286	+ transformgeometryItem.addActionListener(this);
278	287
279	288	oe.menuBar.add(menu = new Menu("Geometry"));
280	289	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -283,6 +292,10 @@
283	292	genNormalsORGANItem.addActionListener(this);
284	293	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
285	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);
286	299	stripifyItem = menu.add(new MenuItem("Stripify"));
287	300	stripifyItem.addActionListener(this);
288	301	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -292,8 +305,6 @@
292	305	untrimItem = menu.add(new MenuItem("Untrim"));
293	306	untrimItem.addActionListener(this);
294	307	menu.add("-");
295		- clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
296		- clearMaterialsItem.addActionListener(this);
297	308	clearColorsItem = menu.add(new MenuItem("Clear AO"));
298	309	clearColorsItem.addActionListener(this);
299	310	reverseNormalsItem = menu.add(new MenuItem("Reverse Normals"));
..	..	@@ -310,6 +321,10 @@
310	321	smoothMeshItem.addActionListener(this);
311	322	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	323	clipMeshItem.addActionListener(this);
	324	+
	325	+ oe.menuBar.add(menu = new Menu("Attributes"));
	326	+ clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
	327	+ clearMaterialsItem.addActionListener(this);
313	328	menu.add("-");
314	329	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
315	330	liveleavesItem.addActionListener(this);
..	..	@@ -332,27 +347,18 @@
332	347	flipVItem.addActionListener(this);
333	348	unflipVItem = menu.add(new MenuItem("Unflip V"));
334	349	unflipVItem.addActionListener(this);
335		- lowTexturesItem = menu.add(new MenuItem("Low Texture"));
	350	+ lowTexturesItem = menu.add(new MenuItem("Low Texture (256)"));
336	351	lowTexturesItem.addActionListener(this);
337		- normalTexturesItem = menu.add(new MenuItem("Normal Texture"));
	352	+ normalTexturesItem = menu.add(new MenuItem("Normal Texture (512)"));
338	353	normalTexturesItem.addActionListener(this);
339		- highTexturesItem = menu.add(new MenuItem("High Texture"));
	354	+ highTexturesItem = menu.add(new MenuItem("High Texture (1024)"));
340	355	highTexturesItem.addActionListener(this);
341		- veryhighTexturesItem = menu.add(new MenuItem("Very high Texture"));
	356	+ veryhighTexturesItem = menu.add(new MenuItem("Very high Texture (2048)"));
342	357	veryhighTexturesItem.addActionListener(this);
343		- maxTexturesItem = menu.add(new MenuItem("Max Texture"));
	358	+ maxTexturesItem = menu.add(new MenuItem("Max Texture (4096)"));
344	359	maxTexturesItem.addActionListener(this);
345		- panoTexturesItem = menu.add(new MenuItem("Panoramic Texture"));
	360	+ panoTexturesItem = menu.add(new MenuItem("Panoramic Texture (8192)"));
346	361	panoTexturesItem.addActionListener(this);
347		- menu.add("-");
348		- extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
349		- extractGeometriesItem.addActionListener(this);
350		- cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
351		- cloneGeometriesItem.addActionListener(this);
352		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
353		- shareGeometriesItem.addActionListener(this);
354		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
355		- mergeGeometriesItem.addActionListener(this);
356	362
357	363	oe.menuBar.add(menu = new Menu("Selection"));
358	364	attachPigmentItem = menu.add(new MenuItem("Attach Pigment..."));
..	..	@@ -370,9 +376,31 @@
370	376	sortbysizeItem.addActionListener(this);
371	377	sortbynameItem = menu.add(new MenuItem("Sort by name"));
372	378	sortbynameItem.addActionListener(this);
	379	+ menu.add("-");
	380	+ extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
	381	+ extractGeometriesItem.addActionListener(this);
	382	+ cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
	383	+ cloneGeometriesItem.addActionListener(this);
	384	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
	385	+ shareGeometriesItem.addActionListener(this);
	386	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
	387	+ mergeGeometriesItem.addActionListener(this);
	388	+
373	389	oe.menuBar.add(menu = new Menu("Insert"));
374	390	buildCreateMenu(menu);
375		- oe.menuBar.add(menu = new Menu("Tools"));
	391	+
	392	+
	393	+ oe.menuBar.add(menu = new Menu("Include"));
	394	+ importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
	395	+ importGFDItem.addActionListener(this);
	396	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
	397	+ importVRMLX3DItem.addActionListener(this);
	398	+ importOBJItem = menu.add(new MenuItem("OBJ Object..."));
	399	+ importOBJItem.addActionListener(this);
	400	+ import3DSItem = menu.add(new MenuItem("3DS Object..."));
	401	+ import3DSItem.addActionListener(this);
	402	+
	403	+ oe.menuBar.add(menu = new Menu("Tools"));
376	404	buildToolsMenu(menu);
377	405	}
378	406
..	..	@@ -406,84 +434,26 @@
406	434	oe.radioPanel.add(dummyButton);
407	435	oe.buttonGroup.add(dummyButton);
408	436	*/
409		- aConstraints.gridy += 1;
410		- oe.aConstraints.gridwidth = 1;
411		- oe.aConstraints.gridx = 0;
	437	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
412	438
413		- 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");
414	441	liveCB.addItemListener(this);
415	442
416		- oe.aConstraints.gridx += 1;
417		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
418		- supportCB.addItemListener(this);
419		-
420		- // oe.aConstraints.gridx += 1;
421		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
422		- // localCB.addItemListener(this);
423		-
424		- oe.aConstraints.gridx += 1;
425		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
426		- crowdCB.addItemListener(this);
427		-
428		- oe.aConstraints.gridx += 1;
429		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
430		- smoothCB.addItemListener(this);
431		-
432		- oe.aConstraints.gridx += 1;
433		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
434		- fastCB.addItemListener(this);
435		- oe.aConstraints.gridx += 1;
436		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
437		- slowCB.addItemListener(this);
438		- oe.aConstraints.gridx += 1;
439		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
440		- boxCB.addItemListener(this);
441		-
442		-// oe.aConstraints.gridx += 1;
443		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
444		-// speakerMocapCB.addItemListener(this);
445		-
446		- if (false)
447		- {
448		- // handled in scripts
449		- oe.aConstraints.gridx += 1;
450		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
451		- speakerCameraCB.addItemListener(this);
452		-
453		- oe.aConstraints.gridx += 1;
454		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
455		- speakerFocusCB.addItemListener(this);
456		-
457		- oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
459		- smoothfocusCB.addItemListener(this);
460		- }
461		-
462		-//oe.aConstraints.gridx += 1;
463		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
464		-// debugCB.addItemListener(this);
465		-
466		- oe.aConstraints.gridx += 1;
467		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
468		- oeilCB.addItemListener(this);
469		-
470		- oe.aConstraints.gridx += 1;
471		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
472		- lookAtCB.addItemListener(this);
473		-
474		- oe.aConstraints.gridx += 1;
475		- 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");
476	445	trackCB.addItemListener(this);
477	446
478		- oe.aConstraints.gridx += 1;
479		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	447	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	448	+ screenfitButton.setToolTipText("Screen fit");
480	449	screenfitButton.addActionListener(this);
481		- oe.aConstraints.gridx += 1;
	450	+
482	451	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
483	452	// screenfitpointButton.addActionListener(this);
484	453	// oe.aConstraints.gridx += 1;
485		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
	454	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
486	455	snapobjectButton.addActionListener(this);
	456	+ snapobjectButton.setToolTipText("Snap Object");
487	457	oe.aConstraints.gridx += 1;
488	458
489	459	//aConstraints.gridx = 0;
..	..	@@ -491,29 +461,35 @@
491	461	oe.aConstraints.weighty = 0;
492	462	oe.aConstraints.gridwidth = 1;
493	463
494		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	464	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	465	+ flashSelectionButton.setToolTipText("Show selection");
495	466	flashSelectionButton.addActionListener(this);
496		- oe.aConstraints.gridx += 1;
497		- oe.aConstraints.weighty = 0;
498		- oe.aConstraints.gridwidth = 1;
499	467
500		- //
501		- 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");
502	472	twoButton.addActionListener(this);
503		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	473	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
504	474	fourButton.addActionListener(this);
505		- 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");
506	478	sixButton.addActionListener(this);
507		- 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");
508	481	threeButton.addActionListener(this);
509		- 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");
510	484	sevenButton.addActionListener(this);
511	485	//
512	486
513		- 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 object in new tab");
514	489	rootButton.addActionListener(this);
515	490	oe.aConstraints.gridx += 1;
516		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	491	+ oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	492	+ closeButton.setToolTipText("Close tab");
517	493	closeButton.addActionListener(this);
518	494	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
519	495	//clearButton.addActionListener(this);
..	..	@@ -616,17 +592,91 @@
616	592	radio.layout = sevenButton;
617	593	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
618	594	}
	595	+
	596	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	597	+ {
	598	+ //constraints.gridx = 0;
	599	+ //constraints.gridy = 0;
	600	+ panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	601	+ fastCB.setToolTipText("Fast mode");
	602	+ fastCB.addItemListener(this);
	603	+ //constraints.gridy += 1;
	604	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	605	+ supportCB.setToolTipText("Enabled rigging");
	606	+ supportCB.addItemListener(this);
	607	+
	608	+ // constraints.gridy += 1;
	609	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	610	+ // localCB.addItemListener(this);
	611	+
	612	+ //constraints.gridy += 1;
	613	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	614	+ crowdCB.setToolTipText("Used for crowds");
	615	+ crowdCB.addItemListener(this);
	616	+
	617	+ //constraints.gridy += 1;
	618	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	619	+ smoothCB.setToolTipText("Snapping delay");
	620	+ smoothCB.addItemListener(this);
	621	+
	622	+ //constraints.gridy += 1;
	623	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	624	+ slowCB.setToolTipText("Smooth interpolation");
	625	+ slowCB.addItemListener(this);
	626	+ //constraints.gridy += 1;
	627	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	628	+ boxCB.setToolTipText("Display bounding boxes");
	629	+ boxCB.addItemListener(this);
	630	+ //constraints.gridy += 1;
	631	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	632	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	633	+ zoomBoxCB.addItemListener(this);
	634	+
	635	+// constraints.gridy += 1;
	636	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	637	+// speakerMocapCB.addItemListener(this);
	638	+
	639	+ if (false)
	640	+ {
	641	+ // handled in scripts
	642	+ //constraints.gridy += 1;
	643	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	644	+ speakerCameraCB.addItemListener(this);
	645	+
	646	+ //constraints.gridy += 1;
	647	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	648	+ speakerFocusCB.addItemListener(this);
	649	+
	650	+ //constraints.gridy += 1;
	651	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	652	+ smoothfocusCB.addItemListener(this);
	653	+ }
	654	+
	655	+//constraints.gridx += 1;
	656	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	657	+// debugCB.addItemListener(this);
	658	+
	659	+ //constraints.gridy += 1;
	660	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	661	+ oeilCB.addItemListener(this);
	662	+
	663	+ //constraints.gridy += 1;
	664	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	665	+ lookAtCB.setToolTipText("Look-at target");
	666	+ lookAtCB.addItemListener(this);
	667	+
	668	+ }
619	669
620	670	void EditObject(Object3D obj)
621	671	{
622		- cRadio dummyButton = new cRadio(obj.name);
623		- dummyButton.SetObject(obj);
624		- dummyButton.layout = sevenButton;
625		- dummyButton.SetCamera(cameraView.renderCamera, false);
626		- dummyButton.addActionListener(this);
627		- radioPanel.add(dummyButton);
628		- buttonGroup.add(dummyButton);
629		- dummyButton.doClick();
	672	+ cRadio radioButton = new cRadio(obj.name);
	673	+ radioButton.SetObject(obj);
	674	+ radioButton.layout = sevenButton;
	675	+ radioButton.SetCamera(cameraView.renderCamera, false);
	676	+ radioButton.addActionListener(this);
	677	+ radioPanel.add(radioButton);
	678	+ buttonGroup.add(radioButton);
	679	+ radioButton.doClick();
630	680	}
631	681	void SetupViews(ObjEditor oe)
632	682	{
..	..	@@ -646,6 +696,7 @@
646	696	JCheckBox fastCB;
647	697	JCheckBox slowCB;
648	698	JCheckBox boxCB;
	699	+ JCheckBox zoomBoxCB;
649	700	JCheckBox trackCB;
650	701	JCheckBox smoothfocusCB;
651	702	// JCheckBox speakerMocapCB;
..	..	@@ -688,8 +739,7 @@
688	739	dropAttributes \|= Object3D.TEXTURE;
689	740	else
690	741	dropAttributes &= ~Object3D.TEXTURE;
691		- }
692		- else if(e.getSource() == liveCB)
	742	+ } else if(e.getSource() == liveCB)
693	743	{
694	744	cameraView.ToggleLive();
695	745	}
..	..	@@ -726,6 +776,10 @@
726	776	Recompile();
727	777	cameraView.repaint();
728	778	// refreshContents();
	779	+ }
	780	+ else if(e.getSource() == zoomBoxCB)
	781	+ {
	782	+ cameraView.ToggleZoomBoxMode();
729	783	}
730	784	else if(e.getSource() == smoothfocusCB)
731	785	{
..	..	@@ -1002,6 +1056,8 @@
1002	1056
1003	1057	void buildCreateMenu(Menu menu)
1004	1058	{
	1059	+ //heightFieldItem = menu.add(new MenuItem("Height Field"));
	1060	+ //heightFieldItem.addActionListener(this);
1005	1061	gridItem = menu.add(new MenuItem("Grid"));
1006	1062	gridItem.addActionListener(this);
1007	1063	rectoidItem = menu.add(new MenuItem("Box"));
..	..	@@ -1014,6 +1070,8 @@
1014	1070	torusItem.addActionListener(this);
1015	1071	superItem = menu.add(new MenuItem("Superellipsoid"));
1016	1072	superItem.addActionListener(this);
	1073	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1074	+ kleinItem.addActionListener(this);
1017	1075	particleItem = menu.add(new MenuItem("Particle system"));
1018	1076	particleItem.addActionListener(this);
1019	1077	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1048,15 +1106,6 @@
1048	1106	doubleItem.addActionListener(this);
1049	1107	tripleItem = menu.add(new MenuItem("Trident"));
1050	1108	tripleItem.addActionListener(this);
1051		- menu.add("-");
1052		- importGFDItem = menu.add(new MenuItem("GraphreeD Object..."));
1053		- importGFDItem.addActionListener(this);
1054		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
1055		- importVRMLX3DItem.addActionListener(this);
1056		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
1057		- importOBJItem.addActionListener(this);
1058		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
1059		- import3DSItem.addActionListener(this);
1060	1109	}
1061	1110
1062	1111	void buildToolsMenu(Menu menu)
..	..	@@ -1068,6 +1117,8 @@
1068	1117	menu.add("-");
1069	1118	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1070	1119	parseverticesItem.addActionListener(this);
	1120	+ textureFieldItem = menu.add(new MenuItem("Texture Field"));
	1121	+ textureFieldItem.addActionListener(this);
1071	1122	alignItem = menu.add(new MenuItem("Align"));
1072	1123	alignItem.addActionListener(this);
1073	1124	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
..	..	@@ -1094,6 +1145,8 @@
1094	1145	resetParentItem.addActionListener(this);
1095	1146	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1096	1147	repairParentItem.addActionListener(this);
	1148	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1149	+ repairShadowItem.addActionListener(this);
1097	1150	menu.add(invariantsItem = new MenuItem("Invariants"));
1098	1151	invariantsItem.addActionListener(this);
1099	1152	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1429,9 +1482,9 @@
1429	1482
1430	1483	void Overwrite(int mask)
1431	1484	{
1432		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1485	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1433	1486	{
1434		- Object3D content = GraphreeD.clipboard.get(0);
	1487	+ Object3D content = GrafreeD.clipboard.get(0);
1435	1488
1436	1489	if (content instanceof cGroup && ((cGroup)content).transientlink )
1437	1490	content = ((cGroup)content).get(0);
..	..	@@ -1454,6 +1507,7 @@
1454	1507	//
1455	1508	public void actionPerformed(ActionEvent event) // , Object arg)
1456	1509	{
	1510	+ Object source = event.getSource();
1457	1511	/*
1458	1512	if (event.getSource() == nameField)
1459	1513	{
..	..	@@ -1465,11 +1519,11 @@
1465	1519	}
1466	1520	else
1467	1521	*/
1468		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1522	+ if (source == lookAtItem \|\| source == lookFromItem)
1469	1523	{
1470	1524	ScreenFit();
1471	1525	} else
1472		- if (event.getSource() == switchItem)
	1526	+ if (source == switchItem)
1473	1527	{
1474	1528	cVector v1 = new cVector();
1475	1529	cVector v2 = new cVector();
..	..	@@ -1478,11 +1532,11 @@
1478	1532	objEditor.cameraView.renderCamera.setAim(v2, v1);
1479	1533	objEditor.cameraView.repaint();
1480	1534	} else
1481		- if (event.getSource() == rectoidItem)
	1535	+ if (source == rectoidItem)
1482	1536	{
1483	1537	makeSomething(new Box());
1484	1538	} else
1485		- if (event.getSource() == particleItem)
	1539	+ if (source == particleItem)
1486	1540	{
1487	1541	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1488	1542	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1503,9 +1557,9 @@
1503	1557	applyExample(particleGeom, "SMOKE");
1504	1558	makeSomething(particleGeom);
1505	1559	} else
1506		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1560	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1507	1561	{
1508		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1562	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1509	1563
1510	1564	ragdoll.toParent = LA.newMatrix();
1511	1565	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1521,27 +1575,71 @@
1521	1575	makeSomething(ragdoll);
1522	1576	//makeSomething(new VehicleDemo());
1523	1577	} else
1524		- if (event.getSource() == gridItem)
	1578	+ /*
	1579	+ */
	1580	+ if (source == heightFieldItem)
	1581	+ {
	1582	+ Object3D obj = new Object3D();
	1583	+
	1584	+ obj.CreateMaterial();
	1585	+ obj.bRep = new BoundaryRep();
	1586	+
	1587	+ obj.bRep.CreateMesh(new iHeightField()
	1588	+ {
	1589	+ public double f(double x, double y)
	1590	+ {
	1591	+ // The Mandelbrot set is represented by coloring
	1592	+ // each point (x,y) according to the number of
	1593	+ // iterations it takes before the while loop in
	1594	+ // this method ends. For points that are actually
	1595	+ // in the Mandelbrot set, or very close to it, the
	1596	+ // count will reach the maximum value, 80. These
	1597	+ // points will be colored purple. All other colors
	1598	+ // represent points that are definitely NOT in the set.
	1599	+ x -= 600;
	1600	+ y -= 500;
	1601	+ x /= 200;
	1602	+ y /= 200;
	1603	+ int count = 0;
	1604	+ double zx = x;
	1605	+ double zy = y;
	1606	+ while (count < 80 && Math.abs(x) < 100 && Math.abs(zy) < 100) {
	1607	+ double new_zx = zxzx - zyzy + x;
	1608	+ zy = 2zxzy + y;
	1609	+ zx = new_zx;
	1610	+ count++;
	1611	+ }
	1612	+ return count; // Math.sqrt(count);
	1613	+ }
	1614	+ }, 1000,1000);
	1615	+
	1616	+ makeSomething(obj);
	1617	+ } else
	1618	+ if (source == gridItem)
1525	1619	{
1526	1620	makeSomething(new Grid());
1527	1621	} else
1528		- if (event.getSource() == ellipsoidItem)
	1622	+ if (source == ellipsoidItem)
1529	1623	{
1530	1624	makeSomething(new Sphere());
1531	1625	} else
1532		- if (event.getSource() == coneItem)
	1626	+ if (source == coneItem)
1533	1627	{
1534	1628	makeSomething(new Cone());
1535	1629	} else
1536		- if (event.getSource() == torusItem)
	1630	+ if (source == torusItem)
1537	1631	{
1538	1632	makeSomething(new Torus());
1539	1633	} else
1540		- if (event.getSource() == superItem)
	1634	+ if (source == superItem)
1541	1635	{
1542	1636	makeSomething(new Superellipsoid());
1543	1637	} else
1544		- if (event.getSource() == blobItem)
	1638	+ if (source == kleinItem)
	1639	+ {
	1640	+ makeSomething(new Klein());
	1641	+ } else
	1642	+ if (source == blobItem)
1545	1643	{
1546	1644	Blob blob = new Blob();
1547	1645	BlobComponent comp = new BlobComponent();
..	..	@@ -1549,15 +1647,15 @@
1549	1647	//blob.retile();
1550	1648	makeSomething(blob);
1551	1649	} else
1552		- if (event.getSource() == latheItem)
	1650	+ if (source == latheItem)
1553	1651	{
1554	1652	makeSomething(new Lathe());
1555	1653	} else
1556		- if (event.getSource() == bezierItem)
	1654	+ if (source == bezierItem)
1557	1655	{
1558	1656	makeSomething(new BezierSurface());
1559	1657	} else
1560		- if (event.getSource() == checkerItem)
	1658	+ if (source == checkerItem)
1561	1659	{
1562	1660	/*
1563	1661	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1570,9 +1668,9 @@
1570	1668	LA.matConcat(obj.toParent, cameraView.renderCamera.fromParent, obj.toParent);
1571	1669	LA.matInvert(obj.toParent, obj.fromParent);
1572	1670	*/
1573		- makeSomething(new CheckerIG());
	1671	+ makeSomething(new Checker());
1574	1672	} else
1575		- if (event.getSource() == meshItem)
	1673	+ if (source == meshItem)
1576	1674	{
1577	1675	Object3D itemtomake = new Object3D();
1578	1676	Object3D child;
..	..	@@ -1593,35 +1691,35 @@
1593	1691	makeSomething(child);
1594	1692	}
1595	1693	} else
1596		- if (event.getSource() == springItem)
	1694	+ if (source == springItem)
1597	1695	{
1598	1696	cSpring s = new cSpring();
1599	1697	s.setup();
1600	1698	makeSomething(s);
1601	1699	} else
1602		- if (event.getSource() == flagItem)
	1700	+ if (source == flagItem)
1603	1701	{
1604	1702	cSpring s = new cFlag();
1605	1703	s.setup();
1606	1704	makeSomething(s);
1607	1705	} else
1608		- if (event.getSource() == lightItem)
	1706	+ if (source == lightItem)
1609	1707	{
1610	1708	makeSomething(new Light());
1611	1709	} else
1612		- if (event.getSource() == csgItem)
	1710	+ if (source == csgItem)
1613	1711	{
1614	1712	group(new CSG());
1615	1713	} else
1616		- if (event.getSource() == templateItem)
	1714	+ if (source == templateItem)
1617	1715	{
1618	1716	group(new cTemplate());
1619	1717	} else
1620		- if (event.getSource() == attributeItem)
	1718	+ if (source == attributeItem)
1621	1719	{
1622	1720	makeSomething(new Attribute());
1623	1721	} else
1624		- if (event.getSource() == pointflowItem)
	1722	+ if (source == pointflowItem)
1625	1723	{
1626	1724	makeSomething(new PointFlow());
1627	1725	} else
..	..	@@ -1633,7 +1731,7 @@
1633	1731	} else
1634	1732	*/
1635	1733
1636		- if (event.getSource() == superLoopItem)
	1734	+ if (source == superLoopItem)
1637	1735	{
1638	1736	Composite g = new cGroup();
1639	1737	for (int i=0; i<15; i++)
..	..	@@ -1655,7 +1753,7 @@
1655	1753
1656	1754	group(g);
1657	1755	} else
1658		- if (event.getSource() == loopItem)
	1756	+ if (source == loopItem)
1659	1757	{
1660	1758	Composite csg = new GroupLeaf();
1661	1759	csg.count = 5;
..	..	@@ -1664,7 +1762,7 @@
1664	1762	csg.addChild(child);
1665	1763	child.addChild(csg);
1666	1764	} else
1667		- if (event.getSource() == doubleItem)
	1765	+ if (source == doubleItem)
1668	1766	{
1669	1767	Composite csg = new GroupLeaf();
1670	1768	csg.count = 5;
..	..	@@ -1676,7 +1774,7 @@
1676	1774	csg.addChild(child);
1677	1775	child.addChild(csg);
1678	1776	} else
1679		- if (event.getSource() == tripleItem)
	1777	+ if (source == tripleItem)
1680	1778	{
1681	1779	Composite csg = new GroupLeaf();
1682	1780	csg.count = 4;
..	..	@@ -1692,70 +1790,70 @@
1692	1790	child.addChild(csg);
1693	1791	} else
1694	1792
1695		- if (event.getSource() == importGFDItem)
	1793	+ if (source == importGFDItem)
1696	1794	{
1697	1795	ImportGFD();
1698	1796	} else
1699		- if (event.getSource() == importVRMLX3DItem)
	1797	+ if (source == importVRMLX3DItem)
1700	1798	{
1701	1799	ImportVRMLX3D();
1702	1800	} else
1703		- if (event.getSource() == import3DSItem)
	1801	+ if (source == import3DSItem)
1704	1802	{
1705	1803	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1706	1804	} else
1707		- if (event.getSource() == importOBJItem)
	1805	+ if (source == importOBJItem)
1708	1806	{
1709	1807	objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1710	1808	} else
1711		- if (event.getSource() == computeAOItem)
	1809	+ if (source == computeAOItem)
1712	1810	{
1713		- CameraPane.drawMode = CameraPane.OCCLUSION;
1714		- CameraPane.theRenderer.repaint();
	1811	+ Globals.drawMode = CameraPane.OCCLUSION;
	1812	+ Globals.theRenderer.repaint();
1715	1813	} else
1716		- if (event.getSource() == recompileItem)
	1814	+ if (source == recompileItem)
1717	1815	{
1718	1816	Recompile();
1719	1817	refreshContents();
1720	1818	} else
1721		- if (event.getSource() == editScriptItem)
	1819	+ if (source == editScriptItem)
1722	1820	{
1723	1821	OpenDialog();
1724	1822	refreshContents();
1725	1823	} else
1726		- if (event.getSource() == invariantsItem)
	1824	+ if (source == invariantsItem)
1727	1825	{
1728	1826	System.out.println("Invariants:");
1729		- GraphreeD.theApplet3D.universe.invariants();
	1827	+ GrafreeD.grafreeD.universe.invariants();
1730	1828	} else
1731		- if (event.getSource() == memoryItem)
	1829	+ if (source == memoryItem)
1732	1830	{
1733	1831	//System.out.println("Invariants:");
1734	1832	PrintMemory();
1735	1833	} else
1736		- if (event.getSource() == pathItem)
	1834	+ if (source == pathItem)
1737	1835	{
1738	1836	PrintPath();
1739	1837	} else
1740		- if (event.getSource() == analyzeItem)
	1838	+ if (source == analyzeItem)
1741	1839	{
1742	1840	AnalyzeObject();
1743	1841	} else
1744		- if (event.getSource() == dumpItem)
	1842	+ if (source == dumpItem)
1745	1843	{
1746	1844	DumpObject();
1747	1845	} else
1748		- if (event.getSource() == screenfitButton)
	1846	+ if (source == screenfitButton)
1749	1847	{
1750	1848	//Reload(lastConverter, lastFilename, true);
1751	1849	ScreenFit();
1752	1850	} else
1753		- if (event.getSource() == screenfitpointButton)
	1851	+ if (source == screenfitpointButton)
1754	1852	{
1755	1853	//Reload(lastConverter, lastFilename, true);
1756	1854	ScreenFitPoint();
1757	1855	} else
1758		- if (event.getSource() == snapobjectButton)
	1856	+ if (source == snapobjectButton)
1759	1857	{
1760	1858	//Reload(lastConverter, lastFilename, true);
1761	1859	SnapObject();
..	..	@@ -1766,13 +1864,13 @@
1766	1864	// Recompile();
1767	1865	// refreshContents();
1768	1866	// } else
1769		- if (event.getSource() == gcButton)
	1867	+ if (source == gcButton)
1770	1868	{
1771	1869	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1772	1870	System.gc();
1773	1871	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1774	1872	} else
1775		- if (event.getSource() == editLeafItem)
	1873	+ if (source == editLeafItem)
1776	1874	{
1777	1875	Object3D obj;
1778	1876	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1786,65 +1884,66 @@
1786	1884	}
1787	1885	refreshContents(true);
1788	1886	} else
1789		- if (event.getSource() == openWindowItem)
	1887	+ if (source == openWindowItem)
1790	1888	{
1791	1889	EditSelection(true);
1792	1890	} else
1793		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1891	+ if (source == cutItem \|\| source == clearButton)
1794	1892	{
1795	1893	loadClipboard(true);
1796	1894	} else
1797		- if (event.getSource() == duplicateItem)
	1895	+ if (source == duplicateItem)
1798	1896	{
1799		- Object3D keep = GraphreeD.clipboard;
	1897	+ Object3D keep = GrafreeD.clipboard;
1800	1898	loadClipboard(false);
1801	1899	paste(false);
1802		- GraphreeD.clipboard = keep;
	1900	+ GrafreeD.clipboard = keep;
1803	1901	} else
1804		- if (event.getSource() == cloneItem)
	1902	+ if (source == cloneItem)
1805	1903	{
1806	1904	CloneSelection(false);
1807	1905	} else
1808		- if (event.getSource() == cloneSupportItem)
	1906	+ if (source == cloneSupportItem)
1809	1907	{
1810	1908	CloneSelection(true);
1811	1909	} else
1812		- if (event.getSource() == copyItem)
	1910	+ if (source == copyItem)
1813	1911	{
1814	1912	loadClipboard(false);
1815	1913	} else
1816		- if (event.getSource() == pasteItem)
	1914	+ if (source == pasteItem)
1817	1915	{
1818	1916	paste(false);
1819	1917	} else
1820		- if (event.getSource() == pasteLinkItem)
	1918	+ if (source == pasteLinkItem)
1821	1919	{
1822	1920	pasteInto(false);
1823	1921	} else
1824		- if (event.getSource() == pasteCloneItem)
	1922	+ if (source == pasteCloneItem)
1825	1923	{
1826	1924	pasteInto(true);
1827	1925	} else
1828		- if (event.getSource() == pasteExpandItem)
	1926	+ if (source == pasteExpandItem)
1829	1927	{
1830	1928	paste(true);
1831	1929	} else
1832		- if (event.getSource() == synchronizeItem)
	1930	+ if (source == synchronizeItem)
1833	1931	{
1834	1932	Overwrite(Object3D.TRANSFORM);
1835	1933	} else
1836		- if (event.getSource() == overwriteNameItem)
	1934	+ if (source == overwriteNameItem)
1837	1935	{
1838	1936	Overwrite(Object3D.NAME);
1839	1937	} else
1840		- if (event.getSource() == overwriteUVItem)
	1938	+ if (source == overwriteUVItem)
1841	1939	{
1842	1940	Overwrite(Object3D.UV);
1843	1941	} else
1844		- if (event.getSource() == overwriteMatItem)
	1942	+ if (source == overwriteMatItem)
1845	1943	{
	1944	+ /* july 2015
1846	1945	if ((dropAttributes & Object3D.TEXTURE) == 0)
1847		- Overwrite(Object3D.MATERIAL);
	1946	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1848	1947	else
1849	1948	{
1850	1949	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1856,13 +1955,16 @@
1856	1955	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1857	1956	}
1858	1957	}
	1958	+ */
	1959	+
	1960	+ Overwrite(dropAttributes);
1859	1961	}
1860		- if (event.getSource() == overwriteGeoItem)
	1962	+ if (source == overwriteGeoItem)
1861	1963	{
1862	1964	Overwrite(Object3D.GEOMETRY);
1863		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1965	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1864	1966	// {
1865		-// Object3D content = GraphreeD.clipboard.get(0);
	1967	+// Object3D content = GrafreeD.clipboard.get(0);
1866	1968	//
1867	1969	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1868	1970	// content = ((cGroup)content).get(0);
..	..	@@ -1874,7 +1976,7 @@
1874	1976	// refreshContents();
1875	1977	// }
1876	1978	} else
1877		- if (event.getSource() == generateMeshItem)
	1979	+ if (source == generateMeshItem)
1878	1980	{
1879	1981	//if (group.selection.size() == 1)
1880	1982	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1885,7 +1987,7 @@
1885	1987	ResetModel();
1886	1988	refreshContents();
1887	1989	} else
1888		- if (event.getSource() == extractGeometriesItem)
	1990	+ if (source == extractGeometriesItem)
1889	1991	{
1890	1992	boolean one = false;
1891	1993
..	..	@@ -1912,7 +2014,7 @@
1912	2014	ResetModel();
1913	2015	refreshContents();
1914	2016	} else
1915		- if (event.getSource() == cloneGeometriesItem)
	2017	+ if (source == cloneGeometriesItem)
1916	2018	{
1917	2019	boolean one = false;
1918	2020
..	..	@@ -1938,32 +2040,37 @@
1938	2040	ResetModel();
1939	2041	refreshContents();
1940	2042	} else
1941		- if (event.getSource() == shareGeometriesItem)
	2043	+ if (source == shareGeometriesItem)
1942	2044	{
1943	2045	boolean one = false;
1944	2046
1945	2047	if (group.selection.size() == 1)
1946	2048	one = true;
1947	2049
	2050	+ Object3D merge = null;
	2051	+
1948	2052	Object3D content = new cGroup();
1949	2053
1950	2054	for (int i=0; i<group.selection.size(); i++)
1951	2055	{
1952		- Object3D sel = new Merge(group.selection.get(i));
	2056	+ merge = new Merge(group.selection.get(i));
1953	2057
1954	2058	if (one)
1955		- makeSomething(sel, false);
	2059	+ makeSomething(merge, false);
1956	2060	else
1957		- content.addChild(sel);
	2061	+ content.addChild(merge);
1958	2062	}
1959	2063
1960	2064	if (!one)
1961		- makeSomething(content, false);
1962		-
1963		- ResetModel();
1964		- refreshContents();
	2065	+ makeSomething(content, true);
	2066	+ else
	2067	+ {
	2068	+ ResetModel();
	2069	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2070	+ refreshContents();
	2071	+ }
1965	2072	} else
1966		- if (event.getSource() == mergeGeometriesItem)
	2073	+ if (source == mergeGeometriesItem)
1967	2074	{
1968	2075	boolean one = false;
1969	2076
..	..	@@ -1993,11 +2100,11 @@
1993	2100	ResetModel();
1994	2101	refreshContents();
1995	2102	} else
1996		- if (event.getSource() == linkverticesItem)
	2103	+ if (source == linkverticesItem)
1997	2104	{
1998		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2105	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
1999	2106	// {
2000		-// Object3D content = GraphreeD.clipboard.get(0);
	2107	+// Object3D content = GrafreeD.clipboard.get(0);
2001	2108	//
2002	2109	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2003	2110	// content = ((cGroup)content).get(0);
..	..	@@ -2006,14 +2113,14 @@
2006	2113	// group.selection.get(0).setMasterThis(content); // should be identity
2007	2114	// refreshContents();
2008	2115	// }
2009		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2116	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
2010	2117	{
2011		- Object3D content = GraphreeD.clipboard.get(0);
	2118	+ Object3D content = GrafreeD.clipboard.get(0);
2012	2119
2013	2120	if (content instanceof cGroup && ((cGroup)content).transientlink )
2014	2121	content = ((cGroup)content).get(0);
2015	2122
2016		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2123	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2017	2124	for (int i=0; i<group.selection.size(); i++)
2018	2125	{
2019	2126	boolean random = CameraPane.RANDOM;
..	..	@@ -2022,11 +2129,11 @@
2022	2129	// group.selection.get(i).setMasterThis(content); // should be identity
2023	2130	CameraPane.RANDOM = random;
2024	2131	}
2025		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2132	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2026	2133	refreshContents();
2027	2134	}
2028	2135	} else
2029		- if (event.getSource() == resetsupportItem)
	2136	+ if (source == resetsupportItem)
2030	2137	{
2031	2138	for (int i=0; i<group.selection.size(); i++)
2032	2139	{
..	..	@@ -2038,7 +2145,16 @@
2038	2145
2039	2146	refreshContents();
2040	2147	} else
2041		- if (event.getSource() == resetreferencesItem)
	2148	+ if (source == relinkverticesItem)
	2149	+ {
	2150	+ boolean random = CameraPane.RANDOM;
	2151	+ CameraPane.RANDOM = false; // parse all random nodes
	2152	+ group.selection.RelinkToSupport();
	2153	+ CameraPane.RANDOM = random;
	2154	+
	2155	+ refreshContents();
	2156	+ } else
	2157	+ if (source == resetreferencesItem)
2042	2158	{
2043	2159	for (int i=0; i<group.selection.size(); i++)
2044	2160	{
..	..	@@ -2047,11 +2163,11 @@
2047	2163
2048	2164	refreshContents();
2049	2165	} else
2050		- if (event.getSource() == setMasterItem)
	2166	+ if (source == setMasterItem)
2051	2167	{
2052		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2168	+ if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2053	2169	{
2054		- Object3D content = GraphreeD.clipboard.get(0);
	2170	+ Object3D content = GrafreeD.clipboard.get(0);
2055	2171
2056	2172	if (content instanceof cGroup && ((cGroup)content).transientlink )
2057	2173	content = ((cGroup)content).get(0);
..	..	@@ -2060,13 +2176,13 @@
2060	2176	refreshContents();
2061	2177	}
2062	2178	} else
2063		- if (event.getSource() == poseMeshItem)
	2179	+ if (source == poseMeshItem)
2064	2180	{
2065	2181	if (group.selection.size() == 1)
2066	2182	{
2067		- if (GraphreeD.clipboard.size() == 1)
	2183	+ if (GrafreeD.clipboard.size() == 1)
2068	2184	{
2069		- Object3D content = GraphreeD.clipboard.get(0);
	2185	+ Object3D content = GrafreeD.clipboard.get(0);
2070	2186
2071	2187	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	2188	content = ((cGroup)content).get(0);
..	..	@@ -2079,19 +2195,19 @@
2079	2195	}
2080	2196
2081	2197	} else
2082		- if (event.getSource() == revertMeshItem)
	2198	+ if (source == revertMeshItem)
2083	2199	{
2084	2200	RevertMeshes();
2085	2201	} else
2086		- if (event.getSource() == resetMeshItem)
	2202	+ if (source == resetMeshItem)
2087	2203	{
2088	2204	ResetAll();
2089	2205	} else
2090		- if (event.getSource() == stepAllItem)
	2206	+ if (source == stepAllItem)
2091	2207	{
2092	2208	StepAll();
2093	2209	} else
2094		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2210	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2095	2211	{
2096	2212	//int indices[] = jList.getSelectedIndices();
2097	2213	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2099,42 +2215,46 @@
2099	2215
2100	2216	ClearSelection(false);
2101	2217	} else
2102		- if (event.getSource() == clearAllItem)
	2218	+ if (source == clearAllItem)
2103	2219	{
2104	2220	ClearSelection(true);
2105	2221	} else
2106		- if (event.getSource() == grabItem)
	2222	+ if (source == grabItem)
2107	2223	{
2108	2224	group(new cGroup(), true);
2109	2225	} else
2110		- if (event.getSource() == frontItem)
	2226	+ if (source == hideItem)
	2227	+ {
	2228	+ group(new HiddenObject());
	2229	+ } else
	2230	+ if (source == frontItem)
2111	2231	{
2112	2232	front();
2113	2233	} else
2114		- if (event.getSource() == backItem)
	2234	+ if (source == backItem)
2115	2235	{
2116	2236	back();
2117	2237	} else
2118		- if (event.getSource() == cameraItem)
	2238	+ if (source == cameraItem)
2119	2239	{
2120	2240	makeSomething(new Camera());
2121	2241	} else
2122		- if (event.getSource() == compositeItem)
	2242	+ if (source == compositeItem)
2123	2243	{
2124	2244	group(new Composite());
2125	2245	} else
2126		- if (event.getSource() == randomItem)
	2246	+ if (source == randomItem)
2127	2247	{
2128	2248	RandomNode random = new RandomNode();
2129	2249	group(random);
2130	2250	if (random.size() > 0)
2131	2251	random.name = random.get(0).name + "Rnd";
2132	2252	} else
2133		- if (event.getSource() == physicsItem)
	2253	+ if (source == physicsItem)
2134	2254	{
2135	2255	group(new PhysicsNode());
2136	2256	} else
2137		- if (event.getSource() == frameselectorItem)
	2257	+ if (source == frameselectorItem)
2138	2258	{
2139	2259	for (int i=0; i<group.selection.size(); i++)
2140	2260	{
..	..	@@ -2146,7 +2266,7 @@
2146	2266	ResetModel();
2147	2267	refreshContents();
2148	2268	} else
2149		- if (event.getSource() == switchGeoItem)
	2269	+ if (source == switchGeoItem)
2150	2270	{
2151	2271	for (int i=0; i<group.selection.size(); i++)
2152	2272	{
..	..	@@ -2158,7 +2278,7 @@
2158	2278	ResetModel();
2159	2279	refreshContents();
2160	2280	} else
2161		- if (event.getSource() == switchTransfoItem)
	2281	+ if (source == switchTransfoItem)
2162	2282	{
2163	2283	for (int i=0; i<group.selection.size(); i++)
2164	2284	{
..	..	@@ -2170,7 +2290,7 @@
2170	2290	ResetModel();
2171	2291	refreshContents();
2172	2292	} else
2173		- if (event.getSource() == morphItem)
	2293	+ if (source == morphItem)
2174	2294	{
2175	2295	for (int i=0; i<group.selection.size(); i++)
2176	2296	{
..	..	@@ -2182,7 +2302,7 @@
2182	2302	ResetModel();
2183	2303	refreshContents();
2184	2304	} else
2185		- if (event.getSource() == scriptNodeItem)
	2305	+ if (source == scriptNodeItem)
2186	2306	{
2187	2307	boolean atleastone = false;
2188	2308
..	..	@@ -2221,191 +2341,215 @@
2221	2341	}
2222	2342	}
2223	2343	} else
2224		- if (event.getSource() == linkerItem)
	2344	+ if (source == linkerItem)
2225	2345	{
2226	2346	group(new cLinker());
2227	2347	} else
2228		- if (event.getSource() == textureItem)
	2348	+ if (source == textureItem)
2229	2349	{
2230	2350	group(new TextureNode());
2231	2351	} else
2232		- if (event.getSource() == shadowXItem)
	2352	+ if (source == billboardItem)
	2353	+ {
	2354	+ group(new BillboardNode());
	2355	+ } else
	2356	+ if (source == shadowXItem)
2233	2357	{
2234	2358	CastShadow(0);
2235	2359	} else
2236		- if (event.getSource() == shadowYItem)
	2360	+ if (source == shadowYItem)
2237	2361	{
2238	2362	CastShadow(1);
2239	2363	} else
2240		- if (event.getSource() == shadowZItem)
	2364	+ if (source == shadowZItem)
2241	2365	{
2242	2366	CastShadow(2);
2243	2367	} else
2244		- if (event.getSource() == ungroupItem)
	2368	+ if (source == ungroupItem)
2245	2369	{
2246		- ungroup();
	2370	+ //ungroup();
	2371	+ for (int i=0; i<group.selection.size(); i++)
	2372	+ {
	2373	+ Ungroup(group.selection.get(i));
	2374	+ }
	2375	+
	2376	+ ClearSelection(false);
	2377	+
	2378	+ refreshContents();
2247	2379	} else
2248		- if (event.getSource() == genUVItem)
	2380	+ if (source == genUVItem)
2249	2381	{
2250	2382	GenUV();
2251	2383	} else
2252		- if (event.getSource() == genNormalsCADItem)
	2384	+ if (source == genNormalsCADItem)
2253	2385	{
2254	2386	GenNormals(true);
2255	2387	} else
2256		- if (event.getSource() == genNormalsORGANItem)
	2388	+ if (source == genNormalsMESHItem)
	2389	+ {
	2390	+ GenNormals(true); // TODO
	2391	+ } else
	2392	+ if (source == genNormalsORGANItem)
2257	2393	{
2258	2394	GenNormals(false);
2259	2395	} else
2260		- if (event.getSource() == stripifyItem)
	2396	+ if (source == genNormalsMINEItem)
	2397	+ {
	2398	+ GenNormalsMINE();
	2399	+ } else
	2400	+ if (source == stripifyItem)
2261	2401	{
2262	2402	Stripify();
2263	2403	} else
2264		- if (event.getSource() == unstripifyItem)
	2404	+ if (source == unstripifyItem)
2265	2405	{
2266	2406	Unstripify();
2267	2407	} else
2268		- if (event.getSource() == trimItem)
	2408	+ if (source == trimItem)
2269	2409	{
2270	2410	Trim();
2271	2411	} else
2272		- if (event.getSource() == untrimItem)
	2412	+ if (source == untrimItem)
2273	2413	{
2274	2414	Untrim();
2275	2415	} else
2276		- if (event.getSource() == clearColorsItem)
	2416	+ if (source == clearColorsItem)
2277	2417	{
2278	2418	ClearColors();
2279	2419	} else
2280		- if (event.getSource() == clearMaterialsItem)
	2420	+ if (source == clearMaterialsItem)
2281	2421	{
2282	2422	ClearMaterials();
2283	2423	} else
2284		- if (event.getSource() == liveleavesItem)
	2424	+ if (source == liveleavesItem)
2285	2425	{
2286	2426	LiveLeaves(true);
2287	2427	} else
2288		- if (event.getSource() == unliveleavesItem)
	2428	+ if (source == unliveleavesItem)
2289	2429	{
2290	2430	LiveLeaves(false);
2291	2431	} else
2292		- if (event.getSource() == supportleavesItem)
	2432	+ if (source == supportleavesItem)
2293	2433	{
2294	2434	SupportLeaves(true);
2295	2435	} else
2296		- if (event.getSource() == unsupportleavesItem)
	2436	+ if (source == unsupportleavesItem)
2297	2437	{
2298	2438	SupportLeaves(false);
2299	2439	} else
2300		- if (event.getSource() == hideleavesItem)
	2440	+ if (source == hideleavesItem)
2301	2441	{
2302	2442	HideLeaves(true);
2303	2443	} else
2304		- if (event.getSource() == showleavesItem)
	2444	+ if (source == showleavesItem)
2305	2445	{
2306	2446	HideLeaves(false);
2307	2447	} else
2308		- if (event.getSource() == markleavesItem)
	2448	+ if (source == markleavesItem)
2309	2449	{
2310	2450	MarkLeaves(true);
2311	2451	} else
2312		- if (event.getSource() == unmarkleavesItem)
	2452	+ if (source == unmarkleavesItem)
2313	2453	{
2314	2454	MarkLeaves(false);
2315	2455	} else
2316		- if (event.getSource() == flipVItem)
	2456	+ if (source == flipVItem)
2317	2457	{
2318	2458	FlipV(true);
2319	2459	} else
2320		- if (event.getSource() == unflipVItem)
	2460	+ if (source == unflipVItem)
2321	2461	{
2322	2462	FlipV(false);
2323	2463	} else
2324		- if (event.getSource() == lowTexturesItem)
	2464	+ if (source == lowTexturesItem)
2325	2465	{
2326	2466	SetTexRes(0);
2327	2467	} else
2328		- if (event.getSource() == normalTexturesItem)
	2468	+ if (source == normalTexturesItem)
2329	2469	{
2330	2470	SetTexRes(1);
2331	2471	} else
2332		- if (event.getSource() == highTexturesItem)
	2472	+ if (source == highTexturesItem)
2333	2473	{
2334	2474	SetTexRes(2);
2335	2475	} else
2336		- if (event.getSource() == veryhighTexturesItem)
	2476	+ if (source == veryhighTexturesItem)
2337	2477	{
2338	2478	SetTexRes(3);
2339	2479	} else
2340		- if (event.getSource() == maxTexturesItem)
	2480	+ if (source == maxTexturesItem)
2341	2481	{
2342	2482	SetTexRes(4);
2343	2483	} else
2344		- if (event.getSource() == panoTexturesItem)
	2484	+ if (source == panoTexturesItem)
2345	2485	{
2346	2486	SetTexRes(5);
2347	2487	} else
2348		- if (event.getSource() == reverseNormalsItem)
	2488	+ if (source == reverseNormalsItem)
2349	2489	{
2350	2490	ReverseNormals();
2351	2491	} else
2352		- if (event.getSource() == parseverticesItem)
	2492	+ if (source == parseverticesItem)
2353	2493	{
2354	2494	ParseVertices();
2355	2495	} else
2356		- if (event.getSource() == alignItem)
	2496	+ if (source == textureFieldItem)
	2497	+ {
	2498	+ TextureVertices();
	2499	+ } else
	2500	+ if (source == alignItem)
2357	2501	{
2358	2502	Align();
2359	2503	} else
2360		- if (event.getSource() == mirrorItem)
	2504	+ if (source == mirrorItem)
2361	2505	{
2362	2506	MirrorPoses();
2363	2507	} else
2364		- if (event.getSource() == reduceMorphItem)
	2508	+ if (source == reduceMorphItem)
2365	2509	{
2366	2510	MeshReduction(false);
2367	2511	} else
2368		- if (event.getSource() == reduce34MorphItem)
	2512	+ if (source == reduce34MorphItem)
2369	2513	{
2370	2514	MeshReduction(true);
2371	2515	} else
2372		- if (event.getSource() == reverseTrianglesItem)
	2516	+ if (source == reverseTrianglesItem)
2373	2517	{
2374	2518	ReverseTriangles();
2375	2519	} else
2376		- if (event.getSource() == reduceMeshItem)
	2520	+ if (source == reduceMeshItem)
2377	2521	{
2378	2522	ReduceMesh(false);
2379	2523	} else
2380		- if (event.getSource() == reduce34MeshItem)
	2524	+ if (source == reduce34MeshItem)
2381	2525	{
2382	2526	ReduceMesh(true);
2383	2527	} else
2384		- if (event.getSource() == increaseMeshItem)
	2528	+ if (source == increaseMeshItem)
2385	2529	{
2386	2530	IncreaseMesh();
2387	2531	} else
2388		- if (event.getSource() == clipMeshItem)
	2532	+ if (source == clipMeshItem)
2389	2533	{
2390	2534	ClipMesh();
2391	2535	} else
2392		- if (event.getSource() == smoothMeshItem)
	2536	+ if (source == smoothMeshItem)
2393	2537	{
2394	2538	SmoothMesh();
2395	2539	} else
2396		- if (event.getSource() == transformgeometryItem)
	2540	+ if (source == transformgeometryItem)
2397	2541	{
2398	2542	TransformGeometry();
2399	2543	} else
2400		- if (event.getSource() == resetTransformItem)
	2544	+ if (source == resetTransformItem)
2401	2545	{
2402	2546	ResetTransform();
2403	2547	} else
2404		- if (event.getSource() == resetCentroidItem)
	2548	+ if (source == resetCentroidItem)
2405	2549	{
2406	2550	ResetCentroid();
2407	2551	} else
2408		- if (event.getSource() == resetParentItem)
	2552	+ if (source == resetParentItem)
2409	2553	{
2410	2554	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2411	2555	{
..	..	@@ -2415,7 +2559,7 @@
2415	2559
2416	2560	refreshContents();
2417	2561	} else
2418		- if (event.getSource() == repairParentItem)
	2562	+ if (source == repairParentItem)
2419	2563	{
2420	2564	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2421	2565	{
..	..	@@ -2429,7 +2573,21 @@
2429	2573
2430	2574	refreshContents();
2431	2575	} else
2432		- if (event.getSource() == sortbysizeItem)
	2576	+ if (source == repairShadowItem)
	2577	+ {
	2578	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2579	+ {
	2580	+ Object3D obj = (Object3D)e.nextElement();
	2581	+ obj.RepairShadow();
	2582	+// for (int i=0; i<obj.size(); i++)
	2583	+// {
	2584	+// obj.get(i).parent = obj;
	2585	+// }
	2586	+ }
	2587	+
	2588	+ refreshContents();
	2589	+ } else
	2590	+ if (source == sortbysizeItem)
2433	2591	{
2434	2592	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2435	2593	{
..	..	@@ -2441,7 +2599,7 @@
2441	2599	ResetModel();
2442	2600	refreshContents();
2443	2601	} else
2444		- if (event.getSource() == sortbynameItem)
	2602	+ if (source == sortbynameItem)
2445	2603	{
2446	2604	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2447	2605	{
..	..	@@ -2453,7 +2611,7 @@
2453	2611	ResetModel();
2454	2612	refreshContents();
2455	2613	} else
2456		- if (event.getSource() == attachPigmentItem)
	2614	+ if (source == attachPigmentItem)
2457	2615	{
2458	2616	String texture = GetFile("Attach pigment");
2459	2617	Object3D obj;
..	..	@@ -2465,7 +2623,7 @@
2465	2623
2466	2624	refreshContents();
2467	2625	} else
2468		- if (event.getSource() == detachPigmentItem)
	2626	+ if (source == detachPigmentItem)
2469	2627	{
2470	2628	Object3D obj;
2471	2629	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2476,7 +2634,7 @@
2476	2634
2477	2635	refreshContents();
2478	2636	} else
2479		- if (event.getSource() == attachBumpItem)
	2637	+ if (source == attachBumpItem)
2480	2638	{
2481	2639	String texture = GetFile("Attach bump");
2482	2640	Object3D obj;
..	..	@@ -2488,7 +2646,7 @@
2488	2646
2489	2647	refreshContents();
2490	2648	} else
2491		- if (event.getSource() == detachBumpItem)
	2649	+ if (source == detachBumpItem)
2492	2650	{
2493	2651	Object3D obj;
2494	2652	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2499,7 +2657,7 @@
2499	2657
2500	2658	refreshContents();
2501	2659	} else
2502		- if (event.getSource() == pigmentBumpItem)
	2660	+ if (source == pigmentBumpItem)
2503	2661	{
2504	2662	Object3D obj;
2505	2663	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2510,158 +2668,195 @@
2510	2668
2511	2669	refreshContents();
2512	2670	} else
2513		- if (event.getSource() == flashSelectionButton)
	2671	+ if (source == flashSelectionButton)
2514	2672	{
2515	2673	CameraPane.flash = true;
2516	2674	refreshContents();
2517	2675	} else
2518		- if (event.getSource() == oneButton)
	2676	+ if (source == oneButton)
2519	2677	{
2520	2678	} else
2521		- if (event.getSource() == twoButton)
	2679	+ if (source == twoButton)
2522	2680	{
2523	2681	radio.layout = twoButton;
2524	2682	// bug
2525	2683	//gridPanel.setDividerLocation(1.0);
2526	2684	//bigPanel.setDividerLocation(0.0);
2527		- bigThree.remove(jtp);
2528		- bigThree.remove(cameraPanel);
2529		- bigThree.remove(XYZPanel);
2530		- aWindowConstraints.gridx = 0;
2531		- aWindowConstraints.gridy = 0;
2532		- aWindowConstraints.gridwidth = 1;
2533		- // aConstraints.gridheight = 3;
2534		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2535		- aWindowConstraints.weightx = 0;
2536		- aWindowConstraints.weighty = 1;
2537		- //bigThree.add(jtp, aWindowConstraints);
2538		- aWindowConstraints.weightx = 1;
2539		- aWindowConstraints.gridwidth = 3;
2540		- // aConstraints.gridheight = 3;
2541		- aWindowConstraints.gridx = 1;
2542		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2543		- bigThree.add(cameraPanel, aWindowConstraints);
2544		- aWindowConstraints.weightx = 0;
2545		- aWindowConstraints.gridx = 4;
2546		- aWindowConstraints.gridwidth = 1;
2547		- // aConstraints.gridheight = 3;
2548		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2549		- //bigThree.add(XYZPanel, aWindowConstraints);
2550		- bigThree.revalidate();
	2685	+// bigThree.remove(scenePanel);
	2686	+// bigThree.remove(centralPanel);
	2687	+// bigThree.remove(XYZPanel);
	2688	+// aWindowConstraints.gridx = 0;
	2689	+// aWindowConstraints.gridy = 0;
	2690	+// aWindowConstraints.gridwidth = 1;
	2691	+// // aConstraints.gridheight = 3;
	2692	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2693	+// aWindowConstraints.weightx = 0;
	2694	+// aWindowConstraints.weighty = 1;
	2695	+// //bigThree.add(jtp, aWindowConstraints);
	2696	+// aWindowConstraints.weightx = 1;
	2697	+// aWindowConstraints.gridwidth = 3;
	2698	+// // aConstraints.gridheight = 3;
	2699	+// aWindowConstraints.gridx = 1;
	2700	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2701	+// bigThree.add(centralPanel, aWindowConstraints);
	2702	+// aWindowConstraints.weightx = 0;
	2703	+// aWindowConstraints.gridx = 4;
	2704	+// aWindowConstraints.gridwidth = 1;
	2705	+// // aConstraints.gridheight = 3;
	2706	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2707	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2708	+// scenePanel.setVisible(false);
	2709	+// centralPanel.setVisible(true);
	2710	+// XYZPanel.setVisible(false);
	2711	+ bigThree.ClearUI();
	2712	+ bigThree.add(centralPanel);
	2713	+ bigThree.FlushUI();
2551	2714	} else
2552		- if (event.getSource() == threeButton)
	2715	+ if (source == threeButton)
2553	2716	{
2554	2717	radio.layout = threeButton;
2555		- bigThree.remove(jtp);
2556		- bigThree.remove(cameraPanel);
2557		- bigThree.remove(XYZPanel);
2558		- aWindowConstraints.gridx = 0;
2559		- aWindowConstraints.gridy = 0;
2560		- aWindowConstraints.gridwidth = 1;
2561		- // aConstraints.gridheight = 3;
2562		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2563		- aWindowConstraints.weightx = 0;
2564		- aWindowConstraints.weighty = 1;
2565		- //bigThree.add(jtp, aWindowConstraints);
2566		- aWindowConstraints.weightx = 1;
2567		- aWindowConstraints.gridwidth = 3;
2568		- // aConstraints.gridheight = 3;
2569		- aWindowConstraints.gridx = 1;
2570		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2571		- bigThree.add(cameraPanel, aWindowConstraints);
2572		- aWindowConstraints.weightx = 0;
2573		- aWindowConstraints.gridx = 4;
2574		- aWindowConstraints.gridwidth = 1;
2575		- // aConstraints.gridheight = 3;
2576		- aConstraints.fill = GridBagConstraints.VERTICAL;
2577		- bigThree.add(XYZPanel, aWindowConstraints);
2578		- bigThree.revalidate();
	2718	+
	2719	+// bigThree.remove(scenePanel);
	2720	+// bigThree.remove(centralPanel);
	2721	+// bigThree.remove(XYZPanel);
	2722	+// aWindowConstraints.gridx = 0;
	2723	+// aWindowConstraints.gridy = 0;
	2724	+// aWindowConstraints.gridwidth = 1;
	2725	+// // aConstraints.gridheight = 3;
	2726	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2727	+// aWindowConstraints.weightx = 0;
	2728	+// aWindowConstraints.weighty = 1;
	2729	+// //bigThree.add(jtp, aWindowConstraints);
	2730	+// aWindowConstraints.weightx = 1;
	2731	+// aWindowConstraints.gridwidth = 3;
	2732	+// // aConstraints.gridheight = 3;
	2733	+// aWindowConstraints.gridx = 1;
	2734	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2735	+// bigThree.add(centralPanel, aWindowConstraints);
	2736	+// aWindowConstraints.weightx = 0;
	2737	+// aWindowConstraints.gridx = 4;
	2738	+// aWindowConstraints.gridwidth = 1;
	2739	+// // aConstraints.gridheight = 3;
	2740	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2741	+// bigThree.add(XYZPanel, aWindowConstraints);
	2742	+// bigThree.validate();
	2743	+// scenePanel.setVisible(false);
	2744	+// centralPanel.setVisible(true);
	2745	+// XYZPanel.setVisible(true);
	2746	+ bigThree.ClearUI();
	2747	+ bigThree.add(centralPanel);
	2748	+ bigThree.add(XYZPanel);
	2749	+ bigThree.FlushUI();
2579	2750	} else
2580		- if (event.getSource() == fourButton)
	2751	+ if (source == fourButton)
2581	2752	{
2582	2753	radio.layout = fourButton;
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		- // aWindowConstraints.gridheight = 3;
2590		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2591		- aWindowConstraints.weightx = 1;
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		- // aWindowConstraints.gridheight = 3;
2604		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2605		- //bigThree.add(XYZPanel, aWindowConstraints);
2606		- bigThree.revalidate();
	2754	+
	2755	+// bigThree.remove(scenePanel);
	2756	+// bigThree.remove(centralPanel);
	2757	+// bigThree.remove(XYZPanel);
	2758	+// aWindowConstraints.gridx = 0;
	2759	+// aWindowConstraints.gridy = 0;
	2760	+// aWindowConstraints.gridwidth = 1;
	2761	+// // aWindowConstraints.gridheight = 3;
	2762	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2763	+// aWindowConstraints.weightx = 1;
	2764	+// aWindowConstraints.weighty = 1;
	2765	+// bigThree.add(scenePanel, aWindowConstraints);
	2766	+// aWindowConstraints.weightx = 1;
	2767	+// aWindowConstraints.gridwidth = 3;
	2768	+// // aConstraints.gridheight = 3;
	2769	+// aWindowConstraints.gridx = 1;
	2770	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2771	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2772	+// aWindowConstraints.weightx = 0;
	2773	+// aWindowConstraints.gridx = 4;
	2774	+// aWindowConstraints.gridwidth = 1;
	2775	+// // aWindowConstraints.gridheight = 3;
	2776	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2777	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2778	+// bigThree.validate();
	2779	+// scenePanel.setVisible(true);
	2780	+// centralPanel.setVisible(false);
	2781	+// XYZPanel.setVisible(false);
	2782	+ bigThree.ClearUI();
	2783	+ bigThree.add(scenePanel);
	2784	+ bigThree.FlushUI();
2607	2785	} else
2608		- if (event.getSource() == sixButton)
	2786	+ if (source == sixButton)
2609	2787	{
2610	2788	radio.layout = sixButton;
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		- // aWindowConstraints.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		- // aWindowConstraints.gridheight = 3;
2632		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2633		- //bigThree.add(XYZPanel, aConstraints);
2634		- bigThree.revalidate();
	2789	+
	2790	+// bigThree.remove(scenePanel);
	2791	+// bigThree.remove(centralPanel);
	2792	+// bigThree.remove(XYZPanel);
	2793	+// aWindowConstraints.gridx = 0;
	2794	+// aWindowConstraints.gridy = 0;
	2795	+// aWindowConstraints.gridwidth = 1;
	2796	+// // aConstraints.gridheight = 3;
	2797	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2798	+// aWindowConstraints.weightx = 0;
	2799	+// aWindowConstraints.weighty = 1;
	2800	+// bigThree.add(scenePanel, aWindowConstraints);
	2801	+// aWindowConstraints.weightx = 1;
	2802	+// aWindowConstraints.gridwidth = 3;
	2803	+// // aWindowConstraints.gridheight = 3;
	2804	+// aWindowConstraints.gridx = 1;
	2805	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2806	+// bigThree.add(centralPanel, aWindowConstraints);
	2807	+// aWindowConstraints.weightx = 0;
	2808	+// aWindowConstraints.gridx = 4;
	2809	+// aWindowConstraints.gridwidth = 1;
	2810	+// // aWindowConstraints.gridheight = 3;
	2811	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2812	+// //bigThree.add(XYZPanel, aConstraints);
	2813	+// bigThree.validate();
	2814	+// scenePanel.setVisible(true);
	2815	+// centralPanel.setVisible(true);
	2816	+// XYZPanel.setVisible(false);
	2817	+ bigThree.ClearUI();
	2818	+ bigThree.add(scenePanel);
	2819	+ bigThree.add(centralPanel);
	2820	+ bigThree.FlushUI();
2635	2821	} else
2636		- if (event.getSource() == sevenButton)
	2822	+ if (source == sevenButton)
2637	2823	{
2638	2824	radio.layout = sevenButton;
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.VERTICAL;
2647		- aWindowConstraints.weightx = 0;
2648		- aWindowConstraints.weighty = 1;
2649		- bigThree.add(jtp, aWindowConstraints);
2650		- aWindowConstraints.weightx = 1;
2651		- aWindowConstraints.gridwidth = 3;
2652		- // aWindowConstraints.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		- // aConstraints.gridheight = 3;
2660		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2661		- bigThree.add(XYZPanel, aWindowConstraints);
2662		- bigThree.revalidate();
	2825	+
	2826	+// bigThree.remove(scenePanel);
	2827	+// bigThree.remove(centralPanel);
	2828	+// bigThree.remove(XYZPanel);
	2829	+// aWindowConstraints.gridx = 0;
	2830	+// aWindowConstraints.gridy = 0;
	2831	+// aWindowConstraints.gridwidth = 1;
	2832	+// // aWindowConstraints.gridheight = 3;
	2833	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2834	+// aWindowConstraints.weightx = 0;
	2835	+// aWindowConstraints.weighty = 1;
	2836	+// bigThree.add(scenePanel, aWindowConstraints);
	2837	+// aWindowConstraints.weightx = 1;
	2838	+// aWindowConstraints.gridwidth = 3;
	2839	+// // aWindowConstraints.gridheight = 3;
	2840	+// aWindowConstraints.gridx = 1;
	2841	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2842	+// bigThree.add(centralPanel, aWindowConstraints);
	2843	+// aWindowConstraints.weightx = 0;
	2844	+// aWindowConstraints.gridx = 4;
	2845	+// aWindowConstraints.gridwidth = 1;
	2846	+// // aConstraints.gridheight = 3;
	2847	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2848	+// bigThree.add(XYZPanel, aWindowConstraints);
	2849	+// bigThree.validate();
	2850	+// scenePanel.setVisible(true);
	2851	+// centralPanel.setVisible(true);
	2852	+// XYZPanel.setVisible(true);
	2853	+ bigThree.ClearUI();
	2854	+ bigThree.add(scenePanel);
	2855	+ bigThree.add(centralPanel);
	2856	+ bigThree.add(XYZPanel);
	2857	+ bigThree.FlushUI();
2663	2858	} else
2664		- if (event.getSource() == rootButton)
	2859	+ if (source == rootButton)
2665	2860	{
2666	2861	Object3D obj;
2667	2862	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2673,7 +2868,7 @@
2673	2868
2674	2869	refreshContents(true);
2675	2870	} else
2676		- if (event.getSource() == closeButton)
	2871	+ if (source == closeButton)
2677	2872	{
2678	2873	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2679	2874	cRadio ab;
..	..	@@ -2694,11 +2889,11 @@
2694	2889	}
2695	2890	refreshContents(true);
2696	2891	} else
2697		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2892	+ if (source == editItem \|\| source == editButton)
2698	2893	{
2699	2894	EditSelection(false);
2700	2895	} else
2701		- if (event.getSource() == uneditButton)
	2896	+ if (source == uneditButton)
2702	2897	{
2703	2898	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2704	2899	{
..	..	@@ -2710,12 +2905,12 @@
2710	2905
2711	2906	child.editWindow = null; // ???????????
2712	2907	}
2713		- objEditor.ctrlPanel.revalidate();
	2908	+ objEditor.ctrlPanel.validate();
2714	2909	//objEditor.jTree.clearSelection();
2715	2910	//objEditor.ResetSliders();
2716	2911	refreshContents(true);
2717	2912	} else
2718		- if (event.getSource() == clearPanelButton)
	2913	+ if (source == clearPanelButton)
2719	2914	{
2720	2915	assert(copy == group);
2721	2916	//copy.ClearUI();
..	..	@@ -2726,7 +2921,7 @@
2726	2921	listUI.clear();
2727	2922	refreshContents(true);
2728	2923	} else
2729		- if (event.getSource() == allParamsButton)
	2924	+ if (source == allParamsButton)
2730	2925	{
2731	2926	assert(copy == group);
2732	2927
..	..	@@ -2747,19 +2942,19 @@
2747	2942
2748	2943	refreshContents(true);
2749	2944	} else
2750		- if (event.getSource() == unselectButton)
	2945	+ if (source == unselectButton)
2751	2946	{
2752	2947	objEditor.jTree.clearSelection();
2753		- // ?? oct 2012 GraphreeD.clipboard.clear();
	2948	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2754	2949	objEditor.ResetSliders();
2755	2950	refreshContents(true);
2756	2951	} else
2757		- if(event.getSource() instanceof cRadio)
	2952	+ if(source instanceof cRadio)
2758	2953	{
2759	2954	group.parent = keepparent;
2760	2955	group.attributes = 0;
2761	2956	//group.editWindow = null;
2762		- /cRadio/ radio = (cRadio)event.getSource();
	2957	+ /cRadio/ radio = (cRadio)source;
2763	2958	Object3D obj = radio.GetObject();
2764	2959	System.out.println("Edit " + obj);
2765	2960	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2779,7 +2974,7 @@
2779	2974	}
2780	2975
2781	2976	copy = group;
2782		- //CameraPane.theRenderer.object = group;
	2977	+ //Globals.theRenderer.object = group;
2783	2978	if(!useclient)
2784	2979	{
2785	2980	cameraView.renderCamera = radio.camera;
..	..	@@ -2788,7 +2983,8 @@
2788	2983	cameraView.cameras[cameraView.cameracount] = radio.camera;
2789	2984	cameraView.targetLookAt.set(radio.camera.lookAt);
2790	2985	cameraView.object = group;
2791		- cameraView.lighttouched = true;
	2986	+ //cameraView.lighttouched = true;
	2987	+ Globals.lighttouched = true;
2792	2988	topView.object = group;
2793	2989	frontView.object = group;
2794	2990	sideView.object = group;
..	..	@@ -2824,7 +3020,7 @@
2824	3020	if (useclient)
2825	3021	{
2826	3022	cameraView.object = client;
2827		- cameraView.lighttouched = true;
	3023	+ Globals.lighttouched = true;
2828	3024	//topView.object = client;
2829	3025	//frontView.object = client;
2830	3026	//sideView.object = client;
..	..	@@ -2832,7 +3028,7 @@
2832	3028	else
2833	3029	{
2834	3030	cameraView.object = group;
2835		- cameraView.lighttouched = true;
	3031	+ Globals.lighttouched = true;
2836	3032	//topView.object = group;
2837	3033	//frontView.object = group;
2838	3034	//sideView.object = group;
..	..	@@ -3065,9 +3261,9 @@
3065	3261	obj = (Object3D)e.nextElement();
3066	3262
3067	3263	System.out.println("Object is: " + obj);
3068		- GraphreeD.AnalyzeObject(obj);
	3264	+ GrafreeD.AnalyzeObject(obj);
3069	3265	System.out.println("Boundary rep: " + obj.bRep);
3070		- GraphreeD.AnalyzeObject(obj.bRep);
	3266	+ GrafreeD.AnalyzeObject(obj.bRep);
3071	3267
3072	3268	// System.err.println((size/1024) + " KB is the size of " + obj);
3073	3269	}
..	..	@@ -3109,6 +3305,13 @@
3109	3305	void GenNormals(boolean crease)
3110	3306	{
3111	3307	group.GenNormalsS(crease);
	3308	+
	3309	+ refreshContents();
	3310	+ }
	3311	+
	3312	+ void GenNormalsMINE()
	3313	+ {
	3314	+ group.selection.GenNormalsMINE();
3112	3315
3113	3316	refreshContents();
3114	3317	}
..	..	@@ -3157,104 +3360,250 @@
3157	3360
3158	3361	//Object3D buffer;
3159	3362	cVector temp = new cVector();
3160		- BoundaryRep temprep;
3161		- Object3D nodes;
3162		- Vector<Vertex> vertices;
3163		-
3164		- public void Vertex(Object3D node, Vertex v)
3165		- {
3166		- vertices.add(v);
3167		- nodes.addElement(node);
3168		-
3169		- if (temprep.GetCache(v) != null)
3170		- {
3171		- temprep.Remove(v);
3172		- }
3173		- else
3174		- {
3175		- temprep.Remember(v);
3176		- }
3177		- }
3178		-
3179		- public void Face(Object3D node, Face f)
3180		- {
3181		-
3182		- }
3183		-
	3363	+// BoundaryRep temprep;
	3364	+// Object3D nodes;
	3365	+// Vector<Vertex> vertices;
	3366	+//
	3367	+// cGroup buffer;
	3368	+//
	3369	+// public void Vertex(Object3D node, Vertex v)
	3370	+// {
	3371	+//// vertices.add(v);
	3372	+//// nodes.addElement(node);
	3373	+////
	3374	+//// if (temprep.GetCache(v) != null)
	3375	+//// {
	3376	+//// temprep.Remove(v);
	3377	+//// } else
	3378	+//// {
	3379	+//// temprep.Remember(v);
	3380	+//// }
	3381	+//
	3382	+// //Object3D node = nodes.get(index);
	3383	+// temp.set(v); // vertices.get(index)); // temprep.GetVertex(k));
	3384	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3385	+//
	3386	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	3387	+//
	3388	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	3389	+//
	3390	+// cGroup g = new cGroup();
	3391	+//
	3392	+// if (g.toParent == null)
	3393	+// {
	3394	+// g.toParent = LA.newMatrix();
	3395	+// g.fromParent = LA.newMatrix();
	3396	+// }
	3397	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3398	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3399	+//
	3400	+// g.add(GrafreeD.clipboard);
	3401	+//
	3402	+// buffer.add(g);
	3403	+// }
	3404	+//
	3405	+// public void Face(Object3D node, Face f)
	3406	+// {
	3407	+//
	3408	+// }
	3409	+//
	3410	+// void ParseVerticesOld() // ??
	3411	+// {
	3412	+// //if (group.selection.size() != 1)
	3413	+// // return;
	3414	+//
	3415	+// temprep = new BoundaryRep();
	3416	+// nodes = new Object3D();
	3417	+// vertices = new Vector<Vertex>();
	3418	+//
	3419	+// boolean epsequal = GrafreeD.epsequal;
	3420	+// GrafreeD.epsequal = true;
	3421	+//
	3422	+// for (int i=0; i<group.selection.size(); i++)
	3423	+// {
	3424	+// Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	3425	+//
	3426	+// group.selection.get(i).Parse(
	3427	+//this );
	3428	+//
	3429	+// int repsize = temprep.VertexCount();
	3430	+// int tablesize = temprep.vertextable.size();
	3431	+// int nodesize = nodes.size();
	3432	+//
	3433	+// assert(vertices.size() == nodes.size());
	3434	+//
	3435	+// temprep.vertextable.elements();
	3436	+//
	3437	+// java.util.Set<java.util.Map.Entry<Vertex,Vertex>> set = temprep.vertextable.entrySet();
	3438	+//
	3439	+// for (java.util.Map.Entry<Vertex,Vertex> entry : set)
	3440	+// {
	3441	+// cGroup g = new cGroup();
	3442	+//
	3443	+// int index = vertices.indexOf(entry.getValue()); // temprep.vertextable.(k));
	3444	+//
	3445	+// Object3D node = nodes.get(index);
	3446	+// temp.set(vertices.get(index)); // temprep.GetVertex(k));
	3447	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3448	+//
	3449	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	3450	+//
	3451	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	3452	+//
	3453	+// if (g.toParent == null)
	3454	+// {
	3455	+// g.toParent = LA.newMatrix();
	3456	+// g.fromParent = LA.newMatrix();
	3457	+// }
	3458	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3459	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3460	+//
	3461	+// g.add(GrafreeD.clipboard);
	3462	+//
	3463	+// buffer.add(g);
	3464	+// }
	3465	+//
	3466	+// makeSomething(buffer, i==group.selection.size()-1);
	3467	+// }
	3468	+//
	3469	+// GrafreeD.epsequal = epsequal;
	3470	+//
	3471	+// //buffer = null;
	3472	+// temprep = null;
	3473	+// nodes = null;
	3474	+//
	3475	+// refreshContents();
	3476	+// }
	3477	+
3184	3478	void ParseVertices()
3185	3479	{
3186		- //if (group.selection.size() != 1)
3187		- // return;
3188		-
3189		- temprep = new BoundaryRep();
3190		- nodes = new Object3D();
3191		- vertices = new Vector<Vertex>();
3192		-
3193		- boolean epsequal = GraphreeD.epsequal;
3194		- GraphreeD.epsequal = true;
	3480	+ boolean epsequal = GrafreeD.epsequal;
	3481	+ GrafreeD.epsequal = true;
3195	3482
3196	3483	for (int i=0; i<group.selection.size(); i++)
3197	3484	{
3198		- Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	3485	+ final cGroup buffer = new cGroup(group.selection.get(i).name + "+");
3199	3486
3200		- group.selection.get(i).Parse(this);
3201		-
3202		- int repsize = temprep.VertexCount();
3203		- int tablesize = temprep.vertextable.size();
3204		- int nodesize = nodes.size();
	3487	+ group.selection.get(i).Parse(
	3488	+
	3489	+ new iParse()
	3490	+ {
	3491	+ public void Vertex(Object3D node, Vertex v)
	3492	+ {
	3493	+ temp.set(v);
	3494	+ LA.xformPos(temp, node.GlobalTransformInv(), temp);
3205	3495
3206		- assert(vertices.size() == nodes.size());
3207		-
3208		- temprep.vertextable.elements();
3209		-
3210		- java.util.Set<java.util.Map.Entry<Vertex,Vertex>> set = temprep.vertextable.entrySet();
	3496	+ cGroup g = new cGroup();
3211	3497
3212		- for (java.util.Map.Entry<Vertex,Vertex> entry : set)
3213		- {
3214		- cGroup g = new cGroup();
	3498	+ if (g.toParent == null)
	3499	+ {
	3500	+ g.toParent = LA.newMatrix();
	3501	+ g.fromParent = LA.newMatrix();
	3502	+ }
	3503	+ LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3504	+ LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3215	3505
3216		- int index = vertices.indexOf(entry.getValue()); // temprep.vertextable.(k));
3217		- Object3D node = nodes.get(index);
3218		- temp.set(vertices.get(index)); // temprep.GetVertex(k));
3219		- // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3506	+ g.add(GrafreeD.clipboard);
3220	3507
3221		- LA.xformPos(temp, node.GlobalTransformInv(), temp);
3222		-
3223		- // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
3224		-
3225		- if (g.toParent == null)
3226		- {
3227		- g.toParent = LA.newMatrix();
3228		- g.fromParent = LA.newMatrix();
3229		- }
3230		- LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3231		- LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3508	+ buffer.add(g);
	3509	+ }
3232	3510
3233		- g.add(GraphreeD.clipboard);
	3511	+ public void Face(Object3D node, Face f)
	3512	+ {
3234	3513
3235		- buffer.add(g);
3236		- }
	3514	+ }
	3515	+ }
	3516	+ );
3237	3517
3238	3518	makeSomething(buffer, i==group.selection.size()-1);
3239	3519	}
3240	3520
3241		- GraphreeD.epsequal = epsequal;
3242		-
3243		- //buffer = null;
3244		- temprep = null;
3245		- nodes = null;
	3521	+ GrafreeD.epsequal = epsequal;
3246	3522
3247	3523	refreshContents();
3248	3524	}
3249		-
	3525	+
	3526	+ void TextureVertices()
	3527	+ {
	3528	+ for (int i=0; i<group.selection.size(); i++)
	3529	+ {
	3530	+ group.selection.get(i).Parse(
	3531	+ new iParse()
	3532	+ {
	3533	+ public void Vertex(Object3D node, Vertex v)
	3534	+ {
	3535	+ cTexture tex = node.GetTextures();
	3536	+ String pigment = Object3D.GetPigment(tex);
	3537	+ //String bump = Object3D.GetBump(tex);
	3538	+
	3539	+ com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3540	+
	3541	+ double s = v.s;
	3542	+
	3543	+ if (s == 1)
	3544	+ s = 0;
	3545	+
	3546	+ double t = v.t;
	3547	+
	3548	+ if (t == 1)
	3549	+ t = 0;
	3550	+
	3551	+ int indexs = (int) (texturedata.getWidth() * s);
	3552	+ int indext = (int) (texturedata.getHeight() * t);
	3553	+
	3554	+ int index = indext * texturedata.getWidth() + indexs;
	3555	+
	3556	+ java.nio.ByteBuffer bytebuf = (java.nio.ByteBuffer)texturedata.getBuffer();
	3557	+
	3558	+ int slide = bytebuf.capacity() / texturedata.getWidth() / texturedata.getHeight();
	3559	+
	3560	+ float scale = bytebuf.get(index*slide) & 0xFF;
	3561	+ scale += bytebuf.get(index*slide+1) & 0xFF;
	3562	+ scale += bytebuf.get(index*slide+2) & 0xFF;
	3563	+ scale /= 3;
	3564	+
	3565	+ scale /= 0xFF;
	3566	+ // c'est quoi ca? scale /= 4;
	3567	+
	3568	+ //v.AO = scale;
	3569	+
	3570	+ v.x += v.norm.x * scale;
	3571	+ v.y += v.norm.y * scale;
	3572	+ v.z += v.norm.z * scale;
	3573	+ }
	3574	+
	3575	+ public void Face(Object3D node, Face f)
	3576	+ {
	3577	+ }
	3578	+ }
	3579	+ );
	3580	+ }
	3581	+
	3582	+ refreshContents();
	3583	+ }
	3584	+
3250	3585	void Align()
3251	3586	{
	3587	+ if (group.selection.size() == 0)
	3588	+ return;
	3589	+
	3590	+ cVector bbmin = new cVector();
	3591	+ cVector bbmax = new cVector();
	3592	+
	3593	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3594	+
	3595	+ double dx = bbmax.x - bbmin.x;
	3596	+ double dy = bbmax.y - bbmin.y;
	3597	+ double dz = bbmax.z - bbmin.z;
	3598	+
	3599	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3600	+
3252	3601	for (int i=0; i<group.selection.size(); i++)
3253	3602	{
3254	3603	Object3D obj = group.selection.get(i);
3255	3604
3256		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3257		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3605	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3606	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3258	3607	}
3259	3608
3260	3609	refreshContents();
..	..	@@ -3267,7 +3616,7 @@
3267	3616	// ref.SaveSupports();
3268	3617	// Object3D par = ref.parent;
3269	3618	// ref.parent = null;
3270		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	3619	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3271	3620	// ref.parent = par;
3272	3621	// ref.RestoreSupports();
3273	3622
..	..	@@ -3297,7 +3646,7 @@
3297	3646	// lowres.SaveSupports();
3298	3647	// par = lowres.parent;
3299	3648	// lowres.parent = null;
3300		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	3649	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3301	3650	Object3D newlow = CloneObject(lowres, false);
3302	3651	newlow.name = sn.switchobject.get(i).name;
3303	3652	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3319,7 +3668,7 @@
3319	3668	return;
3320	3669
3321	3670	Object3D poses = group.selection.get(0);
3322		- Object3D ref = GraphreeD.clipboard.get(0);
	3671	+ Object3D ref = GrafreeD.clipboard.get(0);
3323	3672
3324	3673	Object3D newgroup = new Object3D("Po:" + poses.name);
3325	3674
..	..	@@ -3488,7 +3837,7 @@
3488	3837	group.selection.RelinkToSupport(); // july 2014
3489	3838	System.out.println("DONE.");
3490	3839	refreshContents();
3491		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3840	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3492	3841	}
3493	3842
3494	3843	void ReduceMesh(boolean reduction34)
..	..	@@ -3513,20 +3862,20 @@
3513	3862
3514	3863	void ClipMesh()
3515	3864	{
3516		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	3865	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
3517	3866	{
3518		- Object3D content = GraphreeD.clipboard.get(0);
	3867	+ Object3D content = GrafreeD.clipboard.get(0);
3519	3868
3520	3869	if (content instanceof cGroup && ((cGroup)content).transientlink )
3521	3870	content = ((cGroup)content).get(0);
3522	3871
3523	3872	// for (int i=0; i<group.selection.size(); i++)
3524	3873	// {
3525		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	3874	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3526	3875	// }
3527		- group.selection.ClipMesh(GraphreeD.clipboard);
	3876	+ group.selection.ClipMesh(GrafreeD.clipboard);
3528	3877	}
3529		-// group.selection.ClipMesh(GraphreeD.clipboard);
	3878	+// group.selection.ClipMesh(GrafreeD.clipboard);
3530	3879	System.out.println("DONE.");
3531	3880	refreshContents();
3532	3881	}
..	..	@@ -3773,16 +4122,16 @@
3773	4122
3774	4123	objEditor.SetText(); // jan 2014
3775	4124
3776		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4125	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
3777	4126	CameraPane.flash = true;
3778	4127
3779	4128	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
3780	4129	// a camera
3781	4130	{
3782	4131	CameraPane.camerachangeframe = 0; // don't refuse it
3783		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3784		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3785		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4132	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4133	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4134	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3786	4135	}
3787	4136
3788	4137	refreshContents();
..	..	@@ -3864,12 +4213,12 @@
3864	4213	{
3865	4214	if (group.selection.isEmpty())
3866	4215	return;
3867		- GraphreeD.clipboardIsTempGroup = false;
	4216	+ GrafreeD.clipboardIsTempGroup = false;
3868	4217	Composite tGroup = null;
3869	4218	if (group.selection.size() > 0) // 1)
3870	4219	{
3871	4220	tGroup = new cGroup();
3872		- GraphreeD.clipboardIsTempGroup = true;
	4221	+ GrafreeD.clipboardIsTempGroup = true;
3873	4222	}
3874	4223
3875	4224	if (cut)
..	..	@@ -3909,16 +4258,16 @@
3909	4258	//System.out.println("cut " + child);
3910	4259	//System.out.println("parent = " + child.parent);
3911	4260	// tmp.addChild(child);
3912		- if (GraphreeD.clipboardIsTempGroup)
	4261	+ if (GrafreeD.clipboardIsTempGroup)
3913	4262	tGroup.add/Child/(tmp);
3914	4263	else
3915		- GraphreeD.clipboard = tmp;
	4264	+ GrafreeD.clipboard = tmp;
3916	4265	}
3917	4266	else
3918		- if (GraphreeD.clipboardIsTempGroup)
	4267	+ if (GrafreeD.clipboardIsTempGroup)
3919	4268	tGroup.add/Child/(child);
3920	4269	else
3921		- GraphreeD.clipboard = child;
	4270	+ GrafreeD.clipboard = child;
3922	4271	}
3923	4272
3924	4273	//ResetModel();
..	..	@@ -3950,21 +4299,21 @@
3950	4299	//System.out.println("cut " + elem);
3951	4300	//System.out.println("parent = " + elem.parent);
3952	4301	// tmp.addChild(elem);
3953		- if (GraphreeD.clipboardIsTempGroup)
	4302	+ if (GrafreeD.clipboardIsTempGroup)
3954	4303	tGroup.add/Child/(tmp);
3955	4304	else
3956		- GraphreeD.clipboard = tmp;
	4305	+ GrafreeD.clipboard = tmp;
3957	4306	}
3958	4307	else
3959		- if (GraphreeD.clipboardIsTempGroup)
	4308	+ if (GrafreeD.clipboardIsTempGroup)
3960	4309	tGroup.add/Child/(child);
3961	4310	else
3962		- GraphreeD.clipboard = child;
	4311	+ GrafreeD.clipboard = child;
3963	4312	}
3964	4313
3965	4314	}
3966		- if (GraphreeD.clipboardIsTempGroup)
3967		- GraphreeD.clipboard = tGroup;
	4315	+ if (GrafreeD.clipboardIsTempGroup)
	4316	+ GrafreeD.clipboard = tGroup;
3968	4317	if (cut)
3969	4318	{
3970	4319	ResetModel();
..	..	@@ -3974,11 +4323,11 @@
3974	4323
3975	4324	void paste(boolean expand)
3976	4325	{
3977		- // if (GraphreeD.clipboard == null)
	4326	+ // if (GrafreeD.clipboard == null)
3978	4327	// return;
3979	4328	boolean first = true;
3980	4329
3981		- if (GraphreeD.clipboardIsTempGroup)
	4330	+ if (GrafreeD.clipboardIsTempGroup)
3982	4331	{
3983	4332	Composite temp;
3984	4333
..	..	@@ -3989,7 +4338,7 @@
3989	4338	temp = (Composite)Applet3D.clipboard.deepCopy();
3990	4339	*/
3991	4340	Object3D elem;
3992		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4341	+ for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
3993	4342	{
3994	4343	Object3D child = (Object3D)e.nextElement();
3995	4344
..	..	@@ -4003,7 +4352,7 @@
4003	4352	else
4004	4353	elem = child.deepCopy(); // ?
4005	4354	child.parent = keepparent;
4006		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	4355	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4007	4356	// elem = elem.get(0);
4008	4357	makeSomething(elem, true); // ?? first);
4009	4358	//group.addChild(elem);
..	..	@@ -4023,14 +4372,14 @@
4023	4372	//Object3D cb = Applet3D.clipboard;
4024	4373	//temp.addChild(cb);
4025	4374	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4026		- assert(GraphreeD.clipboard.parent == null);
4027		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
4028		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
4029		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
4030		- makeSomething(expand?GraphreeD.clipboard.get(0).copyExpand():GraphreeD.clipboard.get(0).deepCopy());
	4375	+ assert(GrafreeD.clipboard.parent == null);
	4376	+ Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
	4377	+ GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
	4378	+ if (LA.isIdentity(GrafreeD.clipboard.toParent))
	4379	+ makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
4031	4380	else
4032		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4033		- GraphreeD.clipboard.get(0).parent = keepparent;
	4381	+ makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
	4382	+ GrafreeD.clipboard.get(0).parent = keepparent;
4034	4383	}
4035	4384
4036	4385	ResetModel();
..	..	@@ -4039,7 +4388,7 @@
4039	4388
4040	4389	void pasteInto(boolean copyit)
4041	4390	{
4042		-// if (GraphreeD.clipboard == null)
	4391	+// if (GrafreeD.clipboard == null)
4043	4392	// return;
4044	4393
4045	4394	if (group.selection.size() != 1)
..	..	@@ -4072,9 +4421,9 @@
4072	4421	{
4073	4422	boolean first = true;
4074	4423
4075		- if (GraphreeD.clipboardIsTempGroup)
	4424	+ if (GrafreeD.clipboardIsTempGroup)
4076	4425	{
4077		- Composite temp = (Composite)GraphreeD.clipboard;
	4426	+ Composite temp = (Composite)GrafreeD.clipboard;
4078	4427	Object3D copy;
4079	4428	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4080	4429	{
..	..	@@ -4084,7 +4433,7 @@
4084	4433	}
4085	4434	} else
4086	4435	{
4087		- linkSomething(GraphreeD.clipboard); //.get(0));
	4436	+ linkSomething(GrafreeD.clipboard); //.get(0));
4088	4437	}
4089	4438	}
4090	4439	}
..	..	@@ -4276,6 +4625,26 @@
4276	4625	makeSomething(csg);
4277	4626	}
4278	4627
	4628	+ void Ungroup(Object3D g)
	4629	+ {
	4630	+ if (g instanceof HiddenObject)
	4631	+ {
	4632	+ HiddenObject h = (HiddenObject) g;
	4633	+
	4634	+ for (int i=0; i<h.ActualSize(); i++)
	4635	+ {
	4636	+ objEditor.makeSomething(h.get(i), false);
	4637	+ }
	4638	+ }
	4639	+ else
	4640	+ {
	4641	+ for (int i=0; i<g.Size(); i++)
	4642	+ {
	4643	+ objEditor.makeSomething(g.get(i), false);
	4644	+ }
	4645	+ }
	4646	+ }
	4647	+
4279	4648	void ungroup()
4280	4649	{
4281	4650	/*
..	..	@@ -4471,7 +4840,7 @@
4471	4840
4472	4841	void ImportGFD()
4473	4842	{
4474		- FileDialog browser = new FileDialog(objEditor.frame, "Import GraphreeD", FileDialog.LOAD);
	4843	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4475	4844	browser.show();
4476	4845	String filename = browser.getFile();
4477	4846	if (filename != null && filename.length() > 0)
..	..	@@ -4509,7 +4878,7 @@
4509	4878
4510	4879	void ImportVRMLX3D()
4511	4880	{
4512		- if (GraphreeD.standAlone)
	4881	+ if (GrafreeD.standAlone)
4513	4882	{
4514	4883	/**/
4515	4884	FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
..	..	@@ -4526,7 +4895,7 @@
4526	4895
4527	4896	String GetFile(String dialogName)
4528	4897	{
4529		- if (GraphreeD.standAlone)
	4898	+ if (GrafreeD.standAlone)
4530	4899	{
4531	4900	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4532	4901	browser.show();
..	..	@@ -4635,6 +5004,7 @@
4635	5004	private MenuItem resetsupportItem;
4636	5005	private MenuItem resetreferencesItem;
4637	5006	private MenuItem linkverticesItem;
	5007	+ private MenuItem relinkverticesItem;
4638	5008	private MenuItem setMasterItem;
4639	5009	private MenuItem resetMeshItem;
4640	5010	private MenuItem stepAllItem;
..	..	@@ -4653,8 +5023,10 @@
4653	5023	private MenuItem clearItem;
4654	5024	private MenuItem clearAllItem;
4655	5025	private MenuItem genUVItem;
	5026	+ private MenuItem genNormalsMESHItem;
4656	5027	private MenuItem genNormalsCADItem;
4657	5028	private MenuItem genNormalsORGANItem;
	5029	+ private MenuItem genNormalsMINEItem;
4658	5030	private MenuItem stripifyItem;
4659	5031	private MenuItem unstripifyItem;
4660	5032	private MenuItem trimItem;
..	..	@@ -4696,6 +5068,7 @@
4696	5068	private MenuItem resetCentroidItem;
4697	5069	private MenuItem transformgeometryItem;
4698	5070	private MenuItem resetTransformItem;
	5071	+ private MenuItem hideItem;
4699	5072	private MenuItem grabItem;
4700	5073	private MenuItem backItem;
4701	5074	private MenuItem frontItem;
..	..	@@ -4716,6 +5089,7 @@
4716	5089
4717	5090	private MenuItem resetParentItem;
4718	5091	private MenuItem repairParentItem;
	5092	+ private MenuItem repairShadowItem;
4719	5093	private MenuItem sortbysizeItem;
4720	5094	private MenuItem sortbynameItem;
4721	5095
..	..	@@ -4728,12 +5102,15 @@
4728	5102	private MenuItem particleItem;
4729	5103	private MenuItem ragdollItem;
4730	5104	private MenuItem ragdoll2Item;
	5105	+ private MenuItem heightFieldItem;
	5106	+ private MenuItem textureFieldItem;
4731	5107	private MenuItem gridItem;
4732	5108	private MenuItem rectoidItem;
4733	5109	private MenuItem ellipsoidItem;
4734	5110	private MenuItem coneItem;
4735	5111	private MenuItem torusItem;
4736	5112	private MenuItem superItem;
	5113	+ private MenuItem kleinItem;
4737	5114	private MenuItem blobItem;
4738	5115	private MenuItem latheItem;
4739	5116	private MenuItem bezierItem;
..	..	@@ -4746,6 +5123,7 @@
4746	5123	private MenuItem csgItem;
4747	5124	private MenuItem templateItem;
4748	5125	private MenuItem textureItem;
	5126	+ private MenuItem billboardItem;
4749	5127	private MenuItem shadowXItem;
4750	5128	private MenuItem shadowYItem;
4751	5129	private MenuItem shadowZItem;