~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
..	..	@@ -1002,6 +1029,8 @@
1002	1029
1003	1030	void buildCreateMenu(Menu menu)
1004	1031	{
	1032	+ //heightFieldItem = menu.add(new MenuItem("Height Field"));
	1033	+ //heightFieldItem.addActionListener(this);
1005	1034	gridItem = menu.add(new MenuItem("Grid"));
1006	1035	gridItem.addActionListener(this);
1007	1036	rectoidItem = menu.add(new MenuItem("Box"));
..	..	@@ -1014,6 +1043,8 @@
1014	1043	torusItem.addActionListener(this);
1015	1044	superItem = menu.add(new MenuItem("Superellipsoid"));
1016	1045	superItem.addActionListener(this);
	1046	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1047	+ kleinItem.addActionListener(this);
1017	1048	particleItem = menu.add(new MenuItem("Particle system"));
1018	1049	particleItem.addActionListener(this);
1019	1050	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1048,15 +1079,6 @@
1048	1079	doubleItem.addActionListener(this);
1049	1080	tripleItem = menu.add(new MenuItem("Trident"));
1050	1081	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	1082	}
1061	1083
1062	1084	void buildToolsMenu(Menu menu)
..	..	@@ -1068,6 +1090,8 @@
1068	1090	menu.add("-");
1069	1091	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1070	1092	parseverticesItem.addActionListener(this);
	1093	+ textureFieldItem = menu.add(new MenuItem("Texture Field"));
	1094	+ textureFieldItem.addActionListener(this);
1071	1095	alignItem = menu.add(new MenuItem("Align"));
1072	1096	alignItem.addActionListener(this);
1073	1097	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
..	..	@@ -1429,9 +1453,9 @@
1429	1453
1430	1454	void Overwrite(int mask)
1431	1455	{
1432		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1456	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1433	1457	{
1434		- Object3D content = GraphreeD.clipboard.get(0);
	1458	+ Object3D content = GrafreeD.clipboard.get(0);
1435	1459
1436	1460	if (content instanceof cGroup && ((cGroup)content).transientlink )
1437	1461	content = ((cGroup)content).get(0);
..	..	@@ -1521,6 +1545,46 @@
1521	1545	makeSomething(ragdoll);
1522	1546	//makeSomething(new VehicleDemo());
1523	1547	} else
	1548	+ /*
	1549	+ */
	1550	+ if (event.getSource() == heightFieldItem)
	1551	+ {
	1552	+ Object3D obj = new Object3D();
	1553	+
	1554	+ obj.CreateMaterial();
	1555	+ obj.bRep = new BoundaryRep();
	1556	+
	1557	+ obj.bRep.CreateMesh(new iHeightField()
	1558	+ {
	1559	+ public double f(double x, double y)
	1560	+ {
	1561	+ // The Mandelbrot set is represented by coloring
	1562	+ // each point (x,y) according to the number of
	1563	+ // iterations it takes before the while loop in
	1564	+ // this method ends. For points that are actually
	1565	+ // in the Mandelbrot set, or very close to it, the
	1566	+ // count will reach the maximum value, 80. These
	1567	+ // points will be colored purple. All other colors
	1568	+ // represent points that are definitely NOT in the set.
	1569	+ x -= 600;
	1570	+ y -= 500;
	1571	+ x /= 200;
	1572	+ y /= 200;
	1573	+ int count = 0;
	1574	+ double zx = x;
	1575	+ double zy = y;
	1576	+ while (count < 80 && Math.abs(x) < 100 && Math.abs(zy) < 100) {
	1577	+ double new_zx = zxzx - zyzy + x;
	1578	+ zy = 2zxzy + y;
	1579	+ zx = new_zx;
	1580	+ count++;
	1581	+ }
	1582	+ return count; // Math.sqrt(count);
	1583	+ }
	1584	+ }, 1000,1000);
	1585	+
	1586	+ makeSomething(obj);
	1587	+ } else
1524	1588	if (event.getSource() == gridItem)
1525	1589	{
1526	1590	makeSomething(new Grid());
..	..	@@ -1540,6 +1604,10 @@
1540	1604	if (event.getSource() == superItem)
1541	1605	{
1542	1606	makeSomething(new Superellipsoid());
	1607	+ } else
	1608	+ if (event.getSource() == kleinItem)
	1609	+ {
	1610	+ makeSomething(new Klein());
1543	1611	} else
1544	1612	if (event.getSource() == blobItem)
1545	1613	{
..	..	@@ -1570,7 +1638,7 @@
1570	1638	LA.matConcat(obj.toParent, cameraView.renderCamera.fromParent, obj.toParent);
1571	1639	LA.matInvert(obj.toParent, obj.fromParent);
1572	1640	*/
1573		- makeSomething(new CheckerIG());
	1641	+ makeSomething(new Checker());
1574	1642	} else
1575	1643	if (event.getSource() == meshItem)
1576	1644	{
..	..	@@ -1726,7 +1794,7 @@
1726	1794	if (event.getSource() == invariantsItem)
1727	1795	{
1728	1796	System.out.println("Invariants:");
1729		- GraphreeD.theApplet3D.universe.invariants();
	1797	+ GrafreeD.theApplet3D.universe.invariants();
1730	1798	} else
1731	1799	if (event.getSource() == memoryItem)
1732	1800	{
..	..	@@ -1796,10 +1864,10 @@
1796	1864	} else
1797	1865	if (event.getSource() == duplicateItem)
1798	1866	{
1799		- Object3D keep = GraphreeD.clipboard;
	1867	+ Object3D keep = GrafreeD.clipboard;
1800	1868	loadClipboard(false);
1801	1869	paste(false);
1802		- GraphreeD.clipboard = keep;
	1870	+ GrafreeD.clipboard = keep;
1803	1871	} else
1804	1872	if (event.getSource() == cloneItem)
1805	1873	{
..	..	@@ -1843,8 +1911,9 @@
1843	1911	} else
1844	1912	if (event.getSource() == overwriteMatItem)
1845	1913	{
	1914	+ /* july 2015
1846	1915	if ((dropAttributes & Object3D.TEXTURE) == 0)
1847		- Overwrite(Object3D.MATERIAL);
	1916	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1848	1917	else
1849	1918	{
1850	1919	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1856,13 +1925,16 @@
1856	1925	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1857	1926	}
1858	1927	}
	1928	+ */
	1929	+
	1930	+ Overwrite(dropAttributes);
1859	1931	}
1860	1932	if (event.getSource() == overwriteGeoItem)
1861	1933	{
1862	1934	Overwrite(Object3D.GEOMETRY);
1863		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1935	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1864	1936	// {
1865		-// Object3D content = GraphreeD.clipboard.get(0);
	1937	+// Object3D content = GrafreeD.clipboard.get(0);
1866	1938	//
1867	1939	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1868	1940	// content = ((cGroup)content).get(0);
..	..	@@ -1945,23 +2017,28 @@
1945	2017	if (group.selection.size() == 1)
1946	2018	one = true;
1947	2019
	2020	+ Object3D merge = null;
	2021	+
1948	2022	Object3D content = new cGroup();
1949	2023
1950	2024	for (int i=0; i<group.selection.size(); i++)
1951	2025	{
1952		- Object3D sel = new Merge(group.selection.get(i));
	2026	+ merge = new Merge(group.selection.get(i));
1953	2027
1954	2028	if (one)
1955		- makeSomething(sel, false);
	2029	+ makeSomething(merge, false);
1956	2030	else
1957		- content.addChild(sel);
	2031	+ content.addChild(merge);
1958	2032	}
1959	2033
1960	2034	if (!one)
1961		- makeSomething(content, false);
1962		-
1963		- ResetModel();
1964		- refreshContents();
	2035	+ makeSomething(content, true);
	2036	+ else
	2037	+ {
	2038	+ ResetModel();
	2039	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2040	+ refreshContents();
	2041	+ }
1965	2042	} else
1966	2043	if (event.getSource() == mergeGeometriesItem)
1967	2044	{
..	..	@@ -1995,9 +2072,9 @@
1995	2072	} else
1996	2073	if (event.getSource() == linkverticesItem)
1997	2074	{
1998		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2075	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
1999	2076	// {
2000		-// Object3D content = GraphreeD.clipboard.get(0);
	2077	+// Object3D content = GrafreeD.clipboard.get(0);
2001	2078	//
2002	2079	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2003	2080	// content = ((cGroup)content).get(0);
..	..	@@ -2006,9 +2083,9 @@
2006	2083	// group.selection.get(0).setMasterThis(content); // should be identity
2007	2084	// refreshContents();
2008	2085	// }
2009		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2086	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
2010	2087	{
2011		- Object3D content = GraphreeD.clipboard.get(0);
	2088	+ Object3D content = GrafreeD.clipboard.get(0);
2012	2089
2013	2090	if (content instanceof cGroup && ((cGroup)content).transientlink )
2014	2091	content = ((cGroup)content).get(0);
..	..	@@ -2038,6 +2115,15 @@
2038	2115
2039	2116	refreshContents();
2040	2117	} else
	2118	+ if (event.getSource() == relinkverticesItem)
	2119	+ {
	2120	+ boolean random = CameraPane.RANDOM;
	2121	+ CameraPane.RANDOM = false; // parse all random nodes
	2122	+ group.selection.RelinkToSupport();
	2123	+ CameraPane.RANDOM = random;
	2124	+
	2125	+ refreshContents();
	2126	+ } else
2041	2127	if (event.getSource() == resetreferencesItem)
2042	2128	{
2043	2129	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2049,9 +2135,9 @@
2049	2135	} else
2050	2136	if (event.getSource() == setMasterItem)
2051	2137	{
2052		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2138	+ if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2053	2139	{
2054		- Object3D content = GraphreeD.clipboard.get(0);
	2140	+ Object3D content = GrafreeD.clipboard.get(0);
2055	2141
2056	2142	if (content instanceof cGroup && ((cGroup)content).transientlink )
2057	2143	content = ((cGroup)content).get(0);
..	..	@@ -2064,9 +2150,9 @@
2064	2150	{
2065	2151	if (group.selection.size() == 1)
2066	2152	{
2067		- if (GraphreeD.clipboard.size() == 1)
	2153	+ if (GrafreeD.clipboard.size() == 1)
2068	2154	{
2069		- Object3D content = GraphreeD.clipboard.get(0);
	2155	+ Object3D content = GrafreeD.clipboard.get(0);
2070	2156
2071	2157	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	2158	content = ((cGroup)content).get(0);
..	..	@@ -2106,6 +2192,10 @@
2106	2192	if (event.getSource() == grabItem)
2107	2193	{
2108	2194	group(new cGroup(), true);
	2195	+ } else
	2196	+ if (event.getSource() == hideItem)
	2197	+ {
	2198	+ group(new HiddenObject());
2109	2199	} else
2110	2200	if (event.getSource() == frontItem)
2111	2201	{
..	..	@@ -2229,6 +2319,10 @@
2229	2319	{
2230	2320	group(new TextureNode());
2231	2321	} else
	2322	+ if (event.getSource() == billboardItem)
	2323	+ {
	2324	+ group(new BillboardNode());
	2325	+ } else
2232	2326	if (event.getSource() == shadowXItem)
2233	2327	{
2234	2328	CastShadow(0);
..	..	@@ -2243,7 +2337,15 @@
2243	2337	} else
2244	2338	if (event.getSource() == ungroupItem)
2245	2339	{
2246		- ungroup();
	2340	+ //ungroup();
	2341	+ for (int i=0; i<group.selection.size(); i++)
	2342	+ {
	2343	+ Ungroup(group.selection.get(i));
	2344	+ }
	2345	+
	2346	+ ClearSelection(false);
	2347	+
	2348	+ refreshContents();
2247	2349	} else
2248	2350	if (event.getSource() == genUVItem)
2249	2351	{
..	..	@@ -2253,9 +2355,17 @@
2253	2355	{
2254	2356	GenNormals(true);
2255	2357	} else
	2358	+ if (event.getSource() == genNormalsMESHItem)
	2359	+ {
	2360	+ GenNormals(true); // TODO
	2361	+ } else
2256	2362	if (event.getSource() == genNormalsORGANItem)
2257	2363	{
2258	2364	GenNormals(false);
	2365	+ } else
	2366	+ if (event.getSource() == genNormalsMINEItem)
	2367	+ {
	2368	+ GenNormalsMINE();
2259	2369	} else
2260	2370	if (event.getSource() == stripifyItem)
2261	2371	{
..	..	@@ -2352,6 +2462,10 @@
2352	2462	if (event.getSource() == parseverticesItem)
2353	2463	{
2354	2464	ParseVertices();
	2465	+ } else
	2466	+ if (event.getSource() == textureFieldItem)
	2467	+ {
	2468	+ TextureVertices();
2355	2469	} else
2356	2470	if (event.getSource() == alignItem)
2357	2471	{
..	..	@@ -2750,7 +2864,7 @@
2750	2864	if (event.getSource() == unselectButton)
2751	2865	{
2752	2866	objEditor.jTree.clearSelection();
2753		- // ?? oct 2012 GraphreeD.clipboard.clear();
	2867	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2754	2868	objEditor.ResetSliders();
2755	2869	refreshContents(true);
2756	2870	} else
..	..	@@ -3065,9 +3179,9 @@
3065	3179	obj = (Object3D)e.nextElement();
3066	3180
3067	3181	System.out.println("Object is: " + obj);
3068		- GraphreeD.AnalyzeObject(obj);
	3182	+ GrafreeD.AnalyzeObject(obj);
3069	3183	System.out.println("Boundary rep: " + obj.bRep);
3070		- GraphreeD.AnalyzeObject(obj.bRep);
	3184	+ GrafreeD.AnalyzeObject(obj.bRep);
3071	3185
3072	3186	// System.err.println((size/1024) + " KB is the size of " + obj);
3073	3187	}
..	..	@@ -3109,6 +3223,13 @@
3109	3223	void GenNormals(boolean crease)
3110	3224	{
3111	3225	group.GenNormalsS(crease);
	3226	+
	3227	+ refreshContents();
	3228	+ }
	3229	+
	3230	+ void GenNormalsMINE()
	3231	+ {
	3232	+ group.selection.GenNormalsMINE();
3112	3233
3113	3234	refreshContents();
3114	3235	}
..	..	@@ -3157,104 +3278,250 @@
3157	3278
3158	3279	//Object3D buffer;
3159	3280	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		-
	3281	+// BoundaryRep temprep;
	3282	+// Object3D nodes;
	3283	+// Vector<Vertex> vertices;
	3284	+//
	3285	+// cGroup buffer;
	3286	+//
	3287	+// public void Vertex(Object3D node, Vertex v)
	3288	+// {
	3289	+//// vertices.add(v);
	3290	+//// nodes.addElement(node);
	3291	+////
	3292	+//// if (temprep.GetCache(v) != null)
	3293	+//// {
	3294	+//// temprep.Remove(v);
	3295	+//// } else
	3296	+//// {
	3297	+//// temprep.Remember(v);
	3298	+//// }
	3299	+//
	3300	+// //Object3D node = nodes.get(index);
	3301	+// temp.set(v); // vertices.get(index)); // temprep.GetVertex(k));
	3302	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3303	+//
	3304	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	3305	+//
	3306	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	3307	+//
	3308	+// cGroup g = new cGroup();
	3309	+//
	3310	+// if (g.toParent == null)
	3311	+// {
	3312	+// g.toParent = LA.newMatrix();
	3313	+// g.fromParent = LA.newMatrix();
	3314	+// }
	3315	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3316	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3317	+//
	3318	+// g.add(GrafreeD.clipboard);
	3319	+//
	3320	+// buffer.add(g);
	3321	+// }
	3322	+//
	3323	+// public void Face(Object3D node, Face f)
	3324	+// {
	3325	+//
	3326	+// }
	3327	+//
	3328	+// void ParseVerticesOld() // ??
	3329	+// {
	3330	+// //if (group.selection.size() != 1)
	3331	+// // return;
	3332	+//
	3333	+// temprep = new BoundaryRep();
	3334	+// nodes = new Object3D();
	3335	+// vertices = new Vector<Vertex>();
	3336	+//
	3337	+// boolean epsequal = GrafreeD.epsequal;
	3338	+// GrafreeD.epsequal = true;
	3339	+//
	3340	+// for (int i=0; i<group.selection.size(); i++)
	3341	+// {
	3342	+// Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	3343	+//
	3344	+// group.selection.get(i).Parse(
	3345	+//this );
	3346	+//
	3347	+// int repsize = temprep.VertexCount();
	3348	+// int tablesize = temprep.vertextable.size();
	3349	+// int nodesize = nodes.size();
	3350	+//
	3351	+// assert(vertices.size() == nodes.size());
	3352	+//
	3353	+// temprep.vertextable.elements();
	3354	+//
	3355	+// java.util.Set<java.util.Map.Entry<Vertex,Vertex>> set = temprep.vertextable.entrySet();
	3356	+//
	3357	+// for (java.util.Map.Entry<Vertex,Vertex> entry : set)
	3358	+// {
	3359	+// cGroup g = new cGroup();
	3360	+//
	3361	+// int index = vertices.indexOf(entry.getValue()); // temprep.vertextable.(k));
	3362	+//
	3363	+// Object3D node = nodes.get(index);
	3364	+// temp.set(vertices.get(index)); // temprep.GetVertex(k));
	3365	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3366	+//
	3367	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	3368	+//
	3369	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	3370	+//
	3371	+// if (g.toParent == null)
	3372	+// {
	3373	+// g.toParent = LA.newMatrix();
	3374	+// g.fromParent = LA.newMatrix();
	3375	+// }
	3376	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3377	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3378	+//
	3379	+// g.add(GrafreeD.clipboard);
	3380	+//
	3381	+// buffer.add(g);
	3382	+// }
	3383	+//
	3384	+// makeSomething(buffer, i==group.selection.size()-1);
	3385	+// }
	3386	+//
	3387	+// GrafreeD.epsequal = epsequal;
	3388	+//
	3389	+// //buffer = null;
	3390	+// temprep = null;
	3391	+// nodes = null;
	3392	+//
	3393	+// refreshContents();
	3394	+// }
	3395	+
3184	3396	void ParseVertices()
3185	3397	{
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;
	3398	+ boolean epsequal = GrafreeD.epsequal;
	3399	+ GrafreeD.epsequal = true;
3195	3400
3196	3401	for (int i=0; i<group.selection.size(); i++)
3197	3402	{
3198		- Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	3403	+ final cGroup buffer = new cGroup(group.selection.get(i).name + "+");
3199	3404
3200		- group.selection.get(i).Parse(this);
3201		-
3202		- int repsize = temprep.VertexCount();
3203		- int tablesize = temprep.vertextable.size();
3204		- int nodesize = nodes.size();
	3405	+ group.selection.get(i).Parse(
	3406	+
	3407	+ new iParse()
	3408	+ {
	3409	+ public void Vertex(Object3D node, Vertex v)
	3410	+ {
	3411	+ temp.set(v);
	3412	+ LA.xformPos(temp, node.GlobalTransformInv(), temp);
3205	3413
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();
	3414	+ cGroup g = new cGroup();
3211	3415
3212		- for (java.util.Map.Entry<Vertex,Vertex> entry : set)
3213		- {
3214		- cGroup g = new cGroup();
	3416	+ if (g.toParent == null)
	3417	+ {
	3418	+ g.toParent = LA.newMatrix();
	3419	+ g.fromParent = LA.newMatrix();
	3420	+ }
	3421	+ LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3422	+ LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3215	3423
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);
	3424	+ g.add(GrafreeD.clipboard);
3220	3425
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);
	3426	+ buffer.add(g);
	3427	+ }
3232	3428
3233		- g.add(GraphreeD.clipboard);
	3429	+ public void Face(Object3D node, Face f)
	3430	+ {
3234	3431
3235		- buffer.add(g);
3236		- }
	3432	+ }
	3433	+ }
	3434	+ );
3237	3435
3238	3436	makeSomething(buffer, i==group.selection.size()-1);
3239	3437	}
3240	3438
3241		- GraphreeD.epsequal = epsequal;
3242		-
3243		- //buffer = null;
3244		- temprep = null;
3245		- nodes = null;
	3439	+ GrafreeD.epsequal = epsequal;
3246	3440
3247	3441	refreshContents();
3248	3442	}
3249		-
	3443	+
	3444	+ void TextureVertices()
	3445	+ {
	3446	+ for (int i=0; i<group.selection.size(); i++)
	3447	+ {
	3448	+ group.selection.get(i).Parse(
	3449	+ new iParse()
	3450	+ {
	3451	+ public void Vertex(Object3D node, Vertex v)
	3452	+ {
	3453	+ cTexture tex = node.GetTextures();
	3454	+ String pigment = Object3D.GetPigment(tex);
	3455	+ //String bump = Object3D.GetBump(tex);
	3456	+
	3457	+ com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3458	+
	3459	+ double s = v.s;
	3460	+
	3461	+ if (s == 1)
	3462	+ s = 0;
	3463	+
	3464	+ double t = v.t;
	3465	+
	3466	+ if (t == 1)
	3467	+ t = 0;
	3468	+
	3469	+ int indexs = (int) (texturedata.getWidth() * s);
	3470	+ int indext = (int) (texturedata.getHeight() * t);
	3471	+
	3472	+ int index = indext * texturedata.getWidth() + indexs;
	3473	+
	3474	+ java.nio.ByteBuffer bytebuf = (java.nio.ByteBuffer)texturedata.getBuffer();
	3475	+
	3476	+ int slide = bytebuf.capacity() / texturedata.getWidth() / texturedata.getHeight();
	3477	+
	3478	+ float scale = bytebuf.get(index*slide) & 0xFF;
	3479	+ scale += bytebuf.get(index*slide+1) & 0xFF;
	3480	+ scale += bytebuf.get(index*slide+2) & 0xFF;
	3481	+ scale /= 3;
	3482	+
	3483	+ scale /= 0xFF;
	3484	+ // c'est quoi ca? scale /= 4;
	3485	+
	3486	+ //v.AO = scale;
	3487	+
	3488	+ v.x += v.norm.x * scale;
	3489	+ v.y += v.norm.y * scale;
	3490	+ v.z += v.norm.z * scale;
	3491	+ }
	3492	+
	3493	+ public void Face(Object3D node, Face f)
	3494	+ {
	3495	+ }
	3496	+ }
	3497	+ );
	3498	+ }
	3499	+
	3500	+ refreshContents();
	3501	+ }
	3502	+
3250	3503	void Align()
3251	3504	{
	3505	+ if (group.selection.size() == 0)
	3506	+ return;
	3507	+
	3508	+ cVector bbmin = new cVector();
	3509	+ cVector bbmax = new cVector();
	3510	+
	3511	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3512	+
	3513	+ double dx = bbmax.x - bbmin.x;
	3514	+ double dy = bbmax.y - bbmin.y;
	3515	+ double dz = bbmax.z - bbmin.z;
	3516	+
	3517	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3518	+
3252	3519	for (int i=0; i<group.selection.size(); i++)
3253	3520	{
3254	3521	Object3D obj = group.selection.get(i);
3255	3522
3256		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3257		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3523	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3524	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3258	3525	}
3259	3526
3260	3527	refreshContents();
..	..	@@ -3267,7 +3534,7 @@
3267	3534	// ref.SaveSupports();
3268	3535	// Object3D par = ref.parent;
3269	3536	// ref.parent = null;
3270		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	3537	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3271	3538	// ref.parent = par;
3272	3539	// ref.RestoreSupports();
3273	3540
..	..	@@ -3297,7 +3564,7 @@
3297	3564	// lowres.SaveSupports();
3298	3565	// par = lowres.parent;
3299	3566	// lowres.parent = null;
3300		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	3567	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3301	3568	Object3D newlow = CloneObject(lowres, false);
3302	3569	newlow.name = sn.switchobject.get(i).name;
3303	3570	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3319,7 +3586,7 @@
3319	3586	return;
3320	3587
3321	3588	Object3D poses = group.selection.get(0);
3322		- Object3D ref = GraphreeD.clipboard.get(0);
	3589	+ Object3D ref = GrafreeD.clipboard.get(0);
3323	3590
3324	3591	Object3D newgroup = new Object3D("Po:" + poses.name);
3325	3592
..	..	@@ -3513,20 +3780,20 @@
3513	3780
3514	3781	void ClipMesh()
3515	3782	{
3516		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	3783	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
3517	3784	{
3518		- Object3D content = GraphreeD.clipboard.get(0);
	3785	+ Object3D content = GrafreeD.clipboard.get(0);
3519	3786
3520	3787	if (content instanceof cGroup && ((cGroup)content).transientlink )
3521	3788	content = ((cGroup)content).get(0);
3522	3789
3523	3790	// for (int i=0; i<group.selection.size(); i++)
3524	3791	// {
3525		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	3792	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3526	3793	// }
3527		- group.selection.ClipMesh(GraphreeD.clipboard);
	3794	+ group.selection.ClipMesh(GrafreeD.clipboard);
3528	3795	}
3529		-// group.selection.ClipMesh(GraphreeD.clipboard);
	3796	+// group.selection.ClipMesh(GrafreeD.clipboard);
3530	3797	System.out.println("DONE.");
3531	3798	refreshContents();
3532	3799	}
..	..	@@ -3864,12 +4131,12 @@
3864	4131	{
3865	4132	if (group.selection.isEmpty())
3866	4133	return;
3867		- GraphreeD.clipboardIsTempGroup = false;
	4134	+ GrafreeD.clipboardIsTempGroup = false;
3868	4135	Composite tGroup = null;
3869	4136	if (group.selection.size() > 0) // 1)
3870	4137	{
3871	4138	tGroup = new cGroup();
3872		- GraphreeD.clipboardIsTempGroup = true;
	4139	+ GrafreeD.clipboardIsTempGroup = true;
3873	4140	}
3874	4141
3875	4142	if (cut)
..	..	@@ -3909,16 +4176,16 @@
3909	4176	//System.out.println("cut " + child);
3910	4177	//System.out.println("parent = " + child.parent);
3911	4178	// tmp.addChild(child);
3912		- if (GraphreeD.clipboardIsTempGroup)
	4179	+ if (GrafreeD.clipboardIsTempGroup)
3913	4180	tGroup.add/Child/(tmp);
3914	4181	else
3915		- GraphreeD.clipboard = tmp;
	4182	+ GrafreeD.clipboard = tmp;
3916	4183	}
3917	4184	else
3918		- if (GraphreeD.clipboardIsTempGroup)
	4185	+ if (GrafreeD.clipboardIsTempGroup)
3919	4186	tGroup.add/Child/(child);
3920	4187	else
3921		- GraphreeD.clipboard = child;
	4188	+ GrafreeD.clipboard = child;
3922	4189	}
3923	4190
3924	4191	//ResetModel();
..	..	@@ -3950,21 +4217,21 @@
3950	4217	//System.out.println("cut " + elem);
3951	4218	//System.out.println("parent = " + elem.parent);
3952	4219	// tmp.addChild(elem);
3953		- if (GraphreeD.clipboardIsTempGroup)
	4220	+ if (GrafreeD.clipboardIsTempGroup)
3954	4221	tGroup.add/Child/(tmp);
3955	4222	else
3956		- GraphreeD.clipboard = tmp;
	4223	+ GrafreeD.clipboard = tmp;
3957	4224	}
3958	4225	else
3959		- if (GraphreeD.clipboardIsTempGroup)
	4226	+ if (GrafreeD.clipboardIsTempGroup)
3960	4227	tGroup.add/Child/(child);
3961	4228	else
3962		- GraphreeD.clipboard = child;
	4229	+ GrafreeD.clipboard = child;
3963	4230	}
3964	4231
3965	4232	}
3966		- if (GraphreeD.clipboardIsTempGroup)
3967		- GraphreeD.clipboard = tGroup;
	4233	+ if (GrafreeD.clipboardIsTempGroup)
	4234	+ GrafreeD.clipboard = tGroup;
3968	4235	if (cut)
3969	4236	{
3970	4237	ResetModel();
..	..	@@ -3974,11 +4241,11 @@
3974	4241
3975	4242	void paste(boolean expand)
3976	4243	{
3977		- // if (GraphreeD.clipboard == null)
	4244	+ // if (GrafreeD.clipboard == null)
3978	4245	// return;
3979	4246	boolean first = true;
3980	4247
3981		- if (GraphreeD.clipboardIsTempGroup)
	4248	+ if (GrafreeD.clipboardIsTempGroup)
3982	4249	{
3983	4250	Composite temp;
3984	4251
..	..	@@ -3989,7 +4256,7 @@
3989	4256	temp = (Composite)Applet3D.clipboard.deepCopy();
3990	4257	*/
3991	4258	Object3D elem;
3992		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4259	+ for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
3993	4260	{
3994	4261	Object3D child = (Object3D)e.nextElement();
3995	4262
..	..	@@ -4003,7 +4270,7 @@
4003	4270	else
4004	4271	elem = child.deepCopy(); // ?
4005	4272	child.parent = keepparent;
4006		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	4273	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4007	4274	// elem = elem.get(0);
4008	4275	makeSomething(elem, true); // ?? first);
4009	4276	//group.addChild(elem);
..	..	@@ -4023,14 +4290,14 @@
4023	4290	//Object3D cb = Applet3D.clipboard;
4024	4291	//temp.addChild(cb);
4025	4292	//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());
	4293	+ assert(GrafreeD.clipboard.parent == null);
	4294	+ Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
	4295	+ GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
	4296	+ if (LA.isIdentity(GrafreeD.clipboard.toParent))
	4297	+ makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
4031	4298	else
4032		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4033		- GraphreeD.clipboard.get(0).parent = keepparent;
	4299	+ makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
	4300	+ GrafreeD.clipboard.get(0).parent = keepparent;
4034	4301	}
4035	4302
4036	4303	ResetModel();
..	..	@@ -4039,7 +4306,7 @@
4039	4306
4040	4307	void pasteInto(boolean copyit)
4041	4308	{
4042		-// if (GraphreeD.clipboard == null)
	4309	+// if (GrafreeD.clipboard == null)
4043	4310	// return;
4044	4311
4045	4312	if (group.selection.size() != 1)
..	..	@@ -4072,9 +4339,9 @@
4072	4339	{
4073	4340	boolean first = true;
4074	4341
4075		- if (GraphreeD.clipboardIsTempGroup)
	4342	+ if (GrafreeD.clipboardIsTempGroup)
4076	4343	{
4077		- Composite temp = (Composite)GraphreeD.clipboard;
	4344	+ Composite temp = (Composite)GrafreeD.clipboard;
4078	4345	Object3D copy;
4079	4346	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4080	4347	{
..	..	@@ -4084,7 +4351,7 @@
4084	4351	}
4085	4352	} else
4086	4353	{
4087		- linkSomething(GraphreeD.clipboard); //.get(0));
	4354	+ linkSomething(GrafreeD.clipboard); //.get(0));
4088	4355	}
4089	4356	}
4090	4357	}
..	..	@@ -4276,6 +4543,26 @@
4276	4543	makeSomething(csg);
4277	4544	}
4278	4545
	4546	+ void Ungroup(Object3D g)
	4547	+ {
	4548	+ if (g instanceof HiddenObject)
	4549	+ {
	4550	+ HiddenObject h = (HiddenObject) g;
	4551	+
	4552	+ for (int i=0; i<h.ActualSize(); i++)
	4553	+ {
	4554	+ objEditor.makeSomething(h.get(i), false);
	4555	+ }
	4556	+ }
	4557	+ else
	4558	+ {
	4559	+ for (int i=0; i<g.Size(); i++)
	4560	+ {
	4561	+ objEditor.makeSomething(g.get(i), false);
	4562	+ }
	4563	+ }
	4564	+ }
	4565	+
4279	4566	void ungroup()
4280	4567	{
4281	4568	/*
..	..	@@ -4471,7 +4758,7 @@
4471	4758
4472	4759	void ImportGFD()
4473	4760	{
4474		- FileDialog browser = new FileDialog(objEditor.frame, "Import GraphreeD", FileDialog.LOAD);
	4761	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4475	4762	browser.show();
4476	4763	String filename = browser.getFile();
4477	4764	if (filename != null && filename.length() > 0)
..	..	@@ -4509,7 +4796,7 @@
4509	4796
4510	4797	void ImportVRMLX3D()
4511	4798	{
4512		- if (GraphreeD.standAlone)
	4799	+ if (GrafreeD.standAlone)
4513	4800	{
4514	4801	/**/
4515	4802	FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
..	..	@@ -4526,7 +4813,7 @@
4526	4813
4527	4814	String GetFile(String dialogName)
4528	4815	{
4529		- if (GraphreeD.standAlone)
	4816	+ if (GrafreeD.standAlone)
4530	4817	{
4531	4818	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4532	4819	browser.show();
..	..	@@ -4635,6 +4922,7 @@
4635	4922	private MenuItem resetsupportItem;
4636	4923	private MenuItem resetreferencesItem;
4637	4924	private MenuItem linkverticesItem;
	4925	+ private MenuItem relinkverticesItem;
4638	4926	private MenuItem setMasterItem;
4639	4927	private MenuItem resetMeshItem;
4640	4928	private MenuItem stepAllItem;
..	..	@@ -4653,8 +4941,10 @@
4653	4941	private MenuItem clearItem;
4654	4942	private MenuItem clearAllItem;
4655	4943	private MenuItem genUVItem;
	4944	+ private MenuItem genNormalsMESHItem;
4656	4945	private MenuItem genNormalsCADItem;
4657	4946	private MenuItem genNormalsORGANItem;
	4947	+ private MenuItem genNormalsMINEItem;
4658	4948	private MenuItem stripifyItem;
4659	4949	private MenuItem unstripifyItem;
4660	4950	private MenuItem trimItem;
..	..	@@ -4696,6 +4986,7 @@
4696	4986	private MenuItem resetCentroidItem;
4697	4987	private MenuItem transformgeometryItem;
4698	4988	private MenuItem resetTransformItem;
	4989	+ private MenuItem hideItem;
4699	4990	private MenuItem grabItem;
4700	4991	private MenuItem backItem;
4701	4992	private MenuItem frontItem;
..	..	@@ -4728,12 +5019,15 @@
4728	5019	private MenuItem particleItem;
4729	5020	private MenuItem ragdollItem;
4730	5021	private MenuItem ragdoll2Item;
	5022	+ private MenuItem heightFieldItem;
	5023	+ private MenuItem textureFieldItem;
4731	5024	private MenuItem gridItem;
4732	5025	private MenuItem rectoidItem;
4733	5026	private MenuItem ellipsoidItem;
4734	5027	private MenuItem coneItem;
4735	5028	private MenuItem torusItem;
4736	5029	private MenuItem superItem;
	5030	+ private MenuItem kleinItem;
4737	5031	private MenuItem blobItem;
4738	5032	private MenuItem latheItem;
4739	5033	private MenuItem bezierItem;
..	..	@@ -4746,6 +5040,7 @@
4746	5040	private MenuItem csgItem;
4747	5041	private MenuItem templateItem;
4748	5042	private MenuItem textureItem;
	5043	+ private MenuItem billboardItem;
4749	5044	private MenuItem shadowXItem;
4750	5045	private MenuItem shadowYItem;
4751	5046	private MenuItem shadowZItem;