~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
..	..	@@ -493,6 +520,9 @@
493	520
494	521	oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
495	522	flashSelectionButton.addActionListener(this);
	523	+
	524	+ oe.toolbarPanel.add(new cButton(" ", false));
	525	+
496	526	oe.aConstraints.gridx += 1;
497	527	oe.aConstraints.weighty = 0;
498	528	oe.aConstraints.gridwidth = 1;
..	..	@@ -688,8 +718,7 @@
688	718	dropAttributes \|= Object3D.TEXTURE;
689	719	else
690	720	dropAttributes &= ~Object3D.TEXTURE;
691		- }
692		- else if(e.getSource() == liveCB)
	721	+ } else if(e.getSource() == liveCB)
693	722	{
694	723	cameraView.ToggleLive();
695	724	}
..	..	@@ -1002,6 +1031,8 @@
1002	1031
1003	1032	void buildCreateMenu(Menu menu)
1004	1033	{
	1034	+ //heightFieldItem = menu.add(new MenuItem("Height Field"));
	1035	+ //heightFieldItem.addActionListener(this);
1005	1036	gridItem = menu.add(new MenuItem("Grid"));
1006	1037	gridItem.addActionListener(this);
1007	1038	rectoidItem = menu.add(new MenuItem("Box"));
..	..	@@ -1014,6 +1045,8 @@
1014	1045	torusItem.addActionListener(this);
1015	1046	superItem = menu.add(new MenuItem("Superellipsoid"));
1016	1047	superItem.addActionListener(this);
	1048	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1049	+ kleinItem.addActionListener(this);
1017	1050	particleItem = menu.add(new MenuItem("Particle system"));
1018	1051	particleItem.addActionListener(this);
1019	1052	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1048,15 +1081,6 @@
1048	1081	doubleItem.addActionListener(this);
1049	1082	tripleItem = menu.add(new MenuItem("Trident"));
1050	1083	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	1084	}
1061	1085
1062	1086	void buildToolsMenu(Menu menu)
..	..	@@ -1068,6 +1092,8 @@
1068	1092	menu.add("-");
1069	1093	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1070	1094	parseverticesItem.addActionListener(this);
	1095	+ textureFieldItem = menu.add(new MenuItem("Texture Field"));
	1096	+ textureFieldItem.addActionListener(this);
1071	1097	alignItem = menu.add(new MenuItem("Align"));
1072	1098	alignItem.addActionListener(this);
1073	1099	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
..	..	@@ -1429,9 +1455,9 @@
1429	1455
1430	1456	void Overwrite(int mask)
1431	1457	{
1432		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1458	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1433	1459	{
1434		- Object3D content = GraphreeD.clipboard.get(0);
	1460	+ Object3D content = GrafreeD.clipboard.get(0);
1435	1461
1436	1462	if (content instanceof cGroup && ((cGroup)content).transientlink )
1437	1463	content = ((cGroup)content).get(0);
..	..	@@ -1521,6 +1547,46 @@
1521	1547	makeSomething(ragdoll);
1522	1548	//makeSomething(new VehicleDemo());
1523	1549	} else
	1550	+ /*
	1551	+ */
	1552	+ if (event.getSource() == heightFieldItem)
	1553	+ {
	1554	+ Object3D obj = new Object3D();
	1555	+
	1556	+ obj.CreateMaterial();
	1557	+ obj.bRep = new BoundaryRep();
	1558	+
	1559	+ obj.bRep.CreateMesh(new iHeightField()
	1560	+ {
	1561	+ public double f(double x, double y)
	1562	+ {
	1563	+ // The Mandelbrot set is represented by coloring
	1564	+ // each point (x,y) according to the number of
	1565	+ // iterations it takes before the while loop in
	1566	+ // this method ends. For points that are actually
	1567	+ // in the Mandelbrot set, or very close to it, the
	1568	+ // count will reach the maximum value, 80. These
	1569	+ // points will be colored purple. All other colors
	1570	+ // represent points that are definitely NOT in the set.
	1571	+ x -= 600;
	1572	+ y -= 500;
	1573	+ x /= 200;
	1574	+ y /= 200;
	1575	+ int count = 0;
	1576	+ double zx = x;
	1577	+ double zy = y;
	1578	+ while (count < 80 && Math.abs(x) < 100 && Math.abs(zy) < 100) {
	1579	+ double new_zx = zxzx - zyzy + x;
	1580	+ zy = 2zxzy + y;
	1581	+ zx = new_zx;
	1582	+ count++;
	1583	+ }
	1584	+ return count; // Math.sqrt(count);
	1585	+ }
	1586	+ }, 1000,1000);
	1587	+
	1588	+ makeSomething(obj);
	1589	+ } else
1524	1590	if (event.getSource() == gridItem)
1525	1591	{
1526	1592	makeSomething(new Grid());
..	..	@@ -1540,6 +1606,10 @@
1540	1606	if (event.getSource() == superItem)
1541	1607	{
1542	1608	makeSomething(new Superellipsoid());
	1609	+ } else
	1610	+ if (event.getSource() == kleinItem)
	1611	+ {
	1612	+ makeSomething(new Klein());
1543	1613	} else
1544	1614	if (event.getSource() == blobItem)
1545	1615	{
..	..	@@ -1570,7 +1640,7 @@
1570	1640	LA.matConcat(obj.toParent, cameraView.renderCamera.fromParent, obj.toParent);
1571	1641	LA.matInvert(obj.toParent, obj.fromParent);
1572	1642	*/
1573		- makeSomething(new CheckerIG());
	1643	+ makeSomething(new Checker());
1574	1644	} else
1575	1645	if (event.getSource() == meshItem)
1576	1646	{
..	..	@@ -1726,7 +1796,7 @@
1726	1796	if (event.getSource() == invariantsItem)
1727	1797	{
1728	1798	System.out.println("Invariants:");
1729		- GraphreeD.theApplet3D.universe.invariants();
	1799	+ GrafreeD.grafreeD.universe.invariants();
1730	1800	} else
1731	1801	if (event.getSource() == memoryItem)
1732	1802	{
..	..	@@ -1796,10 +1866,10 @@
1796	1866	} else
1797	1867	if (event.getSource() == duplicateItem)
1798	1868	{
1799		- Object3D keep = GraphreeD.clipboard;
	1869	+ Object3D keep = GrafreeD.clipboard;
1800	1870	loadClipboard(false);
1801	1871	paste(false);
1802		- GraphreeD.clipboard = keep;
	1872	+ GrafreeD.clipboard = keep;
1803	1873	} else
1804	1874	if (event.getSource() == cloneItem)
1805	1875	{
..	..	@@ -1843,8 +1913,9 @@
1843	1913	} else
1844	1914	if (event.getSource() == overwriteMatItem)
1845	1915	{
	1916	+ /* july 2015
1846	1917	if ((dropAttributes & Object3D.TEXTURE) == 0)
1847		- Overwrite(Object3D.MATERIAL);
	1918	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1848	1919	else
1849	1920	{
1850	1921	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1856,13 +1927,16 @@
1856	1927	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1857	1928	}
1858	1929	}
	1930	+ */
	1931	+
	1932	+ Overwrite(dropAttributes);
1859	1933	}
1860	1934	if (event.getSource() == overwriteGeoItem)
1861	1935	{
1862	1936	Overwrite(Object3D.GEOMETRY);
1863		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1937	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1864	1938	// {
1865		-// Object3D content = GraphreeD.clipboard.get(0);
	1939	+// Object3D content = GrafreeD.clipboard.get(0);
1866	1940	//
1867	1941	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1868	1942	// content = ((cGroup)content).get(0);
..	..	@@ -1945,23 +2019,28 @@
1945	2019	if (group.selection.size() == 1)
1946	2020	one = true;
1947	2021
	2022	+ Object3D merge = null;
	2023	+
1948	2024	Object3D content = new cGroup();
1949	2025
1950	2026	for (int i=0; i<group.selection.size(); i++)
1951	2027	{
1952		- Object3D sel = new Merge(group.selection.get(i));
	2028	+ merge = new Merge(group.selection.get(i));
1953	2029
1954	2030	if (one)
1955		- makeSomething(sel, false);
	2031	+ makeSomething(merge, false);
1956	2032	else
1957		- content.addChild(sel);
	2033	+ content.addChild(merge);
1958	2034	}
1959	2035
1960	2036	if (!one)
1961		- makeSomething(content, false);
1962		-
1963		- ResetModel();
1964		- refreshContents();
	2037	+ makeSomething(content, true);
	2038	+ else
	2039	+ {
	2040	+ ResetModel();
	2041	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2042	+ refreshContents();
	2043	+ }
1965	2044	} else
1966	2045	if (event.getSource() == mergeGeometriesItem)
1967	2046	{
..	..	@@ -1995,9 +2074,9 @@
1995	2074	} else
1996	2075	if (event.getSource() == linkverticesItem)
1997	2076	{
1998		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2077	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
1999	2078	// {
2000		-// Object3D content = GraphreeD.clipboard.get(0);
	2079	+// Object3D content = GrafreeD.clipboard.get(0);
2001	2080	//
2002	2081	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2003	2082	// content = ((cGroup)content).get(0);
..	..	@@ -2006,9 +2085,9 @@
2006	2085	// group.selection.get(0).setMasterThis(content); // should be identity
2007	2086	// refreshContents();
2008	2087	// }
2009		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2088	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
2010	2089	{
2011		- Object3D content = GraphreeD.clipboard.get(0);
	2090	+ Object3D content = GrafreeD.clipboard.get(0);
2012	2091
2013	2092	if (content instanceof cGroup && ((cGroup)content).transientlink )
2014	2093	content = ((cGroup)content).get(0);
..	..	@@ -2038,6 +2117,15 @@
2038	2117
2039	2118	refreshContents();
2040	2119	} else
	2120	+ if (event.getSource() == relinkverticesItem)
	2121	+ {
	2122	+ boolean random = CameraPane.RANDOM;
	2123	+ CameraPane.RANDOM = false; // parse all random nodes
	2124	+ group.selection.RelinkToSupport();
	2125	+ CameraPane.RANDOM = random;
	2126	+
	2127	+ refreshContents();
	2128	+ } else
2041	2129	if (event.getSource() == resetreferencesItem)
2042	2130	{
2043	2131	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2049,9 +2137,9 @@
2049	2137	} else
2050	2138	if (event.getSource() == setMasterItem)
2051	2139	{
2052		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2140	+ if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2053	2141	{
2054		- Object3D content = GraphreeD.clipboard.get(0);
	2142	+ Object3D content = GrafreeD.clipboard.get(0);
2055	2143
2056	2144	if (content instanceof cGroup && ((cGroup)content).transientlink )
2057	2145	content = ((cGroup)content).get(0);
..	..	@@ -2064,9 +2152,9 @@
2064	2152	{
2065	2153	if (group.selection.size() == 1)
2066	2154	{
2067		- if (GraphreeD.clipboard.size() == 1)
	2155	+ if (GrafreeD.clipboard.size() == 1)
2068	2156	{
2069		- Object3D content = GraphreeD.clipboard.get(0);
	2157	+ Object3D content = GrafreeD.clipboard.get(0);
2070	2158
2071	2159	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	2160	content = ((cGroup)content).get(0);
..	..	@@ -2106,6 +2194,10 @@
2106	2194	if (event.getSource() == grabItem)
2107	2195	{
2108	2196	group(new cGroup(), true);
	2197	+ } else
	2198	+ if (event.getSource() == hideItem)
	2199	+ {
	2200	+ group(new HiddenObject());
2109	2201	} else
2110	2202	if (event.getSource() == frontItem)
2111	2203	{
..	..	@@ -2229,6 +2321,10 @@
2229	2321	{
2230	2322	group(new TextureNode());
2231	2323	} else
	2324	+ if (event.getSource() == billboardItem)
	2325	+ {
	2326	+ group(new BillboardNode());
	2327	+ } else
2232	2328	if (event.getSource() == shadowXItem)
2233	2329	{
2234	2330	CastShadow(0);
..	..	@@ -2243,7 +2339,15 @@
2243	2339	} else
2244	2340	if (event.getSource() == ungroupItem)
2245	2341	{
2246		- ungroup();
	2342	+ //ungroup();
	2343	+ for (int i=0; i<group.selection.size(); i++)
	2344	+ {
	2345	+ Ungroup(group.selection.get(i));
	2346	+ }
	2347	+
	2348	+ ClearSelection(false);
	2349	+
	2350	+ refreshContents();
2247	2351	} else
2248	2352	if (event.getSource() == genUVItem)
2249	2353	{
..	..	@@ -2253,9 +2357,17 @@
2253	2357	{
2254	2358	GenNormals(true);
2255	2359	} else
	2360	+ if (event.getSource() == genNormalsMESHItem)
	2361	+ {
	2362	+ GenNormals(true); // TODO
	2363	+ } else
2256	2364	if (event.getSource() == genNormalsORGANItem)
2257	2365	{
2258	2366	GenNormals(false);
	2367	+ } else
	2368	+ if (event.getSource() == genNormalsMINEItem)
	2369	+ {
	2370	+ GenNormalsMINE();
2259	2371	} else
2260	2372	if (event.getSource() == stripifyItem)
2261	2373	{
..	..	@@ -2352,6 +2464,10 @@
2352	2464	if (event.getSource() == parseverticesItem)
2353	2465	{
2354	2466	ParseVertices();
	2467	+ } else
	2468	+ if (event.getSource() == textureFieldItem)
	2469	+ {
	2470	+ TextureVertices();
2355	2471	} else
2356	2472	if (event.getSource() == alignItem)
2357	2473	{
..	..	@@ -2524,8 +2640,8 @@
2524	2640	// bug
2525	2641	//gridPanel.setDividerLocation(1.0);
2526	2642	//bigPanel.setDividerLocation(0.0);
2527		- bigThree.remove(jtp);
2528		- bigThree.remove(cameraPanel);
	2643	+ bigThree.remove(scenePanel);
	2644	+ bigThree.remove(centralPanel);
2529	2645	bigThree.remove(XYZPanel);
2530	2646	aWindowConstraints.gridx = 0;
2531	2647	aWindowConstraints.gridy = 0;
..	..	@@ -2540,7 +2656,7 @@
2540	2656	// aConstraints.gridheight = 3;
2541	2657	aWindowConstraints.gridx = 1;
2542	2658	aWindowConstraints.fill = GridBagConstraints.BOTH;
2543		- bigThree.add(cameraPanel, aWindowConstraints);
	2659	+ bigThree.add(centralPanel, aWindowConstraints);
2544	2660	aWindowConstraints.weightx = 0;
2545	2661	aWindowConstraints.gridx = 4;
2546	2662	aWindowConstraints.gridwidth = 1;
..	..	@@ -2552,8 +2668,8 @@
2552	2668	if (event.getSource() == threeButton)
2553	2669	{
2554	2670	radio.layout = threeButton;
2555		- bigThree.remove(jtp);
2556		- bigThree.remove(cameraPanel);
	2671	+ bigThree.remove(scenePanel);
	2672	+ bigThree.remove(centralPanel);
2557	2673	bigThree.remove(XYZPanel);
2558	2674	aWindowConstraints.gridx = 0;
2559	2675	aWindowConstraints.gridy = 0;
..	..	@@ -2568,7 +2684,7 @@
2568	2684	// aConstraints.gridheight = 3;
2569	2685	aWindowConstraints.gridx = 1;
2570	2686	aWindowConstraints.fill = GridBagConstraints.BOTH;
2571		- bigThree.add(cameraPanel, aWindowConstraints);
	2687	+ bigThree.add(centralPanel, aWindowConstraints);
2572	2688	aWindowConstraints.weightx = 0;
2573	2689	aWindowConstraints.gridx = 4;
2574	2690	aWindowConstraints.gridwidth = 1;
..	..	@@ -2580,8 +2696,8 @@
2580	2696	if (event.getSource() == fourButton)
2581	2697	{
2582	2698	radio.layout = fourButton;
2583		- bigThree.remove(jtp);
2584		- bigThree.remove(cameraPanel);
	2699	+ bigThree.remove(scenePanel);
	2700	+ bigThree.remove(centralPanel);
2585	2701	bigThree.remove(XYZPanel);
2586	2702	aWindowConstraints.gridx = 0;
2587	2703	aWindowConstraints.gridy = 0;
..	..	@@ -2590,7 +2706,7 @@
2590	2706	aWindowConstraints.fill = GridBagConstraints.BOTH;
2591	2707	aWindowConstraints.weightx = 1;
2592	2708	aWindowConstraints.weighty = 1;
2593		- bigThree.add(jtp, aWindowConstraints);
	2709	+ bigThree.add(scenePanel, aWindowConstraints);
2594	2710	aWindowConstraints.weightx = 1;
2595	2711	aWindowConstraints.gridwidth = 3;
2596	2712	// aConstraints.gridheight = 3;
..	..	@@ -2608,8 +2724,8 @@
2608	2724	if (event.getSource() == sixButton)
2609	2725	{
2610	2726	radio.layout = sixButton;
2611		- bigThree.remove(jtp);
2612		- bigThree.remove(cameraPanel);
	2727	+ bigThree.remove(scenePanel);
	2728	+ bigThree.remove(centralPanel);
2613	2729	bigThree.remove(XYZPanel);
2614	2730	aWindowConstraints.gridx = 0;
2615	2731	aWindowConstraints.gridy = 0;
..	..	@@ -2618,13 +2734,13 @@
2618	2734	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2619	2735	aWindowConstraints.weightx = 0;
2620	2736	aWindowConstraints.weighty = 1;
2621		- bigThree.add(jtp, aWindowConstraints);
	2737	+ bigThree.add(scenePanel, aWindowConstraints);
2622	2738	aWindowConstraints.weightx = 1;
2623	2739	aWindowConstraints.gridwidth = 3;
2624	2740	// aWindowConstraints.gridheight = 3;
2625	2741	aWindowConstraints.gridx = 1;
2626	2742	aWindowConstraints.fill = GridBagConstraints.BOTH;
2627		- bigThree.add(cameraPanel, aWindowConstraints);
	2743	+ bigThree.add(centralPanel, aWindowConstraints);
2628	2744	aWindowConstraints.weightx = 0;
2629	2745	aWindowConstraints.gridx = 4;
2630	2746	aWindowConstraints.gridwidth = 1;
..	..	@@ -2636,8 +2752,8 @@
2636	2752	if (event.getSource() == sevenButton)
2637	2753	{
2638	2754	radio.layout = sevenButton;
2639		- bigThree.remove(jtp);
2640		- bigThree.remove(cameraPanel);
	2755	+ bigThree.remove(scenePanel);
	2756	+ bigThree.remove(centralPanel);
2641	2757	bigThree.remove(XYZPanel);
2642	2758	aWindowConstraints.gridx = 0;
2643	2759	aWindowConstraints.gridy = 0;
..	..	@@ -2646,13 +2762,13 @@
2646	2762	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2647	2763	aWindowConstraints.weightx = 0;
2648	2764	aWindowConstraints.weighty = 1;
2649		- bigThree.add(jtp, aWindowConstraints);
	2765	+ bigThree.add(scenePanel, aWindowConstraints);
2650	2766	aWindowConstraints.weightx = 1;
2651	2767	aWindowConstraints.gridwidth = 3;
2652	2768	// aWindowConstraints.gridheight = 3;
2653	2769	aWindowConstraints.gridx = 1;
2654	2770	aWindowConstraints.fill = GridBagConstraints.BOTH;
2655		- bigThree.add(cameraPanel, aWindowConstraints);
	2771	+ bigThree.add(centralPanel, aWindowConstraints);
2656	2772	aWindowConstraints.weightx = 0;
2657	2773	aWindowConstraints.gridx = 4;
2658	2774	aWindowConstraints.gridwidth = 1;
..	..	@@ -2750,7 +2866,7 @@
2750	2866	if (event.getSource() == unselectButton)
2751	2867	{
2752	2868	objEditor.jTree.clearSelection();
2753		- // ?? oct 2012 GraphreeD.clipboard.clear();
	2869	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2754	2870	objEditor.ResetSliders();
2755	2871	refreshContents(true);
2756	2872	} else
..	..	@@ -3065,9 +3181,9 @@
3065	3181	obj = (Object3D)e.nextElement();
3066	3182
3067	3183	System.out.println("Object is: " + obj);
3068		- GraphreeD.AnalyzeObject(obj);
	3184	+ GrafreeD.AnalyzeObject(obj);
3069	3185	System.out.println("Boundary rep: " + obj.bRep);
3070		- GraphreeD.AnalyzeObject(obj.bRep);
	3186	+ GrafreeD.AnalyzeObject(obj.bRep);
3071	3187
3072	3188	// System.err.println((size/1024) + " KB is the size of " + obj);
3073	3189	}
..	..	@@ -3109,6 +3225,13 @@
3109	3225	void GenNormals(boolean crease)
3110	3226	{
3111	3227	group.GenNormalsS(crease);
	3228	+
	3229	+ refreshContents();
	3230	+ }
	3231	+
	3232	+ void GenNormalsMINE()
	3233	+ {
	3234	+ group.selection.GenNormalsMINE();
3112	3235
3113	3236	refreshContents();
3114	3237	}
..	..	@@ -3157,104 +3280,250 @@
3157	3280
3158	3281	//Object3D buffer;
3159	3282	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		-
	3283	+// BoundaryRep temprep;
	3284	+// Object3D nodes;
	3285	+// Vector<Vertex> vertices;
	3286	+//
	3287	+// cGroup buffer;
	3288	+//
	3289	+// public void Vertex(Object3D node, Vertex v)
	3290	+// {
	3291	+//// vertices.add(v);
	3292	+//// nodes.addElement(node);
	3293	+////
	3294	+//// if (temprep.GetCache(v) != null)
	3295	+//// {
	3296	+//// temprep.Remove(v);
	3297	+//// } else
	3298	+//// {
	3299	+//// temprep.Remember(v);
	3300	+//// }
	3301	+//
	3302	+// //Object3D node = nodes.get(index);
	3303	+// temp.set(v); // vertices.get(index)); // temprep.GetVertex(k));
	3304	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3305	+//
	3306	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	3307	+//
	3308	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	3309	+//
	3310	+// cGroup g = new cGroup();
	3311	+//
	3312	+// if (g.toParent == null)
	3313	+// {
	3314	+// g.toParent = LA.newMatrix();
	3315	+// g.fromParent = LA.newMatrix();
	3316	+// }
	3317	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3318	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3319	+//
	3320	+// g.add(GrafreeD.clipboard);
	3321	+//
	3322	+// buffer.add(g);
	3323	+// }
	3324	+//
	3325	+// public void Face(Object3D node, Face f)
	3326	+// {
	3327	+//
	3328	+// }
	3329	+//
	3330	+// void ParseVerticesOld() // ??
	3331	+// {
	3332	+// //if (group.selection.size() != 1)
	3333	+// // return;
	3334	+//
	3335	+// temprep = new BoundaryRep();
	3336	+// nodes = new Object3D();
	3337	+// vertices = new Vector<Vertex>();
	3338	+//
	3339	+// boolean epsequal = GrafreeD.epsequal;
	3340	+// GrafreeD.epsequal = true;
	3341	+//
	3342	+// for (int i=0; i<group.selection.size(); i++)
	3343	+// {
	3344	+// Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	3345	+//
	3346	+// group.selection.get(i).Parse(
	3347	+//this );
	3348	+//
	3349	+// int repsize = temprep.VertexCount();
	3350	+// int tablesize = temprep.vertextable.size();
	3351	+// int nodesize = nodes.size();
	3352	+//
	3353	+// assert(vertices.size() == nodes.size());
	3354	+//
	3355	+// temprep.vertextable.elements();
	3356	+//
	3357	+// java.util.Set<java.util.Map.Entry<Vertex,Vertex>> set = temprep.vertextable.entrySet();
	3358	+//
	3359	+// for (java.util.Map.Entry<Vertex,Vertex> entry : set)
	3360	+// {
	3361	+// cGroup g = new cGroup();
	3362	+//
	3363	+// int index = vertices.indexOf(entry.getValue()); // temprep.vertextable.(k));
	3364	+//
	3365	+// Object3D node = nodes.get(index);
	3366	+// temp.set(vertices.get(index)); // temprep.GetVertex(k));
	3367	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3368	+//
	3369	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	3370	+//
	3371	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	3372	+//
	3373	+// if (g.toParent == null)
	3374	+// {
	3375	+// g.toParent = LA.newMatrix();
	3376	+// g.fromParent = LA.newMatrix();
	3377	+// }
	3378	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3379	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3380	+//
	3381	+// g.add(GrafreeD.clipboard);
	3382	+//
	3383	+// buffer.add(g);
	3384	+// }
	3385	+//
	3386	+// makeSomething(buffer, i==group.selection.size()-1);
	3387	+// }
	3388	+//
	3389	+// GrafreeD.epsequal = epsequal;
	3390	+//
	3391	+// //buffer = null;
	3392	+// temprep = null;
	3393	+// nodes = null;
	3394	+//
	3395	+// refreshContents();
	3396	+// }
	3397	+
3184	3398	void ParseVertices()
3185	3399	{
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;
	3400	+ boolean epsequal = GrafreeD.epsequal;
	3401	+ GrafreeD.epsequal = true;
3195	3402
3196	3403	for (int i=0; i<group.selection.size(); i++)
3197	3404	{
3198		- Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	3405	+ final cGroup buffer = new cGroup(group.selection.get(i).name + "+");
3199	3406
3200		- group.selection.get(i).Parse(this);
3201		-
3202		- int repsize = temprep.VertexCount();
3203		- int tablesize = temprep.vertextable.size();
3204		- int nodesize = nodes.size();
	3407	+ group.selection.get(i).Parse(
	3408	+
	3409	+ new iParse()
	3410	+ {
	3411	+ public void Vertex(Object3D node, Vertex v)
	3412	+ {
	3413	+ temp.set(v);
	3414	+ LA.xformPos(temp, node.GlobalTransformInv(), temp);
3205	3415
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();
	3416	+ cGroup g = new cGroup();
3211	3417
3212		- for (java.util.Map.Entry<Vertex,Vertex> entry : set)
3213		- {
3214		- cGroup g = new cGroup();
	3418	+ if (g.toParent == null)
	3419	+ {
	3420	+ g.toParent = LA.newMatrix();
	3421	+ g.fromParent = LA.newMatrix();
	3422	+ }
	3423	+ LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3424	+ LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3215	3425
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);
	3426	+ g.add(GrafreeD.clipboard);
3220	3427
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);
	3428	+ buffer.add(g);
	3429	+ }
3232	3430
3233		- g.add(GraphreeD.clipboard);
	3431	+ public void Face(Object3D node, Face f)
	3432	+ {
3234	3433
3235		- buffer.add(g);
3236		- }
	3434	+ }
	3435	+ }
	3436	+ );
3237	3437
3238	3438	makeSomething(buffer, i==group.selection.size()-1);
3239	3439	}
3240	3440
3241		- GraphreeD.epsequal = epsequal;
3242		-
3243		- //buffer = null;
3244		- temprep = null;
3245		- nodes = null;
	3441	+ GrafreeD.epsequal = epsequal;
3246	3442
3247	3443	refreshContents();
3248	3444	}
3249		-
	3445	+
	3446	+ void TextureVertices()
	3447	+ {
	3448	+ for (int i=0; i<group.selection.size(); i++)
	3449	+ {
	3450	+ group.selection.get(i).Parse(
	3451	+ new iParse()
	3452	+ {
	3453	+ public void Vertex(Object3D node, Vertex v)
	3454	+ {
	3455	+ cTexture tex = node.GetTextures();
	3456	+ String pigment = Object3D.GetPigment(tex);
	3457	+ //String bump = Object3D.GetBump(tex);
	3458	+
	3459	+ com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3460	+
	3461	+ double s = v.s;
	3462	+
	3463	+ if (s == 1)
	3464	+ s = 0;
	3465	+
	3466	+ double t = v.t;
	3467	+
	3468	+ if (t == 1)
	3469	+ t = 0;
	3470	+
	3471	+ int indexs = (int) (texturedata.getWidth() * s);
	3472	+ int indext = (int) (texturedata.getHeight() * t);
	3473	+
	3474	+ int index = indext * texturedata.getWidth() + indexs;
	3475	+
	3476	+ java.nio.ByteBuffer bytebuf = (java.nio.ByteBuffer)texturedata.getBuffer();
	3477	+
	3478	+ int slide = bytebuf.capacity() / texturedata.getWidth() / texturedata.getHeight();
	3479	+
	3480	+ float scale = bytebuf.get(index*slide) & 0xFF;
	3481	+ scale += bytebuf.get(index*slide+1) & 0xFF;
	3482	+ scale += bytebuf.get(index*slide+2) & 0xFF;
	3483	+ scale /= 3;
	3484	+
	3485	+ scale /= 0xFF;
	3486	+ // c'est quoi ca? scale /= 4;
	3487	+
	3488	+ //v.AO = scale;
	3489	+
	3490	+ v.x += v.norm.x * scale;
	3491	+ v.y += v.norm.y * scale;
	3492	+ v.z += v.norm.z * scale;
	3493	+ }
	3494	+
	3495	+ public void Face(Object3D node, Face f)
	3496	+ {
	3497	+ }
	3498	+ }
	3499	+ );
	3500	+ }
	3501	+
	3502	+ refreshContents();
	3503	+ }
	3504	+
3250	3505	void Align()
3251	3506	{
	3507	+ if (group.selection.size() == 0)
	3508	+ return;
	3509	+
	3510	+ cVector bbmin = new cVector();
	3511	+ cVector bbmax = new cVector();
	3512	+
	3513	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3514	+
	3515	+ double dx = bbmax.x - bbmin.x;
	3516	+ double dy = bbmax.y - bbmin.y;
	3517	+ double dz = bbmax.z - bbmin.z;
	3518	+
	3519	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3520	+
3252	3521	for (int i=0; i<group.selection.size(); i++)
3253	3522	{
3254	3523	Object3D obj = group.selection.get(i);
3255	3524
3256		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3257		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3525	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3526	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3258	3527	}
3259	3528
3260	3529	refreshContents();
..	..	@@ -3267,7 +3536,7 @@
3267	3536	// ref.SaveSupports();
3268	3537	// Object3D par = ref.parent;
3269	3538	// ref.parent = null;
3270		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	3539	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3271	3540	// ref.parent = par;
3272	3541	// ref.RestoreSupports();
3273	3542
..	..	@@ -3297,7 +3566,7 @@
3297	3566	// lowres.SaveSupports();
3298	3567	// par = lowres.parent;
3299	3568	// lowres.parent = null;
3300		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	3569	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3301	3570	Object3D newlow = CloneObject(lowres, false);
3302	3571	newlow.name = sn.switchobject.get(i).name;
3303	3572	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3319,7 +3588,7 @@
3319	3588	return;
3320	3589
3321	3590	Object3D poses = group.selection.get(0);
3322		- Object3D ref = GraphreeD.clipboard.get(0);
	3591	+ Object3D ref = GrafreeD.clipboard.get(0);
3323	3592
3324	3593	Object3D newgroup = new Object3D("Po:" + poses.name);
3325	3594
..	..	@@ -3513,20 +3782,20 @@
3513	3782
3514	3783	void ClipMesh()
3515	3784	{
3516		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	3785	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
3517	3786	{
3518		- Object3D content = GraphreeD.clipboard.get(0);
	3787	+ Object3D content = GrafreeD.clipboard.get(0);
3519	3788
3520	3789	if (content instanceof cGroup && ((cGroup)content).transientlink )
3521	3790	content = ((cGroup)content).get(0);
3522	3791
3523	3792	// for (int i=0; i<group.selection.size(); i++)
3524	3793	// {
3525		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	3794	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3526	3795	// }
3527		- group.selection.ClipMesh(GraphreeD.clipboard);
	3796	+ group.selection.ClipMesh(GrafreeD.clipboard);
3528	3797	}
3529		-// group.selection.ClipMesh(GraphreeD.clipboard);
	3798	+// group.selection.ClipMesh(GrafreeD.clipboard);
3530	3799	System.out.println("DONE.");
3531	3800	refreshContents();
3532	3801	}
..	..	@@ -3864,12 +4133,12 @@
3864	4133	{
3865	4134	if (group.selection.isEmpty())
3866	4135	return;
3867		- GraphreeD.clipboardIsTempGroup = false;
	4136	+ GrafreeD.clipboardIsTempGroup = false;
3868	4137	Composite tGroup = null;
3869	4138	if (group.selection.size() > 0) // 1)
3870	4139	{
3871	4140	tGroup = new cGroup();
3872		- GraphreeD.clipboardIsTempGroup = true;
	4141	+ GrafreeD.clipboardIsTempGroup = true;
3873	4142	}
3874	4143
3875	4144	if (cut)
..	..	@@ -3909,16 +4178,16 @@
3909	4178	//System.out.println("cut " + child);
3910	4179	//System.out.println("parent = " + child.parent);
3911	4180	// tmp.addChild(child);
3912		- if (GraphreeD.clipboardIsTempGroup)
	4181	+ if (GrafreeD.clipboardIsTempGroup)
3913	4182	tGroup.add/Child/(tmp);
3914	4183	else
3915		- GraphreeD.clipboard = tmp;
	4184	+ GrafreeD.clipboard = tmp;
3916	4185	}
3917	4186	else
3918		- if (GraphreeD.clipboardIsTempGroup)
	4187	+ if (GrafreeD.clipboardIsTempGroup)
3919	4188	tGroup.add/Child/(child);
3920	4189	else
3921		- GraphreeD.clipboard = child;
	4190	+ GrafreeD.clipboard = child;
3922	4191	}
3923	4192
3924	4193	//ResetModel();
..	..	@@ -3950,21 +4219,21 @@
3950	4219	//System.out.println("cut " + elem);
3951	4220	//System.out.println("parent = " + elem.parent);
3952	4221	// tmp.addChild(elem);
3953		- if (GraphreeD.clipboardIsTempGroup)
	4222	+ if (GrafreeD.clipboardIsTempGroup)
3954	4223	tGroup.add/Child/(tmp);
3955	4224	else
3956		- GraphreeD.clipboard = tmp;
	4225	+ GrafreeD.clipboard = tmp;
3957	4226	}
3958	4227	else
3959		- if (GraphreeD.clipboardIsTempGroup)
	4228	+ if (GrafreeD.clipboardIsTempGroup)
3960	4229	tGroup.add/Child/(child);
3961	4230	else
3962		- GraphreeD.clipboard = child;
	4231	+ GrafreeD.clipboard = child;
3963	4232	}
3964	4233
3965	4234	}
3966		- if (GraphreeD.clipboardIsTempGroup)
3967		- GraphreeD.clipboard = tGroup;
	4235	+ if (GrafreeD.clipboardIsTempGroup)
	4236	+ GrafreeD.clipboard = tGroup;
3968	4237	if (cut)
3969	4238	{
3970	4239	ResetModel();
..	..	@@ -3974,11 +4243,11 @@
3974	4243
3975	4244	void paste(boolean expand)
3976	4245	{
3977		- // if (GraphreeD.clipboard == null)
	4246	+ // if (GrafreeD.clipboard == null)
3978	4247	// return;
3979	4248	boolean first = true;
3980	4249
3981		- if (GraphreeD.clipboardIsTempGroup)
	4250	+ if (GrafreeD.clipboardIsTempGroup)
3982	4251	{
3983	4252	Composite temp;
3984	4253
..	..	@@ -3989,7 +4258,7 @@
3989	4258	temp = (Composite)Applet3D.clipboard.deepCopy();
3990	4259	*/
3991	4260	Object3D elem;
3992		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4261	+ for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
3993	4262	{
3994	4263	Object3D child = (Object3D)e.nextElement();
3995	4264
..	..	@@ -4003,7 +4272,7 @@
4003	4272	else
4004	4273	elem = child.deepCopy(); // ?
4005	4274	child.parent = keepparent;
4006		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	4275	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4007	4276	// elem = elem.get(0);
4008	4277	makeSomething(elem, true); // ?? first);
4009	4278	//group.addChild(elem);
..	..	@@ -4023,14 +4292,14 @@
4023	4292	//Object3D cb = Applet3D.clipboard;
4024	4293	//temp.addChild(cb);
4025	4294	//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());
	4295	+ assert(GrafreeD.clipboard.parent == null);
	4296	+ Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
	4297	+ GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
	4298	+ if (LA.isIdentity(GrafreeD.clipboard.toParent))
	4299	+ makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
4031	4300	else
4032		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4033		- GraphreeD.clipboard.get(0).parent = keepparent;
	4301	+ makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
	4302	+ GrafreeD.clipboard.get(0).parent = keepparent;
4034	4303	}
4035	4304
4036	4305	ResetModel();
..	..	@@ -4039,7 +4308,7 @@
4039	4308
4040	4309	void pasteInto(boolean copyit)
4041	4310	{
4042		-// if (GraphreeD.clipboard == null)
	4311	+// if (GrafreeD.clipboard == null)
4043	4312	// return;
4044	4313
4045	4314	if (group.selection.size() != 1)
..	..	@@ -4072,9 +4341,9 @@
4072	4341	{
4073	4342	boolean first = true;
4074	4343
4075		- if (GraphreeD.clipboardIsTempGroup)
	4344	+ if (GrafreeD.clipboardIsTempGroup)
4076	4345	{
4077		- Composite temp = (Composite)GraphreeD.clipboard;
	4346	+ Composite temp = (Composite)GrafreeD.clipboard;
4078	4347	Object3D copy;
4079	4348	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4080	4349	{
..	..	@@ -4084,7 +4353,7 @@
4084	4353	}
4085	4354	} else
4086	4355	{
4087		- linkSomething(GraphreeD.clipboard); //.get(0));
	4356	+ linkSomething(GrafreeD.clipboard); //.get(0));
4088	4357	}
4089	4358	}
4090	4359	}
..	..	@@ -4276,6 +4545,26 @@
4276	4545	makeSomething(csg);
4277	4546	}
4278	4547
	4548	+ void Ungroup(Object3D g)
	4549	+ {
	4550	+ if (g instanceof HiddenObject)
	4551	+ {
	4552	+ HiddenObject h = (HiddenObject) g;
	4553	+
	4554	+ for (int i=0; i<h.ActualSize(); i++)
	4555	+ {
	4556	+ objEditor.makeSomething(h.get(i), false);
	4557	+ }
	4558	+ }
	4559	+ else
	4560	+ {
	4561	+ for (int i=0; i<g.Size(); i++)
	4562	+ {
	4563	+ objEditor.makeSomething(g.get(i), false);
	4564	+ }
	4565	+ }
	4566	+ }
	4567	+
4279	4568	void ungroup()
4280	4569	{
4281	4570	/*
..	..	@@ -4471,7 +4760,7 @@
4471	4760
4472	4761	void ImportGFD()
4473	4762	{
4474		- FileDialog browser = new FileDialog(objEditor.frame, "Import GraphreeD", FileDialog.LOAD);
	4763	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4475	4764	browser.show();
4476	4765	String filename = browser.getFile();
4477	4766	if (filename != null && filename.length() > 0)
..	..	@@ -4509,7 +4798,7 @@
4509	4798
4510	4799	void ImportVRMLX3D()
4511	4800	{
4512		- if (GraphreeD.standAlone)
	4801	+ if (GrafreeD.standAlone)
4513	4802	{
4514	4803	/**/
4515	4804	FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
..	..	@@ -4526,7 +4815,7 @@
4526	4815
4527	4816	String GetFile(String dialogName)
4528	4817	{
4529		- if (GraphreeD.standAlone)
	4818	+ if (GrafreeD.standAlone)
4530	4819	{
4531	4820	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4532	4821	browser.show();
..	..	@@ -4635,6 +4924,7 @@
4635	4924	private MenuItem resetsupportItem;
4636	4925	private MenuItem resetreferencesItem;
4637	4926	private MenuItem linkverticesItem;
	4927	+ private MenuItem relinkverticesItem;
4638	4928	private MenuItem setMasterItem;
4639	4929	private MenuItem resetMeshItem;
4640	4930	private MenuItem stepAllItem;
..	..	@@ -4653,8 +4943,10 @@
4653	4943	private MenuItem clearItem;
4654	4944	private MenuItem clearAllItem;
4655	4945	private MenuItem genUVItem;
	4946	+ private MenuItem genNormalsMESHItem;
4656	4947	private MenuItem genNormalsCADItem;
4657	4948	private MenuItem genNormalsORGANItem;
	4949	+ private MenuItem genNormalsMINEItem;
4658	4950	private MenuItem stripifyItem;
4659	4951	private MenuItem unstripifyItem;
4660	4952	private MenuItem trimItem;
..	..	@@ -4696,6 +4988,7 @@
4696	4988	private MenuItem resetCentroidItem;
4697	4989	private MenuItem transformgeometryItem;
4698	4990	private MenuItem resetTransformItem;
	4991	+ private MenuItem hideItem;
4699	4992	private MenuItem grabItem;
4700	4993	private MenuItem backItem;
4701	4994	private MenuItem frontItem;
..	..	@@ -4728,12 +5021,15 @@
4728	5021	private MenuItem particleItem;
4729	5022	private MenuItem ragdollItem;
4730	5023	private MenuItem ragdoll2Item;
	5024	+ private MenuItem heightFieldItem;
	5025	+ private MenuItem textureFieldItem;
4731	5026	private MenuItem gridItem;
4732	5027	private MenuItem rectoidItem;
4733	5028	private MenuItem ellipsoidItem;
4734	5029	private MenuItem coneItem;
4735	5030	private MenuItem torusItem;
4736	5031	private MenuItem superItem;
	5032	+ private MenuItem kleinItem;
4737	5033	private MenuItem blobItem;
4738	5034	private MenuItem latheItem;
4739	5035	private MenuItem bezierItem;
..	..	@@ -4746,6 +5042,7 @@
4746	5042	private MenuItem csgItem;
4747	5043	private MenuItem templateItem;
4748	5044	private MenuItem textureItem;
	5045	+ private MenuItem billboardItem;
4749	5046	private MenuItem shadowXItem;
4750	5047	private MenuItem shadowYItem;
4751	5048	private MenuItem shadowZItem;