~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
..	..	@@ -410,7 +437,7 @@
410	437	oe.aConstraints.gridwidth = 1;
411	438	oe.aConstraints.gridx = 0;
412	439
413		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	440	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
414	441	liveCB.addItemListener(this);
415	442
416	443	oe.aConstraints.gridx += 1;
..	..	@@ -422,7 +449,7 @@
422	449	// localCB.addItemListener(this);
423	450
424	451	oe.aConstraints.gridx += 1;
425		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
	452	+ oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), oe.aConstraints);
426	453	crowdCB.addItemListener(this);
427	454
428	455	oe.aConstraints.gridx += 1;
..	..	@@ -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;
..	..	@@ -619,14 +649,14 @@
619	649
620	650	void EditObject(Object3D obj)
621	651	{
622		- cRadio dummyButton = new cRadio(obj.name);
623		- dummyButton.SetObject(obj);
624		- dummyButton.layout = sevenButton;
625		- dummyButton.SetCamera(cameraView.renderCamera, false);
626		- dummyButton.addActionListener(this);
627		- radioPanel.add(dummyButton);
628		- buttonGroup.add(dummyButton);
629		- dummyButton.doClick();
	652	+ cRadio radioButton = new cRadio(obj.name);
	653	+ radioButton.SetObject(obj);
	654	+ radioButton.layout = sevenButton;
	655	+ radioButton.SetCamera(cameraView.renderCamera, false);
	656	+ radioButton.addActionListener(this);
	657	+ radioPanel.add(radioButton);
	658	+ buttonGroup.add(radioButton);
	659	+ radioButton.doClick();
630	660	}
631	661	void SetupViews(ObjEditor oe)
632	662	{
..	..	@@ -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"));
..	..	@@ -1094,6 +1120,8 @@
1094	1120	resetParentItem.addActionListener(this);
1095	1121	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1096	1122	repairParentItem.addActionListener(this);
	1123	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1124	+ repairShadowItem.addActionListener(this);
1097	1125	menu.add(invariantsItem = new MenuItem("Invariants"));
1098	1126	invariantsItem.addActionListener(this);
1099	1127	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1429,9 +1457,9 @@
1429	1457
1430	1458	void Overwrite(int mask)
1431	1459	{
1432		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1460	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1433	1461	{
1434		- Object3D content = GraphreeD.clipboard.get(0);
	1462	+ Object3D content = GrafreeD.clipboard.get(0);
1435	1463
1436	1464	if (content instanceof cGroup && ((cGroup)content).transientlink )
1437	1465	content = ((cGroup)content).get(0);
..	..	@@ -1521,6 +1549,46 @@
1521	1549	makeSomething(ragdoll);
1522	1550	//makeSomething(new VehicleDemo());
1523	1551	} else
	1552	+ /*
	1553	+ */
	1554	+ if (event.getSource() == heightFieldItem)
	1555	+ {
	1556	+ Object3D obj = new Object3D();
	1557	+
	1558	+ obj.CreateMaterial();
	1559	+ obj.bRep = new BoundaryRep();
	1560	+
	1561	+ obj.bRep.CreateMesh(new iHeightField()
	1562	+ {
	1563	+ public double f(double x, double y)
	1564	+ {
	1565	+ // The Mandelbrot set is represented by coloring
	1566	+ // each point (x,y) according to the number of
	1567	+ // iterations it takes before the while loop in
	1568	+ // this method ends. For points that are actually
	1569	+ // in the Mandelbrot set, or very close to it, the
	1570	+ // count will reach the maximum value, 80. These
	1571	+ // points will be colored purple. All other colors
	1572	+ // represent points that are definitely NOT in the set.
	1573	+ x -= 600;
	1574	+ y -= 500;
	1575	+ x /= 200;
	1576	+ y /= 200;
	1577	+ int count = 0;
	1578	+ double zx = x;
	1579	+ double zy = y;
	1580	+ while (count < 80 && Math.abs(x) < 100 && Math.abs(zy) < 100) {
	1581	+ double new_zx = zxzx - zyzy + x;
	1582	+ zy = 2zxzy + y;
	1583	+ zx = new_zx;
	1584	+ count++;
	1585	+ }
	1586	+ return count; // Math.sqrt(count);
	1587	+ }
	1588	+ }, 1000,1000);
	1589	+
	1590	+ makeSomething(obj);
	1591	+ } else
1524	1592	if (event.getSource() == gridItem)
1525	1593	{
1526	1594	makeSomething(new Grid());
..	..	@@ -1540,6 +1608,10 @@
1540	1608	if (event.getSource() == superItem)
1541	1609	{
1542	1610	makeSomething(new Superellipsoid());
	1611	+ } else
	1612	+ if (event.getSource() == kleinItem)
	1613	+ {
	1614	+ makeSomething(new Klein());
1543	1615	} else
1544	1616	if (event.getSource() == blobItem)
1545	1617	{
..	..	@@ -1570,7 +1642,7 @@
1570	1642	LA.matConcat(obj.toParent, cameraView.renderCamera.fromParent, obj.toParent);
1571	1643	LA.matInvert(obj.toParent, obj.fromParent);
1572	1644	*/
1573		- makeSomething(new CheckerIG());
	1645	+ makeSomething(new Checker());
1574	1646	} else
1575	1647	if (event.getSource() == meshItem)
1576	1648	{
..	..	@@ -1710,7 +1782,7 @@
1710	1782	} else
1711	1783	if (event.getSource() == computeAOItem)
1712	1784	{
1713		- CameraPane.drawMode = CameraPane.OCCLUSION;
	1785	+ Globals.drawMode = CameraPane.OCCLUSION;
1714	1786	CameraPane.theRenderer.repaint();
1715	1787	} else
1716	1788	if (event.getSource() == recompileItem)
..	..	@@ -1726,7 +1798,7 @@
1726	1798	if (event.getSource() == invariantsItem)
1727	1799	{
1728	1800	System.out.println("Invariants:");
1729		- GraphreeD.theApplet3D.universe.invariants();
	1801	+ GrafreeD.grafreeD.universe.invariants();
1730	1802	} else
1731	1803	if (event.getSource() == memoryItem)
1732	1804	{
..	..	@@ -1796,10 +1868,10 @@
1796	1868	} else
1797	1869	if (event.getSource() == duplicateItem)
1798	1870	{
1799		- Object3D keep = GraphreeD.clipboard;
	1871	+ Object3D keep = GrafreeD.clipboard;
1800	1872	loadClipboard(false);
1801	1873	paste(false);
1802		- GraphreeD.clipboard = keep;
	1874	+ GrafreeD.clipboard = keep;
1803	1875	} else
1804	1876	if (event.getSource() == cloneItem)
1805	1877	{
..	..	@@ -1843,8 +1915,9 @@
1843	1915	} else
1844	1916	if (event.getSource() == overwriteMatItem)
1845	1917	{
	1918	+ /* july 2015
1846	1919	if ((dropAttributes & Object3D.TEXTURE) == 0)
1847		- Overwrite(Object3D.MATERIAL);
	1920	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1848	1921	else
1849	1922	{
1850	1923	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1856,13 +1929,16 @@
1856	1929	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1857	1930	}
1858	1931	}
	1932	+ */
	1933	+
	1934	+ Overwrite(dropAttributes);
1859	1935	}
1860	1936	if (event.getSource() == overwriteGeoItem)
1861	1937	{
1862	1938	Overwrite(Object3D.GEOMETRY);
1863		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1939	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1864	1940	// {
1865		-// Object3D content = GraphreeD.clipboard.get(0);
	1941	+// Object3D content = GrafreeD.clipboard.get(0);
1866	1942	//
1867	1943	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1868	1944	// content = ((cGroup)content).get(0);
..	..	@@ -1945,23 +2021,28 @@
1945	2021	if (group.selection.size() == 1)
1946	2022	one = true;
1947	2023
	2024	+ Object3D merge = null;
	2025	+
1948	2026	Object3D content = new cGroup();
1949	2027
1950	2028	for (int i=0; i<group.selection.size(); i++)
1951	2029	{
1952		- Object3D sel = new Merge(group.selection.get(i));
	2030	+ merge = new Merge(group.selection.get(i));
1953	2031
1954	2032	if (one)
1955		- makeSomething(sel, false);
	2033	+ makeSomething(merge, false);
1956	2034	else
1957		- content.addChild(sel);
	2035	+ content.addChild(merge);
1958	2036	}
1959	2037
1960	2038	if (!one)
1961		- makeSomething(content, false);
1962		-
1963		- ResetModel();
1964		- refreshContents();
	2039	+ makeSomething(content, true);
	2040	+ else
	2041	+ {
	2042	+ ResetModel();
	2043	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2044	+ refreshContents();
	2045	+ }
1965	2046	} else
1966	2047	if (event.getSource() == mergeGeometriesItem)
1967	2048	{
..	..	@@ -1995,9 +2076,9 @@
1995	2076	} else
1996	2077	if (event.getSource() == linkverticesItem)
1997	2078	{
1998		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2079	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
1999	2080	// {
2000		-// Object3D content = GraphreeD.clipboard.get(0);
	2081	+// Object3D content = GrafreeD.clipboard.get(0);
2001	2082	//
2002	2083	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2003	2084	// content = ((cGroup)content).get(0);
..	..	@@ -2006,9 +2087,9 @@
2006	2087	// group.selection.get(0).setMasterThis(content); // should be identity
2007	2088	// refreshContents();
2008	2089	// }
2009		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2090	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
2010	2091	{
2011		- Object3D content = GraphreeD.clipboard.get(0);
	2092	+ Object3D content = GrafreeD.clipboard.get(0);
2012	2093
2013	2094	if (content instanceof cGroup && ((cGroup)content).transientlink )
2014	2095	content = ((cGroup)content).get(0);
..	..	@@ -2038,6 +2119,15 @@
2038	2119
2039	2120	refreshContents();
2040	2121	} else
	2122	+ if (event.getSource() == relinkverticesItem)
	2123	+ {
	2124	+ boolean random = CameraPane.RANDOM;
	2125	+ CameraPane.RANDOM = false; // parse all random nodes
	2126	+ group.selection.RelinkToSupport();
	2127	+ CameraPane.RANDOM = random;
	2128	+
	2129	+ refreshContents();
	2130	+ } else
2041	2131	if (event.getSource() == resetreferencesItem)
2042	2132	{
2043	2133	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2049,9 +2139,9 @@
2049	2139	} else
2050	2140	if (event.getSource() == setMasterItem)
2051	2141	{
2052		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2142	+ if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2053	2143	{
2054		- Object3D content = GraphreeD.clipboard.get(0);
	2144	+ Object3D content = GrafreeD.clipboard.get(0);
2055	2145
2056	2146	if (content instanceof cGroup && ((cGroup)content).transientlink )
2057	2147	content = ((cGroup)content).get(0);
..	..	@@ -2064,9 +2154,9 @@
2064	2154	{
2065	2155	if (group.selection.size() == 1)
2066	2156	{
2067		- if (GraphreeD.clipboard.size() == 1)
	2157	+ if (GrafreeD.clipboard.size() == 1)
2068	2158	{
2069		- Object3D content = GraphreeD.clipboard.get(0);
	2159	+ Object3D content = GrafreeD.clipboard.get(0);
2070	2160
2071	2161	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	2162	content = ((cGroup)content).get(0);
..	..	@@ -2106,6 +2196,10 @@
2106	2196	if (event.getSource() == grabItem)
2107	2197	{
2108	2198	group(new cGroup(), true);
	2199	+ } else
	2200	+ if (event.getSource() == hideItem)
	2201	+ {
	2202	+ group(new HiddenObject());
2109	2203	} else
2110	2204	if (event.getSource() == frontItem)
2111	2205	{
..	..	@@ -2229,6 +2323,10 @@
2229	2323	{
2230	2324	group(new TextureNode());
2231	2325	} else
	2326	+ if (event.getSource() == billboardItem)
	2327	+ {
	2328	+ group(new BillboardNode());
	2329	+ } else
2232	2330	if (event.getSource() == shadowXItem)
2233	2331	{
2234	2332	CastShadow(0);
..	..	@@ -2243,7 +2341,15 @@
2243	2341	} else
2244	2342	if (event.getSource() == ungroupItem)
2245	2343	{
2246		- ungroup();
	2344	+ //ungroup();
	2345	+ for (int i=0; i<group.selection.size(); i++)
	2346	+ {
	2347	+ Ungroup(group.selection.get(i));
	2348	+ }
	2349	+
	2350	+ ClearSelection(false);
	2351	+
	2352	+ refreshContents();
2247	2353	} else
2248	2354	if (event.getSource() == genUVItem)
2249	2355	{
..	..	@@ -2253,9 +2359,17 @@
2253	2359	{
2254	2360	GenNormals(true);
2255	2361	} else
	2362	+ if (event.getSource() == genNormalsMESHItem)
	2363	+ {
	2364	+ GenNormals(true); // TODO
	2365	+ } else
2256	2366	if (event.getSource() == genNormalsORGANItem)
2257	2367	{
2258	2368	GenNormals(false);
	2369	+ } else
	2370	+ if (event.getSource() == genNormalsMINEItem)
	2371	+ {
	2372	+ GenNormalsMINE();
2259	2373	} else
2260	2374	if (event.getSource() == stripifyItem)
2261	2375	{
..	..	@@ -2353,6 +2467,10 @@
2353	2467	{
2354	2468	ParseVertices();
2355	2469	} else
	2470	+ if (event.getSource() == textureFieldItem)
	2471	+ {
	2472	+ TextureVertices();
	2473	+ } else
2356	2474	if (event.getSource() == alignItem)
2357	2475	{
2358	2476	Align();
..	..	@@ -2421,6 +2539,20 @@
2421	2539	{
2422	2540	Object3D obj = (Object3D)e.nextElement();
2423	2541	obj.RepairParent();
	2542	+// for (int i=0; i<obj.size(); i++)
	2543	+// {
	2544	+// obj.get(i).parent = obj;
	2545	+// }
	2546	+ }
	2547	+
	2548	+ refreshContents();
	2549	+ } else
	2550	+ if (event.getSource() == repairShadowItem)
	2551	+ {
	2552	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2553	+ {
	2554	+ Object3D obj = (Object3D)e.nextElement();
	2555	+ obj.RepairShadow();
2424	2556	// for (int i=0; i<obj.size(); i++)
2425	2557	// {
2426	2558	// obj.get(i).parent = obj;
..	..	@@ -2524,8 +2656,8 @@
2524	2656	// bug
2525	2657	//gridPanel.setDividerLocation(1.0);
2526	2658	//bigPanel.setDividerLocation(0.0);
2527		- bigThree.remove(jtp);
2528		- bigThree.remove(cameraPanel);
	2659	+ bigThree.remove(scenePanel);
	2660	+ bigThree.remove(centralPanel);
2529	2661	bigThree.remove(XYZPanel);
2530	2662	aWindowConstraints.gridx = 0;
2531	2663	aWindowConstraints.gridy = 0;
..	..	@@ -2540,7 +2672,7 @@
2540	2672	// aConstraints.gridheight = 3;
2541	2673	aWindowConstraints.gridx = 1;
2542	2674	aWindowConstraints.fill = GridBagConstraints.BOTH;
2543		- bigThree.add(cameraPanel, aWindowConstraints);
	2675	+ bigThree.add(centralPanel, aWindowConstraints);
2544	2676	aWindowConstraints.weightx = 0;
2545	2677	aWindowConstraints.gridx = 4;
2546	2678	aWindowConstraints.gridwidth = 1;
..	..	@@ -2552,8 +2684,8 @@
2552	2684	if (event.getSource() == threeButton)
2553	2685	{
2554	2686	radio.layout = threeButton;
2555		- bigThree.remove(jtp);
2556		- bigThree.remove(cameraPanel);
	2687	+ bigThree.remove(scenePanel);
	2688	+ bigThree.remove(centralPanel);
2557	2689	bigThree.remove(XYZPanel);
2558	2690	aWindowConstraints.gridx = 0;
2559	2691	aWindowConstraints.gridy = 0;
..	..	@@ -2568,7 +2700,7 @@
2568	2700	// aConstraints.gridheight = 3;
2569	2701	aWindowConstraints.gridx = 1;
2570	2702	aWindowConstraints.fill = GridBagConstraints.BOTH;
2571		- bigThree.add(cameraPanel, aWindowConstraints);
	2703	+ bigThree.add(centralPanel, aWindowConstraints);
2572	2704	aWindowConstraints.weightx = 0;
2573	2705	aWindowConstraints.gridx = 4;
2574	2706	aWindowConstraints.gridwidth = 1;
..	..	@@ -2580,8 +2712,8 @@
2580	2712	if (event.getSource() == fourButton)
2581	2713	{
2582	2714	radio.layout = fourButton;
2583		- bigThree.remove(jtp);
2584		- bigThree.remove(cameraPanel);
	2715	+ bigThree.remove(scenePanel);
	2716	+ bigThree.remove(centralPanel);
2585	2717	bigThree.remove(XYZPanel);
2586	2718	aWindowConstraints.gridx = 0;
2587	2719	aWindowConstraints.gridy = 0;
..	..	@@ -2590,7 +2722,7 @@
2590	2722	aWindowConstraints.fill = GridBagConstraints.BOTH;
2591	2723	aWindowConstraints.weightx = 1;
2592	2724	aWindowConstraints.weighty = 1;
2593		- bigThree.add(jtp, aWindowConstraints);
	2725	+ bigThree.add(scenePanel, aWindowConstraints);
2594	2726	aWindowConstraints.weightx = 1;
2595	2727	aWindowConstraints.gridwidth = 3;
2596	2728	// aConstraints.gridheight = 3;
..	..	@@ -2608,8 +2740,8 @@
2608	2740	if (event.getSource() == sixButton)
2609	2741	{
2610	2742	radio.layout = sixButton;
2611		- bigThree.remove(jtp);
2612		- bigThree.remove(cameraPanel);
	2743	+ bigThree.remove(scenePanel);
	2744	+ bigThree.remove(centralPanel);
2613	2745	bigThree.remove(XYZPanel);
2614	2746	aWindowConstraints.gridx = 0;
2615	2747	aWindowConstraints.gridy = 0;
..	..	@@ -2618,13 +2750,13 @@
2618	2750	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2619	2751	aWindowConstraints.weightx = 0;
2620	2752	aWindowConstraints.weighty = 1;
2621		- bigThree.add(jtp, aWindowConstraints);
	2753	+ bigThree.add(scenePanel, aWindowConstraints);
2622	2754	aWindowConstraints.weightx = 1;
2623	2755	aWindowConstraints.gridwidth = 3;
2624	2756	// aWindowConstraints.gridheight = 3;
2625	2757	aWindowConstraints.gridx = 1;
2626	2758	aWindowConstraints.fill = GridBagConstraints.BOTH;
2627		- bigThree.add(cameraPanel, aWindowConstraints);
	2759	+ bigThree.add(centralPanel, aWindowConstraints);
2628	2760	aWindowConstraints.weightx = 0;
2629	2761	aWindowConstraints.gridx = 4;
2630	2762	aWindowConstraints.gridwidth = 1;
..	..	@@ -2636,8 +2768,8 @@
2636	2768	if (event.getSource() == sevenButton)
2637	2769	{
2638	2770	radio.layout = sevenButton;
2639		- bigThree.remove(jtp);
2640		- bigThree.remove(cameraPanel);
	2771	+ bigThree.remove(scenePanel);
	2772	+ bigThree.remove(centralPanel);
2641	2773	bigThree.remove(XYZPanel);
2642	2774	aWindowConstraints.gridx = 0;
2643	2775	aWindowConstraints.gridy = 0;
..	..	@@ -2646,13 +2778,13 @@
2646	2778	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2647	2779	aWindowConstraints.weightx = 0;
2648	2780	aWindowConstraints.weighty = 1;
2649		- bigThree.add(jtp, aWindowConstraints);
	2781	+ bigThree.add(scenePanel, aWindowConstraints);
2650	2782	aWindowConstraints.weightx = 1;
2651	2783	aWindowConstraints.gridwidth = 3;
2652	2784	// aWindowConstraints.gridheight = 3;
2653	2785	aWindowConstraints.gridx = 1;
2654	2786	aWindowConstraints.fill = GridBagConstraints.BOTH;
2655		- bigThree.add(cameraPanel, aWindowConstraints);
	2787	+ bigThree.add(centralPanel, aWindowConstraints);
2656	2788	aWindowConstraints.weightx = 0;
2657	2789	aWindowConstraints.gridx = 4;
2658	2790	aWindowConstraints.gridwidth = 1;
..	..	@@ -2750,7 +2882,7 @@
2750	2882	if (event.getSource() == unselectButton)
2751	2883	{
2752	2884	objEditor.jTree.clearSelection();
2753		- // ?? oct 2012 GraphreeD.clipboard.clear();
	2885	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2754	2886	objEditor.ResetSliders();
2755	2887	refreshContents(true);
2756	2888	} else
..	..	@@ -2788,7 +2920,8 @@
2788	2920	cameraView.cameras[cameraView.cameracount] = radio.camera;
2789	2921	cameraView.targetLookAt.set(radio.camera.lookAt);
2790	2922	cameraView.object = group;
2791		- cameraView.lighttouched = true;
	2923	+ //cameraView.lighttouched = true;
	2924	+ Globals.lighttouched = true;
2792	2925	topView.object = group;
2793	2926	frontView.object = group;
2794	2927	sideView.object = group;
..	..	@@ -2824,7 +2957,7 @@
2824	2957	if (useclient)
2825	2958	{
2826	2959	cameraView.object = client;
2827		- cameraView.lighttouched = true;
	2960	+ Globals.lighttouched = true;
2828	2961	//topView.object = client;
2829	2962	//frontView.object = client;
2830	2963	//sideView.object = client;
..	..	@@ -2832,7 +2965,7 @@
2832	2965	else
2833	2966	{
2834	2967	cameraView.object = group;
2835		- cameraView.lighttouched = true;
	2968	+ Globals.lighttouched = true;
2836	2969	//topView.object = group;
2837	2970	//frontView.object = group;
2838	2971	//sideView.object = group;
..	..	@@ -3065,9 +3198,9 @@
3065	3198	obj = (Object3D)e.nextElement();
3066	3199
3067	3200	System.out.println("Object is: " + obj);
3068		- GraphreeD.AnalyzeObject(obj);
	3201	+ GrafreeD.AnalyzeObject(obj);
3069	3202	System.out.println("Boundary rep: " + obj.bRep);
3070		- GraphreeD.AnalyzeObject(obj.bRep);
	3203	+ GrafreeD.AnalyzeObject(obj.bRep);
3071	3204
3072	3205	// System.err.println((size/1024) + " KB is the size of " + obj);
3073	3206	}
..	..	@@ -3109,6 +3242,13 @@
3109	3242	void GenNormals(boolean crease)
3110	3243	{
3111	3244	group.GenNormalsS(crease);
	3245	+
	3246	+ refreshContents();
	3247	+ }
	3248	+
	3249	+ void GenNormalsMINE()
	3250	+ {
	3251	+ group.selection.GenNormalsMINE();
3112	3252
3113	3253	refreshContents();
3114	3254	}
..	..	@@ -3157,104 +3297,250 @@
3157	3297
3158	3298	//Object3D buffer;
3159	3299	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		-
	3300	+// BoundaryRep temprep;
	3301	+// Object3D nodes;
	3302	+// Vector<Vertex> vertices;
	3303	+//
	3304	+// cGroup buffer;
	3305	+//
	3306	+// public void Vertex(Object3D node, Vertex v)
	3307	+// {
	3308	+//// vertices.add(v);
	3309	+//// nodes.addElement(node);
	3310	+////
	3311	+//// if (temprep.GetCache(v) != null)
	3312	+//// {
	3313	+//// temprep.Remove(v);
	3314	+//// } else
	3315	+//// {
	3316	+//// temprep.Remember(v);
	3317	+//// }
	3318	+//
	3319	+// //Object3D node = nodes.get(index);
	3320	+// temp.set(v); // vertices.get(index)); // temprep.GetVertex(k));
	3321	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3322	+//
	3323	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	3324	+//
	3325	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	3326	+//
	3327	+// cGroup g = new cGroup();
	3328	+//
	3329	+// if (g.toParent == null)
	3330	+// {
	3331	+// g.toParent = LA.newMatrix();
	3332	+// g.fromParent = LA.newMatrix();
	3333	+// }
	3334	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3335	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3336	+//
	3337	+// g.add(GrafreeD.clipboard);
	3338	+//
	3339	+// buffer.add(g);
	3340	+// }
	3341	+//
	3342	+// public void Face(Object3D node, Face f)
	3343	+// {
	3344	+//
	3345	+// }
	3346	+//
	3347	+// void ParseVerticesOld() // ??
	3348	+// {
	3349	+// //if (group.selection.size() != 1)
	3350	+// // return;
	3351	+//
	3352	+// temprep = new BoundaryRep();
	3353	+// nodes = new Object3D();
	3354	+// vertices = new Vector<Vertex>();
	3355	+//
	3356	+// boolean epsequal = GrafreeD.epsequal;
	3357	+// GrafreeD.epsequal = true;
	3358	+//
	3359	+// for (int i=0; i<group.selection.size(); i++)
	3360	+// {
	3361	+// Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	3362	+//
	3363	+// group.selection.get(i).Parse(
	3364	+//this );
	3365	+//
	3366	+// int repsize = temprep.VertexCount();
	3367	+// int tablesize = temprep.vertextable.size();
	3368	+// int nodesize = nodes.size();
	3369	+//
	3370	+// assert(vertices.size() == nodes.size());
	3371	+//
	3372	+// temprep.vertextable.elements();
	3373	+//
	3374	+// java.util.Set<java.util.Map.Entry<Vertex,Vertex>> set = temprep.vertextable.entrySet();
	3375	+//
	3376	+// for (java.util.Map.Entry<Vertex,Vertex> entry : set)
	3377	+// {
	3378	+// cGroup g = new cGroup();
	3379	+//
	3380	+// int index = vertices.indexOf(entry.getValue()); // temprep.vertextable.(k));
	3381	+//
	3382	+// Object3D node = nodes.get(index);
	3383	+// temp.set(vertices.get(index)); // temprep.GetVertex(k));
	3384	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3385	+//
	3386	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	3387	+//
	3388	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	3389	+//
	3390	+// if (g.toParent == null)
	3391	+// {
	3392	+// g.toParent = LA.newMatrix();
	3393	+// g.fromParent = LA.newMatrix();
	3394	+// }
	3395	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3396	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3397	+//
	3398	+// g.add(GrafreeD.clipboard);
	3399	+//
	3400	+// buffer.add(g);
	3401	+// }
	3402	+//
	3403	+// makeSomething(buffer, i==group.selection.size()-1);
	3404	+// }
	3405	+//
	3406	+// GrafreeD.epsequal = epsequal;
	3407	+//
	3408	+// //buffer = null;
	3409	+// temprep = null;
	3410	+// nodes = null;
	3411	+//
	3412	+// refreshContents();
	3413	+// }
	3414	+
3184	3415	void ParseVertices()
3185	3416	{
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;
	3417	+ boolean epsequal = GrafreeD.epsequal;
	3418	+ GrafreeD.epsequal = true;
3195	3419
3196	3420	for (int i=0; i<group.selection.size(); i++)
3197	3421	{
3198		- Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	3422	+ final cGroup buffer = new cGroup(group.selection.get(i).name + "+");
3199	3423
3200		- group.selection.get(i).Parse(this);
3201		-
3202		- int repsize = temprep.VertexCount();
3203		- int tablesize = temprep.vertextable.size();
3204		- int nodesize = nodes.size();
	3424	+ group.selection.get(i).Parse(
	3425	+
	3426	+ new iParse()
	3427	+ {
	3428	+ public void Vertex(Object3D node, Vertex v)
	3429	+ {
	3430	+ temp.set(v);
	3431	+ LA.xformPos(temp, node.GlobalTransformInv(), temp);
3205	3432
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();
	3433	+ cGroup g = new cGroup();
3211	3434
3212		- for (java.util.Map.Entry<Vertex,Vertex> entry : set)
3213		- {
3214		- cGroup g = new cGroup();
	3435	+ if (g.toParent == null)
	3436	+ {
	3437	+ g.toParent = LA.newMatrix();
	3438	+ g.fromParent = LA.newMatrix();
	3439	+ }
	3440	+ LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3441	+ LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3215	3442
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);
	3443	+ g.add(GrafreeD.clipboard);
3220	3444
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);
	3445	+ buffer.add(g);
	3446	+ }
3232	3447
3233		- g.add(GraphreeD.clipboard);
	3448	+ public void Face(Object3D node, Face f)
	3449	+ {
3234	3450
3235		- buffer.add(g);
3236		- }
	3451	+ }
	3452	+ }
	3453	+ );
3237	3454
3238	3455	makeSomething(buffer, i==group.selection.size()-1);
3239	3456	}
3240	3457
3241		- GraphreeD.epsequal = epsequal;
3242		-
3243		- //buffer = null;
3244		- temprep = null;
3245		- nodes = null;
	3458	+ GrafreeD.epsequal = epsequal;
3246	3459
3247	3460	refreshContents();
3248	3461	}
3249		-
	3462	+
	3463	+ void TextureVertices()
	3464	+ {
	3465	+ for (int i=0; i<group.selection.size(); i++)
	3466	+ {
	3467	+ group.selection.get(i).Parse(
	3468	+ new iParse()
	3469	+ {
	3470	+ public void Vertex(Object3D node, Vertex v)
	3471	+ {
	3472	+ cTexture tex = node.GetTextures();
	3473	+ String pigment = Object3D.GetPigment(tex);
	3474	+ //String bump = Object3D.GetBump(tex);
	3475	+
	3476	+ com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3477	+
	3478	+ double s = v.s;
	3479	+
	3480	+ if (s == 1)
	3481	+ s = 0;
	3482	+
	3483	+ double t = v.t;
	3484	+
	3485	+ if (t == 1)
	3486	+ t = 0;
	3487	+
	3488	+ int indexs = (int) (texturedata.getWidth() * s);
	3489	+ int indext = (int) (texturedata.getHeight() * t);
	3490	+
	3491	+ int index = indext * texturedata.getWidth() + indexs;
	3492	+
	3493	+ java.nio.ByteBuffer bytebuf = (java.nio.ByteBuffer)texturedata.getBuffer();
	3494	+
	3495	+ int slide = bytebuf.capacity() / texturedata.getWidth() / texturedata.getHeight();
	3496	+
	3497	+ float scale = bytebuf.get(index*slide) & 0xFF;
	3498	+ scale += bytebuf.get(index*slide+1) & 0xFF;
	3499	+ scale += bytebuf.get(index*slide+2) & 0xFF;
	3500	+ scale /= 3;
	3501	+
	3502	+ scale /= 0xFF;
	3503	+ // c'est quoi ca? scale /= 4;
	3504	+
	3505	+ //v.AO = scale;
	3506	+
	3507	+ v.x += v.norm.x * scale;
	3508	+ v.y += v.norm.y * scale;
	3509	+ v.z += v.norm.z * scale;
	3510	+ }
	3511	+
	3512	+ public void Face(Object3D node, Face f)
	3513	+ {
	3514	+ }
	3515	+ }
	3516	+ );
	3517	+ }
	3518	+
	3519	+ refreshContents();
	3520	+ }
	3521	+
3250	3522	void Align()
3251	3523	{
	3524	+ if (group.selection.size() == 0)
	3525	+ return;
	3526	+
	3527	+ cVector bbmin = new cVector();
	3528	+ cVector bbmax = new cVector();
	3529	+
	3530	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3531	+
	3532	+ double dx = bbmax.x - bbmin.x;
	3533	+ double dy = bbmax.y - bbmin.y;
	3534	+ double dz = bbmax.z - bbmin.z;
	3535	+
	3536	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3537	+
3252	3538	for (int i=0; i<group.selection.size(); i++)
3253	3539	{
3254	3540	Object3D obj = group.selection.get(i);
3255	3541
3256		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3257		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3542	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3543	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3258	3544	}
3259	3545
3260	3546	refreshContents();
..	..	@@ -3267,7 +3553,7 @@
3267	3553	// ref.SaveSupports();
3268	3554	// Object3D par = ref.parent;
3269	3555	// ref.parent = null;
3270		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	3556	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3271	3557	// ref.parent = par;
3272	3558	// ref.RestoreSupports();
3273	3559
..	..	@@ -3297,7 +3583,7 @@
3297	3583	// lowres.SaveSupports();
3298	3584	// par = lowres.parent;
3299	3585	// lowres.parent = null;
3300		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	3586	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3301	3587	Object3D newlow = CloneObject(lowres, false);
3302	3588	newlow.name = sn.switchobject.get(i).name;
3303	3589	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3319,7 +3605,7 @@
3319	3605	return;
3320	3606
3321	3607	Object3D poses = group.selection.get(0);
3322		- Object3D ref = GraphreeD.clipboard.get(0);
	3608	+ Object3D ref = GrafreeD.clipboard.get(0);
3323	3609
3324	3610	Object3D newgroup = new Object3D("Po:" + poses.name);
3325	3611
..	..	@@ -3513,20 +3799,20 @@
3513	3799
3514	3800	void ClipMesh()
3515	3801	{
3516		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	3802	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
3517	3803	{
3518		- Object3D content = GraphreeD.clipboard.get(0);
	3804	+ Object3D content = GrafreeD.clipboard.get(0);
3519	3805
3520	3806	if (content instanceof cGroup && ((cGroup)content).transientlink )
3521	3807	content = ((cGroup)content).get(0);
3522	3808
3523	3809	// for (int i=0; i<group.selection.size(); i++)
3524	3810	// {
3525		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	3811	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3526	3812	// }
3527		- group.selection.ClipMesh(GraphreeD.clipboard);
	3813	+ group.selection.ClipMesh(GrafreeD.clipboard);
3528	3814	}
3529		-// group.selection.ClipMesh(GraphreeD.clipboard);
	3815	+// group.selection.ClipMesh(GrafreeD.clipboard);
3530	3816	System.out.println("DONE.");
3531	3817	refreshContents();
3532	3818	}
..	..	@@ -3773,7 +4059,7 @@
3773	4059
3774	4060	objEditor.SetText(); // jan 2014
3775	4061
3776		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4062	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
3777	4063	CameraPane.flash = true;
3778	4064
3779	4065	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
..	..	@@ -3864,12 +4150,12 @@
3864	4150	{
3865	4151	if (group.selection.isEmpty())
3866	4152	return;
3867		- GraphreeD.clipboardIsTempGroup = false;
	4153	+ GrafreeD.clipboardIsTempGroup = false;
3868	4154	Composite tGroup = null;
3869	4155	if (group.selection.size() > 0) // 1)
3870	4156	{
3871	4157	tGroup = new cGroup();
3872		- GraphreeD.clipboardIsTempGroup = true;
	4158	+ GrafreeD.clipboardIsTempGroup = true;
3873	4159	}
3874	4160
3875	4161	if (cut)
..	..	@@ -3909,16 +4195,16 @@
3909	4195	//System.out.println("cut " + child);
3910	4196	//System.out.println("parent = " + child.parent);
3911	4197	// tmp.addChild(child);
3912		- if (GraphreeD.clipboardIsTempGroup)
	4198	+ if (GrafreeD.clipboardIsTempGroup)
3913	4199	tGroup.add/Child/(tmp);
3914	4200	else
3915		- GraphreeD.clipboard = tmp;
	4201	+ GrafreeD.clipboard = tmp;
3916	4202	}
3917	4203	else
3918		- if (GraphreeD.clipboardIsTempGroup)
	4204	+ if (GrafreeD.clipboardIsTempGroup)
3919	4205	tGroup.add/Child/(child);
3920	4206	else
3921		- GraphreeD.clipboard = child;
	4207	+ GrafreeD.clipboard = child;
3922	4208	}
3923	4209
3924	4210	//ResetModel();
..	..	@@ -3950,21 +4236,21 @@
3950	4236	//System.out.println("cut " + elem);
3951	4237	//System.out.println("parent = " + elem.parent);
3952	4238	// tmp.addChild(elem);
3953		- if (GraphreeD.clipboardIsTempGroup)
	4239	+ if (GrafreeD.clipboardIsTempGroup)
3954	4240	tGroup.add/Child/(tmp);
3955	4241	else
3956		- GraphreeD.clipboard = tmp;
	4242	+ GrafreeD.clipboard = tmp;
3957	4243	}
3958	4244	else
3959		- if (GraphreeD.clipboardIsTempGroup)
	4245	+ if (GrafreeD.clipboardIsTempGroup)
3960	4246	tGroup.add/Child/(child);
3961	4247	else
3962		- GraphreeD.clipboard = child;
	4248	+ GrafreeD.clipboard = child;
3963	4249	}
3964	4250
3965	4251	}
3966		- if (GraphreeD.clipboardIsTempGroup)
3967		- GraphreeD.clipboard = tGroup;
	4252	+ if (GrafreeD.clipboardIsTempGroup)
	4253	+ GrafreeD.clipboard = tGroup;
3968	4254	if (cut)
3969	4255	{
3970	4256	ResetModel();
..	..	@@ -3974,11 +4260,11 @@
3974	4260
3975	4261	void paste(boolean expand)
3976	4262	{
3977		- // if (GraphreeD.clipboard == null)
	4263	+ // if (GrafreeD.clipboard == null)
3978	4264	// return;
3979	4265	boolean first = true;
3980	4266
3981		- if (GraphreeD.clipboardIsTempGroup)
	4267	+ if (GrafreeD.clipboardIsTempGroup)
3982	4268	{
3983	4269	Composite temp;
3984	4270
..	..	@@ -3989,7 +4275,7 @@
3989	4275	temp = (Composite)Applet3D.clipboard.deepCopy();
3990	4276	*/
3991	4277	Object3D elem;
3992		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4278	+ for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
3993	4279	{
3994	4280	Object3D child = (Object3D)e.nextElement();
3995	4281
..	..	@@ -4003,7 +4289,7 @@
4003	4289	else
4004	4290	elem = child.deepCopy(); // ?
4005	4291	child.parent = keepparent;
4006		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	4292	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4007	4293	// elem = elem.get(0);
4008	4294	makeSomething(elem, true); // ?? first);
4009	4295	//group.addChild(elem);
..	..	@@ -4023,14 +4309,14 @@
4023	4309	//Object3D cb = Applet3D.clipboard;
4024	4310	//temp.addChild(cb);
4025	4311	//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());
	4312	+ assert(GrafreeD.clipboard.parent == null);
	4313	+ Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
	4314	+ GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
	4315	+ if (LA.isIdentity(GrafreeD.clipboard.toParent))
	4316	+ makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
4031	4317	else
4032		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4033		- GraphreeD.clipboard.get(0).parent = keepparent;
	4318	+ makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
	4319	+ GrafreeD.clipboard.get(0).parent = keepparent;
4034	4320	}
4035	4321
4036	4322	ResetModel();
..	..	@@ -4039,7 +4325,7 @@
4039	4325
4040	4326	void pasteInto(boolean copyit)
4041	4327	{
4042		-// if (GraphreeD.clipboard == null)
	4328	+// if (GrafreeD.clipboard == null)
4043	4329	// return;
4044	4330
4045	4331	if (group.selection.size() != 1)
..	..	@@ -4072,9 +4358,9 @@
4072	4358	{
4073	4359	boolean first = true;
4074	4360
4075		- if (GraphreeD.clipboardIsTempGroup)
	4361	+ if (GrafreeD.clipboardIsTempGroup)
4076	4362	{
4077		- Composite temp = (Composite)GraphreeD.clipboard;
	4363	+ Composite temp = (Composite)GrafreeD.clipboard;
4078	4364	Object3D copy;
4079	4365	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4080	4366	{
..	..	@@ -4084,7 +4370,7 @@
4084	4370	}
4085	4371	} else
4086	4372	{
4087		- linkSomething(GraphreeD.clipboard); //.get(0));
	4373	+ linkSomething(GrafreeD.clipboard); //.get(0));
4088	4374	}
4089	4375	}
4090	4376	}
..	..	@@ -4276,6 +4562,26 @@
4276	4562	makeSomething(csg);
4277	4563	}
4278	4564
	4565	+ void Ungroup(Object3D g)
	4566	+ {
	4567	+ if (g instanceof HiddenObject)
	4568	+ {
	4569	+ HiddenObject h = (HiddenObject) g;
	4570	+
	4571	+ for (int i=0; i<h.ActualSize(); i++)
	4572	+ {
	4573	+ objEditor.makeSomething(h.get(i), false);
	4574	+ }
	4575	+ }
	4576	+ else
	4577	+ {
	4578	+ for (int i=0; i<g.Size(); i++)
	4579	+ {
	4580	+ objEditor.makeSomething(g.get(i), false);
	4581	+ }
	4582	+ }
	4583	+ }
	4584	+
4279	4585	void ungroup()
4280	4586	{
4281	4587	/*
..	..	@@ -4471,7 +4777,7 @@
4471	4777
4472	4778	void ImportGFD()
4473	4779	{
4474		- FileDialog browser = new FileDialog(objEditor.frame, "Import GraphreeD", FileDialog.LOAD);
	4780	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4475	4781	browser.show();
4476	4782	String filename = browser.getFile();
4477	4783	if (filename != null && filename.length() > 0)
..	..	@@ -4509,7 +4815,7 @@
4509	4815
4510	4816	void ImportVRMLX3D()
4511	4817	{
4512		- if (GraphreeD.standAlone)
	4818	+ if (GrafreeD.standAlone)
4513	4819	{
4514	4820	/**/
4515	4821	FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
..	..	@@ -4526,7 +4832,7 @@
4526	4832
4527	4833	String GetFile(String dialogName)
4528	4834	{
4529		- if (GraphreeD.standAlone)
	4835	+ if (GrafreeD.standAlone)
4530	4836	{
4531	4837	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4532	4838	browser.show();
..	..	@@ -4635,6 +4941,7 @@
4635	4941	private MenuItem resetsupportItem;
4636	4942	private MenuItem resetreferencesItem;
4637	4943	private MenuItem linkverticesItem;
	4944	+ private MenuItem relinkverticesItem;
4638	4945	private MenuItem setMasterItem;
4639	4946	private MenuItem resetMeshItem;
4640	4947	private MenuItem stepAllItem;
..	..	@@ -4653,8 +4960,10 @@
4653	4960	private MenuItem clearItem;
4654	4961	private MenuItem clearAllItem;
4655	4962	private MenuItem genUVItem;
	4963	+ private MenuItem genNormalsMESHItem;
4656	4964	private MenuItem genNormalsCADItem;
4657	4965	private MenuItem genNormalsORGANItem;
	4966	+ private MenuItem genNormalsMINEItem;
4658	4967	private MenuItem stripifyItem;
4659	4968	private MenuItem unstripifyItem;
4660	4969	private MenuItem trimItem;
..	..	@@ -4696,6 +5005,7 @@
4696	5005	private MenuItem resetCentroidItem;
4697	5006	private MenuItem transformgeometryItem;
4698	5007	private MenuItem resetTransformItem;
	5008	+ private MenuItem hideItem;
4699	5009	private MenuItem grabItem;
4700	5010	private MenuItem backItem;
4701	5011	private MenuItem frontItem;
..	..	@@ -4716,6 +5026,7 @@
4716	5026
4717	5027	private MenuItem resetParentItem;
4718	5028	private MenuItem repairParentItem;
	5029	+ private MenuItem repairShadowItem;
4719	5030	private MenuItem sortbysizeItem;
4720	5031	private MenuItem sortbynameItem;
4721	5032
..	..	@@ -4728,12 +5039,15 @@
4728	5039	private MenuItem particleItem;
4729	5040	private MenuItem ragdollItem;
4730	5041	private MenuItem ragdoll2Item;
	5042	+ private MenuItem heightFieldItem;
	5043	+ private MenuItem textureFieldItem;
4731	5044	private MenuItem gridItem;
4732	5045	private MenuItem rectoidItem;
4733	5046	private MenuItem ellipsoidItem;
4734	5047	private MenuItem coneItem;
4735	5048	private MenuItem torusItem;
4736	5049	private MenuItem superItem;
	5050	+ private MenuItem kleinItem;
4737	5051	private MenuItem blobItem;
4738	5052	private MenuItem latheItem;
4739	5053	private MenuItem bezierItem;
..	..	@@ -4746,6 +5060,7 @@
4746	5060	private MenuItem csgItem;
4747	5061	private MenuItem templateItem;
4748	5062	private MenuItem textureItem;
	5063	+ private MenuItem billboardItem;
4749	5064	private MenuItem shadowXItem;
4750	5065	private MenuItem shadowYItem;
4751	5066	private MenuItem shadowZItem;