~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,9 +12,10 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17		-class GroupEditor extends ObjEditor implements iParse, //iCallBack,
	18	+class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
18	19	ObjectUI,
19	20	Runnable,
20	21	ActionListener,
..	..	@@ -83,7 +84,7 @@
83	84
84	85	void CloneSelection(boolean supports)
85	86	{
86		- // Object3D keep = GraphreeD.clipboard;
	87	+ // Object3D keep = GrafreeD.clipboard;
87	88	//Object3D obj;
88	89	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
89	90	{
..	..	@@ -97,14 +98,14 @@
97	98
98	99	void CloneClipboard(boolean supports)
99	100	{
100		- assert(GraphreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
102		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GraphreeD.clipboard.get(0), false));
	101	+ assert(GrafreeD.clipboard.parent == null);
	102	+ Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
	103	+ GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
	104	+ if (LA.isIdentity(GrafreeD.clipboard.toParent))
	105	+ makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
105	106	else
106		- makeSomething(CloneObject(GraphreeD.clipboard, false));
107		- GraphreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(GrafreeD.clipboard, false));
	108	+ GrafreeD.clipboard.get(0).parent = keepparent;
108	109	}
109	110
110	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +119,7 @@
118	119	// obj.support = null;
119	120	if (!supports)
120	121	obj.SaveSupports();
121		- Object3D clone = (Object3D)GraphreeD.clone(obj);
	122	+ Object3D clone = (Object3D)GrafreeD.clone(obj);
122	123	obj.parent = parent;
123	124	// obj.support = support;
124	125	// clone.support = support; // aout 2013
..	..	@@ -188,8 +189,9 @@
188	189	clearItem.addActionListener(this);
189	190	clearAllItem = menu.add(new MenuItem("Clear All"));
190	191	clearAllItem.addActionListener(this);
191		- menu.add("-");
192		- resetMeshItem = menu.add(new MenuItem("Reset All"));
	192	+
	193	+ oe.menuBar.add(menu = new Menu("Setting"));
	194	+ resetMeshItem = menu.add(new MenuItem("Reset All"));
193	195	resetMeshItem.addActionListener(this);
194	196	stepAllItem = menu.add(new MenuItem("Step All"));
195	197	stepAllItem.addActionListener(this);
..	..	@@ -218,18 +220,24 @@
218	220	resetsupportItem.addActionListener(this);
219	221	linkverticesItem = menu.add(new MenuItem("Link to Support"));
220	222	linkverticesItem.addActionListener(this);
	223	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	224	+ relinkverticesItem.addActionListener(this);
221	225	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
222	226	setMasterItem.addActionListener(this);
223	227
224		- oe.menuBar.add(menu = new Menu("Object"));
	228	+ oe.menuBar.add(menu = new Menu("Group"));
225	229	grabItem = menu.add(new MenuItem("Grab"));
226	230	grabItem.addActionListener(this);
227		- frontItem = menu.add(new MenuItem("Front"));
228		- frontItem.addActionListener(this);
229	231	backItem = menu.add(new MenuItem("Back"));
230	232	backItem.addActionListener(this);
	233	+ frontItem = menu.add(new MenuItem("Front"));
	234	+ frontItem.addActionListener(this);
231	235	compositeItem = menu.add(new MenuItem("Composite"));
232	236	compositeItem.addActionListener(this);
	237	+ hideItem = menu.add(new MenuItem("Hide"));
	238	+ hideItem.addActionListener(this);
	239	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	240	+ ungroupItem.addActionListener(this);
233	241	menu.add("-");
234	242	randomItem = menu.add(new MenuItem("Random"));
235	243	randomItem.addActionListener(this);
..	..	@@ -247,9 +255,12 @@
247	255	scriptNodeItem.addActionListener(this);
248	256	cameraItem = menu.add(new MenuItem("Camera"));
249	257	cameraItem.addActionListener(this);
250		- menu.add("-");
	258	+
	259	+ oe.menuBar.add(menu = new Menu("Object"));
251	260	textureItem = menu.add(new MenuItem("Texture"));
252	261	textureItem.addActionListener(this);
	262	+ billboardItem = menu.add(new MenuItem("Billboard"));
	263	+ billboardItem.addActionListener(this);
253	264	csgItem = menu.add(new MenuItem("CSG"));
254	265	csgItem.addActionListener(this);
255	266	shadowXItem = menu.add(new MenuItem("Shadow X"));
..	..	@@ -267,14 +278,12 @@
267	278	pointflowItem = menu.add(new MenuItem("Point Flow"));
268	279	pointflowItem.addActionListener(this);
269	280	menu.add("-");
270		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
271		- transformgeometryItem.addActionListener(this);
272	281	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
273	282	resetTransformItem.addActionListener(this);
274	283	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
275	284	resetCentroidItem.addActionListener(this);
276		- ungroupItem = menu.add(new MenuItem("Ungroup"));
277		- ungroupItem.addActionListener(this);
	285	+ transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
	286	+ transformgeometryItem.addActionListener(this);
278	287
279	288	oe.menuBar.add(menu = new Menu("Geometry"));
280	289	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -283,6 +292,10 @@
283	292	genNormalsORGANItem.addActionListener(this);
284	293	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
285	294	genNormalsCADItem.addActionListener(this);
	295	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	296	+ genNormalsMESHItem.addActionListener(this);
	297	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	298	+ genNormalsMINEItem.addActionListener(this);
286	299	stripifyItem = menu.add(new MenuItem("Stripify"));
287	300	stripifyItem.addActionListener(this);
288	301	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -292,8 +305,6 @@
292	305	untrimItem = menu.add(new MenuItem("Untrim"));
293	306	untrimItem.addActionListener(this);
294	307	menu.add("-");
295		- clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
296		- clearMaterialsItem.addActionListener(this);
297	308	clearColorsItem = menu.add(new MenuItem("Clear AO"));
298	309	clearColorsItem.addActionListener(this);
299	310	reverseNormalsItem = menu.add(new MenuItem("Reverse Normals"));
..	..	@@ -310,6 +321,10 @@
310	321	smoothMeshItem.addActionListener(this);
311	322	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	323	clipMeshItem.addActionListener(this);
	324	+
	325	+ oe.menuBar.add(menu = new Menu("Attributes"));
	326	+ clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
	327	+ clearMaterialsItem.addActionListener(this);
313	328	menu.add("-");
314	329	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
315	330	liveleavesItem.addActionListener(this);
..	..	@@ -332,27 +347,18 @@
332	347	flipVItem.addActionListener(this);
333	348	unflipVItem = menu.add(new MenuItem("Unflip V"));
334	349	unflipVItem.addActionListener(this);
335		- lowTexturesItem = menu.add(new MenuItem("Low Texture"));
	350	+ lowTexturesItem = menu.add(new MenuItem("Low Texture (256)"));
336	351	lowTexturesItem.addActionListener(this);
337		- normalTexturesItem = menu.add(new MenuItem("Normal Texture"));
	352	+ normalTexturesItem = menu.add(new MenuItem("Normal Texture (512)"));
338	353	normalTexturesItem.addActionListener(this);
339		- highTexturesItem = menu.add(new MenuItem("High Texture"));
	354	+ highTexturesItem = menu.add(new MenuItem("High Texture (1024)"));
340	355	highTexturesItem.addActionListener(this);
341		- veryhighTexturesItem = menu.add(new MenuItem("Very high Texture"));
	356	+ veryhighTexturesItem = menu.add(new MenuItem("Very high Texture (2048)"));
342	357	veryhighTexturesItem.addActionListener(this);
343		- maxTexturesItem = menu.add(new MenuItem("Max Texture"));
	358	+ maxTexturesItem = menu.add(new MenuItem("Max Texture (4096)"));
344	359	maxTexturesItem.addActionListener(this);
345		- panoTexturesItem = menu.add(new MenuItem("Panoramic Texture"));
	360	+ panoTexturesItem = menu.add(new MenuItem("Panoramic Texture (8192)"));
346	361	panoTexturesItem.addActionListener(this);
347		- menu.add("-");
348		- extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
349		- extractGeometriesItem.addActionListener(this);
350		- cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
351		- cloneGeometriesItem.addActionListener(this);
352		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
353		- shareGeometriesItem.addActionListener(this);
354		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
355		- mergeGeometriesItem.addActionListener(this);
356	362
357	363	oe.menuBar.add(menu = new Menu("Selection"));
358	364	attachPigmentItem = menu.add(new MenuItem("Attach Pigment..."));
..	..	@@ -370,9 +376,31 @@
370	376	sortbysizeItem.addActionListener(this);
371	377	sortbynameItem = menu.add(new MenuItem("Sort by name"));
372	378	sortbynameItem.addActionListener(this);
	379	+ menu.add("-");
	380	+ extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
	381	+ extractGeometriesItem.addActionListener(this);
	382	+ cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
	383	+ cloneGeometriesItem.addActionListener(this);
	384	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
	385	+ shareGeometriesItem.addActionListener(this);
	386	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
	387	+ mergeGeometriesItem.addActionListener(this);
	388	+
373	389	oe.menuBar.add(menu = new Menu("Insert"));
374	390	buildCreateMenu(menu);
375		- oe.menuBar.add(menu = new Menu("Tools"));
	391	+
	392	+
	393	+ oe.menuBar.add(menu = new Menu("Include"));
	394	+ importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
	395	+ importGFDItem.addActionListener(this);
	396	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
	397	+ importVRMLX3DItem.addActionListener(this);
	398	+ importOBJItem = menu.add(new MenuItem("OBJ Object..."));
	399	+ importOBJItem.addActionListener(this);
	400	+ import3DSItem = menu.add(new MenuItem("3DS Object..."));
	401	+ import3DSItem.addActionListener(this);
	402	+
	403	+ oe.menuBar.add(menu = new Menu("Tools"));
376	404	buildToolsMenu(menu);
377	405	}
378	406
..	..	@@ -407,76 +435,24 @@
407	435	oe.buttonGroup.add(dummyButton);
408	436	*/
409	437	aConstraints.gridy += 1;
	438	+
	439	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	440	+
410	441	oe.aConstraints.gridwidth = 1;
411	442	oe.aConstraints.gridx = 0;
412	443
413		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	444	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
	445	+ liveCB.setToolTipText("Enabled animation");
414	446	liveCB.addItemListener(this);
415	447
416	448	oe.aConstraints.gridx += 1;
417		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
418		- supportCB.addItemListener(this);
419		-
420		- // oe.aConstraints.gridx += 1;
421		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
422		- // localCB.addItemListener(this);
423		-
424		- oe.aConstraints.gridx += 1;
425		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
426		- crowdCB.addItemListener(this);
427		-
428		- oe.aConstraints.gridx += 1;
429		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
430		- smoothCB.addItemListener(this);
431		-
432		- oe.aConstraints.gridx += 1;
433		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
434		- fastCB.addItemListener(this);
435		- oe.aConstraints.gridx += 1;
436		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
437		- slowCB.addItemListener(this);
438		- oe.aConstraints.gridx += 1;
439		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
440		- boxCB.addItemListener(this);
441		-
442		-// oe.aConstraints.gridx += 1;
443		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
444		-// speakerMocapCB.addItemListener(this);
445		-
446		- if (false)
447		- {
448		- // handled in scripts
449		- oe.aConstraints.gridx += 1;
450		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
451		- speakerCameraCB.addItemListener(this);
452		-
453		- oe.aConstraints.gridx += 1;
454		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
455		- speakerFocusCB.addItemListener(this);
456		-
457		- oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
459		- smoothfocusCB.addItemListener(this);
460		- }
461		-
462		-//oe.aConstraints.gridx += 1;
463		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
464		-// debugCB.addItemListener(this);
465		-
466		- oe.aConstraints.gridx += 1;
467		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
468		- oeilCB.addItemListener(this);
469		-
470		- oe.aConstraints.gridx += 1;
471		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
472		- lookAtCB.addItemListener(this);
473		-
474		- oe.aConstraints.gridx += 1;
475		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	449	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
	450	+ trackCB.setToolTipText("Enable tracking");
476	451	trackCB.addItemListener(this);
477	452
478	453	oe.aConstraints.gridx += 1;
479	454	oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	455	+ screenfitButton.setToolTipText("Screen fit");
480	456	screenfitButton.addActionListener(this);
481	457	oe.aConstraints.gridx += 1;
482	458	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
..	..	@@ -484,6 +460,7 @@
484	460	// oe.aConstraints.gridx += 1;
485	461	oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
486	462	snapobjectButton.addActionListener(this);
	463	+ snapobjectButton.setToolTipText("Snap Object");
487	464	oe.aConstraints.gridx += 1;
488	465
489	466	//aConstraints.gridx = 0;
..	..	@@ -492,28 +469,39 @@
492	469	oe.aConstraints.gridwidth = 1;
493	470
494	471	oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	472	+ flashSelectionButton.setToolTipText("Show selection");
495	473	flashSelectionButton.addActionListener(this);
	474	+
	475	+ oe.toolbarPanel.add(new cButton(" ", false));
	476	+
496	477	oe.aConstraints.gridx += 1;
497	478	oe.aConstraints.weighty = 0;
498	479	oe.aConstraints.gridwidth = 1;
499	480
500	481	//
501	482	oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	483	+ twoButton.setToolTipText("Show center view only");
502	484	twoButton.addActionListener(this);
503	485	oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
504	486	fourButton.addActionListener(this);
	487	+ fourButton.setToolTipText("Show left panel only");
505	488	oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	489	+ sixButton.setToolTipText("2-column layout left");
506	490	sixButton.addActionListener(this);
507	491	oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	492	+ threeButton.setToolTipText("2-column layout right");
508	493	threeButton.addActionListener(this);
509	494	oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	495	+ sevenButton.setToolTipText("3-column layout");
510	496	sevenButton.addActionListener(this);
511	497	//
512	498
513		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	499	+ oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
	500	+ rootButton.setToolTipText("Edit object in new tab");
514	501	rootButton.addActionListener(this);
515	502	oe.aConstraints.gridx += 1;
516	503	oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	504	+ closeButton.setToolTipText("Close tab");
517	505	closeButton.addActionListener(this);
518	506	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
519	507	//clearButton.addActionListener(this);
..	..	@@ -616,17 +604,91 @@
616	604	radio.layout = sevenButton;
617	605	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
618	606	}
	607	+
	608	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	609	+ {
	610	+ //constraints.gridx = 0;
	611	+ //constraints.gridy = 0;
	612	+ panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	613	+ fastCB.setToolTipText("Fast mode");
	614	+ fastCB.addItemListener(this);
	615	+ //constraints.gridy += 1;
	616	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	617	+ supportCB.setToolTipText("Enabled rigging");
	618	+ supportCB.addItemListener(this);
	619	+
	620	+ // constraints.gridy += 1;
	621	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	622	+ // localCB.addItemListener(this);
	623	+
	624	+ //constraints.gridy += 1;
	625	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	626	+ crowdCB.setToolTipText("Used for crowds");
	627	+ crowdCB.addItemListener(this);
	628	+
	629	+ //constraints.gridy += 1;
	630	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	631	+ smoothCB.setToolTipText("Snapping delay");
	632	+ smoothCB.addItemListener(this);
	633	+
	634	+ //constraints.gridy += 1;
	635	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	636	+ slowCB.setToolTipText("Smooth interpolation");
	637	+ slowCB.addItemListener(this);
	638	+ //constraints.gridy += 1;
	639	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	640	+ boxCB.setToolTipText("Display bounding boxes");
	641	+ boxCB.addItemListener(this);
	642	+ //constraints.gridy += 1;
	643	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	644	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	645	+ zoomBoxCB.addItemListener(this);
	646	+
	647	+// constraints.gridy += 1;
	648	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	649	+// speakerMocapCB.addItemListener(this);
	650	+
	651	+ if (false)
	652	+ {
	653	+ // handled in scripts
	654	+ //constraints.gridy += 1;
	655	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	656	+ speakerCameraCB.addItemListener(this);
	657	+
	658	+ //constraints.gridy += 1;
	659	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	660	+ speakerFocusCB.addItemListener(this);
	661	+
	662	+ //constraints.gridy += 1;
	663	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	664	+ smoothfocusCB.addItemListener(this);
	665	+ }
	666	+
	667	+//constraints.gridx += 1;
	668	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	669	+// debugCB.addItemListener(this);
	670	+
	671	+ //constraints.gridy += 1;
	672	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	673	+ oeilCB.addItemListener(this);
	674	+
	675	+ //constraints.gridy += 1;
	676	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	677	+ lookAtCB.setToolTipText("Look-at target");
	678	+ lookAtCB.addItemListener(this);
	679	+
	680	+ }
619	681
620	682	void EditObject(Object3D obj)
621	683	{
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();
	684	+ cRadio radioButton = new cRadio(obj.name);
	685	+ radioButton.SetObject(obj);
	686	+ radioButton.layout = sevenButton;
	687	+ radioButton.SetCamera(cameraView.renderCamera, false);
	688	+ radioButton.addActionListener(this);
	689	+ radioPanel.add(radioButton);
	690	+ buttonGroup.add(radioButton);
	691	+ radioButton.doClick();
630	692	}
631	693	void SetupViews(ObjEditor oe)
632	694	{
..	..	@@ -646,6 +708,7 @@
646	708	JCheckBox fastCB;
647	709	JCheckBox slowCB;
648	710	JCheckBox boxCB;
	711	+ JCheckBox zoomBoxCB;
649	712	JCheckBox trackCB;
650	713	JCheckBox smoothfocusCB;
651	714	// JCheckBox speakerMocapCB;
..	..	@@ -688,8 +751,7 @@
688	751	dropAttributes \|= Object3D.TEXTURE;
689	752	else
690	753	dropAttributes &= ~Object3D.TEXTURE;
691		- }
692		- else if(e.getSource() == liveCB)
	754	+ } else if(e.getSource() == liveCB)
693	755	{
694	756	cameraView.ToggleLive();
695	757	}
..	..	@@ -726,6 +788,10 @@
726	788	Recompile();
727	789	cameraView.repaint();
728	790	// refreshContents();
	791	+ }
	792	+ else if(e.getSource() == zoomBoxCB)
	793	+ {
	794	+ cameraView.ToggleZoomBoxMode();
729	795	}
730	796	else if(e.getSource() == smoothfocusCB)
731	797	{
..	..	@@ -1002,6 +1068,8 @@
1002	1068
1003	1069	void buildCreateMenu(Menu menu)
1004	1070	{
	1071	+ //heightFieldItem = menu.add(new MenuItem("Height Field"));
	1072	+ //heightFieldItem.addActionListener(this);
1005	1073	gridItem = menu.add(new MenuItem("Grid"));
1006	1074	gridItem.addActionListener(this);
1007	1075	rectoidItem = menu.add(new MenuItem("Box"));
..	..	@@ -1014,6 +1082,8 @@
1014	1082	torusItem.addActionListener(this);
1015	1083	superItem = menu.add(new MenuItem("Superellipsoid"));
1016	1084	superItem.addActionListener(this);
	1085	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1086	+ kleinItem.addActionListener(this);
1017	1087	particleItem = menu.add(new MenuItem("Particle system"));
1018	1088	particleItem.addActionListener(this);
1019	1089	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1048,15 +1118,6 @@
1048	1118	doubleItem.addActionListener(this);
1049	1119	tripleItem = menu.add(new MenuItem("Trident"));
1050	1120	tripleItem.addActionListener(this);
1051		- menu.add("-");
1052		- importGFDItem = menu.add(new MenuItem("GraphreeD Object..."));
1053		- importGFDItem.addActionListener(this);
1054		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
1055		- importVRMLX3DItem.addActionListener(this);
1056		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
1057		- importOBJItem.addActionListener(this);
1058		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
1059		- import3DSItem.addActionListener(this);
1060	1121	}
1061	1122
1062	1123	void buildToolsMenu(Menu menu)
..	..	@@ -1068,6 +1129,8 @@
1068	1129	menu.add("-");
1069	1130	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1070	1131	parseverticesItem.addActionListener(this);
	1132	+ textureFieldItem = menu.add(new MenuItem("Texture Field"));
	1133	+ textureFieldItem.addActionListener(this);
1071	1134	alignItem = menu.add(new MenuItem("Align"));
1072	1135	alignItem.addActionListener(this);
1073	1136	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
..	..	@@ -1094,6 +1157,8 @@
1094	1157	resetParentItem.addActionListener(this);
1095	1158	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1096	1159	repairParentItem.addActionListener(this);
	1160	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1161	+ repairShadowItem.addActionListener(this);
1097	1162	menu.add(invariantsItem = new MenuItem("Invariants"));
1098	1163	invariantsItem.addActionListener(this);
1099	1164	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1429,9 +1494,9 @@
1429	1494
1430	1495	void Overwrite(int mask)
1431	1496	{
1432		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1497	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1433	1498	{
1434		- Object3D content = GraphreeD.clipboard.get(0);
	1499	+ Object3D content = GrafreeD.clipboard.get(0);
1435	1500
1436	1501	if (content instanceof cGroup && ((cGroup)content).transientlink )
1437	1502	content = ((cGroup)content).get(0);
..	..	@@ -1454,6 +1519,7 @@
1454	1519	//
1455	1520	public void actionPerformed(ActionEvent event) // , Object arg)
1456	1521	{
	1522	+ Object source = event.getSource();
1457	1523	/*
1458	1524	if (event.getSource() == nameField)
1459	1525	{
..	..	@@ -1465,11 +1531,11 @@
1465	1531	}
1466	1532	else
1467	1533	*/
1468		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1534	+ if (source == lookAtItem \|\| source == lookFromItem)
1469	1535	{
1470	1536	ScreenFit();
1471	1537	} else
1472		- if (event.getSource() == switchItem)
	1538	+ if (source == switchItem)
1473	1539	{
1474	1540	cVector v1 = new cVector();
1475	1541	cVector v2 = new cVector();
..	..	@@ -1478,11 +1544,11 @@
1478	1544	objEditor.cameraView.renderCamera.setAim(v2, v1);
1479	1545	objEditor.cameraView.repaint();
1480	1546	} else
1481		- if (event.getSource() == rectoidItem)
	1547	+ if (source == rectoidItem)
1482	1548	{
1483	1549	makeSomething(new Box());
1484	1550	} else
1485		- if (event.getSource() == particleItem)
	1551	+ if (source == particleItem)
1486	1552	{
1487	1553	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1488	1554	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1503,9 +1569,9 @@
1503	1569	applyExample(particleGeom, "SMOKE");
1504	1570	makeSomething(particleGeom);
1505	1571	} else
1506		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1572	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1507	1573	{
1508		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1574	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1509	1575
1510	1576	ragdoll.toParent = LA.newMatrix();
1511	1577	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1521,27 +1587,71 @@
1521	1587	makeSomething(ragdoll);
1522	1588	//makeSomething(new VehicleDemo());
1523	1589	} else
1524		- if (event.getSource() == gridItem)
	1590	+ /*
	1591	+ */
	1592	+ if (source == heightFieldItem)
	1593	+ {
	1594	+ Object3D obj = new Object3D();
	1595	+
	1596	+ obj.CreateMaterial();
	1597	+ obj.bRep = new BoundaryRep();
	1598	+
	1599	+ obj.bRep.CreateMesh(new iHeightField()
	1600	+ {
	1601	+ public double f(double x, double y)
	1602	+ {
	1603	+ // The Mandelbrot set is represented by coloring
	1604	+ // each point (x,y) according to the number of
	1605	+ // iterations it takes before the while loop in
	1606	+ // this method ends. For points that are actually
	1607	+ // in the Mandelbrot set, or very close to it, the
	1608	+ // count will reach the maximum value, 80. These
	1609	+ // points will be colored purple. All other colors
	1610	+ // represent points that are definitely NOT in the set.
	1611	+ x -= 600;
	1612	+ y -= 500;
	1613	+ x /= 200;
	1614	+ y /= 200;
	1615	+ int count = 0;
	1616	+ double zx = x;
	1617	+ double zy = y;
	1618	+ while (count < 80 && Math.abs(x) < 100 && Math.abs(zy) < 100) {
	1619	+ double new_zx = zxzx - zyzy + x;
	1620	+ zy = 2zxzy + y;
	1621	+ zx = new_zx;
	1622	+ count++;
	1623	+ }
	1624	+ return count; // Math.sqrt(count);
	1625	+ }
	1626	+ }, 1000,1000);
	1627	+
	1628	+ makeSomething(obj);
	1629	+ } else
	1630	+ if (source == gridItem)
1525	1631	{
1526	1632	makeSomething(new Grid());
1527	1633	} else
1528		- if (event.getSource() == ellipsoidItem)
	1634	+ if (source == ellipsoidItem)
1529	1635	{
1530	1636	makeSomething(new Sphere());
1531	1637	} else
1532		- if (event.getSource() == coneItem)
	1638	+ if (source == coneItem)
1533	1639	{
1534	1640	makeSomething(new Cone());
1535	1641	} else
1536		- if (event.getSource() == torusItem)
	1642	+ if (source == torusItem)
1537	1643	{
1538	1644	makeSomething(new Torus());
1539	1645	} else
1540		- if (event.getSource() == superItem)
	1646	+ if (source == superItem)
1541	1647	{
1542	1648	makeSomething(new Superellipsoid());
1543	1649	} else
1544		- if (event.getSource() == blobItem)
	1650	+ if (source == kleinItem)
	1651	+ {
	1652	+ makeSomething(new Klein());
	1653	+ } else
	1654	+ if (source == blobItem)
1545	1655	{
1546	1656	Blob blob = new Blob();
1547	1657	BlobComponent comp = new BlobComponent();
..	..	@@ -1549,15 +1659,15 @@
1549	1659	//blob.retile();
1550	1660	makeSomething(blob);
1551	1661	} else
1552		- if (event.getSource() == latheItem)
	1662	+ if (source == latheItem)
1553	1663	{
1554	1664	makeSomething(new Lathe());
1555	1665	} else
1556		- if (event.getSource() == bezierItem)
	1666	+ if (source == bezierItem)
1557	1667	{
1558	1668	makeSomething(new BezierSurface());
1559	1669	} else
1560		- if (event.getSource() == checkerItem)
	1670	+ if (source == checkerItem)
1561	1671	{
1562	1672	/*
1563	1673	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1570,9 +1680,9 @@
1570	1680	LA.matConcat(obj.toParent, cameraView.renderCamera.fromParent, obj.toParent);
1571	1681	LA.matInvert(obj.toParent, obj.fromParent);
1572	1682	*/
1573		- makeSomething(new CheckerIG());
	1683	+ makeSomething(new Checker());
1574	1684	} else
1575		- if (event.getSource() == meshItem)
	1685	+ if (source == meshItem)
1576	1686	{
1577	1687	Object3D itemtomake = new Object3D();
1578	1688	Object3D child;
..	..	@@ -1593,35 +1703,35 @@
1593	1703	makeSomething(child);
1594	1704	}
1595	1705	} else
1596		- if (event.getSource() == springItem)
	1706	+ if (source == springItem)
1597	1707	{
1598	1708	cSpring s = new cSpring();
1599	1709	s.setup();
1600	1710	makeSomething(s);
1601	1711	} else
1602		- if (event.getSource() == flagItem)
	1712	+ if (source == flagItem)
1603	1713	{
1604	1714	cSpring s = new cFlag();
1605	1715	s.setup();
1606	1716	makeSomething(s);
1607	1717	} else
1608		- if (event.getSource() == lightItem)
	1718	+ if (source == lightItem)
1609	1719	{
1610	1720	makeSomething(new Light());
1611	1721	} else
1612		- if (event.getSource() == csgItem)
	1722	+ if (source == csgItem)
1613	1723	{
1614	1724	group(new CSG());
1615	1725	} else
1616		- if (event.getSource() == templateItem)
	1726	+ if (source == templateItem)
1617	1727	{
1618	1728	group(new cTemplate());
1619	1729	} else
1620		- if (event.getSource() == attributeItem)
	1730	+ if (source == attributeItem)
1621	1731	{
1622	1732	makeSomething(new Attribute());
1623	1733	} else
1624		- if (event.getSource() == pointflowItem)
	1734	+ if (source == pointflowItem)
1625	1735	{
1626	1736	makeSomething(new PointFlow());
1627	1737	} else
..	..	@@ -1633,7 +1743,7 @@
1633	1743	} else
1634	1744	*/
1635	1745
1636		- if (event.getSource() == superLoopItem)
	1746	+ if (source == superLoopItem)
1637	1747	{
1638	1748	Composite g = new cGroup();
1639	1749	for (int i=0; i<15; i++)
..	..	@@ -1655,7 +1765,7 @@
1655	1765
1656	1766	group(g);
1657	1767	} else
1658		- if (event.getSource() == loopItem)
	1768	+ if (source == loopItem)
1659	1769	{
1660	1770	Composite csg = new GroupLeaf();
1661	1771	csg.count = 5;
..	..	@@ -1664,7 +1774,7 @@
1664	1774	csg.addChild(child);
1665	1775	child.addChild(csg);
1666	1776	} else
1667		- if (event.getSource() == doubleItem)
	1777	+ if (source == doubleItem)
1668	1778	{
1669	1779	Composite csg = new GroupLeaf();
1670	1780	csg.count = 5;
..	..	@@ -1676,7 +1786,7 @@
1676	1786	csg.addChild(child);
1677	1787	child.addChild(csg);
1678	1788	} else
1679		- if (event.getSource() == tripleItem)
	1789	+ if (source == tripleItem)
1680	1790	{
1681	1791	Composite csg = new GroupLeaf();
1682	1792	csg.count = 4;
..	..	@@ -1692,70 +1802,70 @@
1692	1802	child.addChild(csg);
1693	1803	} else
1694	1804
1695		- if (event.getSource() == importGFDItem)
	1805	+ if (source == importGFDItem)
1696	1806	{
1697	1807	ImportGFD();
1698	1808	} else
1699		- if (event.getSource() == importVRMLX3DItem)
	1809	+ if (source == importVRMLX3DItem)
1700	1810	{
1701	1811	ImportVRMLX3D();
1702	1812	} else
1703		- if (event.getSource() == import3DSItem)
	1813	+ if (source == import3DSItem)
1704	1814	{
1705	1815	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1706	1816	} else
1707		- if (event.getSource() == importOBJItem)
	1817	+ if (source == importOBJItem)
1708	1818	{
1709	1819	objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1710	1820	} else
1711		- if (event.getSource() == computeAOItem)
	1821	+ if (source == computeAOItem)
1712	1822	{
1713		- CameraPane.drawMode = CameraPane.OCCLUSION;
1714		- CameraPane.theRenderer.repaint();
	1823	+ Globals.drawMode = CameraPane.OCCLUSION;
	1824	+ Globals.theRenderer.repaint();
1715	1825	} else
1716		- if (event.getSource() == recompileItem)
	1826	+ if (source == recompileItem)
1717	1827	{
1718	1828	Recompile();
1719	1829	refreshContents();
1720	1830	} else
1721		- if (event.getSource() == editScriptItem)
	1831	+ if (source == editScriptItem)
1722	1832	{
1723	1833	OpenDialog();
1724	1834	refreshContents();
1725	1835	} else
1726		- if (event.getSource() == invariantsItem)
	1836	+ if (source == invariantsItem)
1727	1837	{
1728	1838	System.out.println("Invariants:");
1729		- GraphreeD.theApplet3D.universe.invariants();
	1839	+ GrafreeD.grafreeD.universe.invariants();
1730	1840	} else
1731		- if (event.getSource() == memoryItem)
	1841	+ if (source == memoryItem)
1732	1842	{
1733	1843	//System.out.println("Invariants:");
1734	1844	PrintMemory();
1735	1845	} else
1736		- if (event.getSource() == pathItem)
	1846	+ if (source == pathItem)
1737	1847	{
1738	1848	PrintPath();
1739	1849	} else
1740		- if (event.getSource() == analyzeItem)
	1850	+ if (source == analyzeItem)
1741	1851	{
1742	1852	AnalyzeObject();
1743	1853	} else
1744		- if (event.getSource() == dumpItem)
	1854	+ if (source == dumpItem)
1745	1855	{
1746	1856	DumpObject();
1747	1857	} else
1748		- if (event.getSource() == screenfitButton)
	1858	+ if (source == screenfitButton)
1749	1859	{
1750	1860	//Reload(lastConverter, lastFilename, true);
1751	1861	ScreenFit();
1752	1862	} else
1753		- if (event.getSource() == screenfitpointButton)
	1863	+ if (source == screenfitpointButton)
1754	1864	{
1755	1865	//Reload(lastConverter, lastFilename, true);
1756	1866	ScreenFitPoint();
1757	1867	} else
1758		- if (event.getSource() == snapobjectButton)
	1868	+ if (source == snapobjectButton)
1759	1869	{
1760	1870	//Reload(lastConverter, lastFilename, true);
1761	1871	SnapObject();
..	..	@@ -1766,13 +1876,13 @@
1766	1876	// Recompile();
1767	1877	// refreshContents();
1768	1878	// } else
1769		- if (event.getSource() == gcButton)
	1879	+ if (source == gcButton)
1770	1880	{
1771	1881	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1772	1882	System.gc();
1773	1883	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1774	1884	} else
1775		- if (event.getSource() == editLeafItem)
	1885	+ if (source == editLeafItem)
1776	1886	{
1777	1887	Object3D obj;
1778	1888	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1786,65 +1896,66 @@
1786	1896	}
1787	1897	refreshContents(true);
1788	1898	} else
1789		- if (event.getSource() == openWindowItem)
	1899	+ if (source == openWindowItem)
1790	1900	{
1791	1901	EditSelection(true);
1792	1902	} else
1793		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1903	+ if (source == cutItem \|\| source == clearButton)
1794	1904	{
1795	1905	loadClipboard(true);
1796	1906	} else
1797		- if (event.getSource() == duplicateItem)
	1907	+ if (source == duplicateItem)
1798	1908	{
1799		- Object3D keep = GraphreeD.clipboard;
	1909	+ Object3D keep = GrafreeD.clipboard;
1800	1910	loadClipboard(false);
1801	1911	paste(false);
1802		- GraphreeD.clipboard = keep;
	1912	+ GrafreeD.clipboard = keep;
1803	1913	} else
1804		- if (event.getSource() == cloneItem)
	1914	+ if (source == cloneItem)
1805	1915	{
1806	1916	CloneSelection(false);
1807	1917	} else
1808		- if (event.getSource() == cloneSupportItem)
	1918	+ if (source == cloneSupportItem)
1809	1919	{
1810	1920	CloneSelection(true);
1811	1921	} else
1812		- if (event.getSource() == copyItem)
	1922	+ if (source == copyItem)
1813	1923	{
1814	1924	loadClipboard(false);
1815	1925	} else
1816		- if (event.getSource() == pasteItem)
	1926	+ if (source == pasteItem)
1817	1927	{
1818	1928	paste(false);
1819	1929	} else
1820		- if (event.getSource() == pasteLinkItem)
	1930	+ if (source == pasteLinkItem)
1821	1931	{
1822	1932	pasteInto(false);
1823	1933	} else
1824		- if (event.getSource() == pasteCloneItem)
	1934	+ if (source == pasteCloneItem)
1825	1935	{
1826	1936	pasteInto(true);
1827	1937	} else
1828		- if (event.getSource() == pasteExpandItem)
	1938	+ if (source == pasteExpandItem)
1829	1939	{
1830	1940	paste(true);
1831	1941	} else
1832		- if (event.getSource() == synchronizeItem)
	1942	+ if (source == synchronizeItem)
1833	1943	{
1834	1944	Overwrite(Object3D.TRANSFORM);
1835	1945	} else
1836		- if (event.getSource() == overwriteNameItem)
	1946	+ if (source == overwriteNameItem)
1837	1947	{
1838	1948	Overwrite(Object3D.NAME);
1839	1949	} else
1840		- if (event.getSource() == overwriteUVItem)
	1950	+ if (source == overwriteUVItem)
1841	1951	{
1842	1952	Overwrite(Object3D.UV);
1843	1953	} else
1844		- if (event.getSource() == overwriteMatItem)
	1954	+ if (source == overwriteMatItem)
1845	1955	{
	1956	+ /* july 2015
1846	1957	if ((dropAttributes & Object3D.TEXTURE) == 0)
1847		- Overwrite(Object3D.MATERIAL);
	1958	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1848	1959	else
1849	1960	{
1850	1961	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1856,13 +1967,16 @@
1856	1967	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1857	1968	}
1858	1969	}
	1970	+ */
	1971	+
	1972	+ Overwrite(dropAttributes);
1859	1973	}
1860		- if (event.getSource() == overwriteGeoItem)
	1974	+ if (source == overwriteGeoItem)
1861	1975	{
1862	1976	Overwrite(Object3D.GEOMETRY);
1863		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1977	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1864	1978	// {
1865		-// Object3D content = GraphreeD.clipboard.get(0);
	1979	+// Object3D content = GrafreeD.clipboard.get(0);
1866	1980	//
1867	1981	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1868	1982	// content = ((cGroup)content).get(0);
..	..	@@ -1874,7 +1988,7 @@
1874	1988	// refreshContents();
1875	1989	// }
1876	1990	} else
1877		- if (event.getSource() == generateMeshItem)
	1991	+ if (source == generateMeshItem)
1878	1992	{
1879	1993	//if (group.selection.size() == 1)
1880	1994	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1885,7 +1999,7 @@
1885	1999	ResetModel();
1886	2000	refreshContents();
1887	2001	} else
1888		- if (event.getSource() == extractGeometriesItem)
	2002	+ if (source == extractGeometriesItem)
1889	2003	{
1890	2004	boolean one = false;
1891	2005
..	..	@@ -1912,7 +2026,7 @@
1912	2026	ResetModel();
1913	2027	refreshContents();
1914	2028	} else
1915		- if (event.getSource() == cloneGeometriesItem)
	2029	+ if (source == cloneGeometriesItem)
1916	2030	{
1917	2031	boolean one = false;
1918	2032
..	..	@@ -1938,32 +2052,37 @@
1938	2052	ResetModel();
1939	2053	refreshContents();
1940	2054	} else
1941		- if (event.getSource() == shareGeometriesItem)
	2055	+ if (source == shareGeometriesItem)
1942	2056	{
1943	2057	boolean one = false;
1944	2058
1945	2059	if (group.selection.size() == 1)
1946	2060	one = true;
1947	2061
	2062	+ Object3D merge = null;
	2063	+
1948	2064	Object3D content = new cGroup();
1949	2065
1950	2066	for (int i=0; i<group.selection.size(); i++)
1951	2067	{
1952		- Object3D sel = new Merge(group.selection.get(i));
	2068	+ merge = new Merge(group.selection.get(i));
1953	2069
1954	2070	if (one)
1955		- makeSomething(sel, false);
	2071	+ makeSomething(merge, false);
1956	2072	else
1957		- content.addChild(sel);
	2073	+ content.addChild(merge);
1958	2074	}
1959	2075
1960	2076	if (!one)
1961		- makeSomething(content, false);
1962		-
1963		- ResetModel();
1964		- refreshContents();
	2077	+ makeSomething(content, true);
	2078	+ else
	2079	+ {
	2080	+ ResetModel();
	2081	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2082	+ refreshContents();
	2083	+ }
1965	2084	} else
1966		- if (event.getSource() == mergeGeometriesItem)
	2085	+ if (source == mergeGeometriesItem)
1967	2086	{
1968	2087	boolean one = false;
1969	2088
..	..	@@ -1993,11 +2112,11 @@
1993	2112	ResetModel();
1994	2113	refreshContents();
1995	2114	} else
1996		- if (event.getSource() == linkverticesItem)
	2115	+ if (source == linkverticesItem)
1997	2116	{
1998		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2117	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
1999	2118	// {
2000		-// Object3D content = GraphreeD.clipboard.get(0);
	2119	+// Object3D content = GrafreeD.clipboard.get(0);
2001	2120	//
2002	2121	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2003	2122	// content = ((cGroup)content).get(0);
..	..	@@ -2006,14 +2125,14 @@
2006	2125	// group.selection.get(0).setMasterThis(content); // should be identity
2007	2126	// refreshContents();
2008	2127	// }
2009		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2128	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
2010	2129	{
2011		- Object3D content = GraphreeD.clipboard.get(0);
	2130	+ Object3D content = GrafreeD.clipboard.get(0);
2012	2131
2013	2132	if (content instanceof cGroup && ((cGroup)content).transientlink )
2014	2133	content = ((cGroup)content).get(0);
2015	2134
2016		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2135	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2017	2136	for (int i=0; i<group.selection.size(); i++)
2018	2137	{
2019	2138	boolean random = CameraPane.RANDOM;
..	..	@@ -2022,11 +2141,11 @@
2022	2141	// group.selection.get(i).setMasterThis(content); // should be identity
2023	2142	CameraPane.RANDOM = random;
2024	2143	}
2025		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2144	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2026	2145	refreshContents();
2027	2146	}
2028	2147	} else
2029		- if (event.getSource() == resetsupportItem)
	2148	+ if (source == resetsupportItem)
2030	2149	{
2031	2150	for (int i=0; i<group.selection.size(); i++)
2032	2151	{
..	..	@@ -2038,7 +2157,16 @@
2038	2157
2039	2158	refreshContents();
2040	2159	} else
2041		- if (event.getSource() == resetreferencesItem)
	2160	+ if (source == relinkverticesItem)
	2161	+ {
	2162	+ boolean random = CameraPane.RANDOM;
	2163	+ CameraPane.RANDOM = false; // parse all random nodes
	2164	+ group.selection.RelinkToSupport();
	2165	+ CameraPane.RANDOM = random;
	2166	+
	2167	+ refreshContents();
	2168	+ } else
	2169	+ if (source == resetreferencesItem)
2042	2170	{
2043	2171	for (int i=0; i<group.selection.size(); i++)
2044	2172	{
..	..	@@ -2047,11 +2175,11 @@
2047	2175
2048	2176	refreshContents();
2049	2177	} else
2050		- if (event.getSource() == setMasterItem)
	2178	+ if (source == setMasterItem)
2051	2179	{
2052		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2180	+ if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2053	2181	{
2054		- Object3D content = GraphreeD.clipboard.get(0);
	2182	+ Object3D content = GrafreeD.clipboard.get(0);
2055	2183
2056	2184	if (content instanceof cGroup && ((cGroup)content).transientlink )
2057	2185	content = ((cGroup)content).get(0);
..	..	@@ -2060,13 +2188,13 @@
2060	2188	refreshContents();
2061	2189	}
2062	2190	} else
2063		- if (event.getSource() == poseMeshItem)
	2191	+ if (source == poseMeshItem)
2064	2192	{
2065	2193	if (group.selection.size() == 1)
2066	2194	{
2067		- if (GraphreeD.clipboard.size() == 1)
	2195	+ if (GrafreeD.clipboard.size() == 1)
2068	2196	{
2069		- Object3D content = GraphreeD.clipboard.get(0);
	2197	+ Object3D content = GrafreeD.clipboard.get(0);
2070	2198
2071	2199	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	2200	content = ((cGroup)content).get(0);
..	..	@@ -2079,19 +2207,19 @@
2079	2207	}
2080	2208
2081	2209	} else
2082		- if (event.getSource() == revertMeshItem)
	2210	+ if (source == revertMeshItem)
2083	2211	{
2084	2212	RevertMeshes();
2085	2213	} else
2086		- if (event.getSource() == resetMeshItem)
	2214	+ if (source == resetMeshItem)
2087	2215	{
2088	2216	ResetAll();
2089	2217	} else
2090		- if (event.getSource() == stepAllItem)
	2218	+ if (source == stepAllItem)
2091	2219	{
2092	2220	StepAll();
2093	2221	} else
2094		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2222	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2095	2223	{
2096	2224	//int indices[] = jList.getSelectedIndices();
2097	2225	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2099,42 +2227,46 @@
2099	2227
2100	2228	ClearSelection(false);
2101	2229	} else
2102		- if (event.getSource() == clearAllItem)
	2230	+ if (source == clearAllItem)
2103	2231	{
2104	2232	ClearSelection(true);
2105	2233	} else
2106		- if (event.getSource() == grabItem)
	2234	+ if (source == grabItem)
2107	2235	{
2108	2236	group(new cGroup(), true);
2109	2237	} else
2110		- if (event.getSource() == frontItem)
	2238	+ if (source == hideItem)
	2239	+ {
	2240	+ group(new HiddenObject());
	2241	+ } else
	2242	+ if (source == frontItem)
2111	2243	{
2112	2244	front();
2113	2245	} else
2114		- if (event.getSource() == backItem)
	2246	+ if (source == backItem)
2115	2247	{
2116	2248	back();
2117	2249	} else
2118		- if (event.getSource() == cameraItem)
	2250	+ if (source == cameraItem)
2119	2251	{
2120	2252	makeSomething(new Camera());
2121	2253	} else
2122		- if (event.getSource() == compositeItem)
	2254	+ if (source == compositeItem)
2123	2255	{
2124	2256	group(new Composite());
2125	2257	} else
2126		- if (event.getSource() == randomItem)
	2258	+ if (source == randomItem)
2127	2259	{
2128	2260	RandomNode random = new RandomNode();
2129	2261	group(random);
2130	2262	if (random.size() > 0)
2131	2263	random.name = random.get(0).name + "Rnd";
2132	2264	} else
2133		- if (event.getSource() == physicsItem)
	2265	+ if (source == physicsItem)
2134	2266	{
2135	2267	group(new PhysicsNode());
2136	2268	} else
2137		- if (event.getSource() == frameselectorItem)
	2269	+ if (source == frameselectorItem)
2138	2270	{
2139	2271	for (int i=0; i<group.selection.size(); i++)
2140	2272	{
..	..	@@ -2146,7 +2278,7 @@
2146	2278	ResetModel();
2147	2279	refreshContents();
2148	2280	} else
2149		- if (event.getSource() == switchGeoItem)
	2281	+ if (source == switchGeoItem)
2150	2282	{
2151	2283	for (int i=0; i<group.selection.size(); i++)
2152	2284	{
..	..	@@ -2158,7 +2290,7 @@
2158	2290	ResetModel();
2159	2291	refreshContents();
2160	2292	} else
2161		- if (event.getSource() == switchTransfoItem)
	2293	+ if (source == switchTransfoItem)
2162	2294	{
2163	2295	for (int i=0; i<group.selection.size(); i++)
2164	2296	{
..	..	@@ -2170,7 +2302,7 @@
2170	2302	ResetModel();
2171	2303	refreshContents();
2172	2304	} else
2173		- if (event.getSource() == morphItem)
	2305	+ if (source == morphItem)
2174	2306	{
2175	2307	for (int i=0; i<group.selection.size(); i++)
2176	2308	{
..	..	@@ -2182,7 +2314,7 @@
2182	2314	ResetModel();
2183	2315	refreshContents();
2184	2316	} else
2185		- if (event.getSource() == scriptNodeItem)
	2317	+ if (source == scriptNodeItem)
2186	2318	{
2187	2319	boolean atleastone = false;
2188	2320
..	..	@@ -2221,191 +2353,215 @@
2221	2353	}
2222	2354	}
2223	2355	} else
2224		- if (event.getSource() == linkerItem)
	2356	+ if (source == linkerItem)
2225	2357	{
2226	2358	group(new cLinker());
2227	2359	} else
2228		- if (event.getSource() == textureItem)
	2360	+ if (source == textureItem)
2229	2361	{
2230	2362	group(new TextureNode());
2231	2363	} else
2232		- if (event.getSource() == shadowXItem)
	2364	+ if (source == billboardItem)
	2365	+ {
	2366	+ group(new BillboardNode());
	2367	+ } else
	2368	+ if (source == shadowXItem)
2233	2369	{
2234	2370	CastShadow(0);
2235	2371	} else
2236		- if (event.getSource() == shadowYItem)
	2372	+ if (source == shadowYItem)
2237	2373	{
2238	2374	CastShadow(1);
2239	2375	} else
2240		- if (event.getSource() == shadowZItem)
	2376	+ if (source == shadowZItem)
2241	2377	{
2242	2378	CastShadow(2);
2243	2379	} else
2244		- if (event.getSource() == ungroupItem)
	2380	+ if (source == ungroupItem)
2245	2381	{
2246		- ungroup();
	2382	+ //ungroup();
	2383	+ for (int i=0; i<group.selection.size(); i++)
	2384	+ {
	2385	+ Ungroup(group.selection.get(i));
	2386	+ }
	2387	+
	2388	+ ClearSelection(false);
	2389	+
	2390	+ refreshContents();
2247	2391	} else
2248		- if (event.getSource() == genUVItem)
	2392	+ if (source == genUVItem)
2249	2393	{
2250	2394	GenUV();
2251	2395	} else
2252		- if (event.getSource() == genNormalsCADItem)
	2396	+ if (source == genNormalsCADItem)
2253	2397	{
2254	2398	GenNormals(true);
2255	2399	} else
2256		- if (event.getSource() == genNormalsORGANItem)
	2400	+ if (source == genNormalsMESHItem)
	2401	+ {
	2402	+ GenNormals(true); // TODO
	2403	+ } else
	2404	+ if (source == genNormalsORGANItem)
2257	2405	{
2258	2406	GenNormals(false);
2259	2407	} else
2260		- if (event.getSource() == stripifyItem)
	2408	+ if (source == genNormalsMINEItem)
	2409	+ {
	2410	+ GenNormalsMINE();
	2411	+ } else
	2412	+ if (source == stripifyItem)
2261	2413	{
2262	2414	Stripify();
2263	2415	} else
2264		- if (event.getSource() == unstripifyItem)
	2416	+ if (source == unstripifyItem)
2265	2417	{
2266	2418	Unstripify();
2267	2419	} else
2268		- if (event.getSource() == trimItem)
	2420	+ if (source == trimItem)
2269	2421	{
2270	2422	Trim();
2271	2423	} else
2272		- if (event.getSource() == untrimItem)
	2424	+ if (source == untrimItem)
2273	2425	{
2274	2426	Untrim();
2275	2427	} else
2276		- if (event.getSource() == clearColorsItem)
	2428	+ if (source == clearColorsItem)
2277	2429	{
2278	2430	ClearColors();
2279	2431	} else
2280		- if (event.getSource() == clearMaterialsItem)
	2432	+ if (source == clearMaterialsItem)
2281	2433	{
2282	2434	ClearMaterials();
2283	2435	} else
2284		- if (event.getSource() == liveleavesItem)
	2436	+ if (source == liveleavesItem)
2285	2437	{
2286	2438	LiveLeaves(true);
2287	2439	} else
2288		- if (event.getSource() == unliveleavesItem)
	2440	+ if (source == unliveleavesItem)
2289	2441	{
2290	2442	LiveLeaves(false);
2291	2443	} else
2292		- if (event.getSource() == supportleavesItem)
	2444	+ if (source == supportleavesItem)
2293	2445	{
2294	2446	SupportLeaves(true);
2295	2447	} else
2296		- if (event.getSource() == unsupportleavesItem)
	2448	+ if (source == unsupportleavesItem)
2297	2449	{
2298	2450	SupportLeaves(false);
2299	2451	} else
2300		- if (event.getSource() == hideleavesItem)
	2452	+ if (source == hideleavesItem)
2301	2453	{
2302	2454	HideLeaves(true);
2303	2455	} else
2304		- if (event.getSource() == showleavesItem)
	2456	+ if (source == showleavesItem)
2305	2457	{
2306	2458	HideLeaves(false);
2307	2459	} else
2308		- if (event.getSource() == markleavesItem)
	2460	+ if (source == markleavesItem)
2309	2461	{
2310	2462	MarkLeaves(true);
2311	2463	} else
2312		- if (event.getSource() == unmarkleavesItem)
	2464	+ if (source == unmarkleavesItem)
2313	2465	{
2314	2466	MarkLeaves(false);
2315	2467	} else
2316		- if (event.getSource() == flipVItem)
	2468	+ if (source == flipVItem)
2317	2469	{
2318	2470	FlipV(true);
2319	2471	} else
2320		- if (event.getSource() == unflipVItem)
	2472	+ if (source == unflipVItem)
2321	2473	{
2322	2474	FlipV(false);
2323	2475	} else
2324		- if (event.getSource() == lowTexturesItem)
	2476	+ if (source == lowTexturesItem)
2325	2477	{
2326	2478	SetTexRes(0);
2327	2479	} else
2328		- if (event.getSource() == normalTexturesItem)
	2480	+ if (source == normalTexturesItem)
2329	2481	{
2330	2482	SetTexRes(1);
2331	2483	} else
2332		- if (event.getSource() == highTexturesItem)
	2484	+ if (source == highTexturesItem)
2333	2485	{
2334	2486	SetTexRes(2);
2335	2487	} else
2336		- if (event.getSource() == veryhighTexturesItem)
	2488	+ if (source == veryhighTexturesItem)
2337	2489	{
2338	2490	SetTexRes(3);
2339	2491	} else
2340		- if (event.getSource() == maxTexturesItem)
	2492	+ if (source == maxTexturesItem)
2341	2493	{
2342	2494	SetTexRes(4);
2343	2495	} else
2344		- if (event.getSource() == panoTexturesItem)
	2496	+ if (source == panoTexturesItem)
2345	2497	{
2346	2498	SetTexRes(5);
2347	2499	} else
2348		- if (event.getSource() == reverseNormalsItem)
	2500	+ if (source == reverseNormalsItem)
2349	2501	{
2350	2502	ReverseNormals();
2351	2503	} else
2352		- if (event.getSource() == parseverticesItem)
	2504	+ if (source == parseverticesItem)
2353	2505	{
2354	2506	ParseVertices();
2355	2507	} else
2356		- if (event.getSource() == alignItem)
	2508	+ if (source == textureFieldItem)
	2509	+ {
	2510	+ TextureVertices();
	2511	+ } else
	2512	+ if (source == alignItem)
2357	2513	{
2358	2514	Align();
2359	2515	} else
2360		- if (event.getSource() == mirrorItem)
	2516	+ if (source == mirrorItem)
2361	2517	{
2362	2518	MirrorPoses();
2363	2519	} else
2364		- if (event.getSource() == reduceMorphItem)
	2520	+ if (source == reduceMorphItem)
2365	2521	{
2366	2522	MeshReduction(false);
2367	2523	} else
2368		- if (event.getSource() == reduce34MorphItem)
	2524	+ if (source == reduce34MorphItem)
2369	2525	{
2370	2526	MeshReduction(true);
2371	2527	} else
2372		- if (event.getSource() == reverseTrianglesItem)
	2528	+ if (source == reverseTrianglesItem)
2373	2529	{
2374	2530	ReverseTriangles();
2375	2531	} else
2376		- if (event.getSource() == reduceMeshItem)
	2532	+ if (source == reduceMeshItem)
2377	2533	{
2378	2534	ReduceMesh(false);
2379	2535	} else
2380		- if (event.getSource() == reduce34MeshItem)
	2536	+ if (source == reduce34MeshItem)
2381	2537	{
2382	2538	ReduceMesh(true);
2383	2539	} else
2384		- if (event.getSource() == increaseMeshItem)
	2540	+ if (source == increaseMeshItem)
2385	2541	{
2386	2542	IncreaseMesh();
2387	2543	} else
2388		- if (event.getSource() == clipMeshItem)
	2544	+ if (source == clipMeshItem)
2389	2545	{
2390	2546	ClipMesh();
2391	2547	} else
2392		- if (event.getSource() == smoothMeshItem)
	2548	+ if (source == smoothMeshItem)
2393	2549	{
2394	2550	SmoothMesh();
2395	2551	} else
2396		- if (event.getSource() == transformgeometryItem)
	2552	+ if (source == transformgeometryItem)
2397	2553	{
2398	2554	TransformGeometry();
2399	2555	} else
2400		- if (event.getSource() == resetTransformItem)
	2556	+ if (source == resetTransformItem)
2401	2557	{
2402	2558	ResetTransform();
2403	2559	} else
2404		- if (event.getSource() == resetCentroidItem)
	2560	+ if (source == resetCentroidItem)
2405	2561	{
2406	2562	ResetCentroid();
2407	2563	} else
2408		- if (event.getSource() == resetParentItem)
	2564	+ if (source == resetParentItem)
2409	2565	{
2410	2566	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2411	2567	{
..	..	@@ -2415,7 +2571,7 @@
2415	2571
2416	2572	refreshContents();
2417	2573	} else
2418		- if (event.getSource() == repairParentItem)
	2574	+ if (source == repairParentItem)
2419	2575	{
2420	2576	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2421	2577	{
..	..	@@ -2429,7 +2585,21 @@
2429	2585
2430	2586	refreshContents();
2431	2587	} else
2432		- if (event.getSource() == sortbysizeItem)
	2588	+ if (source == repairShadowItem)
	2589	+ {
	2590	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2591	+ {
	2592	+ Object3D obj = (Object3D)e.nextElement();
	2593	+ obj.RepairShadow();
	2594	+// for (int i=0; i<obj.size(); i++)
	2595	+// {
	2596	+// obj.get(i).parent = obj;
	2597	+// }
	2598	+ }
	2599	+
	2600	+ refreshContents();
	2601	+ } else
	2602	+ if (source == sortbysizeItem)
2433	2603	{
2434	2604	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2435	2605	{
..	..	@@ -2441,7 +2611,7 @@
2441	2611	ResetModel();
2442	2612	refreshContents();
2443	2613	} else
2444		- if (event.getSource() == sortbynameItem)
	2614	+ if (source == sortbynameItem)
2445	2615	{
2446	2616	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2447	2617	{
..	..	@@ -2453,7 +2623,7 @@
2453	2623	ResetModel();
2454	2624	refreshContents();
2455	2625	} else
2456		- if (event.getSource() == attachPigmentItem)
	2626	+ if (source == attachPigmentItem)
2457	2627	{
2458	2628	String texture = GetFile("Attach pigment");
2459	2629	Object3D obj;
..	..	@@ -2465,7 +2635,7 @@
2465	2635
2466	2636	refreshContents();
2467	2637	} else
2468		- if (event.getSource() == detachPigmentItem)
	2638	+ if (source == detachPigmentItem)
2469	2639	{
2470	2640	Object3D obj;
2471	2641	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2476,7 +2646,7 @@
2476	2646
2477	2647	refreshContents();
2478	2648	} else
2479		- if (event.getSource() == attachBumpItem)
	2649	+ if (source == attachBumpItem)
2480	2650	{
2481	2651	String texture = GetFile("Attach bump");
2482	2652	Object3D obj;
..	..	@@ -2488,7 +2658,7 @@
2488	2658
2489	2659	refreshContents();
2490	2660	} else
2491		- if (event.getSource() == detachBumpItem)
	2661	+ if (source == detachBumpItem)
2492	2662	{
2493	2663	Object3D obj;
2494	2664	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2499,7 +2669,7 @@
2499	2669
2500	2670	refreshContents();
2501	2671	} else
2502		- if (event.getSource() == pigmentBumpItem)
	2672	+ if (source == pigmentBumpItem)
2503	2673	{
2504	2674	Object3D obj;
2505	2675	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2510,158 +2680,195 @@
2510	2680
2511	2681	refreshContents();
2512	2682	} else
2513		- if (event.getSource() == flashSelectionButton)
	2683	+ if (source == flashSelectionButton)
2514	2684	{
2515	2685	CameraPane.flash = true;
2516	2686	refreshContents();
2517	2687	} else
2518		- if (event.getSource() == oneButton)
	2688	+ if (source == oneButton)
2519	2689	{
2520	2690	} else
2521		- if (event.getSource() == twoButton)
	2691	+ if (source == twoButton)
2522	2692	{
2523	2693	radio.layout = twoButton;
2524	2694	// bug
2525	2695	//gridPanel.setDividerLocation(1.0);
2526	2696	//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();
	2697	+// bigThree.remove(scenePanel);
	2698	+// bigThree.remove(centralPanel);
	2699	+// bigThree.remove(XYZPanel);
	2700	+// aWindowConstraints.gridx = 0;
	2701	+// aWindowConstraints.gridy = 0;
	2702	+// aWindowConstraints.gridwidth = 1;
	2703	+// // aConstraints.gridheight = 3;
	2704	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2705	+// aWindowConstraints.weightx = 0;
	2706	+// aWindowConstraints.weighty = 1;
	2707	+// //bigThree.add(jtp, aWindowConstraints);
	2708	+// aWindowConstraints.weightx = 1;
	2709	+// aWindowConstraints.gridwidth = 3;
	2710	+// // aConstraints.gridheight = 3;
	2711	+// aWindowConstraints.gridx = 1;
	2712	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2713	+// bigThree.add(centralPanel, aWindowConstraints);
	2714	+// aWindowConstraints.weightx = 0;
	2715	+// aWindowConstraints.gridx = 4;
	2716	+// aWindowConstraints.gridwidth = 1;
	2717	+// // aConstraints.gridheight = 3;
	2718	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2719	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2720	+// scenePanel.setVisible(false);
	2721	+// centralPanel.setVisible(true);
	2722	+// XYZPanel.setVisible(false);
	2723	+ bigThree.ClearUI();
	2724	+ bigThree.add(centralPanel);
	2725	+ bigThree.FlushUI();
2551	2726	} else
2552		- if (event.getSource() == threeButton)
	2727	+ if (source == threeButton)
2553	2728	{
2554	2729	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();
	2730	+
	2731	+// bigThree.remove(scenePanel);
	2732	+// bigThree.remove(centralPanel);
	2733	+// bigThree.remove(XYZPanel);
	2734	+// aWindowConstraints.gridx = 0;
	2735	+// aWindowConstraints.gridy = 0;
	2736	+// aWindowConstraints.gridwidth = 1;
	2737	+// // aConstraints.gridheight = 3;
	2738	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2739	+// aWindowConstraints.weightx = 0;
	2740	+// aWindowConstraints.weighty = 1;
	2741	+// //bigThree.add(jtp, aWindowConstraints);
	2742	+// aWindowConstraints.weightx = 1;
	2743	+// aWindowConstraints.gridwidth = 3;
	2744	+// // aConstraints.gridheight = 3;
	2745	+// aWindowConstraints.gridx = 1;
	2746	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2747	+// bigThree.add(centralPanel, aWindowConstraints);
	2748	+// aWindowConstraints.weightx = 0;
	2749	+// aWindowConstraints.gridx = 4;
	2750	+// aWindowConstraints.gridwidth = 1;
	2751	+// // aConstraints.gridheight = 3;
	2752	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2753	+// bigThree.add(XYZPanel, aWindowConstraints);
	2754	+// bigThree.validate();
	2755	+// scenePanel.setVisible(false);
	2756	+// centralPanel.setVisible(true);
	2757	+// XYZPanel.setVisible(true);
	2758	+ bigThree.ClearUI();
	2759	+ bigThree.add(centralPanel);
	2760	+ bigThree.add(XYZPanel);
	2761	+ bigThree.FlushUI();
2579	2762	} else
2580		- if (event.getSource() == fourButton)
	2763	+ if (source == fourButton)
2581	2764	{
2582	2765	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();
	2766	+
	2767	+// bigThree.remove(scenePanel);
	2768	+// bigThree.remove(centralPanel);
	2769	+// bigThree.remove(XYZPanel);
	2770	+// aWindowConstraints.gridx = 0;
	2771	+// aWindowConstraints.gridy = 0;
	2772	+// aWindowConstraints.gridwidth = 1;
	2773	+// // aWindowConstraints.gridheight = 3;
	2774	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2775	+// aWindowConstraints.weightx = 1;
	2776	+// aWindowConstraints.weighty = 1;
	2777	+// bigThree.add(scenePanel, aWindowConstraints);
	2778	+// aWindowConstraints.weightx = 1;
	2779	+// aWindowConstraints.gridwidth = 3;
	2780	+// // aConstraints.gridheight = 3;
	2781	+// aWindowConstraints.gridx = 1;
	2782	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2783	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2784	+// aWindowConstraints.weightx = 0;
	2785	+// aWindowConstraints.gridx = 4;
	2786	+// aWindowConstraints.gridwidth = 1;
	2787	+// // aWindowConstraints.gridheight = 3;
	2788	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2789	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2790	+// bigThree.validate();
	2791	+// scenePanel.setVisible(true);
	2792	+// centralPanel.setVisible(false);
	2793	+// XYZPanel.setVisible(false);
	2794	+ bigThree.ClearUI();
	2795	+ bigThree.add(scenePanel);
	2796	+ bigThree.FlushUI();
2607	2797	} else
2608		- if (event.getSource() == sixButton)
	2798	+ if (source == sixButton)
2609	2799	{
2610	2800	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();
	2801	+
	2802	+// bigThree.remove(scenePanel);
	2803	+// bigThree.remove(centralPanel);
	2804	+// bigThree.remove(XYZPanel);
	2805	+// aWindowConstraints.gridx = 0;
	2806	+// aWindowConstraints.gridy = 0;
	2807	+// aWindowConstraints.gridwidth = 1;
	2808	+// // aConstraints.gridheight = 3;
	2809	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2810	+// aWindowConstraints.weightx = 0;
	2811	+// aWindowConstraints.weighty = 1;
	2812	+// bigThree.add(scenePanel, aWindowConstraints);
	2813	+// aWindowConstraints.weightx = 1;
	2814	+// aWindowConstraints.gridwidth = 3;
	2815	+// // aWindowConstraints.gridheight = 3;
	2816	+// aWindowConstraints.gridx = 1;
	2817	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2818	+// bigThree.add(centralPanel, aWindowConstraints);
	2819	+// aWindowConstraints.weightx = 0;
	2820	+// aWindowConstraints.gridx = 4;
	2821	+// aWindowConstraints.gridwidth = 1;
	2822	+// // aWindowConstraints.gridheight = 3;
	2823	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2824	+// //bigThree.add(XYZPanel, aConstraints);
	2825	+// bigThree.validate();
	2826	+// scenePanel.setVisible(true);
	2827	+// centralPanel.setVisible(true);
	2828	+// XYZPanel.setVisible(false);
	2829	+ bigThree.ClearUI();
	2830	+ bigThree.add(scenePanel);
	2831	+ bigThree.add(centralPanel);
	2832	+ bigThree.FlushUI();
2635	2833	} else
2636		- if (event.getSource() == sevenButton)
	2834	+ if (source == sevenButton)
2637	2835	{
2638	2836	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();
	2837	+
	2838	+// bigThree.remove(scenePanel);
	2839	+// bigThree.remove(centralPanel);
	2840	+// bigThree.remove(XYZPanel);
	2841	+// aWindowConstraints.gridx = 0;
	2842	+// aWindowConstraints.gridy = 0;
	2843	+// aWindowConstraints.gridwidth = 1;
	2844	+// // aWindowConstraints.gridheight = 3;
	2845	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2846	+// aWindowConstraints.weightx = 0;
	2847	+// aWindowConstraints.weighty = 1;
	2848	+// bigThree.add(scenePanel, aWindowConstraints);
	2849	+// aWindowConstraints.weightx = 1;
	2850	+// aWindowConstraints.gridwidth = 3;
	2851	+// // aWindowConstraints.gridheight = 3;
	2852	+// aWindowConstraints.gridx = 1;
	2853	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2854	+// bigThree.add(centralPanel, aWindowConstraints);
	2855	+// aWindowConstraints.weightx = 0;
	2856	+// aWindowConstraints.gridx = 4;
	2857	+// aWindowConstraints.gridwidth = 1;
	2858	+// // aConstraints.gridheight = 3;
	2859	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2860	+// bigThree.add(XYZPanel, aWindowConstraints);
	2861	+// bigThree.validate();
	2862	+// scenePanel.setVisible(true);
	2863	+// centralPanel.setVisible(true);
	2864	+// XYZPanel.setVisible(true);
	2865	+ bigThree.ClearUI();
	2866	+ bigThree.add(scenePanel);
	2867	+ bigThree.add(centralPanel);
	2868	+ bigThree.add(XYZPanel);
	2869	+ bigThree.FlushUI();
2663	2870	} else
2664		- if (event.getSource() == rootButton)
	2871	+ if (source == rootButton)
2665	2872	{
2666	2873	Object3D obj;
2667	2874	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2673,7 +2880,7 @@
2673	2880
2674	2881	refreshContents(true);
2675	2882	} else
2676		- if (event.getSource() == closeButton)
	2883	+ if (source == closeButton)
2677	2884	{
2678	2885	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2679	2886	cRadio ab;
..	..	@@ -2694,11 +2901,11 @@
2694	2901	}
2695	2902	refreshContents(true);
2696	2903	} else
2697		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2904	+ if (source == editItem \|\| source == editButton)
2698	2905	{
2699	2906	EditSelection(false);
2700	2907	} else
2701		- if (event.getSource() == uneditButton)
	2908	+ if (source == uneditButton)
2702	2909	{
2703	2910	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2704	2911	{
..	..	@@ -2710,12 +2917,12 @@
2710	2917
2711	2918	child.editWindow = null; // ???????????
2712	2919	}
2713		- objEditor.ctrlPanel.revalidate();
	2920	+ objEditor.ctrlPanel.validate();
2714	2921	//objEditor.jTree.clearSelection();
2715	2922	//objEditor.ResetSliders();
2716	2923	refreshContents(true);
2717	2924	} else
2718		- if (event.getSource() == clearPanelButton)
	2925	+ if (source == clearPanelButton)
2719	2926	{
2720	2927	assert(copy == group);
2721	2928	//copy.ClearUI();
..	..	@@ -2726,7 +2933,7 @@
2726	2933	listUI.clear();
2727	2934	refreshContents(true);
2728	2935	} else
2729		- if (event.getSource() == allParamsButton)
	2936	+ if (source == allParamsButton)
2730	2937	{
2731	2938	assert(copy == group);
2732	2939
..	..	@@ -2747,19 +2954,19 @@
2747	2954
2748	2955	refreshContents(true);
2749	2956	} else
2750		- if (event.getSource() == unselectButton)
	2957	+ if (source == unselectButton)
2751	2958	{
2752	2959	objEditor.jTree.clearSelection();
2753		- // ?? oct 2012 GraphreeD.clipboard.clear();
	2960	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2754	2961	objEditor.ResetSliders();
2755	2962	refreshContents(true);
2756	2963	} else
2757		- if(event.getSource() instanceof cRadio)
	2964	+ if(source instanceof cRadio)
2758	2965	{
2759	2966	group.parent = keepparent;
2760	2967	group.attributes = 0;
2761	2968	//group.editWindow = null;
2762		- /cRadio/ radio = (cRadio)event.getSource();
	2969	+ /cRadio/ radio = (cRadio)source;
2763	2970	Object3D obj = radio.GetObject();
2764	2971	System.out.println("Edit " + obj);
2765	2972	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2779,7 +2986,7 @@
2779	2986	}
2780	2987
2781	2988	copy = group;
2782		- //CameraPane.theRenderer.object = group;
	2989	+ //Globals.theRenderer.object = group;
2783	2990	if(!useclient)
2784	2991	{
2785	2992	cameraView.renderCamera = radio.camera;
..	..	@@ -2788,7 +2995,8 @@
2788	2995	cameraView.cameras[cameraView.cameracount] = radio.camera;
2789	2996	cameraView.targetLookAt.set(radio.camera.lookAt);
2790	2997	cameraView.object = group;
2791		- cameraView.lighttouched = true;
	2998	+ //cameraView.lighttouched = true;
	2999	+ Globals.lighttouched = true;
2792	3000	topView.object = group;
2793	3001	frontView.object = group;
2794	3002	sideView.object = group;
..	..	@@ -2824,7 +3032,7 @@
2824	3032	if (useclient)
2825	3033	{
2826	3034	cameraView.object = client;
2827		- cameraView.lighttouched = true;
	3035	+ Globals.lighttouched = true;
2828	3036	//topView.object = client;
2829	3037	//frontView.object = client;
2830	3038	//sideView.object = client;
..	..	@@ -2832,7 +3040,7 @@
2832	3040	else
2833	3041	{
2834	3042	cameraView.object = group;
2835		- cameraView.lighttouched = true;
	3043	+ Globals.lighttouched = true;
2836	3044	//topView.object = group;
2837	3045	//frontView.object = group;
2838	3046	//sideView.object = group;
..	..	@@ -3065,9 +3273,9 @@
3065	3273	obj = (Object3D)e.nextElement();
3066	3274
3067	3275	System.out.println("Object is: " + obj);
3068		- GraphreeD.AnalyzeObject(obj);
	3276	+ GrafreeD.AnalyzeObject(obj);
3069	3277	System.out.println("Boundary rep: " + obj.bRep);
3070		- GraphreeD.AnalyzeObject(obj.bRep);
	3278	+ GrafreeD.AnalyzeObject(obj.bRep);
3071	3279
3072	3280	// System.err.println((size/1024) + " KB is the size of " + obj);
3073	3281	}
..	..	@@ -3109,6 +3317,13 @@
3109	3317	void GenNormals(boolean crease)
3110	3318	{
3111	3319	group.GenNormalsS(crease);
	3320	+
	3321	+ refreshContents();
	3322	+ }
	3323	+
	3324	+ void GenNormalsMINE()
	3325	+ {
	3326	+ group.selection.GenNormalsMINE();
3112	3327
3113	3328	refreshContents();
3114	3329	}
..	..	@@ -3157,104 +3372,250 @@
3157	3372
3158	3373	//Object3D buffer;
3159	3374	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		-
	3375	+// BoundaryRep temprep;
	3376	+// Object3D nodes;
	3377	+// Vector<Vertex> vertices;
	3378	+//
	3379	+// cGroup buffer;
	3380	+//
	3381	+// public void Vertex(Object3D node, Vertex v)
	3382	+// {
	3383	+//// vertices.add(v);
	3384	+//// nodes.addElement(node);
	3385	+////
	3386	+//// if (temprep.GetCache(v) != null)
	3387	+//// {
	3388	+//// temprep.Remove(v);
	3389	+//// } else
	3390	+//// {
	3391	+//// temprep.Remember(v);
	3392	+//// }
	3393	+//
	3394	+// //Object3D node = nodes.get(index);
	3395	+// temp.set(v); // vertices.get(index)); // temprep.GetVertex(k));
	3396	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3397	+//
	3398	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	3399	+//
	3400	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	3401	+//
	3402	+// cGroup g = new cGroup();
	3403	+//
	3404	+// if (g.toParent == null)
	3405	+// {
	3406	+// g.toParent = LA.newMatrix();
	3407	+// g.fromParent = LA.newMatrix();
	3408	+// }
	3409	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3410	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3411	+//
	3412	+// g.add(GrafreeD.clipboard);
	3413	+//
	3414	+// buffer.add(g);
	3415	+// }
	3416	+//
	3417	+// public void Face(Object3D node, Face f)
	3418	+// {
	3419	+//
	3420	+// }
	3421	+//
	3422	+// void ParseVerticesOld() // ??
	3423	+// {
	3424	+// //if (group.selection.size() != 1)
	3425	+// // return;
	3426	+//
	3427	+// temprep = new BoundaryRep();
	3428	+// nodes = new Object3D();
	3429	+// vertices = new Vector<Vertex>();
	3430	+//
	3431	+// boolean epsequal = GrafreeD.epsequal;
	3432	+// GrafreeD.epsequal = true;
	3433	+//
	3434	+// for (int i=0; i<group.selection.size(); i++)
	3435	+// {
	3436	+// Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	3437	+//
	3438	+// group.selection.get(i).Parse(
	3439	+//this );
	3440	+//
	3441	+// int repsize = temprep.VertexCount();
	3442	+// int tablesize = temprep.vertextable.size();
	3443	+// int nodesize = nodes.size();
	3444	+//
	3445	+// assert(vertices.size() == nodes.size());
	3446	+//
	3447	+// temprep.vertextable.elements();
	3448	+//
	3449	+// java.util.Set<java.util.Map.Entry<Vertex,Vertex>> set = temprep.vertextable.entrySet();
	3450	+//
	3451	+// for (java.util.Map.Entry<Vertex,Vertex> entry : set)
	3452	+// {
	3453	+// cGroup g = new cGroup();
	3454	+//
	3455	+// int index = vertices.indexOf(entry.getValue()); // temprep.vertextable.(k));
	3456	+//
	3457	+// Object3D node = nodes.get(index);
	3458	+// temp.set(vertices.get(index)); // temprep.GetVertex(k));
	3459	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3460	+//
	3461	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	3462	+//
	3463	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	3464	+//
	3465	+// if (g.toParent == null)
	3466	+// {
	3467	+// g.toParent = LA.newMatrix();
	3468	+// g.fromParent = LA.newMatrix();
	3469	+// }
	3470	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3471	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3472	+//
	3473	+// g.add(GrafreeD.clipboard);
	3474	+//
	3475	+// buffer.add(g);
	3476	+// }
	3477	+//
	3478	+// makeSomething(buffer, i==group.selection.size()-1);
	3479	+// }
	3480	+//
	3481	+// GrafreeD.epsequal = epsequal;
	3482	+//
	3483	+// //buffer = null;
	3484	+// temprep = null;
	3485	+// nodes = null;
	3486	+//
	3487	+// refreshContents();
	3488	+// }
	3489	+
3184	3490	void ParseVertices()
3185	3491	{
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;
	3492	+ boolean epsequal = GrafreeD.epsequal;
	3493	+ GrafreeD.epsequal = true;
3195	3494
3196	3495	for (int i=0; i<group.selection.size(); i++)
3197	3496	{
3198		- Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	3497	+ final cGroup buffer = new cGroup(group.selection.get(i).name + "+");
3199	3498
3200		- group.selection.get(i).Parse(this);
3201		-
3202		- int repsize = temprep.VertexCount();
3203		- int tablesize = temprep.vertextable.size();
3204		- int nodesize = nodes.size();
	3499	+ group.selection.get(i).Parse(
	3500	+
	3501	+ new iParse()
	3502	+ {
	3503	+ public void Vertex(Object3D node, Vertex v)
	3504	+ {
	3505	+ temp.set(v);
	3506	+ LA.xformPos(temp, node.GlobalTransformInv(), temp);
3205	3507
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();
	3508	+ cGroup g = new cGroup();
3211	3509
3212		- for (java.util.Map.Entry<Vertex,Vertex> entry : set)
3213		- {
3214		- cGroup g = new cGroup();
	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);
3215	3517
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);
	3518	+ g.add(GrafreeD.clipboard);
3220	3519
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);
	3520	+ buffer.add(g);
	3521	+ }
3232	3522
3233		- g.add(GraphreeD.clipboard);
	3523	+ public void Face(Object3D node, Face f)
	3524	+ {
3234	3525
3235		- buffer.add(g);
3236		- }
	3526	+ }
	3527	+ }
	3528	+ );
3237	3529
3238	3530	makeSomething(buffer, i==group.selection.size()-1);
3239	3531	}
3240	3532
3241		- GraphreeD.epsequal = epsequal;
3242		-
3243		- //buffer = null;
3244		- temprep = null;
3245		- nodes = null;
	3533	+ GrafreeD.epsequal = epsequal;
3246	3534
3247	3535	refreshContents();
3248	3536	}
3249		-
	3537	+
	3538	+ void TextureVertices()
	3539	+ {
	3540	+ for (int i=0; i<group.selection.size(); i++)
	3541	+ {
	3542	+ group.selection.get(i).Parse(
	3543	+ new iParse()
	3544	+ {
	3545	+ public void Vertex(Object3D node, Vertex v)
	3546	+ {
	3547	+ cTexture tex = node.GetTextures();
	3548	+ String pigment = Object3D.GetPigment(tex);
	3549	+ //String bump = Object3D.GetBump(tex);
	3550	+
	3551	+ com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3552	+
	3553	+ double s = v.s;
	3554	+
	3555	+ if (s == 1)
	3556	+ s = 0;
	3557	+
	3558	+ double t = v.t;
	3559	+
	3560	+ if (t == 1)
	3561	+ t = 0;
	3562	+
	3563	+ int indexs = (int) (texturedata.getWidth() * s);
	3564	+ int indext = (int) (texturedata.getHeight() * t);
	3565	+
	3566	+ int index = indext * texturedata.getWidth() + indexs;
	3567	+
	3568	+ java.nio.ByteBuffer bytebuf = (java.nio.ByteBuffer)texturedata.getBuffer();
	3569	+
	3570	+ int slide = bytebuf.capacity() / texturedata.getWidth() / texturedata.getHeight();
	3571	+
	3572	+ float scale = bytebuf.get(index*slide) & 0xFF;
	3573	+ scale += bytebuf.get(index*slide+1) & 0xFF;
	3574	+ scale += bytebuf.get(index*slide+2) & 0xFF;
	3575	+ scale /= 3;
	3576	+
	3577	+ scale /= 0xFF;
	3578	+ // c'est quoi ca? scale /= 4;
	3579	+
	3580	+ //v.AO = scale;
	3581	+
	3582	+ v.x += v.norm.x * scale;
	3583	+ v.y += v.norm.y * scale;
	3584	+ v.z += v.norm.z * scale;
	3585	+ }
	3586	+
	3587	+ public void Face(Object3D node, Face f)
	3588	+ {
	3589	+ }
	3590	+ }
	3591	+ );
	3592	+ }
	3593	+
	3594	+ refreshContents();
	3595	+ }
	3596	+
3250	3597	void Align()
3251	3598	{
	3599	+ if (group.selection.size() == 0)
	3600	+ return;
	3601	+
	3602	+ cVector bbmin = new cVector();
	3603	+ cVector bbmax = new cVector();
	3604	+
	3605	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3606	+
	3607	+ double dx = bbmax.x - bbmin.x;
	3608	+ double dy = bbmax.y - bbmin.y;
	3609	+ double dz = bbmax.z - bbmin.z;
	3610	+
	3611	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3612	+
3252	3613	for (int i=0; i<group.selection.size(); i++)
3253	3614	{
3254	3615	Object3D obj = group.selection.get(i);
3255	3616
3256		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3257		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3617	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3618	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3258	3619	}
3259	3620
3260	3621	refreshContents();
..	..	@@ -3267,7 +3628,7 @@
3267	3628	// ref.SaveSupports();
3268	3629	// Object3D par = ref.parent;
3269	3630	// ref.parent = null;
3270		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	3631	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3271	3632	// ref.parent = par;
3272	3633	// ref.RestoreSupports();
3273	3634
..	..	@@ -3297,7 +3658,7 @@
3297	3658	// lowres.SaveSupports();
3298	3659	// par = lowres.parent;
3299	3660	// lowres.parent = null;
3300		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	3661	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3301	3662	Object3D newlow = CloneObject(lowres, false);
3302	3663	newlow.name = sn.switchobject.get(i).name;
3303	3664	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3319,7 +3680,7 @@
3319	3680	return;
3320	3681
3321	3682	Object3D poses = group.selection.get(0);
3322		- Object3D ref = GraphreeD.clipboard.get(0);
	3683	+ Object3D ref = GrafreeD.clipboard.get(0);
3323	3684
3324	3685	Object3D newgroup = new Object3D("Po:" + poses.name);
3325	3686
..	..	@@ -3488,7 +3849,7 @@
3488	3849	group.selection.RelinkToSupport(); // july 2014
3489	3850	System.out.println("DONE.");
3490	3851	refreshContents();
3491		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3852	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3492	3853	}
3493	3854
3494	3855	void ReduceMesh(boolean reduction34)
..	..	@@ -3513,20 +3874,20 @@
3513	3874
3514	3875	void ClipMesh()
3515	3876	{
3516		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	3877	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
3517	3878	{
3518		- Object3D content = GraphreeD.clipboard.get(0);
	3879	+ Object3D content = GrafreeD.clipboard.get(0);
3519	3880
3520	3881	if (content instanceof cGroup && ((cGroup)content).transientlink )
3521	3882	content = ((cGroup)content).get(0);
3522	3883
3523	3884	// for (int i=0; i<group.selection.size(); i++)
3524	3885	// {
3525		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	3886	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3526	3887	// }
3527		- group.selection.ClipMesh(GraphreeD.clipboard);
	3888	+ group.selection.ClipMesh(GrafreeD.clipboard);
3528	3889	}
3529		-// group.selection.ClipMesh(GraphreeD.clipboard);
	3890	+// group.selection.ClipMesh(GrafreeD.clipboard);
3530	3891	System.out.println("DONE.");
3531	3892	refreshContents();
3532	3893	}
..	..	@@ -3773,16 +4134,16 @@
3773	4134
3774	4135	objEditor.SetText(); // jan 2014
3775	4136
3776		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4137	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
3777	4138	CameraPane.flash = true;
3778	4139
3779	4140	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
3780	4141	// a camera
3781	4142	{
3782	4143	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;
	4144	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4145	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4146	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3786	4147	}
3787	4148
3788	4149	refreshContents();
..	..	@@ -3864,12 +4225,12 @@
3864	4225	{
3865	4226	if (group.selection.isEmpty())
3866	4227	return;
3867		- GraphreeD.clipboardIsTempGroup = false;
	4228	+ GrafreeD.clipboardIsTempGroup = false;
3868	4229	Composite tGroup = null;
3869	4230	if (group.selection.size() > 0) // 1)
3870	4231	{
3871	4232	tGroup = new cGroup();
3872		- GraphreeD.clipboardIsTempGroup = true;
	4233	+ GrafreeD.clipboardIsTempGroup = true;
3873	4234	}
3874	4235
3875	4236	if (cut)
..	..	@@ -3909,16 +4270,16 @@
3909	4270	//System.out.println("cut " + child);
3910	4271	//System.out.println("parent = " + child.parent);
3911	4272	// tmp.addChild(child);
3912		- if (GraphreeD.clipboardIsTempGroup)
	4273	+ if (GrafreeD.clipboardIsTempGroup)
3913	4274	tGroup.add/Child/(tmp);
3914	4275	else
3915		- GraphreeD.clipboard = tmp;
	4276	+ GrafreeD.clipboard = tmp;
3916	4277	}
3917	4278	else
3918		- if (GraphreeD.clipboardIsTempGroup)
	4279	+ if (GrafreeD.clipboardIsTempGroup)
3919	4280	tGroup.add/Child/(child);
3920	4281	else
3921		- GraphreeD.clipboard = child;
	4282	+ GrafreeD.clipboard = child;
3922	4283	}
3923	4284
3924	4285	//ResetModel();
..	..	@@ -3950,21 +4311,21 @@
3950	4311	//System.out.println("cut " + elem);
3951	4312	//System.out.println("parent = " + elem.parent);
3952	4313	// tmp.addChild(elem);
3953		- if (GraphreeD.clipboardIsTempGroup)
	4314	+ if (GrafreeD.clipboardIsTempGroup)
3954	4315	tGroup.add/Child/(tmp);
3955	4316	else
3956		- GraphreeD.clipboard = tmp;
	4317	+ GrafreeD.clipboard = tmp;
3957	4318	}
3958	4319	else
3959		- if (GraphreeD.clipboardIsTempGroup)
	4320	+ if (GrafreeD.clipboardIsTempGroup)
3960	4321	tGroup.add/Child/(child);
3961	4322	else
3962		- GraphreeD.clipboard = child;
	4323	+ GrafreeD.clipboard = child;
3963	4324	}
3964	4325
3965	4326	}
3966		- if (GraphreeD.clipboardIsTempGroup)
3967		- GraphreeD.clipboard = tGroup;
	4327	+ if (GrafreeD.clipboardIsTempGroup)
	4328	+ GrafreeD.clipboard = tGroup;
3968	4329	if (cut)
3969	4330	{
3970	4331	ResetModel();
..	..	@@ -3974,11 +4335,11 @@
3974	4335
3975	4336	void paste(boolean expand)
3976	4337	{
3977		- // if (GraphreeD.clipboard == null)
	4338	+ // if (GrafreeD.clipboard == null)
3978	4339	// return;
3979	4340	boolean first = true;
3980	4341
3981		- if (GraphreeD.clipboardIsTempGroup)
	4342	+ if (GrafreeD.clipboardIsTempGroup)
3982	4343	{
3983	4344	Composite temp;
3984	4345
..	..	@@ -3989,7 +4350,7 @@
3989	4350	temp = (Composite)Applet3D.clipboard.deepCopy();
3990	4351	*/
3991	4352	Object3D elem;
3992		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4353	+ for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
3993	4354	{
3994	4355	Object3D child = (Object3D)e.nextElement();
3995	4356
..	..	@@ -4003,7 +4364,7 @@
4003	4364	else
4004	4365	elem = child.deepCopy(); // ?
4005	4366	child.parent = keepparent;
4006		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	4367	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4007	4368	// elem = elem.get(0);
4008	4369	makeSomething(elem, true); // ?? first);
4009	4370	//group.addChild(elem);
..	..	@@ -4023,14 +4384,14 @@
4023	4384	//Object3D cb = Applet3D.clipboard;
4024	4385	//temp.addChild(cb);
4025	4386	//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());
	4387	+ assert(GrafreeD.clipboard.parent == null);
	4388	+ Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
	4389	+ GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
	4390	+ if (LA.isIdentity(GrafreeD.clipboard.toParent))
	4391	+ makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
4031	4392	else
4032		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4033		- GraphreeD.clipboard.get(0).parent = keepparent;
	4393	+ makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
	4394	+ GrafreeD.clipboard.get(0).parent = keepparent;
4034	4395	}
4035	4396
4036	4397	ResetModel();
..	..	@@ -4039,7 +4400,7 @@
4039	4400
4040	4401	void pasteInto(boolean copyit)
4041	4402	{
4042		-// if (GraphreeD.clipboard == null)
	4403	+// if (GrafreeD.clipboard == null)
4043	4404	// return;
4044	4405
4045	4406	if (group.selection.size() != 1)
..	..	@@ -4072,9 +4433,9 @@
4072	4433	{
4073	4434	boolean first = true;
4074	4435
4075		- if (GraphreeD.clipboardIsTempGroup)
	4436	+ if (GrafreeD.clipboardIsTempGroup)
4076	4437	{
4077		- Composite temp = (Composite)GraphreeD.clipboard;
	4438	+ Composite temp = (Composite)GrafreeD.clipboard;
4078	4439	Object3D copy;
4079	4440	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4080	4441	{
..	..	@@ -4084,7 +4445,7 @@
4084	4445	}
4085	4446	} else
4086	4447	{
4087		- linkSomething(GraphreeD.clipboard); //.get(0));
	4448	+ linkSomething(GrafreeD.clipboard); //.get(0));
4088	4449	}
4089	4450	}
4090	4451	}
..	..	@@ -4276,6 +4637,26 @@
4276	4637	makeSomething(csg);
4277	4638	}
4278	4639
	4640	+ void Ungroup(Object3D g)
	4641	+ {
	4642	+ if (g instanceof HiddenObject)
	4643	+ {
	4644	+ HiddenObject h = (HiddenObject) g;
	4645	+
	4646	+ for (int i=0; i<h.ActualSize(); i++)
	4647	+ {
	4648	+ objEditor.makeSomething(h.get(i), false);
	4649	+ }
	4650	+ }
	4651	+ else
	4652	+ {
	4653	+ for (int i=0; i<g.Size(); i++)
	4654	+ {
	4655	+ objEditor.makeSomething(g.get(i), false);
	4656	+ }
	4657	+ }
	4658	+ }
	4659	+
4279	4660	void ungroup()
4280	4661	{
4281	4662	/*
..	..	@@ -4471,7 +4852,7 @@
4471	4852
4472	4853	void ImportGFD()
4473	4854	{
4474		- FileDialog browser = new FileDialog(objEditor.frame, "Import GraphreeD", FileDialog.LOAD);
	4855	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4475	4856	browser.show();
4476	4857	String filename = browser.getFile();
4477	4858	if (filename != null && filename.length() > 0)
..	..	@@ -4509,7 +4890,7 @@
4509	4890
4510	4891	void ImportVRMLX3D()
4511	4892	{
4512		- if (GraphreeD.standAlone)
	4893	+ if (GrafreeD.standAlone)
4513	4894	{
4514	4895	/**/
4515	4896	FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
..	..	@@ -4526,7 +4907,7 @@
4526	4907
4527	4908	String GetFile(String dialogName)
4528	4909	{
4529		- if (GraphreeD.standAlone)
	4910	+ if (GrafreeD.standAlone)
4530	4911	{
4531	4912	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4532	4913	browser.show();
..	..	@@ -4635,6 +5016,7 @@
4635	5016	private MenuItem resetsupportItem;
4636	5017	private MenuItem resetreferencesItem;
4637	5018	private MenuItem linkverticesItem;
	5019	+ private MenuItem relinkverticesItem;
4638	5020	private MenuItem setMasterItem;
4639	5021	private MenuItem resetMeshItem;
4640	5022	private MenuItem stepAllItem;
..	..	@@ -4653,8 +5035,10 @@
4653	5035	private MenuItem clearItem;
4654	5036	private MenuItem clearAllItem;
4655	5037	private MenuItem genUVItem;
	5038	+ private MenuItem genNormalsMESHItem;
4656	5039	private MenuItem genNormalsCADItem;
4657	5040	private MenuItem genNormalsORGANItem;
	5041	+ private MenuItem genNormalsMINEItem;
4658	5042	private MenuItem stripifyItem;
4659	5043	private MenuItem unstripifyItem;
4660	5044	private MenuItem trimItem;
..	..	@@ -4696,6 +5080,7 @@
4696	5080	private MenuItem resetCentroidItem;
4697	5081	private MenuItem transformgeometryItem;
4698	5082	private MenuItem resetTransformItem;
	5083	+ private MenuItem hideItem;
4699	5084	private MenuItem grabItem;
4700	5085	private MenuItem backItem;
4701	5086	private MenuItem frontItem;
..	..	@@ -4716,6 +5101,7 @@
4716	5101
4717	5102	private MenuItem resetParentItem;
4718	5103	private MenuItem repairParentItem;
	5104	+ private MenuItem repairShadowItem;
4719	5105	private MenuItem sortbysizeItem;
4720	5106	private MenuItem sortbynameItem;
4721	5107
..	..	@@ -4728,12 +5114,15 @@
4728	5114	private MenuItem particleItem;
4729	5115	private MenuItem ragdollItem;
4730	5116	private MenuItem ragdoll2Item;
	5117	+ private MenuItem heightFieldItem;
	5118	+ private MenuItem textureFieldItem;
4731	5119	private MenuItem gridItem;
4732	5120	private MenuItem rectoidItem;
4733	5121	private MenuItem ellipsoidItem;
4734	5122	private MenuItem coneItem;
4735	5123	private MenuItem torusItem;
4736	5124	private MenuItem superItem;
	5125	+ private MenuItem kleinItem;
4737	5126	private MenuItem blobItem;
4738	5127	private MenuItem latheItem;
4739	5128	private MenuItem bezierItem;
..	..	@@ -4746,6 +5135,7 @@
4746	5135	private MenuItem csgItem;
4747	5136	private MenuItem templateItem;
4748	5137	private MenuItem textureItem;
	5138	+ private MenuItem billboardItem;
4749	5139	private MenuItem shadowXItem;
4750	5140	private MenuItem shadowYItem;
4751	5141	private MenuItem shadowZItem;