~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -37,7 +37,6 @@
37	37	static boolean[] selectedstack = new boolean[65536];
38	38	static int materialdepth = 0;
39	39
40		- static boolean DEBUG = false;
41	40	static boolean FRUSTUM = false; // still bogus true; // frustum culling
42	41
43	42	// camera change fix
..	..	@@ -149,6 +148,8 @@
149	148	defaultcaps.setAccumBlueBits(16);
150	149	defaultcaps.setAccumAlphaBits(16);
151	150	}
	151	+
	152	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
152	153
153	154	void SetAsGLRenderer(boolean b)
154	155	{
..	..	@@ -325,7 +326,7 @@
325	326	cStatic.objectstack[materialdepth++] = obj;
326	327	//System.out.println("material " + material);
327	328	//Applet3D.tracein(this, selected);
328		- display.vector2buffer = obj.projectedVertices;
	329	+ //display.vector2buffer = obj.projectedVertices;
329	330	if (obj instanceof Camera)
330	331	{
331	332	display.options1[0] = material.shift;
..	..	@@ -334,14 +335,28 @@
334	335	display.options1[2] = material.shadowbias;
335	336	display.options1[3] = material.aniso;
336	337	display.options1[4] = material.anisoV;
	338	+// System.out.println("display.options1[0] " + display.options1[0]);
	339	+// System.out.println("display.options1[1] " + display.options1[1]);
	340	+// System.out.println("display.options1[2] " + display.options1[2]);
	341	+// System.out.println("display.options1[3] " + display.options1[3]);
	342	+// System.out.println("display.options1[4] " + display.options1[4]);
337	343	display.options2[0] = material.opacity;
338	344	display.options2[1] = material.diffuse;
339	345	display.options2[2] = material.factor;
	346	+// System.out.println("display.options2[0] " + display.options2[0]);
	347	+// System.out.println("display.options2[1] " + display.options2[1]);
	348	+// System.out.println("display.options2[2] " + display.options2[2]);
340	349
341	350	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	351	+// System.out.println("display.options3[0] " + display.options3[0]);
	352	+// System.out.println("display.options3[1] " + display.options3[1]);
	353	+// System.out.println("display.options3[2] " + display.options3[2]);
342	354	display.options4[0] = material.cameralight/0.2f;
343	355	display.options4[1] = material.subsurface;
344	356	display.options4[2] = material.sheen;
	357	+// System.out.println("display.options4[0] " + display.options4[0]);
	358	+// System.out.println("display.options4[1] " + display.options4[1]);
	359	+// System.out.println("display.options4[2] " + display.options4[2]);
345	360
346	361	// if (display.CURRENTANTIALIAS > 0)
347	362	// display.options3[3] /= 4;
..	..	@@ -357,7 +372,7 @@
357	372	/**/
358	373	} else
359	374	{
360		- DrawMaterial(material, selected);
	375	+ DrawMaterial(material, selected, obj.projectedVertices);
361	376	}
362	377	} else
363	378	{
..	..	@@ -381,8 +396,8 @@
381	396	cStatic.objectstack[materialdepth++] = obj;
382	397	//System.out.println("material " + material);
383	398	//Applet3D.tracein("selected ", selected);
384		- display.vector2buffer = obj.projectedVertices;
385		- display.DrawMaterial(material, selected);
	399	+ //display.vector2buffer = obj.projectedVertices;
	400	+ display.DrawMaterial(material, selected, obj.projectedVertices);
386	401	}
387	402	}
388	403
..	..	@@ -399,8 +414,8 @@
399	414	materialdepth -= 1;
400	415	if (materialdepth > 0)
401	416	{
402		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
403		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	417	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	418	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
404	419	}
405	420	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
406	421	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -420,8 +435,8 @@
420	435	materialdepth -= 1;
421	436	if (materialdepth > 0)
422	437	{
423		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
424		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	438	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	439	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
425	440	}
426	441	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
427	442	//else
..	..	@@ -462,10 +477,12 @@
462	477	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
463	478	{
464	479	//gl.glBegin(gl.GL_TRIANGLES);
465		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	480	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	481	+ // TEST LIVE NORMALS && !obj.dontselect
	482	+ ;
466	483	if (!hasnorm)
467	484	{
468		- // System.out.println("FUCK!!");
	485	+ // System.out.println("Mesh normal");
469	486	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
470	487	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
471	488	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1190,10 +1207,12 @@
1190	1207	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1191	1208	}
1192	1209	}
	1210	+
1193	1211	if (flipV)
1194	1212	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1195	1213	else
1196	1214	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1215	+
1197	1216	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1198	1217	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1199	1218
..	..	@@ -1213,10 +1232,12 @@
1213	1232	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1214	1233	}
1215	1234	}
	1235	+
1216	1236	if (flipV)
1217	1237	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1218	1238	else
1219	1239	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1240	+
1220	1241	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1221	1242	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1222	1243
..	..	@@ -1244,8 +1265,10 @@
1244	1265	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1245	1266	else
1246	1267	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1268	+
1247	1269	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1248	1270	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1271	+
1249	1272	count2 += 2;
1250	1273	count3 += 3;
1251	1274	}
..	..	@@ -1601,7 +1624,7 @@
1601	1624	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1602	1625	}
1603	1626
1604		- void DrawMaterial(cMaterial material, boolean selected)
	1627	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1605	1628	{
1606	1629	CameraPane display = this;
1607	1630	//new Exception().printStackTrace();
..	..	@@ -1636,7 +1659,7 @@
1636	1659	colorV[0] = display.modelParams0[0] * material.diffuse;
1637	1660	colorV[1] = display.modelParams0[1] * material.diffuse;
1638	1661	colorV[2] = display.modelParams0[2] * material.diffuse;
1639		- colorV[3] = material.opacity;
	1662	+ colorV[3] = 1; // material.opacity;
1640	1663
1641	1664	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1642	1665	//System.out.println("Opacity = " + opacity);
..	..	@@ -1744,9 +1767,9 @@
1744	1767	display.modelParams7[2] = 0;
1745	1768	display.modelParams7[3] = 0;
1746	1769
1747		- display.modelParams6[0] = 100; // criss de bug de bump
	1770	+ //display.modelParams6[0] = 100; // criss de bug de bump
1748	1771
1749		- Object3D.cVector2[] extparams = display.vector2buffer;
	1772	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1750	1773	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1751	1774	{
1752	1775	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1888,7 +1911,7 @@
1888	1911	void PushMatrix(double[][] matrix)
1889	1912	{
1890	1913	// GrafreeD.tracein(matrix);
1891		- PushMatrix(matrix,1);
	1914	+ PushMatrix(matrix, 1);
1892	1915	}
1893	1916
1894	1917	void PushMatrix()
..	..	@@ -2042,7 +2065,7 @@
2042	2065	//System.err.println("Oeil on");
2043	2066	OEIL = true;
2044	2067	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2045		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2068	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2046	2069	//pingthread.StepToTarget(true);
2047	2070	}
2048	2071
..	..	@@ -2257,7 +2280,7 @@
2257	2280
2258	2281	void ToggleDebug()
2259	2282	{
2260		- DEBUG ^= true;
	2283	+ Globals.DEBUG ^= true;
2261	2284	}
2262	2285
2263	2286	void ToggleLookAt()
..	..	@@ -2265,7 +2288,7 @@
2265	2288	LOOKAT ^= true;
2266	2289	}
2267	2290
2268		- void ToggleRandom()
	2291	+ void ToggleSwitch()
2269	2292	{
2270	2293	SWITCH ^= true;
2271	2294	}
..	..	@@ -2275,10 +2298,17 @@
2275	2298	HANDLES ^= true;
2276	2299	}
2277	2300
	2301	+ Object3D paintFolder;
	2302	+
2278	2303	void TogglePaint()
2279	2304	{
2280	2305	PAINTMODE ^= true;
2281	2306	paintcount = 0;
	2307	+
	2308	+ if (PAINTMODE)
	2309	+ {
	2310	+ paintFolder = GetFolder();
	2311	+ }
2282	2312	}
2283	2313
2284	2314	void SwapCamera(int a, int b)
..	..	@@ -2374,7 +2404,7 @@
2374	2404	{
2375	2405	return currentGL;
2376	2406	}
2377		-
	2407	+
2378	2408	/**/
2379	2409	class CacheTexture
2380	2410	{
..	..	@@ -7900,7 +7930,7 @@
7900	7930	String pigment = Object3D.GetPigment(tex);
7901	7931	String bump = Object3D.GetBump(tex);
7902	7932
7903		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7933	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7904	7934	{
7905	7935	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7906	7936	// System.out.println("; bump = " + bump);
..	..	@@ -7917,6 +7947,64 @@
7917	7947
7918	7948	ReleaseTexture(bump, true);
7919	7949	ReleaseTexture(pigment, false);
	7950	+ }
	7951	+
	7952	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	7953	+ {
	7954	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7955	+ {
	7956	+ return;
	7957	+ }
	7958	+
	7959	+ if (tex == null)
	7960	+ {
	7961	+ ReleaseTexture(null, false);
	7962	+ return;
	7963	+ }
	7964	+
	7965	+ String pigment = Object3D.GetPigment(tex);
	7966	+
	7967	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7968	+ {
	7969	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7970	+ // System.out.println("; bump = " + bump);
	7971	+ }
	7972	+
	7973	+ if (pigment.equals(""))
	7974	+ {
	7975	+ pigment = null;
	7976	+ }
	7977	+
	7978	+ ReleaseTexture(pigment, false);
	7979	+ }
	7980	+
	7981	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	7982	+ {
	7983	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7984	+ {
	7985	+ return;
	7986	+ }
	7987	+
	7988	+ if (tex == null)
	7989	+ {
	7990	+ ReleaseTexture(null, true);
	7991	+ return;
	7992	+ }
	7993	+
	7994	+ String bump = Object3D.GetBump(tex);
	7995	+
	7996	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7997	+ {
	7998	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7999	+ // System.out.println("; bump = " + bump);
	8000	+ }
	8001	+
	8002	+ if (bump.equals(""))
	8003	+ {
	8004	+ bump = null;
	8005	+ }
	8006	+
	8007	+ ReleaseTexture(bump, true);
7920	8008	}
7921	8009
7922	8010	void ReleaseTexture(String tex, boolean bump)
..	..	@@ -8022,7 +8110,7 @@
8022	8110	}
8023	8111	}
8024	8112
8025		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8113	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8026	8114	{
8027	8115	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8028	8116	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8043,7 +8131,7 @@
8043	8131	usedtextures.put(pigment, pigment);
8044	8132	usedtextures.put(bump, bump);
8045	8133
8046		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8134	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8047	8135	{
8048	8136	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8049	8137	// System.out.println("; bump = " + bump);
..	..	@@ -8067,7 +8155,94 @@
8067	8155	return; // true;
8068	8156	}
8069	8157
8070		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8158	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8159	+ {
	8160	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8161	+ ambientOcclusion ) // \|\| !textureon)
	8162	+ {
	8163	+ return; // false;
	8164	+ }
	8165	+
	8166	+ if (tex == null)
	8167	+ {
	8168	+ BindTexture(null,false,resolution);
	8169	+ return;
	8170	+ }
	8171	+
	8172	+ String pigment = Object3D.GetPigment(tex);
	8173	+
	8174	+ usedtextures.put(pigment, pigment);
	8175	+
	8176	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8177	+ {
	8178	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8179	+ // System.out.println("; bump = " + bump);
	8180	+ }
	8181	+
	8182	+ if (pigment.equals(""))
	8183	+ {
	8184	+ pigment = null;
	8185	+ }
	8186	+
	8187	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8188	+ BindTexture(pigment, false, resolution);
	8189	+ }
	8190	+
	8191	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8192	+ {
	8193	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8194	+ ambientOcclusion ) // \|\| !textureon)
	8195	+ {
	8196	+ return; // false;
	8197	+ }
	8198	+
	8199	+ if (tex == null)
	8200	+ {
	8201	+ BindTexture(null,true,resolution);
	8202	+ return;
	8203	+ }
	8204	+
	8205	+ String bump = Object3D.GetBump(tex);
	8206	+
	8207	+ usedtextures.put(bump, bump);
	8208	+
	8209	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8210	+ {
	8211	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8212	+ // System.out.println("; bump = " + bump);
	8213	+ }
	8214	+
	8215	+ if (bump.equals(""))
	8216	+ {
	8217	+ bump = null;
	8218	+ }
	8219	+
	8220	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8221	+ BindTexture(bump, true, resolution);
	8222	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8223	+ }
	8224	+
	8225	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8226	+
	8227	+ private boolean FileExists(String tex)
	8228	+ {
	8229	+ if (missingTextures.contains(tex))
	8230	+ {
	8231	+ return false;
	8232	+ }
	8233	+
	8234	+ boolean fileExists = new File(tex).exists();
	8235	+
	8236	+ if (!fileExists)
	8237	+ {
	8238	+ // If file exists, the "new File()" is not executed sgain
	8239	+ missingTextures.add(tex);
	8240	+ }
	8241	+
	8242	+ return fileExists;
	8243	+ }
	8244	+
	8245	+ CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
8071	8246	{
8072	8247	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
8073	8248
..	..	@@ -8075,15 +8250,17 @@
8075	8250	{
8076	8251	String texname = tex;
8077	8252
	8253	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8254	+
8078	8255	// String[] split = tex.split("Textures");
8079	8256	// if (split.length > 1)
8080	8257	// texname = "/Users/nbriere/Textures" + split[split.length-1];
8081	8258	// else
8082	8259	// if (!texname.startsWith("/"))
8083	8260	// texname = "/Users/nbriere/Textures/" + texname;
8084		- if (!new File(tex).exists())
	8261	+ if (!FileExists(tex))
8085	8262	{
8086		- texname = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory() + "/Textures/" + texname;
	8263	+ texname = fallbackTextureName;
8087	8264	}
8088	8265
8089	8266	if (CACHETEXTURE)
..	..	@@ -8153,7 +8330,7 @@
8153	8330	}
8154	8331
8155	8332	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8156		- if (!new File(cachename).exists())
	8333	+ if (!FileExists(cachename))
8157	8334	cachename = texname;
8158	8335	else
8159	8336	processbump = false; // don't process bump map again
..	..	@@ -8175,7 +8352,7 @@
8175	8352	}
8176	8353
8177	8354	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8178		- if (!new File(cachename).exists())
	8355	+ if (!FileExists(cachename))
8179	8356	cachename = texname;
8180	8357	else
8181	8358	processbump = false; // don't process bump map again
..	..	@@ -8184,7 +8361,9 @@
8184	8361	texturedata = GetFileTexture(cachename, processbump, resolution);
8185	8362
8186	8363
8187		- if (texturedata != null)
	8364	+ if (texturedata == null)
	8365	+ throw new Exception();
	8366	+
8188	8367	texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
8189	8368	//texture = GetTexture(tex, bump);
8190	8369	}
..	..	@@ -8306,7 +8485,7 @@
8306	8485	return texture;
8307	8486	}
8308	8487
8309		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8488	+ com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
8310	8489	{
8311	8490	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8312	8491
..	..	@@ -8324,21 +8503,21 @@
8324	8503	return texture!=null?texture.texture:null;
8325	8504	}
8326	8505
8327		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8506	+ public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
8328	8507	{
8329	8508	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8330	8509
8331	8510	return texture!=null?texture.texturedata:null;
8332	8511	}
8333	8512
8334		- boolean BindTexture(String tex, boolean bump, int resolution)
	8513	+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
8335	8514	{
8336	8515	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8337	8516	{
8338	8517	return false;
8339	8518	}
8340	8519
8341		- boolean newtex = false;
	8520	+ //boolean newtex = false;
8342	8521
8343	8522	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8344	8523
..	..	@@ -8370,7 +8549,7 @@
8370	8549	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8371	8550	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8372	8551
8373		- return newtex;
	8552	+ return true; // Warning: not used.
8374	8553	}
8375	8554
8376	8555	ShadowBuffer shadowPBuf;
..	..	@@ -9208,11 +9387,35 @@
9208	9387	jy8[3] = 0.5f;
9209	9388	}
9210	9389
9211		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9390	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9212	9391	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9213	9392	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9214	9393	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9215	9394
	9395	+ void ResetOptions()
	9396	+ {
	9397	+ options1[0] = 100;
	9398	+ options1[1] = 0.025f;
	9399	+ options1[2] = 0.01f;
	9400	+ options1[3] = 0;
	9401	+ options1[4] = 0;
	9402	+
	9403	+ options2[0] = 0;
	9404	+ options2[1] = 0.75f;
	9405	+ options2[2] = 0;
	9406	+ options2[3] = 0;
	9407	+
	9408	+ options3[0] = 1;
	9409	+ options3[1] = 1;
	9410	+ options3[2] = 1;
	9411	+ options3[3] = 0;
	9412	+
	9413	+ options4[0] = 1;
	9414	+ options4[1] = 0;
	9415	+ options4[2] = 1;
	9416	+ options4[3] = 0;
	9417	+ }
	9418	+
9216	9419	static int imagecount = 0; // movie generation
9217	9420
9218	9421	static int jitter = 0;
..	..	@@ -9308,8 +9511,8 @@
9308	9511	assert (parentcam != renderCamera);
9309	9512
9310	9513	if (renderCamera != lightCamera)
9311		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9312		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9514	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9515	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9313	9516
9314	9517	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9315	9518
..	..	@@ -9324,8 +9527,8 @@
9324	9527	LA.matCopy(renderCamera.fromScreen, matrix);
9325	9528
9326	9529	if (renderCamera != lightCamera)
9327		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9328		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9530	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9531	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9329	9532
9330	9533	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9331	9534
..	..	@@ -10323,6 +10526,7 @@
10323	10526	ANTIALIAS = 0;
10324	10527	//System.out.println("RESTART");
10325	10528	AAtimer.restart();
	10529	+ Globals.TIMERRUNNING = true;
10326	10530	}
10327	10531	}
10328	10532	}
..	..	@@ -10390,13 +10594,14 @@
10390	10594	ambientOcclusion = false;
10391	10595	}
10392	10596
10393		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10597	+ if (//Globals.lighttouched &&
	10598	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10394	10599	{
10395	10600	//if (RENDERSHADOW) // ?
10396	10601	if (!IsFrozen())
10397	10602	{
10398	10603	// dec 2012
10399		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10604	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10400	10605	{
10401	10606	Globals.framecount++;
10402	10607	shadowbuffer.display();
..	..	@@ -10523,8 +10728,8 @@
10523	10728
10524	10729	// if (parentcam != renderCamera) // not a light
10525	10730	if (cam != lightCamera)
10526		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10527		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10731	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10732	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10528	10733
10529	10734	for (int j = 0; j < 4; j++)
10530	10735	{
..	..	@@ -10538,8 +10743,8 @@
10538	10743
10539	10744	// if (parentcam != renderCamera) // not a light
10540	10745	if (cam != lightCamera)
10541		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10542		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10746	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10747	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10543	10748
10544	10749	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10545	10750
..	..	@@ -10798,7 +11003,16 @@
10798	11003	// Bump noise
10799	11004	gl.glActiveTexture(GL.GL_TEXTURE6);
10800	11005	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10801		- BindTexture(NOISE_TEXTURE, false, 2);
	11006	+
	11007	+ try
	11008	+ {
	11009	+ BindTexture(NOISE_TEXTURE, false, 2);
	11010	+ }
	11011	+ catch (Exception e)
	11012	+ {
	11013	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11014	+ }
	11015	+
10802	11016
10803	11017	gl.glActiveTexture(GL.GL_TEXTURE0);
10804	11018	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10821,9 +11035,9 @@
10821	11035
10822	11036	gl.glMatrixMode(GL.GL_MODELVIEW);
10823	11037
10824		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10825		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10826		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11038	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11039	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11040	+gl.glEnable(gl.GL_MULTISAMPLE);
10827	11041	} else
10828	11042	{
10829	11043	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10834,7 +11048,7 @@
10834	11048	//System.out.println("BLENDING ON");
10835	11049	gl.glEnable(GL.GL_BLEND);
10836	11050	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10837		-
	11051	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10838	11052	gl.glMatrixMode(gl.GL_PROJECTION);
10839	11053	gl.glLoadIdentity();
10840	11054
..	..	@@ -10923,8 +11137,8 @@
10923	11137	System.err.println("parentcam != renderCamera");
10924	11138
10925	11139	// if (cam != lightCamera)
10926		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10927		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11140	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11141	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10928	11142	}
10929	11143
10930	11144	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10945,8 +11159,8 @@
10945	11159	if (true) // TODO
10946	11160	{
10947	11161	if (cam != lightCamera)
10948		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10949		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11162	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11163	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10950	11164	}
10951	11165
10952	11166	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11291,15 +11505,36 @@
11291	11505
11292	11506	static boolean zoomonce = false;
11293	11507
	11508	+ static void CreateSelectedPoint()
	11509	+ {
	11510	+ if (selectedpoint == null)
	11511	+ {
	11512	+ debugpointG = new Sphere();
	11513	+ debugpointP = new Sphere();
	11514	+ debugpointC = new Sphere();
	11515	+ debugpointR = new Sphere();
	11516	+
	11517	+ selectedpoint = new Superellipsoid();
	11518	+
	11519	+ for (int i=0; i<8; i++)
	11520	+ {
	11521	+ debugpoints[i] = new Sphere();
	11522	+ }
	11523	+ }
	11524	+ }
	11525	+
11294	11526	void DrawObject(GL gl, boolean draw)
11295	11527	{
	11528	+ // To clear camera values
	11529	+ ResetOptions();
	11530	+
11296	11531	//System.out.println("DRAW OBJECT " + mouseDown);
11297	11532	// DrawMode() = SELECTION;
11298	11533	//GL gl = getGL();
11299	11534	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11300	11535	{
11301	11536	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11302		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11537	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11303	11538	pingthread.StepToTarget(true); // true);
11304	11539	// zoomonce = false;
11305	11540	}
..	..	@@ -11354,7 +11589,14 @@
11354	11589
11355	11590	usedtextures.clear();
11356	11591
11357		- BindTextures(DEFAULT_TEXTURES, 2);
	11592	+ try
	11593	+ {
	11594	+ BindTextures(DEFAULT_TEXTURES, 2);
	11595	+ }
	11596	+ catch (Exception e)
	11597	+ {
	11598	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11599	+ }
11358	11600	}
11359	11601	//System.out.println("--> " + stackdepth);
11360	11602	// GrafreeD.traceon();
..	..	@@ -11364,8 +11606,9 @@
11364	11606
11365	11607	if (DrawMode() == DEFAULT)
11366	11608	{
11367		- if (DEBUG)
	11609	+ if (Globals.DEBUG)
11368	11610	{
	11611	+ CreateSelectedPoint();
11369	11612	float radius = 0.05f;
11370	11613	if (selectedpoint.radius != radius)
11371	11614	{
..	..	@@ -11445,7 +11688,14 @@
11445	11688	if (checker != null && DrawMode() == DEFAULT)
11446	11689	{
11447	11690	//BindTexture(IMMORTAL_TEXTURE);
11448		- BindTextures(checker.GetTextures(), checker.texres);
	11691	+ try
	11692	+ {
	11693	+ BindTextures(checker.GetTextures(), checker.texres);
	11694	+ }
	11695	+ catch (Exception e)
	11696	+ {
	11697	+ System.err.println("FAILED: " + checker.GetTextures());
	11698	+ }
11449	11699	// NEAREST
11450	11700	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11451	11701	DrawChecker(gl);
..	..	@@ -11527,7 +11777,7 @@
11527	11777	return;
11528	11778	}
11529	11779
11530		- String string = obj.GetToolTip();
	11780	+ String string = obj.toString(); //.GetToolTip();
11531	11781
11532	11782	GL gl = GetGL();
11533	11783
..	..	@@ -11844,8 +12094,8 @@
11844	12094	//obj.TransformToWorld(light, light);
11845	12095	for (int i = tp.size(); --i >= 0;)
11846	12096	{
11847		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11848		- LA.xformPos(light, tp.get(i).toParent, light);
	12097	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12098	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11849	12099	}
11850	12100
11851	12101
..	..	@@ -11862,8 +12112,8 @@
11862	12112	parentcam = cameras[0];
11863	12113	}
11864	12114
11865		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11866		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12115	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12116	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11867	12117
11868	12118	LA.xformPos(light, renderCamera.toScreen, light);
11869	12119
..	..	@@ -12477,8 +12727,8 @@
12477	12727
12478	12728	// display shadow only (bump == 0)
12479	12729	"SUB temp.x, half.x, shadow.x;" +
12480		- "MOV temp.y, -params6.x;" +
12481		- "SLT temp.z, temp.y, zero.x;" +
	12730	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12731	+ "SLT temp.z, temp.y, -one2048th.x;" +
12482	12732	"SUB temp.y, one.x, temp.z;" +
12483	12733	"MUL temp.x, temp.x, temp.y;" +
12484	12734	"KIL temp.x;" +
..	..	@@ -12809,7 +13059,7 @@
12809	13059	//once = true;
12810	13060	}
12811	13061
12812		- System.out.print("Program #" + mode + "; length = " + program.length());
	13062	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12813	13063	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12814	13064	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12815	13065
..	..	@@ -12942,12 +13192,16 @@
12942	13192
12943	13193	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12944	13194	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13195	+
	13196	+ // Compare fragment depth in light space with shadowmap.
12945	13197	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12946	13198	"SGE temp.y, temp.x, zero.x;" +
12947		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13199	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13200	+
	13201	+ // Reverse comparison
12948	13202	"SUB temp.x, one.x, temp.x;" +
12949	13203	"MUL " + shadow + ".x, temp.x, temp.y;" +
12950		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13204	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12951	13205	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12952	13206
12953	13207	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12961,6 +13215,10 @@
12961	13215	// No shadow for backface
12962	13216	"DP3 temp.x, normal, lightd;" +
12963	13217	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13218	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13219	+
	13220	+ // No shadow when out of frustrum
	13221	+ "SGE temp.x, " + depth + ".z, one.z;" +
12964	13222	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12965	13223	"";
12966	13224	}
..	..	@@ -13107,7 +13365,8 @@
13107	13365	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13108	13366	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13109	13367	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13110		- Object3D.cVector2[] vector2buffer;
	13368	+
	13369	+ //Object3D.cVector2[] vector2buffer;
13111	13370
13112	13371	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13113	13372	// OUT : diff, spec
..	..	@@ -13123,9 +13382,10 @@
13123	13382	"DP3 " + dest + ".z," + "normals," + "eye;" +
13124	13383	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13125	13384	//"MOV " + dest + ".w," + "normal.z;" +
13126		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13127		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13128		- //"MOV " + dest + ".z," + "params2.w;" +
	13385	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13386	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13387	+
	13388	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13129	13389	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13130	13390	"RCP " + dest + ".w," + dest + ".w;" +
13131	13391	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13630,6 +13890,7 @@
13630	13890	else
13631	13891	if (evt.getSource() == AAtimer)
13632	13892	{
	13893	+ Globals.TIMERRUNNING = false;
13633	13894	if (mouseDown)
13634	13895	{
13635	13896	//new Exception().printStackTrace();
..	..	@@ -13689,7 +13950,7 @@
13689	13950
13690	13951	// fev 2014???
13691	13952	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13692		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	13953	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13693	13954	pingthread.StepToTarget(true); // true);
13694	13955	}
13695	13956	// if (!LIVE)
..	..	@@ -13704,6 +13965,7 @@
13704	13965	return;
13705	13966
13706	13967	AAtimer.restart(); //
	13968	+ Globals.TIMERRUNNING = true;
13707	13969
13708	13970	// waslive = LIVE;
13709	13971	// LIVE = false;
..	..	@@ -13776,9 +14038,12 @@
13776	14038
13777	14039	public void mouseDragged(MouseEvent e)
13778	14040	{
	14041	+ Globals.MOUSEDRAGGED = true;
	14042	+
13779	14043	//System.out.println("mouseDragged: " + e);
13780	14044	if (isRenderer)
13781	14045	movingcamera = true;
	14046	+
13782	14047	//if (drawing)
13783	14048	//return;
13784	14049	if ((e.getModifiersEx() & CTRL) != 0
..	..	@@ -14039,12 +14304,12 @@
14039	14304	void GoDown(int mod)
14040	14305	{
14041	14306	MODIFIERS \|= COMMAND;
14042		- /*
	14307	+ /**/
14043	14308	if((mod&SHIFT) == SHIFT)
14044	14309	manipCamera.RotatePosition(0, -speed);
14045	14310	else
14046		- manipCamera.BackForth(0, -speed*delta, getWidth());
14047		- */
	14311	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14312	+ /**/
14048	14313	if ((mod & SHIFT) == SHIFT)
14049	14314	{
14050	14315	mouseMode = mouseMode; // VR??
..	..	@@ -14060,12 +14325,12 @@
14060	14325	void GoUp(int mod)
14061	14326	{
14062	14327	MODIFIERS \|= COMMAND;
14063		- /*
	14328	+ /**/
14064	14329	if((mod&SHIFT) == SHIFT)
14065	14330	manipCamera.RotatePosition(0, speed);
14066	14331	else
14067		- manipCamera.BackForth(0, speed*delta, getWidth());
14068		- */
	14332	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14333	+ /**/
14069	14334	if ((mod & SHIFT) == SHIFT)
14070	14335	{
14071	14336	mouseMode = mouseMode;
..	..	@@ -14081,12 +14346,12 @@
14081	14346	void GoLeft(int mod)
14082	14347	{
14083	14348	MODIFIERS \|= COMMAND;
14084		- /*
	14349	+ /**/
14085	14350	if((mod&SHIFT) == SHIFT)
14086		- manipCamera.RotatePosition(speed, 0);
14087		- else
14088	14351	manipCamera.Translate(speed*delta, 0, getWidth());
14089		- */
	14352	+ else
	14353	+ manipCamera.RotatePosition(speed, 0);
	14354	+ /**/
14090	14355	if ((mod & SHIFT) == SHIFT)
14091	14356	{
14092	14357	mouseMode = mouseMode;
..	..	@@ -14102,12 +14367,12 @@
14102	14367	void GoRight(int mod)
14103	14368	{
14104	14369	MODIFIERS \|= COMMAND;
14105		- /*
	14370	+ /**/
14106	14371	if((mod&SHIFT) == SHIFT)
14107		- manipCamera.RotatePosition(-speed, 0);
14108		- else
14109	14372	manipCamera.Translate(-speed*delta, 0, getWidth());
14110		- */
	14373	+ else
	14374	+ manipCamera.RotatePosition(-speed, 0);
	14375	+ /**/
14111	14376	if ((mod & SHIFT) == SHIFT)
14112	14377	{
14113	14378	mouseMode = mouseMode;
..	..	@@ -14164,7 +14429,8 @@
14164	14429	info.camera = renderCamera;
14165	14430	info.x = x;
14166	14431	info.y = y;
14167		- object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	14432	+ object.GetWindow().copy
	14433	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14168	14434	} else
14169	14435	{
14170	14436	if (x < startX)
..	..	@@ -14328,7 +14594,9 @@
14328	14594	ci.camera = renderCamera;
14329	14595	if (!isRenderer)
14330	14596	{
14331		- if (object.editWindow.copy.doEditClick(ci, 0))
	14597	+ //ObjEditor editWindow = object.editWindow;
	14598	+ //Object3D copy = editWindow.copy;
	14599	+ if (object.doEditClick(ci, 0))
14332	14600	{
14333	14601	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14334	14602	} else
..	..	@@ -14340,7 +14608,11 @@
14340	14608
14341	14609	public void mouseReleased(MouseEvent e)
14342	14610	{
	14611	+ Globals.MOUSEDRAGGED = false;
	14612	+
14343	14613	movingcamera = false;
	14614	+ X = 0; // getBounds().width/2;
	14615	+ Y = 0; // getBounds().height/2;
14344	14616	//System.out.println("mouseReleased: " + e);
14345	14617	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14346	14618	}
..	..	@@ -14681,7 +14953,9 @@
14681	14953	case 'E' : COMPACT ^= true;
14682	14954	repaint();
14683	14955	break;
14684		- case 'W' : DEBUGHSB ^= true;
	14956	+ case 'W' : // Wide Window (fullscreen)
	14957	+ //DEBUGHSB ^= true;
	14958	+ ObjEditor.theFrame.ToggleFullScreen();
14685	14959	repaint();
14686	14960	break;
14687	14961	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14706,8 +14980,8 @@
14706	14980	RevertCamera();
14707	14981	repaint();
14708	14982	break;
14709		- case 'L':
14710	14983	case 'l':
	14984	+ //case 'L':
14711	14985	if (lightMode)
14712	14986	{
14713	14987	lightMode = false;
..	..	@@ -14850,9 +15124,9 @@
14850	15124	case '_':
14851	15125	kompactbit = 5;
14852	15126	break;
14853		- case '+':
14854		- kompactbit = 6;
14855		- break;
	15127	+// case '+':
	15128	+// kompactbit = 6;
	15129	+// break;
14856	15130	case ' ':
14857	15131	lightMode ^= true;
14858	15132	Globals.lighttouched = true;
..	..	@@ -14864,13 +15138,14 @@
14864	15138	case ESC:
14865	15139	RENDERPROGRAM += 1;
14866	15140	RENDERPROGRAM %= 3;
	15141	+
14867	15142	repaint();
14868	15143	break;
14869	15144	case 'Z':
14870	15145	//RESIZETEXTURE ^= true;
14871	15146	//break;
14872	15147	case 'z':
14873		- RENDERSHADOW ^= true;
	15148	+ Globals.RENDERSHADOW ^= true;
14874	15149	Globals.lighttouched = true;
14875	15150	repaint();
14876	15151	break;
..	..	@@ -14903,8 +15178,9 @@
14903	15178	case DELETE:
14904	15179	ClearSelection();
14905	15180	break;
14906		- /*
14907	15181	case '+':
	15182	+
	15183	+ /*
14908	15184	//fontsize += 1;
14909	15185	bbzoom *= 2;
14910	15186	repaint();
..	..	@@ -14921,17 +15197,17 @@
14921	15197	case '=':
14922	15198	IncDepth();
14923	15199	//fontsize += 1;
14924		- object.editWindow.refreshContents(true);
	15200	+ object.GetWindow().refreshContents(true);
14925	15201	maskbit = 6;
14926	15202	break;
14927	15203	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14928	15204	DecDepth();
14929	15205	maskbit = 5;
14930	15206	//if(fontsize > 1) fontsize -= 1;
14931		- if (object.editWindow == null)
14932		- new Exception().printStackTrace();
14933		- else
14934		- object.editWindow.refreshContents(true);
	15207	+// if (object.editWindow == null)
	15208	+// new Exception().printStackTrace();
	15209	+// else
	15210	+ object.GetWindow().refreshContents(true);
14935	15211	break;
14936	15212	case '{':
14937	15213	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15155,7 +15431,7 @@
15155	15431	}
15156	15432	*/
15157	15433
15158		- object.editWindow.EditSelection();
	15434	+ object.GetWindow().EditSelection(false);
15159	15435	}
15160	15436
15161	15437	void SelectParent()
..	..	@@ -15172,10 +15448,10 @@
15172	15448	{
15173	15449	//selectees.remove(i);
15174	15450	System.out.println("select parent of " + elem);
15175		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15451	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15176	15452	} else
15177	15453	{
15178		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15454	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15179	15455	}
15180	15456
15181	15457	first = false;
..	..	@@ -15217,12 +15493,12 @@
15217	15493	for (int j = 0; j < group.children.size(); j++)
15218	15494	{
15219	15495	elem = (Object3D) group.children.elementAt(j);
15220		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15496	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15221	15497	first = false;
15222	15498	}
15223	15499	} else
15224	15500	{
15225		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15501	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15226	15502	}
15227	15503
15228	15504	first = false;
..	..	@@ -15233,21 +15509,21 @@
15233	15509	{
15234	15510	//Composite group = (Composite) object;
15235	15511	Object3D group = object;
15236		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15512	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15237	15513	}
15238	15514
15239	15515	void ResetTransform(int mask)
15240	15516	{
15241	15517	//Composite group = (Composite) object;
15242	15518	Object3D group = object;
15243		- group.editWindow.ResetTransform(mask);
	15519	+ group.GetWindow().ResetTransform(mask);
15244	15520	}
15245	15521
15246	15522	void FlipTransform()
15247	15523	{
15248	15524	//Composite group = (Composite) object;
15249	15525	Object3D group = object;
15250		- group.editWindow.FlipTransform();
	15526	+ group.GetWindow().FlipTransform();
15251	15527	// group.editWindow.ReduceMesh(true);
15252	15528	}
15253	15529
..	..	@@ -15255,7 +15531,7 @@
15255	15531	{
15256	15532	//Composite group = (Composite) object;
15257	15533	Object3D group = object;
15258		- group.editWindow.PrintMemory();
	15534	+ group.GetWindow().PrintMemory();
15259	15535	// group.editWindow.ReduceMesh(true);
15260	15536	}
15261	15537
..	..	@@ -15263,7 +15539,7 @@
15263	15539	{
15264	15540	//Composite group = (Composite) object;
15265	15541	Object3D group = object;
15266		- group.editWindow.ResetCentroid();
	15542	+ group.GetWindow().ResetCentroid();
15267	15543	}
15268	15544
15269	15545	void IncDepth()
..	..	@@ -15349,7 +15625,9 @@
15349	15625	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15350	15626	//Image img = CreateImage(width, height);
15351	15627	//System.out.println("width = " + width + "; height = " + height + "\n");
	15628	+
15352	15629	Graphics gr = g; // img.getGraphics();
	15630	+
15353	15631	if (!hasMarquee)
15354	15632	{
15355	15633	if (Xmin < Xmax) // !locked)
..	..	@@ -15437,6 +15715,7 @@
15437	15715	info.bounds.y += (height - desired) / 2;
15438	15716	}
15439	15717	}
	15718	+
15440	15719	info.g = gr;
15441	15720	info.camera = renderCamera;
15442	15721	/*
..	..	@@ -15446,15 +15725,55 @@
15446	15725	*/
15447	15726	if (!isRenderer)
15448	15727	{
15449		- object.drawEditHandles(info, 0);
	15728	+ Grafreed.Assert(object != null);
	15729	+ Grafreed.Assert(object.selection != null);
	15730	+ if (object.selection.Size() > 0)
	15731	+ {
	15732	+ int hitSomething = object.selection.get(0).hitSomething;
	15733	+
	15734	+ info.DX = 0;
	15735	+ info.DY = 0;
	15736	+ info.W = 1;
	15737	+ if (hitSomething == Object3D.hitCenter)
	15738	+ {
	15739	+ info.DX = X;
	15740	+ if (X != 0)
	15741	+ info.DX -= info.bounds.width/2;
	15742	+
	15743	+ info.DY = Y;
	15744	+ if (Y != 0)
	15745	+ info.DY -= info.bounds.height/2;
	15746	+ }
	15747	+
	15748	+ object.drawEditHandles(info, 0);
	15749	+
	15750	+ if (drag && (X != 0 \|\| Y != 0))
	15751	+ {
	15752	+ switch (hitSomething)
	15753	+ {
	15754	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15755	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15756	+ break;
	15757	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15758	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15759	+ break;
	15760	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15761	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15762	+ break;
	15763	+ }
	15764	+
	15765	+ }
	15766	+ }
15450	15767	}
15451	15768	}
	15769	+
15452	15770	if (isRenderer)
15453	15771	{
15454	15772	//gr.setColor(Color.black);
15455	15773	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15456	15774	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15457	15775	}
	15776	+
15458	15777	if (hasMarquee)
15459	15778	{
15460	15779	gr.setXORMode(Color.white);
..	..	@@ -15861,7 +16180,7 @@
15861	16180	Object3D object;
15862	16181	static Object3D trackedobject;
15863	16182	Camera renderCamera; // Light or Eye (or Occlusion)
15864		- /static/ Camera manipCamera; // Light or Eye
	16183	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15865	16184	/static/ Camera eyeCamera;
15866	16185	/static/ Camera lightCamera;
15867	16186	int cameracount;
..	..	@@ -16146,16 +16465,16 @@
16146	16465	cStatic.objectstack[materialdepth++] = checker;
16147	16466	//System.out.println("material " + material);
16148	16467	//Applet3D.tracein(this, selected);
16149		- vector2buffer = checker.projectedVertices;
	16468	+ //vector2buffer = checker.projectedVertices;
16150	16469
16151	16470	//checker.GetMaterial().Draw(this, false); // true);
16152		- DrawMaterial(checker.GetMaterial(), false); // true);
	16471	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16153	16472
16154	16473	materialdepth -= 1;
16155	16474	if (materialdepth > 0)
16156	16475	{
16157		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16158		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16476	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16477	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16159	16478	}
16160	16479	//checker.GetMaterial().opacity = 1f;
16161	16480	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16241,6 +16560,14 @@
16241	16560	}
16242	16561	}
16243	16562
	16563	+ private Object3D GetFolder()
	16564	+ {
	16565	+ Object3D folder = object.GetWindow().copy;
	16566	+ if (object.GetWindow().copy.selection.Size() > 0)
	16567	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16568	+ return folder;
	16569	+ }
	16570	+
16244	16571	class SelectBuffer implements GLEventListener
16245	16572	{
16246	16573
..	..	@@ -16320,6 +16647,17 @@
16320	16647
16321	16648	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16322	16649
	16650	+ if (PAINTMODE)
	16651	+ {
	16652	+ if (object.GetWindow().copy.selection.Size() > 0)
	16653	+ {
	16654	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16655	+
	16656	+ // Make what you paint not selectable.
	16657	+ paintobj.ResetSelectable();
	16658	+ }
	16659	+ }
	16660	+
16323	16661	//int tmp = selection_view;
16324	16662	//selection_view = -1;
16325	16663	int temp = DrawMode();
..	..	@@ -16331,6 +16669,17 @@
16331	16669	// temp = DEFAULT; // patch for selection debug
16332	16670	Globals.drawMode = temp; // WARNING
16333	16671
	16672	+ if (PAINTMODE)
	16673	+ {
	16674	+ if (object.GetWindow().copy.selection.Size() > 0)
	16675	+ {
	16676	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16677	+
	16678	+ // Revert.
	16679	+ paintobj.RestoreSelectable();
	16680	+ }
	16681	+ }
	16682	+
16334	16683	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16335	16684
16336	16685	// trying different ways of getting the depth info over
..	..	@@ -16378,6 +16727,8 @@
16378	16727	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16379	16728	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16380	16729	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	16730	+
	16731	+ CreateSelectedPoint();
16381	16732
16382	16733	// Will fit the mesh !!!
16383	16734	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16432,29 +16783,31 @@
16432	16783	}
16433	16784
16434	16785	if (!movingcamera && !PAINTMODE)
16435		- object.editWindow.ScreenFitPoint(); // fev 2014
	16786	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16436	16787
16437		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16788	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16438	16789	{
16439		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16790	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16440	16791
16441		- Object3D group = new Object3D("inst" + paintcount++);
	16792	+ if (object.GetWindow().copy.selection.Size() > 0)
	16793	+ {
	16794	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16442	16795
16443		- group.CreateMaterial(); // use a void leaf to select instances
16444		-
16445		- group.add(paintobj); // link
16446		-
16447		- object.editWindow.SnapObject(group);
16448		-
16449		- Object3D folder = object.editWindow.copy;
16450		-
16451		- if (object.editWindow.copy.selection.Size() > 0)
16452		- folder = object.editWindow.copy.selection.elementAt(0);
16453		-
16454		- folder.add(group);
16455		-
16456		- object.editWindow.ResetModel();
16457		- object.editWindow.refreshContents();
	16796	+ Object3D inst = new Object3D("inst" + paintcount++);
	16797	+
	16798	+ inst.CreateMaterial(); // use a void leaf to select instances
	16799	+
	16800	+ inst.add(paintobj); // link
	16801	+
	16802	+ object.GetWindow().SnapObject(inst);
	16803	+
	16804	+ Object3D folder = paintFolder; // GetFolder();
	16805	+
	16806	+ folder.add(inst);
	16807	+
	16808	+ object.GetWindow().ResetModel();
	16809	+ object.GetWindow().refreshContents();
	16810	+ }
16458	16811	}
16459	16812	else
16460	16813	paintcount = 0;
..	..	@@ -16493,6 +16846,11 @@
16493	16846	//System.out.println("objects[color] = " + objects[color]);
16494	16847	//objects[color].Select();
16495	16848	indexcount = 0;
	16849	+ ObjEditor window = object.GetWindow();
	16850	+ if (window != null && deselect)
	16851	+ {
	16852	+ window.Select(null, deselect, true);
	16853	+ }
16496	16854	object.Select(color, deselect);
16497	16855	}
16498	16856
..	..	@@ -16592,7 +16950,7 @@
16592	16950	gl.glDisable(gl.GL_CULL_FACE);
16593	16951	}
16594	16952
16595		- if (!RENDERSHADOW)
	16953	+ if (!Globals.RENDERSHADOW)
16596	16954	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16597	16955
16598	16956	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16602,7 +16960,7 @@
16602	16960	//gl.glColorMask(false, false, false, false);
16603	16961
16604	16962	//render_scene_from_light_view(gl, drawable, 0, 0);
16605		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	16963	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16606	16964	{
16607	16965	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16608	16966
..	..	@@ -17018,23 +17376,15 @@
17018	17376	int AAbuffersize = 0;
17019	17377
17020	17378	//double[] selectedpoint = new double[3];
17021		- static Superellipsoid selectedpoint = new Superellipsoid();
	17379	+ static Superellipsoid selectedpoint;
17022	17380	static Sphere previousselectedpoint = null;
17023		- static Sphere debugpointG = new Sphere();
17024		- static Sphere debugpointP = new Sphere();
17025		- static Sphere debugpointC = new Sphere();
17026		- static Sphere debugpointR = new Sphere();
	17381	+ static Sphere debugpointG;
	17382	+ static Sphere debugpointP;
	17383	+ static Sphere debugpointC;
	17384	+ static Sphere debugpointR;
17027	17385
17028	17386	static Sphere debugpoints[] = new Sphere[8];
17029	17387
17030		- static
17031		- {
17032		- for (int i=0; i<8; i++)
17033		- {
17034		- debugpoints[i] = new Sphere();
17035		- }
17036		- }
17037		-
17038	17388	static void InitPoints(float radius)
17039	17389	{
17040	17390	for (int i=0; i<8; i++)