~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
..	..	@@ -149,6 +150,8 @@
149	150
150	151	void SetupMenu2(ObjEditor oe)
151	152	{
	153	+ if (Globals.ADVANCED)
	154	+ {
152	155	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153	156	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154	157	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -160,36 +163,49 @@
160	163	lookAtItem.addActionListener(this);
161	164	//lookFromItem.addActinoListener(this);
162	165	//switchItem.addActionListener(this);
	166	+ }
	167	+
163	168	Menu menu;
164	169	oe.menuBar.add(menu = new Menu("Edit"));
165	170	//editItem = menu.add(new MenuItem("Edit"));
166	171	//editItem.addActionListener(this);
167	172	duplicateItem = menu.add(new MenuItem("Duplicate"));
168	173	duplicateItem.addActionListener(this);
169		- menu.add("-");
170		- cloneItem = menu.add(new MenuItem("Clone"));
171		- cloneItem.addActionListener(this);
172		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173		- cloneSupportItem.addActionListener(this);
174		- menu.add("-");
175	174	cutItem = menu.add(new MenuItem("Cut"));
176	175	cutItem.addActionListener(this);
177	176	copyItem = menu.add(new MenuItem("Copy"));
178	177	copyItem.addActionListener(this);
179	178	pasteItem = menu.add(new MenuItem("Paste"));
180	179	pasteItem.addActionListener(this);
	180	+ menu.add("-");
	181	+ cloneItem = menu.add(new MenuItem("Clone"));
	182	+ cloneItem.addActionListener(this);
	183	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	184	+ cloneSupportItem.addActionListener(this);
	185	+ menu.add("-");
	186	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	187	+ pasteIntoItem.addActionListener(this);
181	188	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	189	pasteLinkItem.addActionListener(this);
183	190	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	191	pasteCloneItem.addActionListener(this);
185	192	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	193	// pasteExpandItem.addActionListener(this);
	194	+ menu.add("-");
187	195	clearItem = menu.add(new MenuItem("Clear"));
188	196	clearItem.addActionListener(this);
	197	+
	198	+ if (Globals.ADVANCED)
	199	+ {
	200	+ // Deletes the cameras...
189	201	clearAllItem = menu.add(new MenuItem("Clear All"));
190	202	clearAllItem.addActionListener(this);
191		- menu.add("-");
192		- resetMeshItem = menu.add(new MenuItem("Reset All"));
	203	+ }
	204	+
	205	+ oe.menuBar.add(menu = new Menu("Setting"));
	206	+ if (Globals.ADVANCED)
	207	+ {
	208	+ resetMeshItem = menu.add(new MenuItem("Reset All"));
193	209	resetMeshItem.addActionListener(this);
194	210	stepAllItem = menu.add(new MenuItem("Step All"));
195	211	stepAllItem.addActionListener(this);
..	..	@@ -198,6 +214,7 @@
198	214	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
199	215	resetreferencesItem.addActionListener(this);
200	216	menu.add("-");
	217	+ }
201	218	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
202	219	overwriteGeoItem.addActionListener(this);
203	220	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -209,47 +226,67 @@
209	226	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
210	227	overwriteUVItem.addActionListener(this);
211	228	menu.add("-");
	229	+ if (Globals.ADVANCED)
	230	+ {
212	231	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
213	232	generateMeshItem.addActionListener(this);
214	233	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
215	234	poseMeshItem.addActionListener(this);
216	235	menu.add("-");
	236	+ }
217	237	resetsupportItem = menu.add(new MenuItem("Reset support"));
218	238	resetsupportItem.addActionListener(this);
219	239	linkverticesItem = menu.add(new MenuItem("Link to Support"));
220	240	linkverticesItem.addActionListener(this);
	241	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	242	+ relinkverticesItem.addActionListener(this);
	243	+
	244	+ if (Globals.ADVANCED)
	245	+ {
221	246	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
222	247	setMasterItem.addActionListener(this);
	248	+ }
223	249
224		- oe.menuBar.add(menu = new Menu("Object"));
	250	+ oe.menuBar.add(menu = new Menu("Group"));
225	251	grabItem = menu.add(new MenuItem("Grab"));
226	252	grabItem.addActionListener(this);
227		- frontItem = menu.add(new MenuItem("Front"));
228		- frontItem.addActionListener(this);
229	253	backItem = menu.add(new MenuItem("Back"));
230	254	backItem.addActionListener(this);
	255	+ frontItem = menu.add(new MenuItem("Front"));
	256	+ frontItem.addActionListener(this);
231	257	compositeItem = menu.add(new MenuItem("Composite"));
232	258	compositeItem.addActionListener(this);
	259	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	260	+ hideItem.addActionListener(this);
	261	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	262	+ ungroupItem.addActionListener(this);
233	263	menu.add("-");
234		- randomItem = menu.add(new MenuItem("Random"));
	264	+ randomItem = menu.add(new MenuItem("Switch node"));
235	265	randomItem.addActionListener(this);
236		- physicsItem = menu.add(new MenuItem("Physics"));
237		- physicsItem.addActionListener(this);
238		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
239		- frameselectorItem.addActionListener(this);
240	266	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
241	267	switchGeoItem.addActionListener(this);
242	268	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
243	269	switchTransfoItem.addActionListener(this);
244		- morphItem = menu.add(new MenuItem("Morph"));
	270	+ morphItem = menu.add(new MenuItem("Morph Group"));
245	271	morphItem.addActionListener(this);
	272	+
	273	+ if (Globals.ADVANCED)
	274	+ {
	275	+ physicsItem = menu.add(new MenuItem("Physics"));
	276	+ physicsItem.addActionListener(this);
	277	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	278	+ frameselectorItem.addActionListener(this);
246	279	scriptNodeItem = menu.add(new MenuItem("Script Node"));
247	280	scriptNodeItem.addActionListener(this);
248	281	cameraItem = menu.add(new MenuItem("Camera"));
249	282	cameraItem.addActionListener(this);
250		- menu.add("-");
	283	+ }
	284	+
	285	+ oe.menuBar.add(menu = new Menu("Object"));
251	286	textureItem = menu.add(new MenuItem("Texture"));
252	287	textureItem.addActionListener(this);
	288	+ billboardItem = menu.add(new MenuItem("Billboard"));
	289	+ billboardItem.addActionListener(this);
253	290	csgItem = menu.add(new MenuItem("CSG"));
254	291	csgItem.addActionListener(this);
255	292	shadowXItem = menu.add(new MenuItem("Shadow X"));
..	..	@@ -258,23 +295,24 @@
258	295	shadowYItem.addActionListener(this);
259	296	shadowZItem = menu.add(new MenuItem("Shadow Z"));
260	297	shadowZItem.addActionListener(this);
	298	+ if (Globals.ADVANCED)
	299	+ {
261	300	linkerItem = menu.add(new MenuItem("Linker"));
262	301	linkerItem.addActionListener(this);
263		- templateItem = menu.add(new MenuItem("Template"));
264		- templateItem.addActionListener(this);
265	302	attributeItem = menu.add(new MenuItem("Attribute"));
266	303	attributeItem.addActionListener(this);
	304	+ templateItem = menu.add(new MenuItem("Template"));
	305	+ templateItem.addActionListener(this);
267	306	pointflowItem = menu.add(new MenuItem("Point Flow"));
268	307	pointflowItem.addActionListener(this);
269	308	menu.add("-");
270		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
271		- transformgeometryItem.addActionListener(this);
	309	+ }
272	310	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
273	311	resetTransformItem.addActionListener(this);
274	312	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
275	313	resetCentroidItem.addActionListener(this);
276		- ungroupItem = menu.add(new MenuItem("Ungroup"));
277		- ungroupItem.addActionListener(this);
	314	+ transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
	315	+ transformgeometryItem.addActionListener(this);
278	316
279	317	oe.menuBar.add(menu = new Menu("Geometry"));
280	318	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -283,6 +321,13 @@
283	321	genNormalsORGANItem.addActionListener(this);
284	322	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
285	323	genNormalsCADItem.addActionListener(this);
	324	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	325	+ genNormalsMESHItem.addActionListener(this);
	326	+ if (Globals.ADVANCED)
	327	+ {
	328	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	329	+ genNormalsMINEItem.addActionListener(this);
	330	+ }
286	331	stripifyItem = menu.add(new MenuItem("Stripify"));
287	332	stripifyItem.addActionListener(this);
288	333	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -292,8 +337,6 @@
292	337	untrimItem = menu.add(new MenuItem("Untrim"));
293	338	untrimItem.addActionListener(this);
294	339	menu.add("-");
295		- clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
296		- clearMaterialsItem.addActionListener(this);
297	340	clearColorsItem = menu.add(new MenuItem("Clear AO"));
298	341	clearColorsItem.addActionListener(this);
299	342	reverseNormalsItem = menu.add(new MenuItem("Reverse Normals"));
..	..	@@ -306,19 +349,30 @@
306	349	reduce34MeshItem.addActionListener(this);
307	350	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	351	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	352	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	353	clipMeshItem.addActionListener(this);
	354	+
	355	+ if (Globals.ADVANCED)
	356	+ {
	357	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	358	+ smoothMeshItem.addActionListener(this);
	359	+ }
	360	+
	361	+ oe.menuBar.add(menu = new Menu("Attributes"));
	362	+ clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
	363	+ clearMaterialsItem.addActionListener(this);
313	364	menu.add("-");
314	365	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
315	366	liveleavesItem.addActionListener(this);
316	367	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
317	368	unliveleavesItem.addActionListener(this);
	369	+ if (Globals.ADVANCED)
	370	+ {
318	371	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
319	372	supportleavesItem.addActionListener(this);
320	373	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
321	374	unsupportleavesItem.addActionListener(this);
	375	+ }
322	376	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
323	377	hideleavesItem.addActionListener(this);
324	378	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -332,27 +386,18 @@
332	386	flipVItem.addActionListener(this);
333	387	unflipVItem = menu.add(new MenuItem("Unflip V"));
334	388	unflipVItem.addActionListener(this);
335		- lowTexturesItem = menu.add(new MenuItem("Low Texture"));
	389	+ lowTexturesItem = menu.add(new MenuItem("Low Texture (256)"));
336	390	lowTexturesItem.addActionListener(this);
337		- normalTexturesItem = menu.add(new MenuItem("Normal Texture"));
	391	+ normalTexturesItem = menu.add(new MenuItem("Normal Texture (512)"));
338	392	normalTexturesItem.addActionListener(this);
339		- highTexturesItem = menu.add(new MenuItem("High Texture"));
	393	+ highTexturesItem = menu.add(new MenuItem("High Texture (1024)"));
340	394	highTexturesItem.addActionListener(this);
341		- veryhighTexturesItem = menu.add(new MenuItem("Very high Texture"));
	395	+ veryhighTexturesItem = menu.add(new MenuItem("Very high Texture (2048)"));
342	396	veryhighTexturesItem.addActionListener(this);
343		- maxTexturesItem = menu.add(new MenuItem("Max Texture"));
	397	+ maxTexturesItem = menu.add(new MenuItem("Max Texture (4096)"));
344	398	maxTexturesItem.addActionListener(this);
345		- panoTexturesItem = menu.add(new MenuItem("Panoramic Texture"));
	399	+ panoTexturesItem = menu.add(new MenuItem("Panoramic Texture (8192)"));
346	400	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	401
357	402	oe.menuBar.add(menu = new Menu("Selection"));
358	403	attachPigmentItem = menu.add(new MenuItem("Attach Pigment..."));
..	..	@@ -370,9 +415,33 @@
370	415	sortbysizeItem.addActionListener(this);
371	416	sortbynameItem = menu.add(new MenuItem("Sort by name"));
372	417	sortbynameItem.addActionListener(this);
	418	+ if (Globals.ADVANCED)
	419	+ {
	420	+ menu.add("-");
	421	+ extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
	422	+ extractGeometriesItem.addActionListener(this);
	423	+ cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
	424	+ cloneGeometriesItem.addActionListener(this);
	425	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
	426	+ shareGeometriesItem.addActionListener(this);
	427	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
	428	+ mergeGeometriesItem.addActionListener(this);
	429	+ }
	430	+
373	431	oe.menuBar.add(menu = new Menu("Insert"));
374	432	buildCreateMenu(menu);
375		- oe.menuBar.add(menu = new Menu("Tools"));
	433	+
	434	+ oe.menuBar.add(menu = new Menu("Include"));
	435	+ importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
	436	+ importGFDItem.addActionListener(this);
	437	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
	438	+ importVRMLX3DItem.addActionListener(this);
	439	+ importOBJItem = menu.add(new MenuItem("OBJ Object..."));
	440	+ importOBJItem.addActionListener(this);
	441	+ import3DSItem = menu.add(new MenuItem("3DS Object..."));
	442	+ import3DSItem.addActionListener(this);
	443	+
	444	+ oe.menuBar.add(menu = new Menu("Tools"));
376	445	buildToolsMenu(menu);
377	446	}
378	447
..	..	@@ -406,150 +475,98 @@
406	475	oe.radioPanel.add(dummyButton);
407	476	oe.buttonGroup.add(dummyButton);
408	477	*/
409		- aConstraints.gridy += 1;
410		- oe.aConstraints.gridwidth = 1;
411		- oe.aConstraints.gridx = 0;
	478	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
412	479
413		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	480	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	481	+ liveCB.setToolTipText("Enabled animation");
414	482	liveCB.addItemListener(this);
415	483
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);
	484	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	485	+ oneStepButton.setToolTipText("Animate one step forward");
	486	+ oneStepButton.addActionListener(this);
	487	+
	488	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	489	+ fastCB.setToolTipText("Fast mode");
434	490	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);
	491	+
	492	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	493	+ trackCB.setToolTipText("Enable tracking");
476	494	trackCB.addItemListener(this);
477	495
478		- oe.aConstraints.gridx += 1;
479		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	496	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	497	+ screenfitButton.setToolTipText("Screen fit");
480	498	screenfitButton.addActionListener(this);
481		- oe.aConstraints.gridx += 1;
	499	+
482	500	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
483	501	// screenfitpointButton.addActionListener(this);
484		-// oe.aConstraints.gridx += 1;
485		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
486		- snapobjectButton.addActionListener(this);
487		- oe.aConstraints.gridx += 1;
488	502
489		- //aConstraints.gridx = 0;
490		- //aConstraints.gridy += 1;
491		- oe.aConstraints.weighty = 0;
492		- oe.aConstraints.gridwidth = 1;
493		-
494		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	503	+ if (Globals.ADVANCED)
	504	+ {
	505	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	506	+ snapobjectButton.addActionListener(this);
	507	+ snapobjectButton.setToolTipText("Snap Object");
	508	+ }
	509	+
	510	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	511	+ flashSelectionButton.setToolTipText("Show selection");
495	512	flashSelectionButton.addActionListener(this);
496		- oe.aConstraints.gridx += 1;
497		- oe.aConstraints.weighty = 0;
498		- oe.aConstraints.gridwidth = 1;
499	513
500		- //
501		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	514	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	515	+
	516	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	517	+ twoButton.setToolTipText("Show center view only");
502	518	twoButton.addActionListener(this);
503		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	519	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
504	520	fourButton.addActionListener(this);
505		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	521	+ fourButton.setToolTipText("Show left panel only");
	522	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	523	+ sixButton.setToolTipText("2-column layout left");
506	524	sixButton.addActionListener(this);
507		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	525	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	526	+ threeButton.setToolTipText("2-column layout right");
508	527	threeButton.addActionListener(this);
509		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	528	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	529	+ sevenButton.setToolTipText("3-column layout");
510	530	sevenButton.addActionListener(this);
511	531	//
512	532
513		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	533	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	534	+ rootButton.setToolTipText("Edit selection in new tab");
514	535	rootButton.addActionListener(this);
515		- oe.aConstraints.gridx += 1;
516		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	536	+
	537	+ oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	538	+ closeButton.setToolTipText("Close tab");
517	539	closeButton.addActionListener(this);
518	540	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
519	541	//clearButton.addActionListener(this);
520		- oe.aConstraints.gridx += 1;
521	542
522		- oe.aConstraints.gridx = 1; //
523		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	543	+ cGridBag commandsPanel = new cGridBag();
	544	+
	545	+ commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	546	+ editButton.setToolTipText("Edit selection");
524	547	editButton.addActionListener(this);
525		- oe.aConstraints.gridx += 1;
526		- oe.aConstraints.weighty = 0;
527		- oe.aConstraints.gridwidth = 1;
528	548
529		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	549	+ commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	550	+ uneditButton.setToolTipText("Unedit selection");
530	551	uneditButton.addActionListener(this);
531	552
532		- oe.aConstraints.gridx += 1;
533		- oe.aConstraints.weighty = 0;
534		- oe.aConstraints.gridwidth = 1;
535		-
536		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
537		- clearPanelButton.addActionListener(this);
538		-
539		- oe.aConstraints.gridx += 1;
540		- oe.aConstraints.weighty = 0;
541		- oe.aConstraints.gridwidth = 1;
542		-
543		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	553	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	554	+ allParamsButton.setToolTipText("Edit all params");
544	555	allParamsButton.addActionListener(this);
545	556
546		- oe.aConstraints.gridx += 1;
547		- oe.aConstraints.weighty = 0;
548		- oe.aConstraints.gridwidth = 1;
549		-
550		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	557	+ commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	558	+ clearPanelButton.setToolTipText("Clear edit panel");
	559	+ clearPanelButton.addActionListener(this);
	560	+
	561	+ commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	562	+ unselectButton.setToolTipText("Unselect");
551	563	unselectButton.addActionListener(this);
552	564
	565	+ commandsPanel.preferredHeight = 1;
	566	+
	567	+ oe.treePanel.add(commandsPanel);
	568	+ oe.treePanel.Return();
	569	+
553	570	// oe.aConstraints.gridx += 1;
554	571	// oe.aConstraints.weighty = 0;
555	572	// oe.aConstraints.gridwidth = 1;
..	..	@@ -561,40 +578,37 @@
561	578	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
562	579	// gcButton.addActionListener(this);
563	580
564		- oe.aConstraints.gridx = 0;
565		- oe.aConstraints.gridy += 1;
566		-
567		- //ctrlPanel.add(objList = new List(5, true));
568		- oe.aConstraints.gridwidth = 100;
569		- // oe.aConstraints.gridheight = 100;
570		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
571		- oe.aConstraints.gridheight = 1;
572		- oe.aConstraints.weighty = 0.5;
573		- oe.aConstraints.gridx = 0;
574		- JScrollPane jSP;
	581	+ cGridBag jSPPanel = new cGridBag();
	582	+
	583	+ JScrollPane jSP;
575	584	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
576		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	585	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
577	586	ResetModel();
578		- oe.aConstraints.weighty = 0.5;
579		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
580		- oe.aConstraints.gridy += 1;
581		- oe.aConstraints.gridwidth = 1;
	587	+
	588	+ oe.treePanel.add(jSPPanel);
	589	+ oe.treePanel.Return();
582	590
583		- oe.aConstraints.weighty = 0;
584		- oe.aConstraints.gridwidth = 2;
585		-
586		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
	591	+ cGridBag copyOptionsPanel = new cGridBag();
	592	+
	593	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	594	+ colorCB.setToolTipText("Copy color when dropped");
587	595	colorCB.addItemListener(this);
588		- oe.aConstraints.gridx += 2;
589		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	596	+
	597	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	598	+ materialCB.setToolTipText("Copy material when dropped");
590	599	materialCB.addItemListener(this);
591		- oe.aConstraints.gridx += 2;
592		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	600	+
	601	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	602	+ textureCB.setToolTipText("Copy texture when dropped");
593	603	textureCB.addItemListener(this);
594	604
595		- oe.aConstraints.gridx = 0;
596		- oe.aConstraints.gridy += 1;
	605	+ copyOptionsPanel.preferredHeight = 1;
	606	+ oe.treePanel.add(copyOptionsPanel);
	607	+ oe.treePanel.Return();
597	608
	609	+// mainPanel.setDividerLocation(0.5); //1.0);
	610	+// mainPanel.setResizeWeight(0.5);
	611	+
598	612	//jList.addListSelectionListener(this);
599	613	oe.jTree.addTreeSelectionListener(this);
600	614	//jTree.setRootVisible(false);
..	..	@@ -616,17 +630,89 @@
616	630	radio.layout = sevenButton;
617	631	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
618	632	}
	633	+
	634	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	635	+ {
	636	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	637	+ boxCB.setToolTipText("Display bounding boxes");
	638	+ boxCB.addItemListener(this);
	639	+
	640	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	641	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	642	+ zoomBoxCB.addItemListener(this);
	643	+
	644	+ if (Globals.ADVANCED)
	645	+ {
	646	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	647	+ supportCB.setToolTipText("Enable rigging");
	648	+ supportCB.addItemListener(this);
	649	+
	650	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	651	+ // localCB.addItemListener(this);
	652	+
	653	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	654	+ crowdCB.setToolTipText("Used for crowds");
	655	+ crowdCB.addItemListener(this);
	656	+
	657	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	658	+ smoothCB.setToolTipText("Snapping delay");
	659	+ smoothCB.addItemListener(this);
	660	+
	661	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	662	+ slowCB.setToolTipText("Smooth interpolation");
	663	+ slowCB.addItemListener(this);
	664	+
	665	+// constraints.gridy += 1;
	666	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	667	+// speakerMocapCB.addItemListener(this);
	668	+
	669	+ if (false)
	670	+ {
	671	+ // handled in scripts
	672	+ //constraints.gridy += 1;
	673	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	674	+ speakerCameraCB.addItemListener(this);
	675	+
	676	+ //constraints.gridy += 1;
	677	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	678	+ speakerFocusCB.addItemListener(this);
	679	+
	680	+ //constraints.gridy += 1;
	681	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	682	+ smoothfocusCB.addItemListener(this);
	683	+ }
	684	+
	685	+//constraints.gridx += 1;
	686	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	687	+// debugCB.addItemListener(this);
	688	+
	689	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	690	+ oeilCB.addItemListener(this);
	691	+
	692	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	693	+ lookAtCB.setToolTipText("Look-at target");
	694	+ lookAtCB.addItemListener(this);
	695	+
	696	+ }
	697	+
	698	+ cGridBag fill = new cGridBag();
	699	+
	700	+ fill.preferredHeight = 200;
	701	+
	702	+ panel.add(fill);
	703	+
	704	+ }
619	705
620	706	void EditObject(Object3D obj)
621	707	{
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();
	708	+ cRadio radioButton = new cRadio(obj.name);
	709	+ radioButton.SetObject(obj);
	710	+ radioButton.layout = sevenButton;
	711	+ radioButton.SetCamera(cameraView.renderCamera, false);
	712	+ radioButton.addActionListener(this);
	713	+ radioPanel.add(radioButton);
	714	+ buttonGroup.add(radioButton);
	715	+ radioButton.doClick();
630	716	}
631	717	void SetupViews(ObjEditor oe)
632	718	{
..	..	@@ -646,6 +732,7 @@
646	732	JCheckBox fastCB;
647	733	JCheckBox slowCB;
648	734	JCheckBox boxCB;
	735	+ JCheckBox zoomBoxCB;
649	736	JCheckBox trackCB;
650	737	JCheckBox smoothfocusCB;
651	738	// JCheckBox speakerMocapCB;
..	..	@@ -688,8 +775,7 @@
688	775	dropAttributes \|= Object3D.TEXTURE;
689	776	else
690	777	dropAttributes &= ~Object3D.TEXTURE;
691		- }
692		- else if(e.getSource() == liveCB)
	778	+ } else if(e.getSource() == liveCB)
693	779	{
694	780	cameraView.ToggleLive();
695	781	}
..	..	@@ -726,6 +812,10 @@
726	812	Recompile();
727	813	cameraView.repaint();
728	814	// refreshContents();
	815	+ }
	816	+ else if(e.getSource() == zoomBoxCB)
	817	+ {
	818	+ cameraView.ToggleZoomBoxMode();
729	819	}
730	820	else if(e.getSource() == smoothfocusCB)
731	821	{
..	..	@@ -894,11 +984,11 @@
894	984	{
895	985	loadClipboard(true);
896	986	objEditor.jTree.setSelectionPath(destinationPath);
897		- pasteInto(false);
	987	+ pasteInto(false, false);
898	988	} else {
899	989	loadClipboard(false);
900	990	objEditor.jTree.setSelectionPath(destinationPath);
901		- pasteInto(false); // true); // ???
	991	+ pasteInto(false, false); // true); // ???
902	992	}
903	993	}
904	994	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1002,6 +1092,8 @@
1002	1092
1003	1093	void buildCreateMenu(Menu menu)
1004	1094	{
	1095	+ //heightFieldItem = menu.add(new MenuItem("Height Field"));
	1096	+ //heightFieldItem.addActionListener(this);
1005	1097	gridItem = menu.add(new MenuItem("Grid"));
1006	1098	gridItem.addActionListener(this);
1007	1099	rectoidItem = menu.add(new MenuItem("Box"));
..	..	@@ -1014,29 +1106,37 @@
1014	1106	torusItem.addActionListener(this);
1015	1107	superItem = menu.add(new MenuItem("Superellipsoid"));
1016	1108	superItem.addActionListener(this);
	1109	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1110	+ kleinItem.addActionListener(this);
1017	1111	particleItem = menu.add(new MenuItem("Particle system"));
1018	1112	particleItem.addActionListener(this);
	1113	+ if (Globals.ADVANCED)
	1114	+ {
1019	1115	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1020	1116	ragdollItem.addActionListener(this);
1021	1117	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1022	1118	ragdoll2Item.addActionListener(this);
	1119	+ }
1023	1120	menu.add("-");
1024		- meshItem = menu.add(new MenuItem("Mesh"));
	1121	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1025	1122	meshItem.addActionListener(this);
1026	1123	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1027	1124	// meshGroupItem.addActionListener(this);
	1125	+ if (Globals.ADVANCED)
	1126	+ {
1028	1127	springItem = menu.add(new MenuItem("Spring"));
1029	1128	springItem.addActionListener(this);
1030	1129	flagItem = menu.add(new MenuItem("Flag"));
1031	1130	flagItem.addActionListener(this);
1032		- bezierItem = menu.add(new MenuItem("Patch"));
1033		- bezierItem.addActionListener(this);
1034		- checkerItem = menu.add(new MenuItem("Checker"));
1035		- checkerItem.addActionListener(this);
1036	1131	blobItem = menu.add(new MenuItem("Blob"));
1037	1132	blobItem.addActionListener(this);
1038	1133	latheItem = menu.add(new MenuItem("Lathe"));
1039	1134	latheItem.addActionListener(this);
	1135	+ }
	1136	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1137	+ bezierItem.addActionListener(this);
	1138	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1139	+ overlayItem.addActionListener(this);
1040	1140	lightItem = menu.add(new MenuItem("Light"));
1041	1141	lightItem.addActionListener(this);
1042	1142	menu.add("-");
..	..	@@ -1046,32 +1146,26 @@
1046	1146	loopItem.addActionListener(this);
1047	1147	doubleItem = menu.add(new MenuItem("Fork"));
1048	1148	doubleItem.addActionListener(this);
	1149	+ if (Globals.ADVANCED)
	1150	+ {
1049	1151	tripleItem = menu.add(new MenuItem("Trident"));
1050	1152	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);
	1153	+ }
1060	1154	}
1061	1155
1062	1156	void buildToolsMenu(Menu menu)
1063	1157	{
1064	1158	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1065	1159	animationItem.addItemListener(this);
1066		- animationItem.setState(CameraPane.ANIMATION);
	1160	+ animationItem.setState(Globals.ANIMATION);
1067	1161
1068	1162	menu.add("-");
1069	1163	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1070	1164	parseverticesItem.addActionListener(this);
1071		- alignItem = menu.add(new MenuItem("Align"));
	1165	+ textureFieldItem = menu.add(new MenuItem("Texture Field"));
	1166	+ textureFieldItem.addActionListener(this);
	1167	+ alignItem = menu.add(new MenuItem("Align Object"));
1072	1168	alignItem.addActionListener(this);
1073		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1074		- mirrorItem.addActionListener(this);
1075	1169	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1076	1170	reduceMorphItem.addActionListener(this);
1077	1171	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
..	..	@@ -1079,8 +1173,12 @@
1079	1173
1080	1174	menu.add(computeAOItem = new MenuItem("Compute AO"));
1081	1175	computeAOItem.addActionListener(this);
1082		- menu.add("-");
1083	1176
	1177	+ if (Globals.ADVANCED)
	1178	+ {
	1179	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1180	+ mirrorItem.addActionListener(this);
	1181	+ menu.add("-");
1084	1182	menu.add(memoryItem = new MenuItem("Memory Usage"));
1085	1183	memoryItem.addActionListener(this);
1086	1184	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1094,6 +1192,8 @@
1094	1192	resetParentItem.addActionListener(this);
1095	1193	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1096	1194	repairParentItem.addActionListener(this);
	1195	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1196	+ repairShadowItem.addActionListener(this);
1097	1197	menu.add(invariantsItem = new MenuItem("Invariants"));
1098	1198	invariantsItem.addActionListener(this);
1099	1199	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1101,6 +1201,7 @@
1101	1201	menu.add("-");
1102	1202	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1103	1203	editScriptItem.addActionListener(this);
	1204	+ }
1104	1205	}
1105	1206
1106	1207	void ScreenFit()
..	..	@@ -1429,9 +1530,9 @@
1429	1530
1430	1531	void Overwrite(int mask)
1431	1532	{
1432		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1533	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1433	1534	{
1434		- Object3D content = GraphreeD.clipboard.get(0);
	1535	+ Object3D content = GrafreeD.clipboard.get(0);
1435	1536
1436	1537	if (content instanceof cGroup && ((cGroup)content).transientlink )
1437	1538	content = ((cGroup)content).get(0);
..	..	@@ -1454,6 +1555,7 @@
1454	1555	//
1455	1556	public void actionPerformed(ActionEvent event) // , Object arg)
1456	1557	{
	1558	+ Object source = event.getSource();
1457	1559	/*
1458	1560	if (event.getSource() == nameField)
1459	1561	{
..	..	@@ -1465,11 +1567,11 @@
1465	1567	}
1466	1568	else
1467	1569	*/
1468		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1570	+ if (source == lookAtItem \|\| source == lookFromItem)
1469	1571	{
1470	1572	ScreenFit();
1471	1573	} else
1472		- if (event.getSource() == switchItem)
	1574	+ if (source == switchItem)
1473	1575	{
1474	1576	cVector v1 = new cVector();
1475	1577	cVector v2 = new cVector();
..	..	@@ -1478,11 +1580,11 @@
1478	1580	objEditor.cameraView.renderCamera.setAim(v2, v1);
1479	1581	objEditor.cameraView.repaint();
1480	1582	} else
1481		- if (event.getSource() == rectoidItem)
	1583	+ if (source == rectoidItem)
1482	1584	{
1483	1585	makeSomething(new Box());
1484	1586	} else
1485		- if (event.getSource() == particleItem)
	1587	+ if (source == particleItem)
1486	1588	{
1487	1589	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1488	1590	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1503,9 +1605,9 @@
1503	1605	applyExample(particleGeom, "SMOKE");
1504	1606	makeSomething(particleGeom);
1505	1607	} else
1506		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1608	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1507	1609	{
1508		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1610	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1509	1611
1510	1612	ragdoll.toParent = LA.newMatrix();
1511	1613	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1521,27 +1623,71 @@
1521	1623	makeSomething(ragdoll);
1522	1624	//makeSomething(new VehicleDemo());
1523	1625	} else
1524		- if (event.getSource() == gridItem)
	1626	+ /*
	1627	+ */
	1628	+ if (source == heightFieldItem)
	1629	+ {
	1630	+ Object3D obj = new Object3D();
	1631	+
	1632	+ obj.CreateMaterial();
	1633	+ obj.bRep = new BoundaryRep();
	1634	+
	1635	+ obj.bRep.CreateMesh(new iHeightField()
	1636	+ {
	1637	+ public double f(double x, double y)
	1638	+ {
	1639	+ // The Mandelbrot set is represented by coloring
	1640	+ // each point (x,y) according to the number of
	1641	+ // iterations it takes before the while loop in
	1642	+ // this method ends. For points that are actually
	1643	+ // in the Mandelbrot set, or very close to it, the
	1644	+ // count will reach the maximum value, 80. These
	1645	+ // points will be colored purple. All other colors
	1646	+ // represent points that are definitely NOT in the set.
	1647	+ x -= 600;
	1648	+ y -= 500;
	1649	+ x /= 200;
	1650	+ y /= 200;
	1651	+ int count = 0;
	1652	+ double zx = x;
	1653	+ double zy = y;
	1654	+ while (count < 80 && Math.abs(x) < 100 && Math.abs(zy) < 100) {
	1655	+ double new_zx = zxzx - zyzy + x;
	1656	+ zy = 2zxzy + y;
	1657	+ zx = new_zx;
	1658	+ count++;
	1659	+ }
	1660	+ return count; // Math.sqrt(count);
	1661	+ }
	1662	+ }, 1000,1000);
	1663	+
	1664	+ makeSomething(obj);
	1665	+ } else
	1666	+ if (source == gridItem)
1525	1667	{
1526	1668	makeSomething(new Grid());
1527	1669	} else
1528		- if (event.getSource() == ellipsoidItem)
	1670	+ if (source == ellipsoidItem)
1529	1671	{
1530	1672	makeSomething(new Sphere());
1531	1673	} else
1532		- if (event.getSource() == coneItem)
	1674	+ if (source == coneItem)
1533	1675	{
1534	1676	makeSomething(new Cone());
1535	1677	} else
1536		- if (event.getSource() == torusItem)
	1678	+ if (source == torusItem)
1537	1679	{
1538	1680	makeSomething(new Torus());
1539	1681	} else
1540		- if (event.getSource() == superItem)
	1682	+ if (source == superItem)
1541	1683	{
1542	1684	makeSomething(new Superellipsoid());
1543	1685	} else
1544		- if (event.getSource() == blobItem)
	1686	+ if (source == kleinItem)
	1687	+ {
	1688	+ makeSomething(new Klein());
	1689	+ } else
	1690	+ if (source == blobItem)
1545	1691	{
1546	1692	Blob blob = new Blob();
1547	1693	BlobComponent comp = new BlobComponent();
..	..	@@ -1549,15 +1695,15 @@
1549	1695	//blob.retile();
1550	1696	makeSomething(blob);
1551	1697	} else
1552		- if (event.getSource() == latheItem)
	1698	+ if (source == latheItem)
1553	1699	{
1554	1700	makeSomething(new Lathe());
1555	1701	} else
1556		- if (event.getSource() == bezierItem)
	1702	+ if (source == bezierItem)
1557	1703	{
1558	1704	makeSomething(new BezierSurface());
1559	1705	} else
1560		- if (event.getSource() == checkerItem)
	1706	+ if (source == overlayItem)
1561	1707	{
1562	1708	/*
1563	1709	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1570,9 +1716,9 @@
1570	1716	LA.matConcat(obj.toParent, cameraView.renderCamera.fromParent, obj.toParent);
1571	1717	LA.matInvert(obj.toParent, obj.fromParent);
1572	1718	*/
1573		- makeSomething(new CheckerIG());
	1719	+ makeSomething(new Checker());
1574	1720	} else
1575		- if (event.getSource() == meshItem)
	1721	+ if (source == meshItem)
1576	1722	{
1577	1723	Object3D itemtomake = new Object3D();
1578	1724	Object3D child;
..	..	@@ -1593,35 +1739,35 @@
1593	1739	makeSomething(child);
1594	1740	}
1595	1741	} else
1596		- if (event.getSource() == springItem)
	1742	+ if (source == springItem)
1597	1743	{
1598	1744	cSpring s = new cSpring();
1599	1745	s.setup();
1600	1746	makeSomething(s);
1601	1747	} else
1602		- if (event.getSource() == flagItem)
	1748	+ if (source == flagItem)
1603	1749	{
1604	1750	cSpring s = new cFlag();
1605	1751	s.setup();
1606	1752	makeSomething(s);
1607	1753	} else
1608		- if (event.getSource() == lightItem)
	1754	+ if (source == lightItem)
1609	1755	{
1610	1756	makeSomething(new Light());
1611	1757	} else
1612		- if (event.getSource() == csgItem)
	1758	+ if (source == csgItem)
1613	1759	{
1614	1760	group(new CSG());
1615	1761	} else
1616		- if (event.getSource() == templateItem)
	1762	+ if (source == templateItem)
1617	1763	{
1618	1764	group(new cTemplate());
1619	1765	} else
1620		- if (event.getSource() == attributeItem)
	1766	+ if (source == attributeItem)
1621	1767	{
1622	1768	makeSomething(new Attribute());
1623	1769	} else
1624		- if (event.getSource() == pointflowItem)
	1770	+ if (source == pointflowItem)
1625	1771	{
1626	1772	makeSomething(new PointFlow());
1627	1773	} else
..	..	@@ -1633,7 +1779,7 @@
1633	1779	} else
1634	1780	*/
1635	1781
1636		- if (event.getSource() == superLoopItem)
	1782	+ if (source == superLoopItem)
1637	1783	{
1638	1784	Composite g = new cGroup();
1639	1785	for (int i=0; i<15; i++)
..	..	@@ -1655,7 +1801,7 @@
1655	1801
1656	1802	group(g);
1657	1803	} else
1658		- if (event.getSource() == loopItem)
	1804	+ if (source == loopItem)
1659	1805	{
1660	1806	Composite csg = new GroupLeaf();
1661	1807	csg.count = 5;
..	..	@@ -1664,7 +1810,7 @@
1664	1810	csg.addChild(child);
1665	1811	child.addChild(csg);
1666	1812	} else
1667		- if (event.getSource() == doubleItem)
	1813	+ if (source == doubleItem)
1668	1814	{
1669	1815	Composite csg = new GroupLeaf();
1670	1816	csg.count = 5;
..	..	@@ -1676,7 +1822,7 @@
1676	1822	csg.addChild(child);
1677	1823	child.addChild(csg);
1678	1824	} else
1679		- if (event.getSource() == tripleItem)
	1825	+ if (source == tripleItem)
1680	1826	{
1681	1827	Composite csg = new GroupLeaf();
1682	1828	csg.count = 4;
..	..	@@ -1692,70 +1838,75 @@
1692	1838	child.addChild(csg);
1693	1839	} else
1694	1840
1695		- if (event.getSource() == importGFDItem)
	1841	+ if (source == importGFDItem)
1696	1842	{
1697	1843	ImportGFD();
1698	1844	} else
1699		- if (event.getSource() == importVRMLX3DItem)
	1845	+ if (source == importVRMLX3DItem)
1700	1846	{
1701	1847	ImportVRMLX3D();
1702	1848	} else
1703		- if (event.getSource() == import3DSItem)
	1849	+ if (source == import3DSItem)
1704	1850	{
1705	1851	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1706	1852	} else
1707		- if (event.getSource() == importOBJItem)
	1853	+ if (source == importOBJItem)
1708	1854	{
1709	1855	objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1710	1856	} else
1711		- if (event.getSource() == computeAOItem)
	1857	+ if (source == computeAOItem)
1712	1858	{
1713		- CameraPane.drawMode = CameraPane.OCCLUSION;
1714		- CameraPane.theRenderer.repaint();
	1859	+ Globals.drawMode = CameraPane.OCCLUSION;
	1860	+ Globals.theRenderer.repaint();
1715	1861	} else
1716		- if (event.getSource() == recompileItem)
	1862	+ if (source == recompileItem)
1717	1863	{
1718	1864	Recompile();
1719	1865	refreshContents();
1720	1866	} else
1721		- if (event.getSource() == editScriptItem)
	1867	+ if (source == editScriptItem)
1722	1868	{
1723	1869	OpenDialog();
1724	1870	refreshContents();
1725	1871	} else
1726		- if (event.getSource() == invariantsItem)
	1872	+ if (source == invariantsItem)
1727	1873	{
1728	1874	System.out.println("Invariants:");
1729		- GraphreeD.theApplet3D.universe.invariants();
	1875	+ GrafreeD.grafreeD.universe.invariants();
1730	1876	} else
1731		- if (event.getSource() == memoryItem)
	1877	+ if (source == memoryItem)
1732	1878	{
1733	1879	//System.out.println("Invariants:");
1734	1880	PrintMemory();
1735	1881	} else
1736		- if (event.getSource() == pathItem)
	1882	+ if (source == pathItem)
1737	1883	{
1738	1884	PrintPath();
1739	1885	} else
1740		- if (event.getSource() == analyzeItem)
	1886	+ if (source == analyzeItem)
1741	1887	{
1742	1888	AnalyzeObject();
1743	1889	} else
1744		- if (event.getSource() == dumpItem)
	1890	+ if (source == dumpItem)
1745	1891	{
1746	1892	DumpObject();
1747	1893	} else
1748		- if (event.getSource() == screenfitButton)
	1894	+ if (source == oneStepButton)
	1895	+ {
	1896	+ Globals.ONESTEP = true;
	1897	+ cameraView.repaint();
	1898	+ } else
	1899	+ if (source == screenfitButton)
1749	1900	{
1750	1901	//Reload(lastConverter, lastFilename, true);
1751	1902	ScreenFit();
1752	1903	} else
1753		- if (event.getSource() == screenfitpointButton)
	1904	+ if (source == screenfitpointButton)
1754	1905	{
1755	1906	//Reload(lastConverter, lastFilename, true);
1756	1907	ScreenFitPoint();
1757	1908	} else
1758		- if (event.getSource() == snapobjectButton)
	1909	+ if (source == snapobjectButton)
1759	1910	{
1760	1911	//Reload(lastConverter, lastFilename, true);
1761	1912	SnapObject();
..	..	@@ -1766,13 +1917,13 @@
1766	1917	// Recompile();
1767	1918	// refreshContents();
1768	1919	// } else
1769		- if (event.getSource() == gcButton)
	1920	+ if (source == gcButton)
1770	1921	{
1771	1922	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1772	1923	System.gc();
1773	1924	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1774	1925	} else
1775		- if (event.getSource() == editLeafItem)
	1926	+ if (source == editLeafItem)
1776	1927	{
1777	1928	Object3D obj;
1778	1929	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1786,65 +1937,70 @@
1786	1937	}
1787	1938	refreshContents(true);
1788	1939	} else
1789		- if (event.getSource() == openWindowItem)
	1940	+ if (source == openWindowItem)
1790	1941	{
1791	1942	EditSelection(true);
1792	1943	} else
1793		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1944	+ if (source == cutItem \|\| source == clearButton)
1794	1945	{
1795	1946	loadClipboard(true);
1796	1947	} else
1797		- if (event.getSource() == duplicateItem)
	1948	+ if (source == duplicateItem)
1798	1949	{
1799		- Object3D keep = GraphreeD.clipboard;
	1950	+ Object3D keep = GrafreeD.clipboard;
1800	1951	loadClipboard(false);
1801	1952	paste(false);
1802		- GraphreeD.clipboard = keep;
	1953	+ GrafreeD.clipboard = keep;
1803	1954	} else
1804		- if (event.getSource() == cloneItem)
	1955	+ if (source == cloneItem)
1805	1956	{
1806	1957	CloneSelection(false);
1807	1958	} else
1808		- if (event.getSource() == cloneSupportItem)
	1959	+ if (source == cloneSupportItem)
1809	1960	{
1810	1961	CloneSelection(true);
1811	1962	} else
1812		- if (event.getSource() == copyItem)
	1963	+ if (source == copyItem)
1813	1964	{
1814	1965	loadClipboard(false);
1815	1966	} else
1816		- if (event.getSource() == pasteItem)
	1967	+ if (source == pasteItem)
1817	1968	{
1818	1969	paste(false);
1819	1970	} else
1820		- if (event.getSource() == pasteLinkItem)
	1971	+ if (source == pasteIntoItem)
1821	1972	{
1822		- pasteInto(false);
	1973	+ pasteInto(true, false);
1823	1974	} else
1824		- if (event.getSource() == pasteCloneItem)
	1975	+ if (source == pasteLinkItem)
1825	1976	{
1826		- pasteInto(true);
	1977	+ pasteInto(false, false);
1827	1978	} else
1828		- if (event.getSource() == pasteExpandItem)
	1979	+ if (source == pasteCloneItem)
	1980	+ {
	1981	+ pasteInto(true, true);
	1982	+ } else
	1983	+ if (source == pasteExpandItem)
1829	1984	{
1830	1985	paste(true);
1831	1986	} else
1832		- if (event.getSource() == synchronizeItem)
	1987	+ if (source == synchronizeItem)
1833	1988	{
1834	1989	Overwrite(Object3D.TRANSFORM);
1835	1990	} else
1836		- if (event.getSource() == overwriteNameItem)
	1991	+ if (source == overwriteNameItem)
1837	1992	{
1838	1993	Overwrite(Object3D.NAME);
1839	1994	} else
1840		- if (event.getSource() == overwriteUVItem)
	1995	+ if (source == overwriteUVItem)
1841	1996	{
1842	1997	Overwrite(Object3D.UV);
1843	1998	} else
1844		- if (event.getSource() == overwriteMatItem)
	1999	+ if (source == overwriteMatItem)
1845	2000	{
	2001	+ /* july 2015
1846	2002	if ((dropAttributes & Object3D.TEXTURE) == 0)
1847		- Overwrite(Object3D.MATERIAL);
	2003	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1848	2004	else
1849	2005	{
1850	2006	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1856,13 +2012,16 @@
1856	2012	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1857	2013	}
1858	2014	}
	2015	+ */
	2016	+
	2017	+ Overwrite(dropAttributes);
1859	2018	}
1860		- if (event.getSource() == overwriteGeoItem)
	2019	+ if (source == overwriteGeoItem)
1861	2020	{
1862	2021	Overwrite(Object3D.GEOMETRY);
1863		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2022	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1864	2023	// {
1865		-// Object3D content = GraphreeD.clipboard.get(0);
	2024	+// Object3D content = GrafreeD.clipboard.get(0);
1866	2025	//
1867	2026	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1868	2027	// content = ((cGroup)content).get(0);
..	..	@@ -1874,7 +2033,7 @@
1874	2033	// refreshContents();
1875	2034	// }
1876	2035	} else
1877		- if (event.getSource() == generateMeshItem)
	2036	+ if (source == generateMeshItem)
1878	2037	{
1879	2038	//if (group.selection.size() == 1)
1880	2039	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1885,7 +2044,7 @@
1885	2044	ResetModel();
1886	2045	refreshContents();
1887	2046	} else
1888		- if (event.getSource() == extractGeometriesItem)
	2047	+ if (source == extractGeometriesItem)
1889	2048	{
1890	2049	boolean one = false;
1891	2050
..	..	@@ -1912,7 +2071,7 @@
1912	2071	ResetModel();
1913	2072	refreshContents();
1914	2073	} else
1915		- if (event.getSource() == cloneGeometriesItem)
	2074	+ if (source == cloneGeometriesItem)
1916	2075	{
1917	2076	boolean one = false;
1918	2077
..	..	@@ -1938,32 +2097,37 @@
1938	2097	ResetModel();
1939	2098	refreshContents();
1940	2099	} else
1941		- if (event.getSource() == shareGeometriesItem)
	2100	+ if (source == shareGeometriesItem)
1942	2101	{
1943	2102	boolean one = false;
1944	2103
1945	2104	if (group.selection.size() == 1)
1946	2105	one = true;
1947	2106
	2107	+ Object3D merge = null;
	2108	+
1948	2109	Object3D content = new cGroup();
1949	2110
1950	2111	for (int i=0; i<group.selection.size(); i++)
1951	2112	{
1952		- Object3D sel = new Merge(group.selection.get(i));
	2113	+ merge = new Merge(group.selection.get(i));
1953	2114
1954	2115	if (one)
1955		- makeSomething(sel, false);
	2116	+ makeSomething(merge, false);
1956	2117	else
1957		- content.addChild(sel);
	2118	+ content.addChild(merge);
1958	2119	}
1959	2120
1960	2121	if (!one)
1961		- makeSomething(content, false);
1962		-
1963		- ResetModel();
1964		- refreshContents();
	2122	+ makeSomething(content, true);
	2123	+ else
	2124	+ {
	2125	+ ResetModel();
	2126	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2127	+ refreshContents();
	2128	+ }
1965	2129	} else
1966		- if (event.getSource() == mergeGeometriesItem)
	2130	+ if (source == mergeGeometriesItem)
1967	2131	{
1968	2132	boolean one = false;
1969	2133
..	..	@@ -1993,11 +2157,11 @@
1993	2157	ResetModel();
1994	2158	refreshContents();
1995	2159	} else
1996		- if (event.getSource() == linkverticesItem)
	2160	+ if (source == linkverticesItem)
1997	2161	{
1998		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2162	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
1999	2163	// {
2000		-// Object3D content = GraphreeD.clipboard.get(0);
	2164	+// Object3D content = GrafreeD.clipboard.get(0);
2001	2165	//
2002	2166	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2003	2167	// content = ((cGroup)content).get(0);
..	..	@@ -2006,39 +2170,48 @@
2006	2170	// group.selection.get(0).setMasterThis(content); // should be identity
2007	2171	// refreshContents();
2008	2172	// }
2009		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2173	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
2010	2174	{
2011		- Object3D content = GraphreeD.clipboard.get(0);
	2175	+ Object3D content = GrafreeD.clipboard.get(0);
2012	2176
2013	2177	if (content instanceof cGroup && ((cGroup)content).transientlink )
2014	2178	content = ((cGroup)content).get(0);
2015	2179
2016		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2180	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2017	2181	for (int i=0; i<group.selection.size(); i++)
2018	2182	{
2019		- boolean random = CameraPane.RANDOM;
2020		- CameraPane.RANDOM = false; // parse all random nodes
	2183	+ boolean random = CameraPane.SWITCH;
	2184	+ CameraPane.SWITCH = false; // parse all random nodes
2021	2185	group.selection.get(i).linkVerticesThis(content);
2022	2186	// group.selection.get(i).setMasterThis(content); // should be identity
2023		- CameraPane.RANDOM = random;
	2187	+ CameraPane.SWITCH = random;
2024	2188	}
2025		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2189	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2026	2190	refreshContents();
2027	2191	}
2028	2192	} else
2029		- if (event.getSource() == resetsupportItem)
	2193	+ if (source == resetsupportItem)
2030	2194	{
2031	2195	for (int i=0; i<group.selection.size(); i++)
2032	2196	{
2033		- boolean random = CameraPane.RANDOM;
2034		- CameraPane.RANDOM = false; // parse all random nodes
	2197	+ boolean random = CameraPane.SWITCH;
	2198	+ CameraPane.SWITCH = false; // parse all random nodes
2035	2199	group.selection.get(i).linkVerticesThis(null);
2036		- CameraPane.RANDOM = random;
	2200	+ CameraPane.SWITCH = random;
2037	2201	}
2038	2202
2039	2203	refreshContents();
2040	2204	} else
2041		- if (event.getSource() == resetreferencesItem)
	2205	+ if (source == relinkverticesItem)
	2206	+ {
	2207	+ boolean random = CameraPane.SWITCH;
	2208	+ CameraPane.SWITCH = false; // parse all random nodes
	2209	+ group.selection.RelinkToSupport();
	2210	+ CameraPane.SWITCH = random;
	2211	+
	2212	+ refreshContents();
	2213	+ } else
	2214	+ if (source == resetreferencesItem)
2042	2215	{
2043	2216	for (int i=0; i<group.selection.size(); i++)
2044	2217	{
..	..	@@ -2047,11 +2220,11 @@
2047	2220
2048	2221	refreshContents();
2049	2222	} else
2050		- if (event.getSource() == setMasterItem)
	2223	+ if (source == setMasterItem)
2051	2224	{
2052		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2225	+ if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2053	2226	{
2054		- Object3D content = GraphreeD.clipboard.get(0);
	2227	+ Object3D content = GrafreeD.clipboard.get(0);
2055	2228
2056	2229	if (content instanceof cGroup && ((cGroup)content).transientlink )
2057	2230	content = ((cGroup)content).get(0);
..	..	@@ -2060,13 +2233,13 @@
2060	2233	refreshContents();
2061	2234	}
2062	2235	} else
2063		- if (event.getSource() == poseMeshItem)
	2236	+ if (source == poseMeshItem)
2064	2237	{
2065	2238	if (group.selection.size() == 1)
2066	2239	{
2067		- if (GraphreeD.clipboard.size() == 1)
	2240	+ if (GrafreeD.clipboard.size() == 1)
2068	2241	{
2069		- Object3D content = GraphreeD.clipboard.get(0);
	2242	+ Object3D content = GrafreeD.clipboard.get(0);
2070	2243
2071	2244	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	2245	content = ((cGroup)content).get(0);
..	..	@@ -2079,19 +2252,19 @@
2079	2252	}
2080	2253
2081	2254	} else
2082		- if (event.getSource() == revertMeshItem)
	2255	+ if (source == revertMeshItem)
2083	2256	{
2084	2257	RevertMeshes();
2085	2258	} else
2086		- if (event.getSource() == resetMeshItem)
	2259	+ if (source == resetMeshItem)
2087	2260	{
2088	2261	ResetAll();
2089	2262	} else
2090		- if (event.getSource() == stepAllItem)
	2263	+ if (source == stepAllItem)
2091	2264	{
2092	2265	StepAll();
2093	2266	} else
2094		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2267	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2095	2268	{
2096	2269	//int indices[] = jList.getSelectedIndices();
2097	2270	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2099,42 +2272,46 @@
2099	2272
2100	2273	ClearSelection(false);
2101	2274	} else
2102		- if (event.getSource() == clearAllItem)
	2275	+ if (source == clearAllItem)
2103	2276	{
2104	2277	ClearSelection(true);
2105	2278	} else
2106		- if (event.getSource() == grabItem)
	2279	+ if (source == grabItem)
2107	2280	{
2108	2281	group(new cGroup(), true);
2109	2282	} else
2110		- if (event.getSource() == frontItem)
	2283	+ if (source == hideItem)
	2284	+ {
	2285	+ group(new HiddenObject());
	2286	+ } else
	2287	+ if (source == frontItem)
2111	2288	{
2112	2289	front();
2113	2290	} else
2114		- if (event.getSource() == backItem)
	2291	+ if (source == backItem)
2115	2292	{
2116	2293	back();
2117	2294	} else
2118		- if (event.getSource() == cameraItem)
	2295	+ if (source == cameraItem)
2119	2296	{
2120	2297	makeSomething(new Camera());
2121	2298	} else
2122		- if (event.getSource() == compositeItem)
	2299	+ if (source == compositeItem)
2123	2300	{
2124	2301	group(new Composite());
2125	2302	} else
2126		- if (event.getSource() == randomItem)
	2303	+ if (source == randomItem)
2127	2304	{
2128	2305	RandomNode random = new RandomNode();
2129	2306	group(random);
2130	2307	if (random.size() > 0)
2131		- random.name = random.get(0).name + "Rnd";
	2308	+ random.name = random.get(0).name + "Switch";
2132	2309	} else
2133		- if (event.getSource() == physicsItem)
	2310	+ if (source == physicsItem)
2134	2311	{
2135	2312	group(new PhysicsNode());
2136	2313	} else
2137		- if (event.getSource() == frameselectorItem)
	2314	+ if (source == frameselectorItem)
2138	2315	{
2139	2316	for (int i=0; i<group.selection.size(); i++)
2140	2317	{
..	..	@@ -2146,7 +2323,7 @@
2146	2323	ResetModel();
2147	2324	refreshContents();
2148	2325	} else
2149		- if (event.getSource() == switchGeoItem)
	2326	+ if (source == switchGeoItem)
2150	2327	{
2151	2328	for (int i=0; i<group.selection.size(); i++)
2152	2329	{
..	..	@@ -2158,7 +2335,7 @@
2158	2335	ResetModel();
2159	2336	refreshContents();
2160	2337	} else
2161		- if (event.getSource() == switchTransfoItem)
	2338	+ if (source == switchTransfoItem)
2162	2339	{
2163	2340	for (int i=0; i<group.selection.size(); i++)
2164	2341	{
..	..	@@ -2170,7 +2347,7 @@
2170	2347	ResetModel();
2171	2348	refreshContents();
2172	2349	} else
2173		- if (event.getSource() == morphItem)
	2350	+ if (source == morphItem)
2174	2351	{
2175	2352	for (int i=0; i<group.selection.size(); i++)
2176	2353	{
..	..	@@ -2182,7 +2359,7 @@
2182	2359	ResetModel();
2183	2360	refreshContents();
2184	2361	} else
2185		- if (event.getSource() == scriptNodeItem)
	2362	+ if (source == scriptNodeItem)
2186	2363	{
2187	2364	boolean atleastone = false;
2188	2365
..	..	@@ -2221,191 +2398,215 @@
2221	2398	}
2222	2399	}
2223	2400	} else
2224		- if (event.getSource() == linkerItem)
	2401	+ if (source == linkerItem)
2225	2402	{
2226	2403	group(new cLinker());
2227	2404	} else
2228		- if (event.getSource() == textureItem)
	2405	+ if (source == textureItem)
2229	2406	{
2230	2407	group(new TextureNode());
2231	2408	} else
2232		- if (event.getSource() == shadowXItem)
	2409	+ if (source == billboardItem)
	2410	+ {
	2411	+ group(new BillboardNode());
	2412	+ } else
	2413	+ if (source == shadowXItem)
2233	2414	{
2234	2415	CastShadow(0);
2235	2416	} else
2236		- if (event.getSource() == shadowYItem)
	2417	+ if (source == shadowYItem)
2237	2418	{
2238	2419	CastShadow(1);
2239	2420	} else
2240		- if (event.getSource() == shadowZItem)
	2421	+ if (source == shadowZItem)
2241	2422	{
2242	2423	CastShadow(2);
2243	2424	} else
2244		- if (event.getSource() == ungroupItem)
	2425	+ if (source == ungroupItem)
2245	2426	{
2246		- ungroup();
	2427	+ //ungroup();
	2428	+ for (int i=0; i<group.selection.size(); i++)
	2429	+ {
	2430	+ Ungroup(group.selection.get(i));
	2431	+ }
	2432	+
	2433	+ ClearSelection(false);
	2434	+
	2435	+ refreshContents();
2247	2436	} else
2248		- if (event.getSource() == genUVItem)
	2437	+ if (source == genUVItem)
2249	2438	{
2250	2439	GenUV();
2251	2440	} else
2252		- if (event.getSource() == genNormalsCADItem)
	2441	+ if (source == genNormalsCADItem)
2253	2442	{
2254	2443	GenNormals(true);
2255	2444	} else
2256		- if (event.getSource() == genNormalsORGANItem)
	2445	+ if (source == genNormalsMESHItem)
	2446	+ {
	2447	+ GenNormals(true); // TODO
	2448	+ } else
	2449	+ if (source == genNormalsORGANItem)
2257	2450	{
2258	2451	GenNormals(false);
2259	2452	} else
2260		- if (event.getSource() == stripifyItem)
	2453	+ if (source == genNormalsMINEItem)
	2454	+ {
	2455	+ GenNormalsMINE();
	2456	+ } else
	2457	+ if (source == stripifyItem)
2261	2458	{
2262	2459	Stripify();
2263	2460	} else
2264		- if (event.getSource() == unstripifyItem)
	2461	+ if (source == unstripifyItem)
2265	2462	{
2266	2463	Unstripify();
2267	2464	} else
2268		- if (event.getSource() == trimItem)
	2465	+ if (source == trimItem)
2269	2466	{
2270	2467	Trim();
2271	2468	} else
2272		- if (event.getSource() == untrimItem)
	2469	+ if (source == untrimItem)
2273	2470	{
2274	2471	Untrim();
2275	2472	} else
2276		- if (event.getSource() == clearColorsItem)
	2473	+ if (source == clearColorsItem)
2277	2474	{
2278	2475	ClearColors();
2279	2476	} else
2280		- if (event.getSource() == clearMaterialsItem)
	2477	+ if (source == clearMaterialsItem)
2281	2478	{
2282	2479	ClearMaterials();
2283	2480	} else
2284		- if (event.getSource() == liveleavesItem)
	2481	+ if (source == liveleavesItem)
2285	2482	{
2286	2483	LiveLeaves(true);
2287	2484	} else
2288		- if (event.getSource() == unliveleavesItem)
	2485	+ if (source == unliveleavesItem)
2289	2486	{
2290	2487	LiveLeaves(false);
2291	2488	} else
2292		- if (event.getSource() == supportleavesItem)
	2489	+ if (source == supportleavesItem)
2293	2490	{
2294	2491	SupportLeaves(true);
2295	2492	} else
2296		- if (event.getSource() == unsupportleavesItem)
	2493	+ if (source == unsupportleavesItem)
2297	2494	{
2298	2495	SupportLeaves(false);
2299	2496	} else
2300		- if (event.getSource() == hideleavesItem)
	2497	+ if (source == hideleavesItem)
2301	2498	{
2302	2499	HideLeaves(true);
2303	2500	} else
2304		- if (event.getSource() == showleavesItem)
	2501	+ if (source == showleavesItem)
2305	2502	{
2306	2503	HideLeaves(false);
2307	2504	} else
2308		- if (event.getSource() == markleavesItem)
	2505	+ if (source == markleavesItem)
2309	2506	{
2310	2507	MarkLeaves(true);
2311	2508	} else
2312		- if (event.getSource() == unmarkleavesItem)
	2509	+ if (source == unmarkleavesItem)
2313	2510	{
2314	2511	MarkLeaves(false);
2315	2512	} else
2316		- if (event.getSource() == flipVItem)
	2513	+ if (source == flipVItem)
2317	2514	{
2318	2515	FlipV(true);
2319	2516	} else
2320		- if (event.getSource() == unflipVItem)
	2517	+ if (source == unflipVItem)
2321	2518	{
2322	2519	FlipV(false);
2323	2520	} else
2324		- if (event.getSource() == lowTexturesItem)
	2521	+ if (source == lowTexturesItem)
2325	2522	{
2326	2523	SetTexRes(0);
2327	2524	} else
2328		- if (event.getSource() == normalTexturesItem)
	2525	+ if (source == normalTexturesItem)
2329	2526	{
2330	2527	SetTexRes(1);
2331	2528	} else
2332		- if (event.getSource() == highTexturesItem)
	2529	+ if (source == highTexturesItem)
2333	2530	{
2334	2531	SetTexRes(2);
2335	2532	} else
2336		- if (event.getSource() == veryhighTexturesItem)
	2533	+ if (source == veryhighTexturesItem)
2337	2534	{
2338	2535	SetTexRes(3);
2339	2536	} else
2340		- if (event.getSource() == maxTexturesItem)
	2537	+ if (source == maxTexturesItem)
2341	2538	{
2342	2539	SetTexRes(4);
2343	2540	} else
2344		- if (event.getSource() == panoTexturesItem)
	2541	+ if (source == panoTexturesItem)
2345	2542	{
2346	2543	SetTexRes(5);
2347	2544	} else
2348		- if (event.getSource() == reverseNormalsItem)
	2545	+ if (source == reverseNormalsItem)
2349	2546	{
2350	2547	ReverseNormals();
2351	2548	} else
2352		- if (event.getSource() == parseverticesItem)
	2549	+ if (source == parseverticesItem)
2353	2550	{
2354	2551	ParseVertices();
2355	2552	} else
2356		- if (event.getSource() == alignItem)
	2553	+ if (source == textureFieldItem)
	2554	+ {
	2555	+ TextureVertices();
	2556	+ } else
	2557	+ if (source == alignItem)
2357	2558	{
2358	2559	Align();
2359	2560	} else
2360		- if (event.getSource() == mirrorItem)
	2561	+ if (source == mirrorItem)
2361	2562	{
2362	2563	MirrorPoses();
2363	2564	} else
2364		- if (event.getSource() == reduceMorphItem)
	2565	+ if (source == reduceMorphItem)
2365	2566	{
2366	2567	MeshReduction(false);
2367	2568	} else
2368		- if (event.getSource() == reduce34MorphItem)
	2569	+ if (source == reduce34MorphItem)
2369	2570	{
2370	2571	MeshReduction(true);
2371	2572	} else
2372		- if (event.getSource() == reverseTrianglesItem)
	2573	+ if (source == reverseTrianglesItem)
2373	2574	{
2374	2575	ReverseTriangles();
2375	2576	} else
2376		- if (event.getSource() == reduceMeshItem)
	2577	+ if (source == reduceMeshItem)
2377	2578	{
2378	2579	ReduceMesh(false);
2379	2580	} else
2380		- if (event.getSource() == reduce34MeshItem)
	2581	+ if (source == reduce34MeshItem)
2381	2582	{
2382	2583	ReduceMesh(true);
2383	2584	} else
2384		- if (event.getSource() == increaseMeshItem)
	2585	+ if (source == increaseMeshItem)
2385	2586	{
2386	2587	IncreaseMesh();
2387	2588	} else
2388		- if (event.getSource() == clipMeshItem)
	2589	+ if (source == clipMeshItem)
2389	2590	{
2390	2591	ClipMesh();
2391	2592	} else
2392		- if (event.getSource() == smoothMeshItem)
	2593	+ if (source == smoothMeshItem)
2393	2594	{
2394	2595	SmoothMesh();
2395	2596	} else
2396		- if (event.getSource() == transformgeometryItem)
	2597	+ if (source == transformgeometryItem)
2397	2598	{
2398	2599	TransformGeometry();
2399	2600	} else
2400		- if (event.getSource() == resetTransformItem)
	2601	+ if (source == resetTransformItem)
2401	2602	{
2402	2603	ResetTransform();
2403	2604	} else
2404		- if (event.getSource() == resetCentroidItem)
	2605	+ if (source == resetCentroidItem)
2405	2606	{
2406	2607	ResetCentroid();
2407	2608	} else
2408		- if (event.getSource() == resetParentItem)
	2609	+ if (source == resetParentItem)
2409	2610	{
2410	2611	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2411	2612	{
..	..	@@ -2415,7 +2616,7 @@
2415	2616
2416	2617	refreshContents();
2417	2618	} else
2418		- if (event.getSource() == repairParentItem)
	2619	+ if (source == repairParentItem)
2419	2620	{
2420	2621	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2421	2622	{
..	..	@@ -2429,7 +2630,21 @@
2429	2630
2430	2631	refreshContents();
2431	2632	} else
2432		- if (event.getSource() == sortbysizeItem)
	2633	+ if (source == repairShadowItem)
	2634	+ {
	2635	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2636	+ {
	2637	+ Object3D obj = (Object3D)e.nextElement();
	2638	+ obj.RepairShadow();
	2639	+// for (int i=0; i<obj.size(); i++)
	2640	+// {
	2641	+// obj.get(i).parent = obj;
	2642	+// }
	2643	+ }
	2644	+
	2645	+ refreshContents();
	2646	+ } else
	2647	+ if (source == sortbysizeItem)
2433	2648	{
2434	2649	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2435	2650	{
..	..	@@ -2441,7 +2656,7 @@
2441	2656	ResetModel();
2442	2657	refreshContents();
2443	2658	} else
2444		- if (event.getSource() == sortbynameItem)
	2659	+ if (source == sortbynameItem)
2445	2660	{
2446	2661	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2447	2662	{
..	..	@@ -2453,7 +2668,7 @@
2453	2668	ResetModel();
2454	2669	refreshContents();
2455	2670	} else
2456		- if (event.getSource() == attachPigmentItem)
	2671	+ if (source == attachPigmentItem)
2457	2672	{
2458	2673	String texture = GetFile("Attach pigment");
2459	2674	Object3D obj;
..	..	@@ -2465,7 +2680,7 @@
2465	2680
2466	2681	refreshContents();
2467	2682	} else
2468		- if (event.getSource() == detachPigmentItem)
	2683	+ if (source == detachPigmentItem)
2469	2684	{
2470	2685	Object3D obj;
2471	2686	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2476,7 +2691,7 @@
2476	2691
2477	2692	refreshContents();
2478	2693	} else
2479		- if (event.getSource() == attachBumpItem)
	2694	+ if (source == attachBumpItem)
2480	2695	{
2481	2696	String texture = GetFile("Attach bump");
2482	2697	Object3D obj;
..	..	@@ -2488,7 +2703,7 @@
2488	2703
2489	2704	refreshContents();
2490	2705	} else
2491		- if (event.getSource() == detachBumpItem)
	2706	+ if (source == detachBumpItem)
2492	2707	{
2493	2708	Object3D obj;
2494	2709	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2499,7 +2714,7 @@
2499	2714
2500	2715	refreshContents();
2501	2716	} else
2502		- if (event.getSource() == pigmentBumpItem)
	2717	+ if (source == pigmentBumpItem)
2503	2718	{
2504	2719	Object3D obj;
2505	2720	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2510,158 +2725,195 @@
2510	2725
2511	2726	refreshContents();
2512	2727	} else
2513		- if (event.getSource() == flashSelectionButton)
	2728	+ if (source == flashSelectionButton)
2514	2729	{
2515	2730	CameraPane.flash = true;
2516	2731	refreshContents();
2517	2732	} else
2518		- if (event.getSource() == oneButton)
	2733	+ if (source == oneButton)
2519	2734	{
2520	2735	} else
2521		- if (event.getSource() == twoButton)
	2736	+ if (source == twoButton)
2522	2737	{
2523	2738	radio.layout = twoButton;
2524	2739	// bug
2525	2740	//gridPanel.setDividerLocation(1.0);
2526	2741	//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();
	2742	+// bigThree.remove(scenePanel);
	2743	+// bigThree.remove(centralPanel);
	2744	+// bigThree.remove(XYZPanel);
	2745	+// aWindowConstraints.gridx = 0;
	2746	+// aWindowConstraints.gridy = 0;
	2747	+// aWindowConstraints.gridwidth = 1;
	2748	+// // aConstraints.gridheight = 3;
	2749	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2750	+// aWindowConstraints.weightx = 0;
	2751	+// aWindowConstraints.weighty = 1;
	2752	+// //bigThree.add(jtp, aWindowConstraints);
	2753	+// aWindowConstraints.weightx = 1;
	2754	+// aWindowConstraints.gridwidth = 3;
	2755	+// // aConstraints.gridheight = 3;
	2756	+// aWindowConstraints.gridx = 1;
	2757	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2758	+// bigThree.add(centralPanel, aWindowConstraints);
	2759	+// aWindowConstraints.weightx = 0;
	2760	+// aWindowConstraints.gridx = 4;
	2761	+// aWindowConstraints.gridwidth = 1;
	2762	+// // aConstraints.gridheight = 3;
	2763	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2764	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2765	+// scenePanel.setVisible(false);
	2766	+// centralPanel.setVisible(true);
	2767	+// XYZPanel.setVisible(false);
	2768	+ bigThree.ClearUI();
	2769	+ bigThree.add(centralPanel);
	2770	+ bigThree.FlushUI();
2551	2771	} else
2552		- if (event.getSource() == threeButton)
	2772	+ if (source == threeButton)
2553	2773	{
2554	2774	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();
	2775	+
	2776	+// bigThree.remove(scenePanel);
	2777	+// bigThree.remove(centralPanel);
	2778	+// bigThree.remove(XYZPanel);
	2779	+// aWindowConstraints.gridx = 0;
	2780	+// aWindowConstraints.gridy = 0;
	2781	+// aWindowConstraints.gridwidth = 1;
	2782	+// // aConstraints.gridheight = 3;
	2783	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2784	+// aWindowConstraints.weightx = 0;
	2785	+// aWindowConstraints.weighty = 1;
	2786	+// //bigThree.add(jtp, aWindowConstraints);
	2787	+// aWindowConstraints.weightx = 1;
	2788	+// aWindowConstraints.gridwidth = 3;
	2789	+// // aConstraints.gridheight = 3;
	2790	+// aWindowConstraints.gridx = 1;
	2791	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2792	+// bigThree.add(centralPanel, aWindowConstraints);
	2793	+// aWindowConstraints.weightx = 0;
	2794	+// aWindowConstraints.gridx = 4;
	2795	+// aWindowConstraints.gridwidth = 1;
	2796	+// // aConstraints.gridheight = 3;
	2797	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2798	+// bigThree.add(XYZPanel, aWindowConstraints);
	2799	+// bigThree.validate();
	2800	+// scenePanel.setVisible(false);
	2801	+// centralPanel.setVisible(true);
	2802	+// XYZPanel.setVisible(true);
	2803	+ bigThree.ClearUI();
	2804	+ bigThree.add(centralPanel);
	2805	+ bigThree.add(XYZPanel);
	2806	+ bigThree.FlushUI();
2579	2807	} else
2580		- if (event.getSource() == fourButton)
	2808	+ if (source == fourButton)
2581	2809	{
2582	2810	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();
	2811	+
	2812	+// bigThree.remove(scenePanel);
	2813	+// bigThree.remove(centralPanel);
	2814	+// bigThree.remove(XYZPanel);
	2815	+// aWindowConstraints.gridx = 0;
	2816	+// aWindowConstraints.gridy = 0;
	2817	+// aWindowConstraints.gridwidth = 1;
	2818	+// // aWindowConstraints.gridheight = 3;
	2819	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2820	+// aWindowConstraints.weightx = 1;
	2821	+// aWindowConstraints.weighty = 1;
	2822	+// bigThree.add(scenePanel, aWindowConstraints);
	2823	+// aWindowConstraints.weightx = 1;
	2824	+// aWindowConstraints.gridwidth = 3;
	2825	+// // aConstraints.gridheight = 3;
	2826	+// aWindowConstraints.gridx = 1;
	2827	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2828	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2829	+// aWindowConstraints.weightx = 0;
	2830	+// aWindowConstraints.gridx = 4;
	2831	+// aWindowConstraints.gridwidth = 1;
	2832	+// // aWindowConstraints.gridheight = 3;
	2833	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2834	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2835	+// bigThree.validate();
	2836	+// scenePanel.setVisible(true);
	2837	+// centralPanel.setVisible(false);
	2838	+// XYZPanel.setVisible(false);
	2839	+ bigThree.ClearUI();
	2840	+ bigThree.add(scenePanel);
	2841	+ bigThree.FlushUI();
2607	2842	} else
2608		- if (event.getSource() == sixButton)
	2843	+ if (source == sixButton)
2609	2844	{
2610	2845	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();
	2846	+
	2847	+// bigThree.remove(scenePanel);
	2848	+// bigThree.remove(centralPanel);
	2849	+// bigThree.remove(XYZPanel);
	2850	+// aWindowConstraints.gridx = 0;
	2851	+// aWindowConstraints.gridy = 0;
	2852	+// aWindowConstraints.gridwidth = 1;
	2853	+// // aConstraints.gridheight = 3;
	2854	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2855	+// aWindowConstraints.weightx = 0;
	2856	+// aWindowConstraints.weighty = 1;
	2857	+// bigThree.add(scenePanel, aWindowConstraints);
	2858	+// aWindowConstraints.weightx = 1;
	2859	+// aWindowConstraints.gridwidth = 3;
	2860	+// // aWindowConstraints.gridheight = 3;
	2861	+// aWindowConstraints.gridx = 1;
	2862	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2863	+// bigThree.add(centralPanel, aWindowConstraints);
	2864	+// aWindowConstraints.weightx = 0;
	2865	+// aWindowConstraints.gridx = 4;
	2866	+// aWindowConstraints.gridwidth = 1;
	2867	+// // aWindowConstraints.gridheight = 3;
	2868	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2869	+// //bigThree.add(XYZPanel, aConstraints);
	2870	+// bigThree.validate();
	2871	+// scenePanel.setVisible(true);
	2872	+// centralPanel.setVisible(true);
	2873	+// XYZPanel.setVisible(false);
	2874	+ bigThree.ClearUI();
	2875	+ bigThree.add(scenePanel);
	2876	+ bigThree.add(centralPanel);
	2877	+ bigThree.FlushUI();
2635	2878	} else
2636		- if (event.getSource() == sevenButton)
	2879	+ if (source == sevenButton)
2637	2880	{
2638	2881	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();
	2882	+
	2883	+// bigThree.remove(scenePanel);
	2884	+// bigThree.remove(centralPanel);
	2885	+// bigThree.remove(XYZPanel);
	2886	+// aWindowConstraints.gridx = 0;
	2887	+// aWindowConstraints.gridy = 0;
	2888	+// aWindowConstraints.gridwidth = 1;
	2889	+// // aWindowConstraints.gridheight = 3;
	2890	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2891	+// aWindowConstraints.weightx = 0;
	2892	+// aWindowConstraints.weighty = 1;
	2893	+// bigThree.add(scenePanel, aWindowConstraints);
	2894	+// aWindowConstraints.weightx = 1;
	2895	+// aWindowConstraints.gridwidth = 3;
	2896	+// // aWindowConstraints.gridheight = 3;
	2897	+// aWindowConstraints.gridx = 1;
	2898	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2899	+// bigThree.add(centralPanel, aWindowConstraints);
	2900	+// aWindowConstraints.weightx = 0;
	2901	+// aWindowConstraints.gridx = 4;
	2902	+// aWindowConstraints.gridwidth = 1;
	2903	+// // aConstraints.gridheight = 3;
	2904	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2905	+// bigThree.add(XYZPanel, aWindowConstraints);
	2906	+// bigThree.validate();
	2907	+// scenePanel.setVisible(true);
	2908	+// centralPanel.setVisible(true);
	2909	+// XYZPanel.setVisible(true);
	2910	+ bigThree.ClearUI();
	2911	+ bigThree.add(scenePanel);
	2912	+ bigThree.add(centralPanel);
	2913	+ bigThree.add(XYZPanel);
	2914	+ bigThree.FlushUI();
2663	2915	} else
2664		- if (event.getSource() == rootButton)
	2916	+ if (source == rootButton)
2665	2917	{
2666	2918	Object3D obj;
2667	2919	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2673,7 +2925,7 @@
2673	2925
2674	2926	refreshContents(true);
2675	2927	} else
2676		- if (event.getSource() == closeButton)
	2928	+ if (source == closeButton)
2677	2929	{
2678	2930	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2679	2931	cRadio ab;
..	..	@@ -2694,11 +2946,11 @@
2694	2946	}
2695	2947	refreshContents(true);
2696	2948	} else
2697		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2949	+ if (source == editItem \|\| source == editButton)
2698	2950	{
2699	2951	EditSelection(false);
2700	2952	} else
2701		- if (event.getSource() == uneditButton)
	2953	+ if (source == uneditButton)
2702	2954	{
2703	2955	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2704	2956	{
..	..	@@ -2710,12 +2962,12 @@
2710	2962
2711	2963	child.editWindow = null; // ???????????
2712	2964	}
2713		- objEditor.ctrlPanel.revalidate();
	2965	+ objEditor.ctrlPanel.FlushUI();
2714	2966	//objEditor.jTree.clearSelection();
2715	2967	//objEditor.ResetSliders();
2716	2968	refreshContents(true);
2717	2969	} else
2718		- if (event.getSource() == clearPanelButton)
	2970	+ if (source == clearPanelButton)
2719	2971	{
2720	2972	assert(copy == group);
2721	2973	//copy.ClearUI();
..	..	@@ -2726,7 +2978,7 @@
2726	2978	listUI.clear();
2727	2979	refreshContents(true);
2728	2980	} else
2729		- if (event.getSource() == allParamsButton)
	2981	+ if (source == allParamsButton)
2730	2982	{
2731	2983	assert(copy == group);
2732	2984
..	..	@@ -2747,19 +2999,19 @@
2747	2999
2748	3000	refreshContents(true);
2749	3001	} else
2750		- if (event.getSource() == unselectButton)
	3002	+ if (source == unselectButton)
2751	3003	{
2752	3004	objEditor.jTree.clearSelection();
2753		- // ?? oct 2012 GraphreeD.clipboard.clear();
	3005	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2754	3006	objEditor.ResetSliders();
2755	3007	refreshContents(true);
2756	3008	} else
2757		- if(event.getSource() instanceof cRadio)
	3009	+ if(source instanceof cRadio)
2758	3010	{
2759	3011	group.parent = keepparent;
2760	3012	group.attributes = 0;
2761	3013	//group.editWindow = null;
2762		- /cRadio/ radio = (cRadio)event.getSource();
	3014	+ /cRadio/ radio = (cRadio)source;
2763	3015	Object3D obj = radio.GetObject();
2764	3016	System.out.println("Edit " + obj);
2765	3017	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2779,7 +3031,7 @@
2779	3031	}
2780	3032
2781	3033	copy = group;
2782		- //CameraPane.theRenderer.object = group;
	3034	+ //Globals.theRenderer.object = group;
2783	3035	if(!useclient)
2784	3036	{
2785	3037	cameraView.renderCamera = radio.camera;
..	..	@@ -2788,7 +3040,8 @@
2788	3040	cameraView.cameras[cameraView.cameracount] = radio.camera;
2789	3041	cameraView.targetLookAt.set(radio.camera.lookAt);
2790	3042	cameraView.object = group;
2791		- cameraView.lighttouched = true;
	3043	+ //cameraView.lighttouched = true;
	3044	+ Globals.lighttouched = true;
2792	3045	topView.object = group;
2793	3046	frontView.object = group;
2794	3047	sideView.object = group;
..	..	@@ -2824,7 +3077,7 @@
2824	3077	if (useclient)
2825	3078	{
2826	3079	cameraView.object = client;
2827		- cameraView.lighttouched = true;
	3080	+ Globals.lighttouched = true;
2828	3081	//topView.object = client;
2829	3082	//frontView.object = client;
2830	3083	//sideView.object = client;
..	..	@@ -2832,7 +3085,7 @@
2832	3085	else
2833	3086	{
2834	3087	cameraView.object = group;
2835		- cameraView.lighttouched = true;
	3088	+ Globals.lighttouched = true;
2836	3089	//topView.object = group;
2837	3090	//frontView.object = group;
2838	3091	//sideView.object = group;
..	..	@@ -3065,9 +3318,9 @@
3065	3318	obj = (Object3D)e.nextElement();
3066	3319
3067	3320	System.out.println("Object is: " + obj);
3068		- GraphreeD.AnalyzeObject(obj);
	3321	+ GrafreeD.AnalyzeObject(obj);
3069	3322	System.out.println("Boundary rep: " + obj.bRep);
3070		- GraphreeD.AnalyzeObject(obj.bRep);
	3323	+ GrafreeD.AnalyzeObject(obj.bRep);
3071	3324
3072	3325	// System.err.println((size/1024) + " KB is the size of " + obj);
3073	3326	}
..	..	@@ -3109,6 +3362,13 @@
3109	3362	void GenNormals(boolean crease)
3110	3363	{
3111	3364	group.GenNormalsS(crease);
	3365	+
	3366	+ refreshContents();
	3367	+ }
	3368	+
	3369	+ void GenNormalsMINE()
	3370	+ {
	3371	+ group.selection.GenNormalsMINE();
3112	3372
3113	3373	refreshContents();
3114	3374	}
..	..	@@ -3157,104 +3417,250 @@
3157	3417
3158	3418	//Object3D buffer;
3159	3419	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		-
	3420	+// BoundaryRep temprep;
	3421	+// Object3D nodes;
	3422	+// Vector<Vertex> vertices;
	3423	+//
	3424	+// cGroup buffer;
	3425	+//
	3426	+// public void Vertex(Object3D node, Vertex v)
	3427	+// {
	3428	+//// vertices.add(v);
	3429	+//// nodes.addElement(node);
	3430	+////
	3431	+//// if (temprep.GetCache(v) != null)
	3432	+//// {
	3433	+//// temprep.Remove(v);
	3434	+//// } else
	3435	+//// {
	3436	+//// temprep.Remember(v);
	3437	+//// }
	3438	+//
	3439	+// //Object3D node = nodes.get(index);
	3440	+// temp.set(v); // vertices.get(index)); // temprep.GetVertex(k));
	3441	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3442	+//
	3443	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	3444	+//
	3445	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	3446	+//
	3447	+// cGroup g = new cGroup();
	3448	+//
	3449	+// if (g.toParent == null)
	3450	+// {
	3451	+// g.toParent = LA.newMatrix();
	3452	+// g.fromParent = LA.newMatrix();
	3453	+// }
	3454	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3455	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3456	+//
	3457	+// g.add(GrafreeD.clipboard);
	3458	+//
	3459	+// buffer.add(g);
	3460	+// }
	3461	+//
	3462	+// public void Face(Object3D node, Face f)
	3463	+// {
	3464	+//
	3465	+// }
	3466	+//
	3467	+// void ParseVerticesOld() // ??
	3468	+// {
	3469	+// //if (group.selection.size() != 1)
	3470	+// // return;
	3471	+//
	3472	+// temprep = new BoundaryRep();
	3473	+// nodes = new Object3D();
	3474	+// vertices = new Vector<Vertex>();
	3475	+//
	3476	+// boolean epsequal = GrafreeD.epsequal;
	3477	+// GrafreeD.epsequal = true;
	3478	+//
	3479	+// for (int i=0; i<group.selection.size(); i++)
	3480	+// {
	3481	+// Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	3482	+//
	3483	+// group.selection.get(i).Parse(
	3484	+//this );
	3485	+//
	3486	+// int repsize = temprep.VertexCount();
	3487	+// int tablesize = temprep.vertextable.size();
	3488	+// int nodesize = nodes.size();
	3489	+//
	3490	+// assert(vertices.size() == nodes.size());
	3491	+//
	3492	+// temprep.vertextable.elements();
	3493	+//
	3494	+// java.util.Set<java.util.Map.Entry<Vertex,Vertex>> set = temprep.vertextable.entrySet();
	3495	+//
	3496	+// for (java.util.Map.Entry<Vertex,Vertex> entry : set)
	3497	+// {
	3498	+// cGroup g = new cGroup();
	3499	+//
	3500	+// int index = vertices.indexOf(entry.getValue()); // temprep.vertextable.(k));
	3501	+//
	3502	+// Object3D node = nodes.get(index);
	3503	+// temp.set(vertices.get(index)); // temprep.GetVertex(k));
	3504	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3505	+//
	3506	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	3507	+//
	3508	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	3509	+//
	3510	+// if (g.toParent == null)
	3511	+// {
	3512	+// g.toParent = LA.newMatrix();
	3513	+// g.fromParent = LA.newMatrix();
	3514	+// }
	3515	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3516	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3517	+//
	3518	+// g.add(GrafreeD.clipboard);
	3519	+//
	3520	+// buffer.add(g);
	3521	+// }
	3522	+//
	3523	+// makeSomething(buffer, i==group.selection.size()-1);
	3524	+// }
	3525	+//
	3526	+// GrafreeD.epsequal = epsequal;
	3527	+//
	3528	+// //buffer = null;
	3529	+// temprep = null;
	3530	+// nodes = null;
	3531	+//
	3532	+// refreshContents();
	3533	+// }
	3534	+
3184	3535	void ParseVertices()
3185	3536	{
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;
	3537	+ boolean epsequal = GrafreeD.epsequal;
	3538	+ GrafreeD.epsequal = true;
3195	3539
3196	3540	for (int i=0; i<group.selection.size(); i++)
3197	3541	{
3198		- Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	3542	+ final cGroup buffer = new cGroup(group.selection.get(i).name + "+");
3199	3543
3200		- group.selection.get(i).Parse(this);
3201		-
3202		- int repsize = temprep.VertexCount();
3203		- int tablesize = temprep.vertextable.size();
3204		- int nodesize = nodes.size();
	3544	+ group.selection.get(i).Parse(
	3545	+
	3546	+ new iParse()
	3547	+ {
	3548	+ public void Vertex(Object3D node, Vertex v)
	3549	+ {
	3550	+ temp.set(v);
	3551	+ LA.xformPos(temp, node.GlobalTransformInv(), temp);
3205	3552
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();
	3553	+ cGroup g = new cGroup();
3211	3554
3212		- for (java.util.Map.Entry<Vertex,Vertex> entry : set)
3213		- {
3214		- cGroup g = new cGroup();
	3555	+ if (g.toParent == null)
	3556	+ {
	3557	+ g.toParent = LA.newMatrix();
	3558	+ g.fromParent = LA.newMatrix();
	3559	+ }
	3560	+ LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3561	+ LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3215	3562
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);
	3563	+ g.add(GrafreeD.clipboard);
3220	3564
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);
	3565	+ buffer.add(g);
	3566	+ }
3232	3567
3233		- g.add(GraphreeD.clipboard);
	3568	+ public void Face(Object3D node, Face f)
	3569	+ {
3234	3570
3235		- buffer.add(g);
3236		- }
	3571	+ }
	3572	+ }
	3573	+ );
3237	3574
3238	3575	makeSomething(buffer, i==group.selection.size()-1);
3239	3576	}
3240	3577
3241		- GraphreeD.epsequal = epsequal;
3242		-
3243		- //buffer = null;
3244		- temprep = null;
3245		- nodes = null;
	3578	+ GrafreeD.epsequal = epsequal;
3246	3579
3247	3580	refreshContents();
3248	3581	}
3249		-
	3582	+
	3583	+ void TextureVertices()
	3584	+ {
	3585	+ for (int i=0; i<group.selection.size(); i++)
	3586	+ {
	3587	+ group.selection.get(i).Parse(
	3588	+ new iParse()
	3589	+ {
	3590	+ public void Vertex(Object3D node, Vertex v)
	3591	+ {
	3592	+ cTexture tex = node.GetTextures();
	3593	+ String pigment = Object3D.GetPigment(tex);
	3594	+ //String bump = Object3D.GetBump(tex);
	3595	+
	3596	+ com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3597	+
	3598	+ double s = v.s;
	3599	+
	3600	+ if (s == 1)
	3601	+ s = 0;
	3602	+
	3603	+ double t = v.t;
	3604	+
	3605	+ if (t == 1)
	3606	+ t = 0;
	3607	+
	3608	+ int indexs = (int) (texturedata.getWidth() * s);
	3609	+ int indext = (int) (texturedata.getHeight() * t);
	3610	+
	3611	+ int index = indext * texturedata.getWidth() + indexs;
	3612	+
	3613	+ java.nio.ByteBuffer bytebuf = (java.nio.ByteBuffer)texturedata.getBuffer();
	3614	+
	3615	+ int slide = bytebuf.capacity() / texturedata.getWidth() / texturedata.getHeight();
	3616	+
	3617	+ float scale = bytebuf.get(index*slide) & 0xFF;
	3618	+ scale += bytebuf.get(index*slide+1) & 0xFF;
	3619	+ scale += bytebuf.get(index*slide+2) & 0xFF;
	3620	+ scale /= 3;
	3621	+
	3622	+ scale /= 0xFF;
	3623	+ // c'est quoi ca? scale /= 4;
	3624	+
	3625	+ //v.AO = scale;
	3626	+
	3627	+ v.x += v.norm.x * scale;
	3628	+ v.y += v.norm.y * scale;
	3629	+ v.z += v.norm.z * scale;
	3630	+ }
	3631	+
	3632	+ public void Face(Object3D node, Face f)
	3633	+ {
	3634	+ }
	3635	+ }
	3636	+ );
	3637	+ }
	3638	+
	3639	+ refreshContents();
	3640	+ }
	3641	+
3250	3642	void Align()
3251	3643	{
	3644	+ if (group.selection.size() == 0)
	3645	+ return;
	3646	+
	3647	+ cVector bbmin = new cVector();
	3648	+ cVector bbmax = new cVector();
	3649	+
	3650	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3651	+
	3652	+ double dx = bbmax.x - bbmin.x;
	3653	+ double dy = bbmax.y - bbmin.y;
	3654	+ double dz = bbmax.z - bbmin.z;
	3655	+
	3656	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3657	+
3252	3658	for (int i=0; i<group.selection.size(); i++)
3253	3659	{
3254	3660	Object3D obj = group.selection.get(i);
3255	3661
3256		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3257		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3662	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3663	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3258	3664	}
3259	3665
3260	3666	refreshContents();
..	..	@@ -3267,7 +3673,7 @@
3267	3673	// ref.SaveSupports();
3268	3674	// Object3D par = ref.parent;
3269	3675	// ref.parent = null;
3270		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	3676	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3271	3677	// ref.parent = par;
3272	3678	// ref.RestoreSupports();
3273	3679
..	..	@@ -3275,11 +3681,11 @@
3275	3681
3276	3682	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3277	3683
3278		- boolean random = CameraPane.RANDOM;
3279		- CameraPane.RANDOM = false; // parse all random nodes
	3684	+ boolean random = CameraPane.SWITCH;
	3685	+ CameraPane.SWITCH = false; // parse all random nodes
3280	3686	lowres.linkVerticesThis(null);
3281	3687	lowres.linkVerticesThis(sn);
3282		- CameraPane.RANDOM = random;
	3688	+ CameraPane.SWITCH = random;
3283	3689
3284	3690	System.err.flush();
3285	3691
..	..	@@ -3297,7 +3703,7 @@
3297	3703	// lowres.SaveSupports();
3298	3704	// par = lowres.parent;
3299	3705	// lowres.parent = null;
3300		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	3706	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3301	3707	Object3D newlow = CloneObject(lowres, false);
3302	3708	newlow.name = sn.switchobject.get(i).name;
3303	3709	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3319,7 +3725,7 @@
3319	3725	return;
3320	3726
3321	3727	Object3D poses = group.selection.get(0);
3322		- Object3D ref = GraphreeD.clipboard.get(0);
	3728	+ Object3D ref = GrafreeD.clipboard.get(0);
3323	3729
3324	3730	Object3D newgroup = new Object3D("Po:" + poses.name);
3325	3731
..	..	@@ -3488,7 +3894,7 @@
3488	3894	group.selection.RelinkToSupport(); // july 2014
3489	3895	System.out.println("DONE.");
3490	3896	refreshContents();
3491		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3897	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3492	3898	}
3493	3899
3494	3900	void ReduceMesh(boolean reduction34)
..	..	@@ -3513,20 +3919,20 @@
3513	3919
3514	3920	void ClipMesh()
3515	3921	{
3516		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	3922	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
3517	3923	{
3518		- Object3D content = GraphreeD.clipboard.get(0);
	3924	+ Object3D content = GrafreeD.clipboard.get(0);
3519	3925
3520	3926	if (content instanceof cGroup && ((cGroup)content).transientlink )
3521	3927	content = ((cGroup)content).get(0);
3522	3928
3523	3929	// for (int i=0; i<group.selection.size(); i++)
3524	3930	// {
3525		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	3931	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3526	3932	// }
3527		- group.selection.ClipMesh(GraphreeD.clipboard);
	3933	+ group.selection.ClipMesh(GrafreeD.clipboard);
3528	3934	}
3529		-// group.selection.ClipMesh(GraphreeD.clipboard);
	3935	+// group.selection.ClipMesh(GrafreeD.clipboard);
3530	3936	System.out.println("DONE.");
3531	3937	refreshContents();
3532	3938	}
..	..	@@ -3764,25 +4170,25 @@
3764	4170	System.err.println("info : " + child.GetPath());
3765	4171	}
3766	4172	}
3767		- else
3768		- {
3769		- objEditor.SetMaterial(group); // .GetMaterial());
3770		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3771		- System.err.println("info : " + group.GetPath());
3772		- }
	4173	+// else
	4174	+// {
	4175	+// objEditor.SetMaterial(group); // .GetMaterial());
	4176	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4177	+// System.err.println("info : " + group.GetPath());
	4178	+// }
3773	4179
3774	4180	objEditor.SetText(); // jan 2014
3775	4181
3776		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4182	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
3777	4183	CameraPane.flash = true;
3778	4184
3779	4185	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
3780	4186	// a camera
3781	4187	{
3782	4188	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;
	4189	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4190	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4191	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3786	4192	}
3787	4193
3788	4194	refreshContents();
..	..	@@ -3864,12 +4270,12 @@
3864	4270	{
3865	4271	if (group.selection.isEmpty())
3866	4272	return;
3867		- GraphreeD.clipboardIsTempGroup = false;
	4273	+ GrafreeD.clipboardIsTempGroup = false;
3868	4274	Composite tGroup = null;
3869	4275	if (group.selection.size() > 0) // 1)
3870	4276	{
3871	4277	tGroup = new cGroup();
3872		- GraphreeD.clipboardIsTempGroup = true;
	4278	+ GrafreeD.clipboardIsTempGroup = true;
3873	4279	}
3874	4280
3875	4281	if (cut)
..	..	@@ -3909,16 +4315,16 @@
3909	4315	//System.out.println("cut " + child);
3910	4316	//System.out.println("parent = " + child.parent);
3911	4317	// tmp.addChild(child);
3912		- if (GraphreeD.clipboardIsTempGroup)
	4318	+ if (GrafreeD.clipboardIsTempGroup)
3913	4319	tGroup.add/Child/(tmp);
3914	4320	else
3915		- GraphreeD.clipboard = tmp;
	4321	+ GrafreeD.clipboard = tmp;
3916	4322	}
3917	4323	else
3918		- if (GraphreeD.clipboardIsTempGroup)
	4324	+ if (GrafreeD.clipboardIsTempGroup)
3919	4325	tGroup.add/Child/(child);
3920	4326	else
3921		- GraphreeD.clipboard = child;
	4327	+ GrafreeD.clipboard = child;
3922	4328	}
3923	4329
3924	4330	//ResetModel();
..	..	@@ -3950,21 +4356,21 @@
3950	4356	//System.out.println("cut " + elem);
3951	4357	//System.out.println("parent = " + elem.parent);
3952	4358	// tmp.addChild(elem);
3953		- if (GraphreeD.clipboardIsTempGroup)
	4359	+ if (GrafreeD.clipboardIsTempGroup)
3954	4360	tGroup.add/Child/(tmp);
3955	4361	else
3956		- GraphreeD.clipboard = tmp;
	4362	+ GrafreeD.clipboard = tmp;
3957	4363	}
3958	4364	else
3959		- if (GraphreeD.clipboardIsTempGroup)
	4365	+ if (GrafreeD.clipboardIsTempGroup)
3960	4366	tGroup.add/Child/(child);
3961	4367	else
3962		- GraphreeD.clipboard = child;
	4368	+ GrafreeD.clipboard = child;
3963	4369	}
3964	4370
3965	4371	}
3966		- if (GraphreeD.clipboardIsTempGroup)
3967		- GraphreeD.clipboard = tGroup;
	4372	+ if (GrafreeD.clipboardIsTempGroup)
	4373	+ GrafreeD.clipboard = tGroup;
3968	4374	if (cut)
3969	4375	{
3970	4376	ResetModel();
..	..	@@ -3974,11 +4380,11 @@
3974	4380
3975	4381	void paste(boolean expand)
3976	4382	{
3977		- // if (GraphreeD.clipboard == null)
	4383	+ // if (GrafreeD.clipboard == null)
3978	4384	// return;
3979	4385	boolean first = true;
3980	4386
3981		- if (GraphreeD.clipboardIsTempGroup)
	4387	+ if (GrafreeD.clipboardIsTempGroup)
3982	4388	{
3983	4389	Composite temp;
3984	4390
..	..	@@ -3989,7 +4395,7 @@
3989	4395	temp = (Composite)Applet3D.clipboard.deepCopy();
3990	4396	*/
3991	4397	Object3D elem;
3992		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4398	+ for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
3993	4399	{
3994	4400	Object3D child = (Object3D)e.nextElement();
3995	4401
..	..	@@ -4003,7 +4409,7 @@
4003	4409	else
4004	4410	elem = child.deepCopy(); // ?
4005	4411	child.parent = keepparent;
4006		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	4412	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4007	4413	// elem = elem.get(0);
4008	4414	makeSomething(elem, true); // ?? first);
4009	4415	//group.addChild(elem);
..	..	@@ -4023,23 +4429,23 @@
4023	4429	//Object3D cb = Applet3D.clipboard;
4024	4430	//temp.addChild(cb);
4025	4431	//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());
	4432	+ assert(GrafreeD.clipboard.parent == null);
	4433	+ Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
	4434	+ GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
	4435	+ if (LA.isIdentity(GrafreeD.clipboard.toParent))
	4436	+ makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
4031	4437	else
4032		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4033		- GraphreeD.clipboard.get(0).parent = keepparent;
	4438	+ makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
	4439	+ GrafreeD.clipboard.get(0).parent = keepparent;
4034	4440	}
4035	4441
4036	4442	ResetModel();
4037	4443	refreshContents();
4038	4444	}
4039	4445
4040		- void pasteInto(boolean copyit)
	4446	+ void pasteInto(boolean copyit, boolean clone)
4041	4447	{
4042		-// if (GraphreeD.clipboard == null)
	4448	+// if (GrafreeD.clipboard == null)
4043	4449	// return;
4044	4450
4045	4451	if (group.selection.size() != 1)
..	..	@@ -4066,15 +4472,22 @@
4066	4472	if (copyit)
4067	4473	{
4068	4474	// paste(false);
4069		- CloneClipboard(false); // sept 2014
	4475	+ if (clone)
	4476	+ {
	4477	+ CloneClipboard(false); // sept 2014
	4478	+ }
	4479	+ else
	4480	+ {
	4481	+ paste(false);
	4482	+ }
4070	4483	}
4071	4484	else
4072	4485	{
4073	4486	boolean first = true;
4074	4487
4075		- if (GraphreeD.clipboardIsTempGroup)
	4488	+ if (GrafreeD.clipboardIsTempGroup)
4076	4489	{
4077		- Composite temp = (Composite)GraphreeD.clipboard;
	4490	+ Composite temp = (Composite)GrafreeD.clipboard;
4078	4491	Object3D copy;
4079	4492	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4080	4493	{
..	..	@@ -4084,7 +4497,7 @@
4084	4497	}
4085	4498	} else
4086	4499	{
4087		- linkSomething(GraphreeD.clipboard); //.get(0));
	4500	+ linkSomething(GrafreeD.clipboard); //.get(0));
4088	4501	}
4089	4502	}
4090	4503	}
..	..	@@ -4276,6 +4689,26 @@
4276	4689	makeSomething(csg);
4277	4690	}
4278	4691
	4692	+ void Ungroup(Object3D g)
	4693	+ {
	4694	+ if (g instanceof HiddenObject)
	4695	+ {
	4696	+ HiddenObject h = (HiddenObject) g;
	4697	+
	4698	+ for (int i=0; i<h.ActualSize(); i++)
	4699	+ {
	4700	+ objEditor.makeSomething(h.get(i), false);
	4701	+ }
	4702	+ }
	4703	+ else
	4704	+ {
	4705	+ for (int i=0; i<g.Size(); i++)
	4706	+ {
	4707	+ objEditor.makeSomething(g.get(i), false);
	4708	+ }
	4709	+ }
	4710	+ }
	4711	+
4279	4712	void ungroup()
4280	4713	{
4281	4714	/*
..	..	@@ -4471,7 +4904,7 @@
4471	4904
4472	4905	void ImportGFD()
4473	4906	{
4474		- FileDialog browser = new FileDialog(objEditor.frame, "Import GraphreeD", FileDialog.LOAD);
	4907	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4475	4908	browser.show();
4476	4909	String filename = browser.getFile();
4477	4910	if (filename != null && filename.length() > 0)
..	..	@@ -4509,7 +4942,7 @@
4509	4942
4510	4943	void ImportVRMLX3D()
4511	4944	{
4512		- if (GraphreeD.standAlone)
	4945	+ if (GrafreeD.standAlone)
4513	4946	{
4514	4947	/**/
4515	4948	FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
..	..	@@ -4526,7 +4959,7 @@
4526	4959
4527	4960	String GetFile(String dialogName)
4528	4961	{
4529		- if (GraphreeD.standAlone)
	4962	+ if (GrafreeD.standAlone)
4530	4963	{
4531	4964	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4532	4965	browser.show();
..	..	@@ -4590,10 +5023,12 @@
4590	5023	cButton flashSelectionButton;
4591	5024	cButton editButton;
4592	5025	cButton uneditButton;
	5026	+ JCheckBox allParamsButton;
4593	5027	cButton clearpanelButton;
4594		- cButton allParamsButton;
4595	5028	cButton unselectButton;
4596	5029
	5030	+ cButton oneStepButton;
	5031	+
4597	5032	cButton screenfitButton;
4598	5033	cButton screenfitpointButton;
4599	5034	cButton snapobjectButton;
..	..	@@ -4635,6 +5070,7 @@
4635	5070	private MenuItem resetsupportItem;
4636	5071	private MenuItem resetreferencesItem;
4637	5072	private MenuItem linkverticesItem;
	5073	+ private MenuItem relinkverticesItem;
4638	5074	private MenuItem setMasterItem;
4639	5075	private MenuItem resetMeshItem;
4640	5076	private MenuItem stepAllItem;
..	..	@@ -4647,14 +5083,17 @@
4647	5083	private MenuItem mergeGeometriesItem;
4648	5084	private MenuItem copyItem;
4649	5085	private MenuItem pasteItem;
	5086	+ private MenuItem pasteIntoItem;
4650	5087	private MenuItem pasteLinkItem;
4651	5088	private MenuItem pasteCloneItem;
4652	5089	private MenuItem pasteExpandItem;
4653	5090	private MenuItem clearItem;
4654	5091	private MenuItem clearAllItem;
4655	5092	private MenuItem genUVItem;
	5093	+ private MenuItem genNormalsMESHItem;
4656	5094	private MenuItem genNormalsCADItem;
4657	5095	private MenuItem genNormalsORGANItem;
	5096	+ private MenuItem genNormalsMINEItem;
4658	5097	private MenuItem stripifyItem;
4659	5098	private MenuItem unstripifyItem;
4660	5099	private MenuItem trimItem;
..	..	@@ -4696,6 +5135,7 @@
4696	5135	private MenuItem resetCentroidItem;
4697	5136	private MenuItem transformgeometryItem;
4698	5137	private MenuItem resetTransformItem;
	5138	+ private MenuItem hideItem;
4699	5139	private MenuItem grabItem;
4700	5140	private MenuItem backItem;
4701	5141	private MenuItem frontItem;
..	..	@@ -4716,6 +5156,7 @@
4716	5156
4717	5157	private MenuItem resetParentItem;
4718	5158	private MenuItem repairParentItem;
	5159	+ private MenuItem repairShadowItem;
4719	5160	private MenuItem sortbysizeItem;
4720	5161	private MenuItem sortbynameItem;
4721	5162
..	..	@@ -4728,16 +5169,19 @@
4728	5169	private MenuItem particleItem;
4729	5170	private MenuItem ragdollItem;
4730	5171	private MenuItem ragdoll2Item;
	5172	+ private MenuItem heightFieldItem;
	5173	+ private MenuItem textureFieldItem;
4731	5174	private MenuItem gridItem;
4732	5175	private MenuItem rectoidItem;
4733	5176	private MenuItem ellipsoidItem;
4734	5177	private MenuItem coneItem;
4735	5178	private MenuItem torusItem;
4736	5179	private MenuItem superItem;
	5180	+ private MenuItem kleinItem;
4737	5181	private MenuItem blobItem;
4738	5182	private MenuItem latheItem;
4739	5183	private MenuItem bezierItem;
4740		- private MenuItem checkerItem;
	5184	+ private MenuItem overlayItem;
4741	5185	private MenuItem meshItem;
4742	5186	// private MenuItem meshGroupItem;
4743	5187	private MenuItem springItem;
..	..	@@ -4746,6 +5190,7 @@
4746	5190	private MenuItem csgItem;
4747	5191	private MenuItem templateItem;
4748	5192	private MenuItem textureItem;
	5193	+ private MenuItem billboardItem;
4749	5194	private MenuItem shadowXItem;
4750	5195	private MenuItem shadowYItem;
4751	5196	private MenuItem shadowZItem;