~nbriere/GrafreeD.git - Noware Git Repository

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