~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -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
..	..	@@ -219,18 +219,24 @@
219	219	resetsupportItem.addActionListener(this);
220	220	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	221	linkverticesItem.addActionListener(this);
	222	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	223	+ relinkverticesItem.addActionListener(this);
222	224	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	225	setMasterItem.addActionListener(this);
224	226
225	227	oe.menuBar.add(menu = new Menu("Group"));
226	228	grabItem = menu.add(new MenuItem("Grab"));
227	229	grabItem.addActionListener(this);
228		- frontItem = menu.add(new MenuItem("Front"));
229		- frontItem.addActionListener(this);
230	230	backItem = menu.add(new MenuItem("Back"));
231	231	backItem.addActionListener(this);
	232	+ frontItem = menu.add(new MenuItem("Front"));
	233	+ frontItem.addActionListener(this);
232	234	compositeItem = menu.add(new MenuItem("Composite"));
233	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);
234	240	menu.add("-");
235	241	randomItem = menu.add(new MenuItem("Random"));
236	242	randomItem.addActionListener(this);
..	..	@@ -252,6 +258,8 @@
252	258	oe.menuBar.add(menu = new Menu("Object"));
253	259	textureItem = menu.add(new MenuItem("Texture"));
254	260	textureItem.addActionListener(this);
	261	+ billboardItem = menu.add(new MenuItem("Billboard"));
	262	+ billboardItem.addActionListener(this);
255	263	csgItem = menu.add(new MenuItem("CSG"));
256	264	csgItem.addActionListener(this);
257	265	shadowXItem = menu.add(new MenuItem("Shadow X"));
..	..	@@ -269,14 +277,12 @@
269	277	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	278	pointflowItem.addActionListener(this);
271	279	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	280	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	281	resetTransformItem.addActionListener(this);
276	282	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	283	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	284	+ transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
	285	+ transformgeometryItem.addActionListener(this);
280	286
281	287	oe.menuBar.add(menu = new Menu("Geometry"));
282	288	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -285,6 +291,10 @@
285	291	genNormalsORGANItem.addActionListener(this);
286	292	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287	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);
288	298	stripifyItem = menu.add(new MenuItem("Stripify"));
289	299	stripifyItem.addActionListener(this);
290	300	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -380,7 +390,7 @@
380	390
381	391
382	392	oe.menuBar.add(menu = new Menu("Include"));
383		- importGFDItem = menu.add(new MenuItem("GraphreeD Object..."));
	393	+ importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
384	394	importGFDItem.addActionListener(this);
385	395	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
386	396	importVRMLX3DItem.addActionListener(this);
..	..	@@ -427,11 +437,17 @@
427	437	oe.aConstraints.gridwidth = 1;
428	438	oe.aConstraints.gridx = 0;
429	439
430		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	440	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
	441	+ liveCB.setToolTipText("Enabled animation");
431	442	liveCB.addItemListener(this);
432	443
433	444	oe.aConstraints.gridx += 1;
	445	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	446	+ fastCB.setToolTipText("Fast mode");
	447	+ fastCB.addItemListener(this);
	448	+ oe.aConstraints.gridx += 1;
434	449	oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
	450	+ supportCB.setToolTipText("Enabled rigging");
435	451	supportCB.addItemListener(this);
436	452
437	453	// oe.aConstraints.gridx += 1;
..	..	@@ -439,22 +455,27 @@
439	455	// localCB.addItemListener(this);
440	456
441	457	oe.aConstraints.gridx += 1;
442		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
	458	+ oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), oe.aConstraints);
	459	+ crowdCB.setToolTipText("Used for crowds");
443	460	crowdCB.addItemListener(this);
444	461
445	462	oe.aConstraints.gridx += 1;
446	463	oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
	464	+ smoothCB.setToolTipText("Snapping delay");
447	465	smoothCB.addItemListener(this);
448	466
449	467	oe.aConstraints.gridx += 1;
450		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
451		- fastCB.addItemListener(this);
452		- oe.aConstraints.gridx += 1;
453	468	oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
	469	+ slowCB.setToolTipText("Smooth interpolation");
454	470	slowCB.addItemListener(this);
455	471	oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
	472	+ oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), oe.aConstraints);
	473	+ boxCB.setToolTipText("Display bounding boxes");
457	474	boxCB.addItemListener(this);
	475	+ oe.aConstraints.gridx += 1;
	476	+ oe.toolbarPanel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), oe.aConstraints);
	477	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	478	+ zoomBoxCB.addItemListener(this);
458	479
459	480	// oe.aConstraints.gridx += 1;
460	481	// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
..	..	@@ -481,19 +502,22 @@
481	502	// debugCB.addItemListener(this);
482	503
483	504	oe.aConstraints.gridx += 1;
484		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
	505	+ oe.toolbarPanel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), oe.aConstraints);
485	506	oeilCB.addItemListener(this);
486	507
487	508	oe.aConstraints.gridx += 1;
488		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
	509	+ oe.toolbarPanel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), oe.aConstraints);
	510	+ lookAtCB.setToolTipText("Look-at target");
489	511	lookAtCB.addItemListener(this);
490	512
491	513	oe.aConstraints.gridx += 1;
492	514	oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	515	+ trackCB.setToolTipText("Enable tracking");
493	516	trackCB.addItemListener(this);
494	517
495	518	oe.aConstraints.gridx += 1;
496	519	oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	520	+ screenfitButton.setToolTipText("Screen fit");
497	521	screenfitButton.addActionListener(this);
498	522	oe.aConstraints.gridx += 1;
499	523	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
..	..	@@ -501,6 +525,7 @@
501	525	// oe.aConstraints.gridx += 1;
502	526	oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
503	527	snapobjectButton.addActionListener(this);
	528	+ snapobjectButton.setToolTipText("Snap Object");
504	529	oe.aConstraints.gridx += 1;
505	530
506	531	//aConstraints.gridx = 0;
..	..	@@ -509,28 +534,39 @@
509	534	oe.aConstraints.gridwidth = 1;
510	535
511	536	oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	537	+ flashSelectionButton.setToolTipText("Show selection");
512	538	flashSelectionButton.addActionListener(this);
	539	+
	540	+ oe.toolbarPanel.add(new cButton(" ", false));
	541	+
513	542	oe.aConstraints.gridx += 1;
514	543	oe.aConstraints.weighty = 0;
515	544	oe.aConstraints.gridwidth = 1;
516	545
517	546	//
518	547	oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	548	+ twoButton.setToolTipText("Show center view only");
519	549	twoButton.addActionListener(this);
520	550	oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
521	551	fourButton.addActionListener(this);
	552	+ fourButton.setToolTipText("Show left panel only");
522	553	oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	554	+ sixButton.setToolTipText("2-column layout left");
523	555	sixButton.addActionListener(this);
524	556	oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	557	+ threeButton.setToolTipText("2-column layout right");
525	558	threeButton.addActionListener(this);
526	559	oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	560	+ sevenButton.setToolTipText("3-column layout");
527	561	sevenButton.addActionListener(this);
528	562	//
529	563
530		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	564	+ oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
	565	+ rootButton.setToolTipText("Edit object in new tab");
531	566	rootButton.addActionListener(this);
532	567	oe.aConstraints.gridx += 1;
533	568	oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	569	+ closeButton.setToolTipText("Close tab");
534	570	closeButton.addActionListener(this);
535	571	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536	572	//clearButton.addActionListener(this);
..	..	@@ -636,14 +672,14 @@
636	672
637	673	void EditObject(Object3D obj)
638	674	{
639		- cRadio dummyButton = new cRadio(obj.name);
640		- dummyButton.SetObject(obj);
641		- dummyButton.layout = sevenButton;
642		- dummyButton.SetCamera(cameraView.renderCamera, false);
643		- dummyButton.addActionListener(this);
644		- radioPanel.add(dummyButton);
645		- buttonGroup.add(dummyButton);
646		- dummyButton.doClick();
	675	+ cRadio radioButton = new cRadio(obj.name);
	676	+ radioButton.SetObject(obj);
	677	+ radioButton.layout = sevenButton;
	678	+ radioButton.SetCamera(cameraView.renderCamera, false);
	679	+ radioButton.addActionListener(this);
	680	+ radioPanel.add(radioButton);
	681	+ buttonGroup.add(radioButton);
	682	+ radioButton.doClick();
647	683	}
648	684	void SetupViews(ObjEditor oe)
649	685	{
..	..	@@ -663,6 +699,7 @@
663	699	JCheckBox fastCB;
664	700	JCheckBox slowCB;
665	701	JCheckBox boxCB;
	702	+ JCheckBox zoomBoxCB;
666	703	JCheckBox trackCB;
667	704	JCheckBox smoothfocusCB;
668	705	// JCheckBox speakerMocapCB;
..	..	@@ -705,8 +742,7 @@
705	742	dropAttributes \|= Object3D.TEXTURE;
706	743	else
707	744	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	745	+ } else if(e.getSource() == liveCB)
710	746	{
711	747	cameraView.ToggleLive();
712	748	}
..	..	@@ -743,6 +779,10 @@
743	779	Recompile();
744	780	cameraView.repaint();
745	781	// refreshContents();
	782	+ }
	783	+ else if(e.getSource() == zoomBoxCB)
	784	+ {
	785	+ cameraView.ToggleZoomBoxMode();
746	786	}
747	787	else if(e.getSource() == smoothfocusCB)
748	788	{
..	..	@@ -1033,6 +1073,8 @@
1033	1073	torusItem.addActionListener(this);
1034	1074	superItem = menu.add(new MenuItem("Superellipsoid"));
1035	1075	superItem.addActionListener(this);
	1076	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1077	+ kleinItem.addActionListener(this);
1036	1078	particleItem = menu.add(new MenuItem("Particle system"));
1037	1079	particleItem.addActionListener(this);
1038	1080	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1106,6 +1148,8 @@
1106	1148	resetParentItem.addActionListener(this);
1107	1149	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	1150	repairParentItem.addActionListener(this);
	1151	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1152	+ repairShadowItem.addActionListener(this);
1109	1153	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	1154	invariantsItem.addActionListener(this);
1111	1155	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1441,9 +1485,9 @@
1441	1485
1442	1486	void Overwrite(int mask)
1443	1487	{
1444		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1488	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1445	1489	{
1446		- Object3D content = GraphreeD.clipboard.get(0);
	1490	+ Object3D content = GrafreeD.clipboard.get(0);
1447	1491
1448	1492	if (content instanceof cGroup && ((cGroup)content).transientlink )
1449	1493	content = ((cGroup)content).get(0);
..	..	@@ -1592,6 +1636,10 @@
1592	1636	if (event.getSource() == superItem)
1593	1637	{
1594	1638	makeSomething(new Superellipsoid());
	1639	+ } else
	1640	+ if (event.getSource() == kleinItem)
	1641	+ {
	1642	+ makeSomething(new Klein());
1595	1643	} else
1596	1644	if (event.getSource() == blobItem)
1597	1645	{
..	..	@@ -1762,8 +1810,8 @@
1762	1810	} else
1763	1811	if (event.getSource() == computeAOItem)
1764	1812	{
1765		- CameraPane.drawMode = CameraPane.OCCLUSION;
1766		- CameraPane.theRenderer.repaint();
	1813	+ Globals.drawMode = CameraPane.OCCLUSION;
	1814	+ Globals.theRenderer.repaint();
1767	1815	} else
1768	1816	if (event.getSource() == recompileItem)
1769	1817	{
..	..	@@ -1778,7 +1826,7 @@
1778	1826	if (event.getSource() == invariantsItem)
1779	1827	{
1780	1828	System.out.println("Invariants:");
1781		- GraphreeD.theApplet3D.universe.invariants();
	1829	+ GrafreeD.grafreeD.universe.invariants();
1782	1830	} else
1783	1831	if (event.getSource() == memoryItem)
1784	1832	{
..	..	@@ -1848,10 +1896,10 @@
1848	1896	} else
1849	1897	if (event.getSource() == duplicateItem)
1850	1898	{
1851		- Object3D keep = GraphreeD.clipboard;
	1899	+ Object3D keep = GrafreeD.clipboard;
1852	1900	loadClipboard(false);
1853	1901	paste(false);
1854		- GraphreeD.clipboard = keep;
	1902	+ GrafreeD.clipboard = keep;
1855	1903	} else
1856	1904	if (event.getSource() == cloneItem)
1857	1905	{
..	..	@@ -1895,8 +1943,9 @@
1895	1943	} else
1896	1944	if (event.getSource() == overwriteMatItem)
1897	1945	{
	1946	+ /* july 2015
1898	1947	if ((dropAttributes & Object3D.TEXTURE) == 0)
1899		- Overwrite(Object3D.MATERIAL);
	1948	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1900	1949	else
1901	1950	{
1902	1951	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1908,13 +1957,16 @@
1908	1957	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1909	1958	}
1910	1959	}
	1960	+ */
	1961	+
	1962	+ Overwrite(dropAttributes);
1911	1963	}
1912	1964	if (event.getSource() == overwriteGeoItem)
1913	1965	{
1914	1966	Overwrite(Object3D.GEOMETRY);
1915		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1967	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1916	1968	// {
1917		-// Object3D content = GraphreeD.clipboard.get(0);
	1969	+// Object3D content = GrafreeD.clipboard.get(0);
1918	1970	//
1919	1971	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1920	1972	// content = ((cGroup)content).get(0);
..	..	@@ -1997,23 +2049,28 @@
1997	2049	if (group.selection.size() == 1)
1998	2050	one = true;
1999	2051
	2052	+ Object3D merge = null;
	2053	+
2000	2054	Object3D content = new cGroup();
2001	2055
2002	2056	for (int i=0; i<group.selection.size(); i++)
2003	2057	{
2004		- Object3D sel = new Merge(group.selection.get(i));
	2058	+ merge = new Merge(group.selection.get(i));
2005	2059
2006	2060	if (one)
2007		- makeSomething(sel, false);
	2061	+ makeSomething(merge, false);
2008	2062	else
2009		- content.addChild(sel);
	2063	+ content.addChild(merge);
2010	2064	}
2011	2065
2012	2066	if (!one)
2013		- makeSomething(content, false);
2014		-
2015		- ResetModel();
2016		- refreshContents();
	2067	+ makeSomething(content, true);
	2068	+ else
	2069	+ {
	2070	+ ResetModel();
	2071	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2072	+ refreshContents();
	2073	+ }
2017	2074	} else
2018	2075	if (event.getSource() == mergeGeometriesItem)
2019	2076	{
..	..	@@ -2047,9 +2104,9 @@
2047	2104	} else
2048	2105	if (event.getSource() == linkverticesItem)
2049	2106	{
2050		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2107	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2051	2108	// {
2052		-// Object3D content = GraphreeD.clipboard.get(0);
	2109	+// Object3D content = GrafreeD.clipboard.get(0);
2053	2110	//
2054	2111	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2055	2112	// content = ((cGroup)content).get(0);
..	..	@@ -2058,14 +2115,14 @@
2058	2115	// group.selection.get(0).setMasterThis(content); // should be identity
2059	2116	// refreshContents();
2060	2117	// }
2061		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2118	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
2062	2119	{
2063		- Object3D content = GraphreeD.clipboard.get(0);
	2120	+ Object3D content = GrafreeD.clipboard.get(0);
2064	2121
2065	2122	if (content instanceof cGroup && ((cGroup)content).transientlink )
2066	2123	content = ((cGroup)content).get(0);
2067	2124
2068		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2125	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2069	2126	for (int i=0; i<group.selection.size(); i++)
2070	2127	{
2071	2128	boolean random = CameraPane.RANDOM;
..	..	@@ -2074,7 +2131,7 @@
2074	2131	// group.selection.get(i).setMasterThis(content); // should be identity
2075	2132	CameraPane.RANDOM = random;
2076	2133	}
2077		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2134	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2078	2135	refreshContents();
2079	2136	}
2080	2137	} else
..	..	@@ -2090,6 +2147,15 @@
2090	2147
2091	2148	refreshContents();
2092	2149	} else
	2150	+ if (event.getSource() == relinkverticesItem)
	2151	+ {
	2152	+ boolean random = CameraPane.RANDOM;
	2153	+ CameraPane.RANDOM = false; // parse all random nodes
	2154	+ group.selection.RelinkToSupport();
	2155	+ CameraPane.RANDOM = random;
	2156	+
	2157	+ refreshContents();
	2158	+ } else
2093	2159	if (event.getSource() == resetreferencesItem)
2094	2160	{
2095	2161	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2101,9 +2167,9 @@
2101	2167	} else
2102	2168	if (event.getSource() == setMasterItem)
2103	2169	{
2104		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2170	+ if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2105	2171	{
2106		- Object3D content = GraphreeD.clipboard.get(0);
	2172	+ Object3D content = GrafreeD.clipboard.get(0);
2107	2173
2108	2174	if (content instanceof cGroup && ((cGroup)content).transientlink )
2109	2175	content = ((cGroup)content).get(0);
..	..	@@ -2116,9 +2182,9 @@
2116	2182	{
2117	2183	if (group.selection.size() == 1)
2118	2184	{
2119		- if (GraphreeD.clipboard.size() == 1)
	2185	+ if (GrafreeD.clipboard.size() == 1)
2120	2186	{
2121		- Object3D content = GraphreeD.clipboard.get(0);
	2187	+ Object3D content = GrafreeD.clipboard.get(0);
2122	2188
2123	2189	if (content instanceof cGroup && ((cGroup)content).transientlink )
2124	2190	content = ((cGroup)content).get(0);
..	..	@@ -2158,6 +2224,10 @@
2158	2224	if (event.getSource() == grabItem)
2159	2225	{
2160	2226	group(new cGroup(), true);
	2227	+ } else
	2228	+ if (event.getSource() == hideItem)
	2229	+ {
	2230	+ group(new HiddenObject());
2161	2231	} else
2162	2232	if (event.getSource() == frontItem)
2163	2233	{
..	..	@@ -2281,6 +2351,10 @@
2281	2351	{
2282	2352	group(new TextureNode());
2283	2353	} else
	2354	+ if (event.getSource() == billboardItem)
	2355	+ {
	2356	+ group(new BillboardNode());
	2357	+ } else
2284	2358	if (event.getSource() == shadowXItem)
2285	2359	{
2286	2360	CastShadow(0);
..	..	@@ -2295,7 +2369,15 @@
2295	2369	} else
2296	2370	if (event.getSource() == ungroupItem)
2297	2371	{
2298		- ungroup();
	2372	+ //ungroup();
	2373	+ for (int i=0; i<group.selection.size(); i++)
	2374	+ {
	2375	+ Ungroup(group.selection.get(i));
	2376	+ }
	2377	+
	2378	+ ClearSelection(false);
	2379	+
	2380	+ refreshContents();
2299	2381	} else
2300	2382	if (event.getSource() == genUVItem)
2301	2383	{
..	..	@@ -2305,9 +2387,17 @@
2305	2387	{
2306	2388	GenNormals(true);
2307	2389	} else
	2390	+ if (event.getSource() == genNormalsMESHItem)
	2391	+ {
	2392	+ GenNormals(true); // TODO
	2393	+ } else
2308	2394	if (event.getSource() == genNormalsORGANItem)
2309	2395	{
2310	2396	GenNormals(false);
	2397	+ } else
	2398	+ if (event.getSource() == genNormalsMINEItem)
	2399	+ {
	2400	+ GenNormalsMINE();
2311	2401	} else
2312	2402	if (event.getSource() == stripifyItem)
2313	2403	{
..	..	@@ -2485,6 +2575,20 @@
2485	2575
2486	2576	refreshContents();
2487	2577	} else
	2578	+ if (event.getSource() == repairShadowItem)
	2579	+ {
	2580	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2581	+ {
	2582	+ Object3D obj = (Object3D)e.nextElement();
	2583	+ obj.RepairShadow();
	2584	+// for (int i=0; i<obj.size(); i++)
	2585	+// {
	2586	+// obj.get(i).parent = obj;
	2587	+// }
	2588	+ }
	2589	+
	2590	+ refreshContents();
	2591	+ } else
2488	2592	if (event.getSource() == sortbysizeItem)
2489	2593	{
2490	2594	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2580,8 +2684,8 @@
2580	2684	// bug
2581	2685	//gridPanel.setDividerLocation(1.0);
2582	2686	//bigPanel.setDividerLocation(0.0);
2583		- bigThree.remove(jtp);
2584		- bigThree.remove(cameraPanel);
	2687	+ bigThree.remove(scenePanel);
	2688	+ bigThree.remove(centralPanel);
2585	2689	bigThree.remove(XYZPanel);
2586	2690	aWindowConstraints.gridx = 0;
2587	2691	aWindowConstraints.gridy = 0;
..	..	@@ -2596,7 +2700,7 @@
2596	2700	// aConstraints.gridheight = 3;
2597	2701	aWindowConstraints.gridx = 1;
2598	2702	aWindowConstraints.fill = GridBagConstraints.BOTH;
2599		- bigThree.add(cameraPanel, aWindowConstraints);
	2703	+ bigThree.add(centralPanel, aWindowConstraints);
2600	2704	aWindowConstraints.weightx = 0;
2601	2705	aWindowConstraints.gridx = 4;
2602	2706	aWindowConstraints.gridwidth = 1;
..	..	@@ -2608,8 +2712,8 @@
2608	2712	if (event.getSource() == threeButton)
2609	2713	{
2610	2714	radio.layout = threeButton;
2611		- bigThree.remove(jtp);
2612		- bigThree.remove(cameraPanel);
	2715	+ bigThree.remove(scenePanel);
	2716	+ bigThree.remove(centralPanel);
2613	2717	bigThree.remove(XYZPanel);
2614	2718	aWindowConstraints.gridx = 0;
2615	2719	aWindowConstraints.gridy = 0;
..	..	@@ -2624,7 +2728,7 @@
2624	2728	// aConstraints.gridheight = 3;
2625	2729	aWindowConstraints.gridx = 1;
2626	2730	aWindowConstraints.fill = GridBagConstraints.BOTH;
2627		- bigThree.add(cameraPanel, aWindowConstraints);
	2731	+ bigThree.add(centralPanel, aWindowConstraints);
2628	2732	aWindowConstraints.weightx = 0;
2629	2733	aWindowConstraints.gridx = 4;
2630	2734	aWindowConstraints.gridwidth = 1;
..	..	@@ -2636,8 +2740,8 @@
2636	2740	if (event.getSource() == fourButton)
2637	2741	{
2638	2742	radio.layout = fourButton;
2639		- bigThree.remove(jtp);
2640		- bigThree.remove(cameraPanel);
	2743	+ bigThree.remove(scenePanel);
	2744	+ bigThree.remove(centralPanel);
2641	2745	bigThree.remove(XYZPanel);
2642	2746	aWindowConstraints.gridx = 0;
2643	2747	aWindowConstraints.gridy = 0;
..	..	@@ -2646,7 +2750,7 @@
2646	2750	aWindowConstraints.fill = GridBagConstraints.BOTH;
2647	2751	aWindowConstraints.weightx = 1;
2648	2752	aWindowConstraints.weighty = 1;
2649		- bigThree.add(jtp, aWindowConstraints);
	2753	+ bigThree.add(scenePanel, aWindowConstraints);
2650	2754	aWindowConstraints.weightx = 1;
2651	2755	aWindowConstraints.gridwidth = 3;
2652	2756	// aConstraints.gridheight = 3;
..	..	@@ -2664,8 +2768,8 @@
2664	2768	if (event.getSource() == sixButton)
2665	2769	{
2666	2770	radio.layout = sixButton;
2667		- bigThree.remove(jtp);
2668		- bigThree.remove(cameraPanel);
	2771	+ bigThree.remove(scenePanel);
	2772	+ bigThree.remove(centralPanel);
2669	2773	bigThree.remove(XYZPanel);
2670	2774	aWindowConstraints.gridx = 0;
2671	2775	aWindowConstraints.gridy = 0;
..	..	@@ -2674,13 +2778,13 @@
2674	2778	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2675	2779	aWindowConstraints.weightx = 0;
2676	2780	aWindowConstraints.weighty = 1;
2677		- bigThree.add(jtp, aWindowConstraints);
	2781	+ bigThree.add(scenePanel, aWindowConstraints);
2678	2782	aWindowConstraints.weightx = 1;
2679	2783	aWindowConstraints.gridwidth = 3;
2680	2784	// aWindowConstraints.gridheight = 3;
2681	2785	aWindowConstraints.gridx = 1;
2682	2786	aWindowConstraints.fill = GridBagConstraints.BOTH;
2683		- bigThree.add(cameraPanel, aWindowConstraints);
	2787	+ bigThree.add(centralPanel, aWindowConstraints);
2684	2788	aWindowConstraints.weightx = 0;
2685	2789	aWindowConstraints.gridx = 4;
2686	2790	aWindowConstraints.gridwidth = 1;
..	..	@@ -2692,8 +2796,8 @@
2692	2796	if (event.getSource() == sevenButton)
2693	2797	{
2694	2798	radio.layout = sevenButton;
2695		- bigThree.remove(jtp);
2696		- bigThree.remove(cameraPanel);
	2799	+ bigThree.remove(scenePanel);
	2800	+ bigThree.remove(centralPanel);
2697	2801	bigThree.remove(XYZPanel);
2698	2802	aWindowConstraints.gridx = 0;
2699	2803	aWindowConstraints.gridy = 0;
..	..	@@ -2702,13 +2806,13 @@
2702	2806	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2703	2807	aWindowConstraints.weightx = 0;
2704	2808	aWindowConstraints.weighty = 1;
2705		- bigThree.add(jtp, aWindowConstraints);
	2809	+ bigThree.add(scenePanel, aWindowConstraints);
2706	2810	aWindowConstraints.weightx = 1;
2707	2811	aWindowConstraints.gridwidth = 3;
2708	2812	// aWindowConstraints.gridheight = 3;
2709	2813	aWindowConstraints.gridx = 1;
2710	2814	aWindowConstraints.fill = GridBagConstraints.BOTH;
2711		- bigThree.add(cameraPanel, aWindowConstraints);
	2815	+ bigThree.add(centralPanel, aWindowConstraints);
2712	2816	aWindowConstraints.weightx = 0;
2713	2817	aWindowConstraints.gridx = 4;
2714	2818	aWindowConstraints.gridwidth = 1;
..	..	@@ -2806,7 +2910,7 @@
2806	2910	if (event.getSource() == unselectButton)
2807	2911	{
2808	2912	objEditor.jTree.clearSelection();
2809		- // ?? oct 2012 GraphreeD.clipboard.clear();
	2913	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2810	2914	objEditor.ResetSliders();
2811	2915	refreshContents(true);
2812	2916	} else
..	..	@@ -2835,7 +2939,7 @@
2835	2939	}
2836	2940
2837	2941	copy = group;
2838		- //CameraPane.theRenderer.object = group;
	2942	+ //Globals.theRenderer.object = group;
2839	2943	if(!useclient)
2840	2944	{
2841	2945	cameraView.renderCamera = radio.camera;
..	..	@@ -2844,7 +2948,8 @@
2844	2948	cameraView.cameras[cameraView.cameracount] = radio.camera;
2845	2949	cameraView.targetLookAt.set(radio.camera.lookAt);
2846	2950	cameraView.object = group;
2847		- cameraView.lighttouched = true;
	2951	+ //cameraView.lighttouched = true;
	2952	+ Globals.lighttouched = true;
2848	2953	topView.object = group;
2849	2954	frontView.object = group;
2850	2955	sideView.object = group;
..	..	@@ -2880,7 +2985,7 @@
2880	2985	if (useclient)
2881	2986	{
2882	2987	cameraView.object = client;
2883		- cameraView.lighttouched = true;
	2988	+ Globals.lighttouched = true;
2884	2989	//topView.object = client;
2885	2990	//frontView.object = client;
2886	2991	//sideView.object = client;
..	..	@@ -2888,7 +2993,7 @@
2888	2993	else
2889	2994	{
2890	2995	cameraView.object = group;
2891		- cameraView.lighttouched = true;
	2996	+ Globals.lighttouched = true;
2892	2997	//topView.object = group;
2893	2998	//frontView.object = group;
2894	2999	//sideView.object = group;
..	..	@@ -3121,9 +3226,9 @@
3121	3226	obj = (Object3D)e.nextElement();
3122	3227
3123	3228	System.out.println("Object is: " + obj);
3124		- GraphreeD.AnalyzeObject(obj);
	3229	+ GrafreeD.AnalyzeObject(obj);
3125	3230	System.out.println("Boundary rep: " + obj.bRep);
3126		- GraphreeD.AnalyzeObject(obj.bRep);
	3231	+ GrafreeD.AnalyzeObject(obj.bRep);
3127	3232
3128	3233	// System.err.println((size/1024) + " KB is the size of " + obj);
3129	3234	}
..	..	@@ -3165,6 +3270,13 @@
3165	3270	void GenNormals(boolean crease)
3166	3271	{
3167	3272	group.GenNormalsS(crease);
	3273	+
	3274	+ refreshContents();
	3275	+ }
	3276	+
	3277	+ void GenNormalsMINE()
	3278	+ {
	3279	+ group.selection.GenNormalsMINE();
3168	3280
3169	3281	refreshContents();
3170	3282	}
..	..	@@ -3250,7 +3362,7 @@
3250	3362	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3251	3363	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3252	3364	//
3253		-// g.add(GraphreeD.clipboard);
	3365	+// g.add(GrafreeD.clipboard);
3254	3366	//
3255	3367	// buffer.add(g);
3256	3368	// }
..	..	@@ -3269,8 +3381,8 @@
3269	3381	// nodes = new Object3D();
3270	3382	// vertices = new Vector<Vertex>();
3271	3383	//
3272		-// boolean epsequal = GraphreeD.epsequal;
3273		-// GraphreeD.epsequal = true;
	3384	+// boolean epsequal = GrafreeD.epsequal;
	3385	+// GrafreeD.epsequal = true;
3274	3386	//
3275	3387	// for (int i=0; i<group.selection.size(); i++)
3276	3388	// {
..	..	@@ -3311,7 +3423,7 @@
3311	3423	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3312	3424	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3313	3425	//
3314		-// g.add(GraphreeD.clipboard);
	3426	+// g.add(GrafreeD.clipboard);
3315	3427	//
3316	3428	// buffer.add(g);
3317	3429	// }
..	..	@@ -3319,7 +3431,7 @@
3319	3431	// makeSomething(buffer, i==group.selection.size()-1);
3320	3432	// }
3321	3433	//
3322		-// GraphreeD.epsequal = epsequal;
	3434	+// GrafreeD.epsequal = epsequal;
3323	3435	//
3324	3436	// //buffer = null;
3325	3437	// temprep = null;
..	..	@@ -3330,8 +3442,8 @@
3330	3442
3331	3443	void ParseVertices()
3332	3444	{
3333		- boolean epsequal = GraphreeD.epsequal;
3334		- GraphreeD.epsequal = true;
	3445	+ boolean epsequal = GrafreeD.epsequal;
	3446	+ GrafreeD.epsequal = true;
3335	3447
3336	3448	for (int i=0; i<group.selection.size(); i++)
3337	3449	{
..	..	@@ -3356,7 +3468,7 @@
3356	3468	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3357	3469	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3358	3470
3359		- g.add(GraphreeD.clipboard);
	3471	+ g.add(GrafreeD.clipboard);
3360	3472
3361	3473	buffer.add(g);
3362	3474	}
..	..	@@ -3371,7 +3483,7 @@
3371	3483	makeSomething(buffer, i==group.selection.size()-1);
3372	3484	}
3373	3485
3374		- GraphreeD.epsequal = epsequal;
	3486	+ GrafreeD.epsequal = epsequal;
3375	3487
3376	3488	refreshContents();
3377	3489	}
..	..	@@ -3389,7 +3501,7 @@
3389	3501	String pigment = Object3D.GetPigment(tex);
3390	3502	//String bump = Object3D.GetBump(tex);
3391	3503
3392		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3504	+ com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3393	3505
3394	3506	double s = v.s;
3395	3507
..	..	@@ -3416,7 +3528,7 @@
3416	3528	scale /= 3;
3417	3529
3418	3530	scale /= 0xFF;
3419		- scale /= 4;
	3531	+ // c'est quoi ca? scale /= 4;
3420	3532
3421	3533	//v.AO = scale;
3422	3534
..	..	@@ -3437,12 +3549,26 @@
3437	3549
3438	3550	void Align()
3439	3551	{
	3552	+ if (group.selection.size() == 0)
	3553	+ return;
	3554	+
	3555	+ cVector bbmin = new cVector();
	3556	+ cVector bbmax = new cVector();
	3557	+
	3558	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3559	+
	3560	+ double dx = bbmax.x - bbmin.x;
	3561	+ double dy = bbmax.y - bbmin.y;
	3562	+ double dz = bbmax.z - bbmin.z;
	3563	+
	3564	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3565	+
3440	3566	for (int i=0; i<group.selection.size(); i++)
3441	3567	{
3442	3568	Object3D obj = group.selection.get(i);
3443	3569
3444		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3445		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3570	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3571	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3446	3572	}
3447	3573
3448	3574	refreshContents();
..	..	@@ -3455,7 +3581,7 @@
3455	3581	// ref.SaveSupports();
3456	3582	// Object3D par = ref.parent;
3457	3583	// ref.parent = null;
3458		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	3584	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3459	3585	// ref.parent = par;
3460	3586	// ref.RestoreSupports();
3461	3587
..	..	@@ -3485,7 +3611,7 @@
3485	3611	// lowres.SaveSupports();
3486	3612	// par = lowres.parent;
3487	3613	// lowres.parent = null;
3488		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	3614	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3489	3615	Object3D newlow = CloneObject(lowres, false);
3490	3616	newlow.name = sn.switchobject.get(i).name;
3491	3617	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3507,7 +3633,7 @@
3507	3633	return;
3508	3634
3509	3635	Object3D poses = group.selection.get(0);
3510		- Object3D ref = GraphreeD.clipboard.get(0);
	3636	+ Object3D ref = GrafreeD.clipboard.get(0);
3511	3637
3512	3638	Object3D newgroup = new Object3D("Po:" + poses.name);
3513	3639
..	..	@@ -3676,7 +3802,7 @@
3676	3802	group.selection.RelinkToSupport(); // july 2014
3677	3803	System.out.println("DONE.");
3678	3804	refreshContents();
3679		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3805	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3680	3806	}
3681	3807
3682	3808	void ReduceMesh(boolean reduction34)
..	..	@@ -3701,20 +3827,20 @@
3701	3827
3702	3828	void ClipMesh()
3703	3829	{
3704		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	3830	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
3705	3831	{
3706		- Object3D content = GraphreeD.clipboard.get(0);
	3832	+ Object3D content = GrafreeD.clipboard.get(0);
3707	3833
3708	3834	if (content instanceof cGroup && ((cGroup)content).transientlink )
3709	3835	content = ((cGroup)content).get(0);
3710	3836
3711	3837	// for (int i=0; i<group.selection.size(); i++)
3712	3838	// {
3713		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	3839	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3714	3840	// }
3715		- group.selection.ClipMesh(GraphreeD.clipboard);
	3841	+ group.selection.ClipMesh(GrafreeD.clipboard);
3716	3842	}
3717		-// group.selection.ClipMesh(GraphreeD.clipboard);
	3843	+// group.selection.ClipMesh(GrafreeD.clipboard);
3718	3844	System.out.println("DONE.");
3719	3845	refreshContents();
3720	3846	}
..	..	@@ -3961,16 +4087,16 @@
3961	4087
3962	4088	objEditor.SetText(); // jan 2014
3963	4089
3964		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4090	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
3965	4091	CameraPane.flash = true;
3966	4092
3967	4093	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
3968	4094	// a camera
3969	4095	{
3970	4096	CameraPane.camerachangeframe = 0; // don't refuse it
3971		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3972		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3973		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4097	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4098	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4099	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3974	4100	}
3975	4101
3976	4102	refreshContents();
..	..	@@ -4052,12 +4178,12 @@
4052	4178	{
4053	4179	if (group.selection.isEmpty())
4054	4180	return;
4055		- GraphreeD.clipboardIsTempGroup = false;
	4181	+ GrafreeD.clipboardIsTempGroup = false;
4056	4182	Composite tGroup = null;
4057	4183	if (group.selection.size() > 0) // 1)
4058	4184	{
4059	4185	tGroup = new cGroup();
4060		- GraphreeD.clipboardIsTempGroup = true;
	4186	+ GrafreeD.clipboardIsTempGroup = true;
4061	4187	}
4062	4188
4063	4189	if (cut)
..	..	@@ -4097,16 +4223,16 @@
4097	4223	//System.out.println("cut " + child);
4098	4224	//System.out.println("parent = " + child.parent);
4099	4225	// tmp.addChild(child);
4100		- if (GraphreeD.clipboardIsTempGroup)
	4226	+ if (GrafreeD.clipboardIsTempGroup)
4101	4227	tGroup.add/Child/(tmp);
4102	4228	else
4103		- GraphreeD.clipboard = tmp;
	4229	+ GrafreeD.clipboard = tmp;
4104	4230	}
4105	4231	else
4106		- if (GraphreeD.clipboardIsTempGroup)
	4232	+ if (GrafreeD.clipboardIsTempGroup)
4107	4233	tGroup.add/Child/(child);
4108	4234	else
4109		- GraphreeD.clipboard = child;
	4235	+ GrafreeD.clipboard = child;
4110	4236	}
4111	4237
4112	4238	//ResetModel();
..	..	@@ -4138,21 +4264,21 @@
4138	4264	//System.out.println("cut " + elem);
4139	4265	//System.out.println("parent = " + elem.parent);
4140	4266	// tmp.addChild(elem);
4141		- if (GraphreeD.clipboardIsTempGroup)
	4267	+ if (GrafreeD.clipboardIsTempGroup)
4142	4268	tGroup.add/Child/(tmp);
4143	4269	else
4144		- GraphreeD.clipboard = tmp;
	4270	+ GrafreeD.clipboard = tmp;
4145	4271	}
4146	4272	else
4147		- if (GraphreeD.clipboardIsTempGroup)
	4273	+ if (GrafreeD.clipboardIsTempGroup)
4148	4274	tGroup.add/Child/(child);
4149	4275	else
4150		- GraphreeD.clipboard = child;
	4276	+ GrafreeD.clipboard = child;
4151	4277	}
4152	4278
4153	4279	}
4154		- if (GraphreeD.clipboardIsTempGroup)
4155		- GraphreeD.clipboard = tGroup;
	4280	+ if (GrafreeD.clipboardIsTempGroup)
	4281	+ GrafreeD.clipboard = tGroup;
4156	4282	if (cut)
4157	4283	{
4158	4284	ResetModel();
..	..	@@ -4162,11 +4288,11 @@
4162	4288
4163	4289	void paste(boolean expand)
4164	4290	{
4165		- // if (GraphreeD.clipboard == null)
	4291	+ // if (GrafreeD.clipboard == null)
4166	4292	// return;
4167	4293	boolean first = true;
4168	4294
4169		- if (GraphreeD.clipboardIsTempGroup)
	4295	+ if (GrafreeD.clipboardIsTempGroup)
4170	4296	{
4171	4297	Composite temp;
4172	4298
..	..	@@ -4177,7 +4303,7 @@
4177	4303	temp = (Composite)Applet3D.clipboard.deepCopy();
4178	4304	*/
4179	4305	Object3D elem;
4180		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4306	+ for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4181	4307	{
4182	4308	Object3D child = (Object3D)e.nextElement();
4183	4309
..	..	@@ -4191,7 +4317,7 @@
4191	4317	else
4192	4318	elem = child.deepCopy(); // ?
4193	4319	child.parent = keepparent;
4194		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	4320	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4195	4321	// elem = elem.get(0);
4196	4322	makeSomething(elem, true); // ?? first);
4197	4323	//group.addChild(elem);
..	..	@@ -4211,14 +4337,14 @@
4211	4337	//Object3D cb = Applet3D.clipboard;
4212	4338	//temp.addChild(cb);
4213	4339	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4214		- assert(GraphreeD.clipboard.parent == null);
4215		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
4216		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
4217		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
4218		- makeSomething(expand?GraphreeD.clipboard.get(0).copyExpand():GraphreeD.clipboard.get(0).deepCopy());
	4340	+ assert(GrafreeD.clipboard.parent == null);
	4341	+ Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
	4342	+ GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
	4343	+ if (LA.isIdentity(GrafreeD.clipboard.toParent))
	4344	+ makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
4219	4345	else
4220		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4221		- GraphreeD.clipboard.get(0).parent = keepparent;
	4346	+ makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
	4347	+ GrafreeD.clipboard.get(0).parent = keepparent;
4222	4348	}
4223	4349
4224	4350	ResetModel();
..	..	@@ -4227,7 +4353,7 @@
4227	4353
4228	4354	void pasteInto(boolean copyit)
4229	4355	{
4230		-// if (GraphreeD.clipboard == null)
	4356	+// if (GrafreeD.clipboard == null)
4231	4357	// return;
4232	4358
4233	4359	if (group.selection.size() != 1)
..	..	@@ -4260,9 +4386,9 @@
4260	4386	{
4261	4387	boolean first = true;
4262	4388
4263		- if (GraphreeD.clipboardIsTempGroup)
	4389	+ if (GrafreeD.clipboardIsTempGroup)
4264	4390	{
4265		- Composite temp = (Composite)GraphreeD.clipboard;
	4391	+ Composite temp = (Composite)GrafreeD.clipboard;
4266	4392	Object3D copy;
4267	4393	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4268	4394	{
..	..	@@ -4272,7 +4398,7 @@
4272	4398	}
4273	4399	} else
4274	4400	{
4275		- linkSomething(GraphreeD.clipboard); //.get(0));
	4401	+ linkSomething(GrafreeD.clipboard); //.get(0));
4276	4402	}
4277	4403	}
4278	4404	}
..	..	@@ -4464,6 +4590,26 @@
4464	4590	makeSomething(csg);
4465	4591	}
4466	4592
	4593	+ void Ungroup(Object3D g)
	4594	+ {
	4595	+ if (g instanceof HiddenObject)
	4596	+ {
	4597	+ HiddenObject h = (HiddenObject) g;
	4598	+
	4599	+ for (int i=0; i<h.ActualSize(); i++)
	4600	+ {
	4601	+ objEditor.makeSomething(h.get(i), false);
	4602	+ }
	4603	+ }
	4604	+ else
	4605	+ {
	4606	+ for (int i=0; i<g.Size(); i++)
	4607	+ {
	4608	+ objEditor.makeSomething(g.get(i), false);
	4609	+ }
	4610	+ }
	4611	+ }
	4612	+
4467	4613	void ungroup()
4468	4614	{
4469	4615	/*
..	..	@@ -4659,7 +4805,7 @@
4659	4805
4660	4806	void ImportGFD()
4661	4807	{
4662		- FileDialog browser = new FileDialog(objEditor.frame, "Import GraphreeD", FileDialog.LOAD);
	4808	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4663	4809	browser.show();
4664	4810	String filename = browser.getFile();
4665	4811	if (filename != null && filename.length() > 0)
..	..	@@ -4697,7 +4843,7 @@
4697	4843
4698	4844	void ImportVRMLX3D()
4699	4845	{
4700		- if (GraphreeD.standAlone)
	4846	+ if (GrafreeD.standAlone)
4701	4847	{
4702	4848	/**/
4703	4849	FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
..	..	@@ -4714,7 +4860,7 @@
4714	4860
4715	4861	String GetFile(String dialogName)
4716	4862	{
4717		- if (GraphreeD.standAlone)
	4863	+ if (GrafreeD.standAlone)
4718	4864	{
4719	4865	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4720	4866	browser.show();
..	..	@@ -4823,6 +4969,7 @@
4823	4969	private MenuItem resetsupportItem;
4824	4970	private MenuItem resetreferencesItem;
4825	4971	private MenuItem linkverticesItem;
	4972	+ private MenuItem relinkverticesItem;
4826	4973	private MenuItem setMasterItem;
4827	4974	private MenuItem resetMeshItem;
4828	4975	private MenuItem stepAllItem;
..	..	@@ -4841,8 +4988,10 @@
4841	4988	private MenuItem clearItem;
4842	4989	private MenuItem clearAllItem;
4843	4990	private MenuItem genUVItem;
	4991	+ private MenuItem genNormalsMESHItem;
4844	4992	private MenuItem genNormalsCADItem;
4845	4993	private MenuItem genNormalsORGANItem;
	4994	+ private MenuItem genNormalsMINEItem;
4846	4995	private MenuItem stripifyItem;
4847	4996	private MenuItem unstripifyItem;
4848	4997	private MenuItem trimItem;
..	..	@@ -4884,6 +5033,7 @@
4884	5033	private MenuItem resetCentroidItem;
4885	5034	private MenuItem transformgeometryItem;
4886	5035	private MenuItem resetTransformItem;
	5036	+ private MenuItem hideItem;
4887	5037	private MenuItem grabItem;
4888	5038	private MenuItem backItem;
4889	5039	private MenuItem frontItem;
..	..	@@ -4904,6 +5054,7 @@
4904	5054
4905	5055	private MenuItem resetParentItem;
4906	5056	private MenuItem repairParentItem;
	5057	+ private MenuItem repairShadowItem;
4907	5058	private MenuItem sortbysizeItem;
4908	5059	private MenuItem sortbynameItem;
4909	5060
..	..	@@ -4924,6 +5075,7 @@
4924	5075	private MenuItem coneItem;
4925	5076	private MenuItem torusItem;
4926	5077	private MenuItem superItem;
	5078	+ private MenuItem kleinItem;
4927	5079	private MenuItem blobItem;
4928	5080	private MenuItem latheItem;
4929	5081	private MenuItem bezierItem;
..	..	@@ -4936,6 +5088,7 @@
4936	5088	private MenuItem csgItem;
4937	5089	private MenuItem templateItem;
4938	5090	private MenuItem textureItem;
	5091	+ private MenuItem billboardItem;
4939	5092	private MenuItem shadowXItem;
4940	5093	private MenuItem shadowYItem;
4941	5094	private MenuItem shadowZItem;