~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
..	..	@@ -61,7 +60,7 @@
61	60	//boolean REDUCETEXTURE = true;
62	61	boolean CACHETEXTURE = true;
63	62	boolean CLEANCACHE = false; // true;
64		- boolean MIPMAP = false; // true;
	63	+ boolean MIPMAP = true; // false; // true;
65	64	boolean COMPRESSTEXTURE = false;
66	65	boolean KOMPACTTEXTURE = false; // true;
67	66	boolean RESIZETEXTURE = false;
..	..	@@ -327,7 +326,7 @@
327	326	cStatic.objectstack[materialdepth++] = obj;
328	327	//System.out.println("material " + material);
329	328	//Applet3D.tracein(this, selected);
330		- display.vector2buffer = obj.projectedVertices;
	329	+ //display.vector2buffer = obj.projectedVertices;
331	330	if (obj instanceof Camera)
332	331	{
333	332	display.options1[0] = material.shift;
..	..	@@ -336,14 +335,28 @@
336	335	display.options1[2] = material.shadowbias;
337	336	display.options1[3] = material.aniso;
338	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]);
339	343	display.options2[0] = material.opacity;
340	344	display.options2[1] = material.diffuse;
341	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]);
342	349
343	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]);
344	354	display.options4[0] = material.cameralight/0.2f;
345	355	display.options4[1] = material.subsurface;
346	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]);
347	360
348	361	// if (display.CURRENTANTIALIAS > 0)
349	362	// display.options3[3] /= 4;
..	..	@@ -359,7 +372,7 @@
359	372	/**/
360	373	} else
361	374	{
362		- DrawMaterial(material, selected);
	375	+ DrawMaterial(material, selected, obj.projectedVertices);
363	376	}
364	377	} else
365	378	{
..	..	@@ -383,8 +396,8 @@
383	396	cStatic.objectstack[materialdepth++] = obj;
384	397	//System.out.println("material " + material);
385	398	//Applet3D.tracein("selected ", selected);
386		- display.vector2buffer = obj.projectedVertices;
387		- display.DrawMaterial(material, selected);
	399	+ //display.vector2buffer = obj.projectedVertices;
	400	+ display.DrawMaterial(material, selected, obj.projectedVertices);
388	401	}
389	402	}
390	403
..	..	@@ -401,8 +414,8 @@
401	414	materialdepth -= 1;
402	415	if (materialdepth > 0)
403	416	{
404		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
405		- 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);
406	419	}
407	420	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
408	421	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -422,8 +435,8 @@
422	435	materialdepth -= 1;
423	436	if (materialdepth > 0)
424	437	{
425		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
426		- 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);
427	440	}
428	441	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
429	442	//else
..	..	@@ -464,10 +477,12 @@
464	477	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
465	478	{
466	479	//gl.glBegin(gl.GL_TRIANGLES);
467		- 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	+ ;
468	483	if (!hasnorm)
469	484	{
470		- // System.out.println("FUCK!!");
	485	+ // System.out.println("Mesh normal");
471	486	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
472	487	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
473	488	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1192,10 +1207,12 @@
1192	1207	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1193	1208	}
1194	1209	}
	1210	+
1195	1211	if (flipV)
1196	1212	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1197	1213	else
1198	1214	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1215	+
1199	1216	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1200	1217	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1201	1218
..	..	@@ -1215,10 +1232,12 @@
1215	1232	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1216	1233	}
1217	1234	}
	1235	+
1218	1236	if (flipV)
1219	1237	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1220	1238	else
1221	1239	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1240	+
1222	1241	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1223	1242	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1224	1243
..	..	@@ -1246,8 +1265,10 @@
1246	1265	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1247	1266	else
1248	1267	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1268	+
1249	1269	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1250	1270	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1271	+
1251	1272	count2 += 2;
1252	1273	count3 += 3;
1253	1274	}
..	..	@@ -1603,7 +1624,7 @@
1603	1624	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1604	1625	}
1605	1626
1606		- void DrawMaterial(cMaterial material, boolean selected)
	1627	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1607	1628	{
1608	1629	CameraPane display = this;
1609	1630	//new Exception().printStackTrace();
..	..	@@ -1638,7 +1659,7 @@
1638	1659	colorV[0] = display.modelParams0[0] * material.diffuse;
1639	1660	colorV[1] = display.modelParams0[1] * material.diffuse;
1640	1661	colorV[2] = display.modelParams0[2] * material.diffuse;
1641		- colorV[3] = material.opacity;
	1662	+ colorV[3] = 1; // material.opacity;
1642	1663
1643	1664	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1644	1665	//System.out.println("Opacity = " + opacity);
..	..	@@ -1746,9 +1767,9 @@
1746	1767	display.modelParams7[2] = 0;
1747	1768	display.modelParams7[3] = 0;
1748	1769
1749		- display.modelParams6[0] = 100; // criss de bug de bump
	1770	+ //display.modelParams6[0] = 100; // criss de bug de bump
1750	1771
1751		- Object3D.cVector2[] extparams = display.vector2buffer;
	1772	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1752	1773	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1753	1774	{
1754	1775	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1890,7 +1911,7 @@
1890	1911	void PushMatrix(double[][] matrix)
1891	1912	{
1892	1913	// GrafreeD.tracein(matrix);
1893		- PushMatrix(matrix,1);
	1914	+ PushMatrix(matrix, 1);
1894	1915	}
1895	1916
1896	1917	void PushMatrix()
..	..	@@ -2044,7 +2065,7 @@
2044	2065	//System.err.println("Oeil on");
2045	2066	OEIL = true;
2046	2067	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2047		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2068	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2048	2069	//pingthread.StepToTarget(true);
2049	2070	}
2050	2071
..	..	@@ -2259,7 +2280,7 @@
2259	2280
2260	2281	void ToggleDebug()
2261	2282	{
2262		- DEBUG ^= true;
	2283	+ Globals.DEBUG ^= true;
2263	2284	}
2264	2285
2265	2286	void ToggleLookAt()
..	..	@@ -2277,10 +2298,17 @@
2277	2298	HANDLES ^= true;
2278	2299	}
2279	2300
	2301	+ Object3D paintFolder;
	2302	+
2280	2303	void TogglePaint()
2281	2304	{
2282	2305	PAINTMODE ^= true;
2283	2306	paintcount = 0;
	2307	+
	2308	+ if (PAINTMODE)
	2309	+ {
	2310	+ paintFolder = GetFolder();
	2311	+ }
2284	2312	}
2285	2313
2286	2314	void SwapCamera(int a, int b)
..	..	@@ -2394,9 +2422,10 @@
2394	2422	/**/
2395	2423
2396	2424	// TEXTURE static Texture texture;
2397		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2398		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2399		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2425	+ static public java.util.Hashtable<String, CacheTexture> textures = new java.util.Hashtable<String, CacheTexture>();
	2426	+ static public java.util.Hashtable<BufferedImage, CacheTexture> bimtextures = new java.util.Hashtable<BufferedImage, CacheTexture>();
	2427	+ static public java.util.HashSet<String> usedtextures = new java.util.HashSet<String>();
	2428	+
2400	2429	int pigmentdepth = 0;
2401	2430	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2402	2431	int bumpdepth = 0;
..	..	@@ -2418,6 +2447,33 @@
2418	2447	true,
2419	2448	com.sun.opengl.util.texture.TextureIO.PNG);
2420	2449	} catch (java.io.IOException e)
	2450	+ {
	2451	+ throw new javax.media.opengl.GLException(e);
	2452	+ }
	2453	+
	2454	+ if (bump)
	2455	+ texturedata = ConvertBump(texturedata, false);
	2456	+
	2457	+ com.sun.opengl.util.texture.Texture texture =
	2458	+ com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2459	+
	2460	+ texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2461	+ texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2462	+
	2463	+ return texture;
	2464	+ }
	2465	+
	2466	+ com.sun.opengl.util.texture.Texture GetBimTexture(BufferedImage name, boolean bump)
	2467	+ {
	2468	+ TextureData texturedata = null;
	2469	+
	2470	+ try
	2471	+ {
	2472	+ texturedata =
	2473	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2474	+ name,
	2475	+ true);
	2476	+ } catch (Exception e)
2421	2477	{
2422	2478	throw new javax.media.opengl.GLException(e);
2423	2479	}
..	..	@@ -3504,6 +3560,8 @@
3504	3560
3505	3561	System.out.println("LOADING TEXTURE : " + name);
3506	3562
	3563	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3564	+
3507	3565	//
3508	3566	if (false) // compressbit > 0)
3509	3567	{
..	..	@@ -7902,7 +7960,7 @@
7902	7960	String pigment = Object3D.GetPigment(tex);
7903	7961	String bump = Object3D.GetBump(tex);
7904	7962
7905		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7963	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7906	7964	{
7907	7965	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7908	7966	// System.out.println("; bump = " + bump);
..	..	@@ -7919,6 +7977,64 @@
7919	7977
7920	7978	ReleaseTexture(bump, true);
7921	7979	ReleaseTexture(pigment, false);
	7980	+ }
	7981	+
	7982	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	7983	+ {
	7984	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7985	+ {
	7986	+ return;
	7987	+ }
	7988	+
	7989	+ if (tex == null)
	7990	+ {
	7991	+ ReleaseTexture(null, false);
	7992	+ return;
	7993	+ }
	7994	+
	7995	+ String pigment = Object3D.GetPigment(tex);
	7996	+
	7997	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7998	+ {
	7999	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8000	+ // System.out.println("; bump = " + bump);
	8001	+ }
	8002	+
	8003	+ if (pigment.equals(""))
	8004	+ {
	8005	+ pigment = null;
	8006	+ }
	8007	+
	8008	+ ReleaseTexture(pigment, false);
	8009	+ }
	8010	+
	8011	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8012	+ {
	8013	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8014	+ {
	8015	+ return;
	8016	+ }
	8017	+
	8018	+ if (tex == null)
	8019	+ {
	8020	+ ReleaseTexture(null, true);
	8021	+ return;
	8022	+ }
	8023	+
	8024	+ String bump = Object3D.GetBump(tex);
	8025	+
	8026	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8027	+ {
	8028	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8029	+ // System.out.println("; bump = " + bump);
	8030	+ }
	8031	+
	8032	+ if (bump.equals(""))
	8033	+ {
	8034	+ bump = null;
	8035	+ }
	8036	+
	8037	+ ReleaseTexture(bump, true);
7922	8038	}
7923	8039
7924	8040	void ReleaseTexture(String tex, boolean bump)
..	..	@@ -8026,6 +8142,54 @@
8026	8142
8027	8143	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8028	8144	{
	8145	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8146	+// ambientOcclusion ) // \|\| !textureon)
	8147	+// {
	8148	+// return; // false;
	8149	+// }
	8150	+//
	8151	+// if (tex == null)
	8152	+// {
	8153	+// BindTexture(null,false,resolution);
	8154	+// BindTexture(null,true,resolution);
	8155	+// return;
	8156	+// }
	8157	+//
	8158	+// String pigment = Object3D.GetPigment(tex);
	8159	+// String bump = Object3D.GetBump(tex);
	8160	+//
	8161	+// usedtextures.add(pigment);
	8162	+// usedtextures.add(bump);
	8163	+//
	8164	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8165	+// {
	8166	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8167	+// // System.out.println("; bump = " + bump);
	8168	+// }
	8169	+//
	8170	+// if (bump.equals(""))
	8171	+// {
	8172	+// bump = null;
	8173	+// }
	8174	+// if (pigment.equals(""))
	8175	+// {
	8176	+// pigment = null;
	8177	+// }
	8178	+//
	8179	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8180	+// BindTexture(pigment, false, resolution);
	8181	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8182	+// BindTexture(bump, true, resolution);
	8183	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8184	+//
	8185	+// return; // true;
	8186	+
	8187	+ BindPigmentTexture(tex, resolution);
	8188	+ BindBumpTexture(tex, resolution);
	8189	+ }
	8190	+
	8191	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8192	+ {
8029	8193	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8030	8194	ambientOcclusion ) // \|\| !textureon)
8031	8195	{
..	..	@@ -8034,18 +8198,48 @@
8034	8198
8035	8199	if (tex == null)
8036	8200	{
8037		- BindTexture(null,false,resolution);
8038		- BindTexture(null,true,resolution);
	8201	+ BindTexture(null, null,false,resolution);
8039	8202	return;
8040	8203	}
8041	8204
8042	8205	String pigment = Object3D.GetPigment(tex);
	8206	+
	8207	+ usedtextures.add(pigment);
	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 (pigment.equals(""))
	8216	+ {
	8217	+ pigment = null;
	8218	+ }
	8219	+
	8220	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8221	+ BindTexture(tex.pigmenttexture, pigment, false, resolution);
	8222	+ }
	8223	+
	8224	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8225	+ {
	8226	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8227	+ ambientOcclusion ) // \|\| !textureon)
	8228	+ {
	8229	+ return; // false;
	8230	+ }
	8231	+
	8232	+ if (tex == null)
	8233	+ {
	8234	+ BindTexture(null, null,true,resolution);
	8235	+ return;
	8236	+ }
	8237	+
8043	8238	String bump = Object3D.GetBump(tex);
8044	8239
8045		- usedtextures.put(pigment, pigment);
8046		- usedtextures.put(bump, bump);
	8240	+ usedtextures.add(bump);
8047	8241
8048		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8242	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8049	8243	{
8050	8244	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8051	8245	// System.out.println("; bump = " + bump);
..	..	@@ -8055,18 +8249,10 @@
8055	8249	{
8056	8250	bump = null;
8057	8251	}
8058		- if (pigment.equals(""))
8059		- {
8060		- pigment = null;
8061		- }
8062	8252
8063		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8064		- BindTexture(pigment, false, resolution);
8065	8253	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8066		- BindTexture(bump, true, resolution);
	8254	+ BindTexture(tex.bumptexture, bump, true, resolution);
8067	8255	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8068		-
8069		- return; // true;
8070	8256	}
8071	8257
8072	8258	java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
..	..	@@ -8089,9 +8275,9 @@
8089	8275	return fileExists;
8090	8276	}
8091	8277
8092		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8278	+ CacheTexture GetCacheTexture(java.awt.image.BufferedImage bim, String tex, boolean bump, int resolution) throws Exception
8093	8279	{
8094		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8280	+ CacheTexture texturecache = null;
8095	8281
8096	8282	if (tex != null)
8097	8283	{
..	..	@@ -8111,12 +8297,22 @@
8111	8297	}
8112	8298
8113	8299	if (CACHETEXTURE)
8114		- texture = textures.get(texname); // TEXTURE CACHE
8115		-
8116		- TextureData texturedata = null;
8117		-
8118		- if (texture == null \|\| texture.resolution < resolution)
8119	8300	{
	8301	+ if (bim == null)
	8302	+ texturecache = textures.get(texname); // TEXTURE CACHE
	8303	+ else
	8304	+ texturecache = bimtextures.get(bim); // TEXTURE CACHE
	8305	+ }
	8306	+
	8307	+ if (texturecache == null \|\| texturecache.resolution < resolution)
	8308	+ {
	8309	+ TextureData texturedata = null;
	8310	+
	8311	+ if (bim == null)
	8312	+ {
	8313	+
	8314	+ }
	8315	+ else
8120	8316	if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8121	8317	{
8122	8318	assert(!bump);
..	..	@@ -8128,19 +8324,19 @@
8128	8324	// }
8129	8325	// else
8130	8326	// {
8131		- texture = textures.get(tex);
8132		- if (texture == null)
	8327	+ texturecache = textures.get(tex);
	8328	+ if (texturecache == null)
8133	8329	{
8134		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8330	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8135	8331	}
8136	8332	// }
8137	8333	} else
8138	8334	if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8139	8335	{
8140	8336	assert(bump);
8141		- texture = textures.get(tex);
8142		- if (texture == null)
8143		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8337	+ texturecache = textures.get(tex);
	8338	+ if (texturecache == null)
	8339	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8144	8340	} else
8145	8341	{
8146	8342	//if (tex.equals("IMMORTAL"))
..	..	@@ -8150,9 +8346,9 @@
8150	8346	//{
8151	8347	if (tex.equals("WHITE_NOISE"))
8152	8348	{
8153		- texture = textures.get(tex);
8154		- if (texture == null)
8155		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8349	+ texturecache = textures.get(tex);
	8350	+ if (texturecache == null)
	8351	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
8156	8352	} else
8157	8353	{
8158	8354	if (textureon)
..	..	@@ -8211,19 +8407,19 @@
8211	8407	if (texturedata == null)
8212	8408	throw new Exception();
8213	8409
8214		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8410	+ texturecache = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
8215	8411	//texture = GetTexture(tex, bump);
8216	8412	}
8217	8413	}
8218	8414	//}
8219	8415	}
8220	8416
8221		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8417	+ if (/CACHETEXTURE &&/ texturecache != null && textureon)
8222	8418	{
8223	8419	//return false;
8224	8420
8225	8421	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8226		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8422	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8227	8423	{
8228	8424	// String ext = "_highres";
8229	8425	// if (REDUCETEXTURE)
..	..	@@ -8312,8 +8508,8 @@
8312	8508	textures.remove(texname);
8313	8509	}
8314	8510
8315		- texture.texturedata = texturedata;
8316		- textures.put(texname, texture);
	8511	+ //texture.texturedata = texturedata;
	8512	+ textures.put(texname, texturecache);
8317	8513
8318	8514	// newtex = true;
8319	8515	}
..	..	@@ -8329,12 +8525,12 @@
8329	8525	}
8330	8526	}
8331	8527
8332		- return texture;
	8528	+ return texturecache;
8333	8529	}
8334	8530
8335		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	8531	+ com.sun.opengl.util.texture.Texture GetTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
8336	8532	{
8337		- CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8533	+ CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
8338	8534
8339	8535	if (bump)
8340	8536	{
..	..	@@ -8350,23 +8546,23 @@
8350	8546	return texture!=null?texture.texture:null;
8351	8547	}
8352	8548
8353		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
	8549	+ public com.sun.opengl.util.texture.TextureData GetTextureData(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
8354	8550	{
8355		- CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8551	+ CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
8356	8552
8357	8553	return texture!=null?texture.texturedata:null;
8358	8554	}
8359	8555
8360		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8556	+ boolean BindTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
8361	8557	{
8362	8558	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8363	8559	{
8364	8560	return false;
8365	8561	}
8366	8562
8367		- boolean newtex = false;
	8563	+ //boolean newtex = false;
8368	8564
8369		- com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
	8565	+ com.sun.opengl.util.texture.Texture texture = GetTexture(stream, tex, bump, resolution);
8370	8566
8371	8567	if (texture == null)
8372	8568	return false;
..	..	@@ -8396,7 +8592,7 @@
8396	8592	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8397	8593	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8398	8594
8399		- return newtex;
	8595	+ return true; // Warning: not used.
8400	8596	}
8401	8597
8402	8598	ShadowBuffer shadowPBuf;
..	..	@@ -9234,11 +9430,35 @@
9234	9430	jy8[3] = 0.5f;
9235	9431	}
9236	9432
9237		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9433	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9238	9434	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9239	9435	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9240	9436	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9241	9437
	9438	+ void ResetOptions()
	9439	+ {
	9440	+ options1[0] = 100;
	9441	+ options1[1] = 0.025f;
	9442	+ options1[2] = 0.01f;
	9443	+ options1[3] = 0;
	9444	+ options1[4] = 0;
	9445	+
	9446	+ options2[0] = 0;
	9447	+ options2[1] = 0.75f;
	9448	+ options2[2] = 0;
	9449	+ options2[3] = 0;
	9450	+
	9451	+ options3[0] = 1;
	9452	+ options3[1] = 1;
	9453	+ options3[2] = 1;
	9454	+ options3[3] = 0;
	9455	+
	9456	+ options4[0] = 1;
	9457	+ options4[1] = 0;
	9458	+ options4[2] = 1;
	9459	+ options4[3] = 0;
	9460	+ }
	9461	+
9242	9462	static int imagecount = 0; // movie generation
9243	9463
9244	9464	static int jitter = 0;
..	..	@@ -9335,7 +9555,7 @@
9335	9555
9336	9556	if (renderCamera != lightCamera)
9337	9557	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9338		- LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
	9558	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9339	9559
9340	9560	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9341	9561
..	..	@@ -9351,7 +9571,7 @@
9351	9571
9352	9572	if (renderCamera != lightCamera)
9353	9573	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9354		- LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
	9574	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9355	9575
9356	9576	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9357	9577
..	..	@@ -10349,6 +10569,7 @@
10349	10569	ANTIALIAS = 0;
10350	10570	//System.out.println("RESTART");
10351	10571	AAtimer.restart();
	10572	+ Globals.TIMERRUNNING = true;
10352	10573	}
10353	10574	}
10354	10575	}
..	..	@@ -10416,7 +10637,8 @@
10416	10637	ambientOcclusion = false;
10417	10638	}
10418	10639
10419		- if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
	10640	+ if (//Globals.lighttouched &&
	10641	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10420	10642	{
10421	10643	//if (RENDERSHADOW) // ?
10422	10644	if (!IsFrozen())
..	..	@@ -10550,7 +10772,7 @@
10550	10772	// if (parentcam != renderCamera) // not a light
10551	10773	if (cam != lightCamera)
10552	10774	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10553		- LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
	10775	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10554	10776
10555	10777	for (int j = 0; j < 4; j++)
10556	10778	{
..	..	@@ -10565,7 +10787,7 @@
10565	10787	// if (parentcam != renderCamera) // not a light
10566	10788	if (cam != lightCamera)
10567	10789	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10568		- LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
	10790	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10569	10791
10570	10792	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10571	10793
..	..	@@ -10827,7 +11049,7 @@
10827	11049
10828	11050	try
10829	11051	{
10830		- BindTexture(NOISE_TEXTURE, false, 2);
	11052	+ BindTexture(null, NOISE_TEXTURE, false, 2);
10831	11053	}
10832	11054	catch (Exception e)
10833	11055	{
..	..	@@ -10856,9 +11078,9 @@
10856	11078
10857	11079	gl.glMatrixMode(GL.GL_MODELVIEW);
10858	11080
10859		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10860		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10861		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11081	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11082	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11083	+gl.glEnable(gl.GL_MULTISAMPLE);
10862	11084	} else
10863	11085	{
10864	11086	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10869,7 +11091,7 @@
10869	11091	//System.out.println("BLENDING ON");
10870	11092	gl.glEnable(GL.GL_BLEND);
10871	11093	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10872		-
	11094	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10873	11095	gl.glMatrixMode(gl.GL_PROJECTION);
10874	11096	gl.glLoadIdentity();
10875	11097
..	..	@@ -10959,7 +11181,7 @@
10959	11181
10960	11182	// if (cam != lightCamera)
10961	11183	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10962		- LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
	11184	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10963	11185	}
10964	11186
10965	11187	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10981,7 +11203,7 @@
10981	11203	{
10982	11204	if (cam != lightCamera)
10983	11205	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10984		- LA.xformDir(light0, parentcam.GlobalTransformInv(), light0); // may 2013
	11206	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10985	11207	}
10986	11208
10987	11209	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11326,15 +11548,36 @@
11326	11548
11327	11549	static boolean zoomonce = false;
11328	11550
	11551	+ static void CreateSelectedPoint()
	11552	+ {
	11553	+ if (selectedpoint == null)
	11554	+ {
	11555	+ debugpointG = new Sphere();
	11556	+ debugpointP = new Sphere();
	11557	+ debugpointC = new Sphere();
	11558	+ debugpointR = new Sphere();
	11559	+
	11560	+ selectedpoint = new Superellipsoid();
	11561	+
	11562	+ for (int i=0; i<8; i++)
	11563	+ {
	11564	+ debugpoints[i] = new Sphere();
	11565	+ }
	11566	+ }
	11567	+ }
	11568	+
11329	11569	void DrawObject(GL gl, boolean draw)
11330	11570	{
	11571	+ // To clear camera values
	11572	+ ResetOptions();
	11573	+
11331	11574	//System.out.println("DRAW OBJECT " + mouseDown);
11332	11575	// DrawMode() = SELECTION;
11333	11576	//GL gl = getGL();
11334	11577	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11335	11578	{
11336	11579	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11337		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11580	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11338	11581	pingthread.StepToTarget(true); // true);
11339	11582	// zoomonce = false;
11340	11583	}
..	..	@@ -11406,8 +11649,9 @@
11406	11649
11407	11650	if (DrawMode() == DEFAULT)
11408	11651	{
11409		- if (DEBUG)
	11652	+ if (Globals.DEBUG)
11410	11653	{
	11654	+ CreateSelectedPoint();
11411	11655	float radius = 0.05f;
11412	11656	if (selectedpoint.radius != radius)
11413	11657	{
..	..	@@ -11470,7 +11714,7 @@
11470	11714	if (tex.equals("WHITE_NOISE"))
11471	11715	continue;
11472	11716
11473		- if (!usedtextures.containsKey(tex))
	11717	+ if (!usedtextures.contains(tex))
11474	11718	{
11475	11719	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11476	11720	textures.get(tex).texture.dispose();
..	..	@@ -11912,7 +12156,7 @@
11912	12156	}
11913	12157
11914	12158	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11915		- LA.xformPos(light, parentcam.GlobalTransformInv(), light); // may 2013
	12159	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11916	12160
11917	12161	LA.xformPos(light, renderCamera.toScreen, light);
11918	12162
..	..	@@ -13164,7 +13408,8 @@
13164	13408	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13165	13409	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13166	13410	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13167		- Object3D.cVector2[] vector2buffer;
	13411	+
	13412	+ //Object3D.cVector2[] vector2buffer;
13168	13413
13169	13414	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13170	13415	// OUT : diff, spec
..	..	@@ -13180,9 +13425,10 @@
13180	13425	"DP3 " + dest + ".z," + "normals," + "eye;" +
13181	13426	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13182	13427	//"MOV " + dest + ".w," + "normal.z;" +
13183		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13184		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13185		- //"MOV " + dest + ".z," + "params2.w;" +
	13428	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13429	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13430	+
	13431	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13186	13432	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13187	13433	"RCP " + dest + ".w," + dest + ".w;" +
13188	13434	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13687,6 +13933,7 @@
13687	13933	else
13688	13934	if (evt.getSource() == AAtimer)
13689	13935	{
	13936	+ Globals.TIMERRUNNING = false;
13690	13937	if (mouseDown)
13691	13938	{
13692	13939	//new Exception().printStackTrace();
..	..	@@ -13746,7 +13993,7 @@
13746	13993
13747	13994	// fev 2014???
13748	13995	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13749		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	13996	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13750	13997	pingthread.StepToTarget(true); // true);
13751	13998	}
13752	13999	// if (!LIVE)
..	..	@@ -13761,6 +14008,7 @@
13761	14008	return;
13762	14009
13763	14010	AAtimer.restart(); //
	14011	+ Globals.TIMERRUNNING = true;
13764	14012
13765	14013	// waslive = LIVE;
13766	14014	// LIVE = false;
..	..	@@ -13833,6 +14081,8 @@
13833	14081
13834	14082	public void mouseDragged(MouseEvent e)
13835	14083	{
	14084	+ Globals.MOUSEDRAGGED = true;
	14085	+
13836	14086	//System.out.println("mouseDragged: " + e);
13837	14087	if (isRenderer)
13838	14088	movingcamera = true;
..	..	@@ -14097,12 +14347,12 @@
14097	14347	void GoDown(int mod)
14098	14348	{
14099	14349	MODIFIERS \|= COMMAND;
14100		- /*
	14350	+ /**/
14101	14351	if((mod&SHIFT) == SHIFT)
14102	14352	manipCamera.RotatePosition(0, -speed);
14103	14353	else
14104		- manipCamera.BackForth(0, -speed*delta, getWidth());
14105		- */
	14354	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14355	+ /**/
14106	14356	if ((mod & SHIFT) == SHIFT)
14107	14357	{
14108	14358	mouseMode = mouseMode; // VR??
..	..	@@ -14118,12 +14368,12 @@
14118	14368	void GoUp(int mod)
14119	14369	{
14120	14370	MODIFIERS \|= COMMAND;
14121		- /*
	14371	+ /**/
14122	14372	if((mod&SHIFT) == SHIFT)
14123	14373	manipCamera.RotatePosition(0, speed);
14124	14374	else
14125		- manipCamera.BackForth(0, speed*delta, getWidth());
14126		- */
	14375	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14376	+ /**/
14127	14377	if ((mod & SHIFT) == SHIFT)
14128	14378	{
14129	14379	mouseMode = mouseMode;
..	..	@@ -14139,12 +14389,12 @@
14139	14389	void GoLeft(int mod)
14140	14390	{
14141	14391	MODIFIERS \|= COMMAND;
14142		- /*
	14392	+ /**/
14143	14393	if((mod&SHIFT) == SHIFT)
14144		- manipCamera.RotatePosition(speed, 0);
14145		- else
14146	14394	manipCamera.Translate(speed*delta, 0, getWidth());
14147		- */
	14395	+ else
	14396	+ manipCamera.RotatePosition(speed, 0);
	14397	+ /**/
14148	14398	if ((mod & SHIFT) == SHIFT)
14149	14399	{
14150	14400	mouseMode = mouseMode;
..	..	@@ -14160,12 +14410,12 @@
14160	14410	void GoRight(int mod)
14161	14411	{
14162	14412	MODIFIERS \|= COMMAND;
14163		- /*
	14413	+ /**/
14164	14414	if((mod&SHIFT) == SHIFT)
14165		- manipCamera.RotatePosition(-speed, 0);
14166		- else
14167	14415	manipCamera.Translate(-speed*delta, 0, getWidth());
14168		- */
	14416	+ else
	14417	+ manipCamera.RotatePosition(-speed, 0);
	14418	+ /**/
14169	14419	if ((mod & SHIFT) == SHIFT)
14170	14420	{
14171	14421	mouseMode = mouseMode;
..	..	@@ -14222,7 +14472,8 @@
14222	14472	info.camera = renderCamera;
14223	14473	info.x = x;
14224	14474	info.y = y;
14225		- object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	14475	+ object.GetWindow().copy
	14476	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14226	14477	} else
14227	14478	{
14228	14479	if (x < startX)
..	..	@@ -14386,7 +14637,9 @@
14386	14637	ci.camera = renderCamera;
14387	14638	if (!isRenderer)
14388	14639	{
14389		- if (object.editWindow.copy.doEditClick(ci, 0))
	14640	+ //ObjEditor editWindow = object.editWindow;
	14641	+ //Object3D copy = editWindow.copy;
	14642	+ if (object.doEditClick(ci, 0))
14390	14643	{
14391	14644	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14392	14645	} else
..	..	@@ -14398,8 +14651,11 @@
14398	14651
14399	14652	public void mouseReleased(MouseEvent e)
14400	14653	{
	14654	+ Globals.MOUSEDRAGGED = false;
	14655	+
14401	14656	movingcamera = false;
14402		- X = Y = 0;
	14657	+ X = 0; // getBounds().width/2;
	14658	+ Y = 0; // getBounds().height/2;
14403	14659	//System.out.println("mouseReleased: " + e);
14404	14660	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14405	14661	}
..	..	@@ -14740,7 +14996,9 @@
14740	14996	case 'E' : COMPACT ^= true;
14741	14997	repaint();
14742	14998	break;
14743		- case 'W' : DEBUGHSB ^= true;
	14999	+ case 'W' : // Wide Window (fullscreen)
	15000	+ //DEBUGHSB ^= true;
	15001	+ ObjEditor.theFrame.ToggleFullScreen();
14744	15002	repaint();
14745	15003	break;
14746	15004	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14765,8 +15023,8 @@
14765	15023	RevertCamera();
14766	15024	repaint();
14767	15025	break;
14768		- case 'L':
14769	15026	case 'l':
	15027	+ //case 'L':
14770	15028	if (lightMode)
14771	15029	{
14772	15030	lightMode = false;
..	..	@@ -14909,9 +15167,9 @@
14909	15167	case '_':
14910	15168	kompactbit = 5;
14911	15169	break;
14912		- case '+':
14913		- kompactbit = 6;
14914		- break;
	15170	+// case '+':
	15171	+// kompactbit = 6;
	15172	+// break;
14915	15173	case ' ':
14916	15174	lightMode ^= true;
14917	15175	Globals.lighttouched = true;
..	..	@@ -14923,6 +15181,7 @@
14923	15181	case ESC:
14924	15182	RENDERPROGRAM += 1;
14925	15183	RENDERPROGRAM %= 3;
	15184	+
14926	15185	repaint();
14927	15186	break;
14928	15187	case 'Z':
..	..	@@ -14962,8 +15221,9 @@
14962	15221	case DELETE:
14963	15222	ClearSelection();
14964	15223	break;
14965		- /*
14966	15224	case '+':
	15225	+
	15226	+ /*
14967	15227	//fontsize += 1;
14968	15228	bbzoom *= 2;
14969	15229	repaint();
..	..	@@ -14980,17 +15240,17 @@
14980	15240	case '=':
14981	15241	IncDepth();
14982	15242	//fontsize += 1;
14983		- object.editWindow.refreshContents(true);
	15243	+ object.GetWindow().refreshContents(true);
14984	15244	maskbit = 6;
14985	15245	break;
14986	15246	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14987	15247	DecDepth();
14988	15248	maskbit = 5;
14989	15249	//if(fontsize > 1) fontsize -= 1;
14990		- if (object.editWindow == null)
14991		- new Exception().printStackTrace();
14992		- else
14993		- object.editWindow.refreshContents(true);
	15250	+// if (object.editWindow == null)
	15251	+// new Exception().printStackTrace();
	15252	+// else
	15253	+ object.GetWindow().refreshContents(true);
14994	15254	break;
14995	15255	case '{':
14996	15256	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15214,7 +15474,7 @@
15214	15474	}
15215	15475	*/
15216	15476
15217		- object.editWindow.EditSelection();
	15477	+ object.GetWindow().EditSelection(false);
15218	15478	}
15219	15479
15220	15480	void SelectParent()
..	..	@@ -15231,10 +15491,10 @@
15231	15491	{
15232	15492	//selectees.remove(i);
15233	15493	System.out.println("select parent of " + elem);
15234		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15494	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15235	15495	} else
15236	15496	{
15237		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15497	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15238	15498	}
15239	15499
15240	15500	first = false;
..	..	@@ -15276,12 +15536,12 @@
15276	15536	for (int j = 0; j < group.children.size(); j++)
15277	15537	{
15278	15538	elem = (Object3D) group.children.elementAt(j);
15279		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15539	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15280	15540	first = false;
15281	15541	}
15282	15542	} else
15283	15543	{
15284		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15544	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15285	15545	}
15286	15546
15287	15547	first = false;
..	..	@@ -15292,21 +15552,21 @@
15292	15552	{
15293	15553	//Composite group = (Composite) object;
15294	15554	Object3D group = object;
15295		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15555	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15296	15556	}
15297	15557
15298	15558	void ResetTransform(int mask)
15299	15559	{
15300	15560	//Composite group = (Composite) object;
15301	15561	Object3D group = object;
15302		- group.editWindow.ResetTransform(mask);
	15562	+ group.GetWindow().ResetTransform(mask);
15303	15563	}
15304	15564
15305	15565	void FlipTransform()
15306	15566	{
15307	15567	//Composite group = (Composite) object;
15308	15568	Object3D group = object;
15309		- group.editWindow.FlipTransform();
	15569	+ group.GetWindow().FlipTransform();
15310	15570	// group.editWindow.ReduceMesh(true);
15311	15571	}
15312	15572
..	..	@@ -15314,7 +15574,7 @@
15314	15574	{
15315	15575	//Composite group = (Composite) object;
15316	15576	Object3D group = object;
15317		- group.editWindow.PrintMemory();
	15577	+ group.GetWindow().PrintMemory();
15318	15578	// group.editWindow.ReduceMesh(true);
15319	15579	}
15320	15580
..	..	@@ -15322,7 +15582,7 @@
15322	15582	{
15323	15583	//Composite group = (Composite) object;
15324	15584	Object3D group = object;
15325		- group.editWindow.ResetCentroid();
	15585	+ group.GetWindow().ResetCentroid();
15326	15586	}
15327	15587
15328	15588	void IncDepth()
..	..	@@ -15498,6 +15758,7 @@
15498	15758	info.bounds.y += (height - desired) / 2;
15499	15759	}
15500	15760	}
	15761	+
15501	15762	info.g = gr;
15502	15763	info.camera = renderCamera;
15503	15764	/*
..	..	@@ -15507,18 +15768,44 @@
15507	15768	*/
15508	15769	if (!isRenderer)
15509	15770	{
15510		- object.drawEditHandles(info, 0);
15511		-
15512		- if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	15771	+ Grafreed.Assert(object != null);
	15772	+ Grafreed.Assert(object.selection != null);
	15773	+ if (object.selection.Size() > 0)
15513	15774	{
15514		- switch (object.selection.get(0).hitSomething)
	15775	+ int hitSomething = object.selection.get(0).hitSomething;
	15776	+
	15777	+ info.DX = 0;
	15778	+ info.DY = 0;
	15779	+ info.W = 1;
	15780	+ if (hitSomething == Object3D.hitCenter)
15515	15781	{
15516		- case Object3D.hitCenter: gr.setColor(Color.pink); break;
15517		- case Object3D.hitRotate: gr.setColor(Color.green); break;
15518		- case Object3D.hitScale: gr.setColor(Color.cyan); break;
	15782	+ info.DX = X;
	15783	+ if (X != 0)
	15784	+ info.DX -= info.bounds.width/2;
	15785	+
	15786	+ info.DY = Y;
	15787	+ if (Y != 0)
	15788	+ info.DY -= info.bounds.height/2;
15519	15789	}
15520		-
15521		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15790	+
	15791	+ object.drawEditHandles(info, 0);
	15792	+
	15793	+ if (drag && (X != 0 \|\| Y != 0))
	15794	+ {
	15795	+ switch (hitSomething)
	15796	+ {
	15797	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15798	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15799	+ break;
	15800	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15801	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15802	+ break;
	15803	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15804	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15805	+ break;
	15806	+ }
	15807	+
	15808	+ }
15522	15809	}
15523	15810	}
15524	15811	}
..	..	@@ -16221,16 +16508,16 @@
16221	16508	cStatic.objectstack[materialdepth++] = checker;
16222	16509	//System.out.println("material " + material);
16223	16510	//Applet3D.tracein(this, selected);
16224		- vector2buffer = checker.projectedVertices;
	16511	+ //vector2buffer = checker.projectedVertices;
16225	16512
16226	16513	//checker.GetMaterial().Draw(this, false); // true);
16227		- DrawMaterial(checker.GetMaterial(), false); // true);
	16514	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16228	16515
16229	16516	materialdepth -= 1;
16230	16517	if (materialdepth > 0)
16231	16518	{
16232		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16233		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16519	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16520	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16234	16521	}
16235	16522	//checker.GetMaterial().opacity = 1f;
16236	16523	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16316,6 +16603,14 @@
16316	16603	}
16317	16604	}
16318	16605
	16606	+ private Object3D GetFolder()
	16607	+ {
	16608	+ Object3D folder = object.GetWindow().copy;
	16609	+ if (object.GetWindow().copy.selection.Size() > 0)
	16610	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16611	+ return folder;
	16612	+ }
	16613	+
16319	16614	class SelectBuffer implements GLEventListener
16320	16615	{
16321	16616
..	..	@@ -16395,6 +16690,17 @@
16395	16690
16396	16691	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16397	16692
	16693	+ if (PAINTMODE)
	16694	+ {
	16695	+ if (object.GetWindow().copy.selection.Size() > 0)
	16696	+ {
	16697	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16698	+
	16699	+ // Make what you paint not selectable.
	16700	+ paintobj.ResetSelectable();
	16701	+ }
	16702	+ }
	16703	+
16398	16704	//int tmp = selection_view;
16399	16705	//selection_view = -1;
16400	16706	int temp = DrawMode();
..	..	@@ -16406,6 +16712,17 @@
16406	16712	// temp = DEFAULT; // patch for selection debug
16407	16713	Globals.drawMode = temp; // WARNING
16408	16714
	16715	+ if (PAINTMODE)
	16716	+ {
	16717	+ if (object.GetWindow().copy.selection.Size() > 0)
	16718	+ {
	16719	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16720	+
	16721	+ // Revert.
	16722	+ paintobj.RestoreSelectable();
	16723	+ }
	16724	+ }
	16725	+
16409	16726	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16410	16727
16411	16728	// trying different ways of getting the depth info over
..	..	@@ -16453,6 +16770,8 @@
16453	16770	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16454	16771	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16455	16772	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	16773	+
	16774	+ CreateSelectedPoint();
16456	16775
16457	16776	// Will fit the mesh !!!
16458	16777	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16507,29 +16826,31 @@
16507	16826	}
16508	16827
16509	16828	if (!movingcamera && !PAINTMODE)
16510		- object.editWindow.ScreenFitPoint(); // fev 2014
	16829	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16511	16830
16512		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16831	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16513	16832	{
16514		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16833	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16515	16834
16516		- Object3D group = new Object3D("inst" + paintcount++);
	16835	+ if (object.GetWindow().copy.selection.Size() > 0)
	16836	+ {
	16837	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16517	16838
16518		- group.CreateMaterial(); // use a void leaf to select instances
16519		-
16520		- group.add(paintobj); // link
16521		-
16522		- object.editWindow.SnapObject(group);
16523		-
16524		- Object3D folder = object.editWindow.copy;
16525		-
16526		- if (object.editWindow.copy.selection.Size() > 0)
16527		- folder = object.editWindow.copy.selection.elementAt(0);
16528		-
16529		- folder.add(group);
16530		-
16531		- object.editWindow.ResetModel();
16532		- object.editWindow.refreshContents();
	16839	+ Object3D inst = new Object3D("inst" + paintcount++);
	16840	+
	16841	+ inst.CreateMaterial(); // use a void leaf to select instances
	16842	+
	16843	+ inst.add(paintobj); // link
	16844	+
	16845	+ object.GetWindow().SnapObject(inst);
	16846	+
	16847	+ Object3D folder = paintFolder; // GetFolder();
	16848	+
	16849	+ folder.add(inst);
	16850	+
	16851	+ object.GetWindow().ResetModel();
	16852	+ object.GetWindow().refreshContents();
	16853	+ }
16533	16854	}
16534	16855	else
16535	16856	paintcount = 0;
..	..	@@ -16568,6 +16889,11 @@
16568	16889	//System.out.println("objects[color] = " + objects[color]);
16569	16890	//objects[color].Select();
16570	16891	indexcount = 0;
	16892	+ ObjEditor window = object.GetWindow();
	16893	+ if (window != null && deselect)
	16894	+ {
	16895	+ window.Select(null, deselect, true);
	16896	+ }
16571	16897	object.Select(color, deselect);
16572	16898	}
16573	16899
..	..	@@ -17093,23 +17419,15 @@
17093	17419	int AAbuffersize = 0;
17094	17420
17095	17421	//double[] selectedpoint = new double[3];
17096		- static Superellipsoid selectedpoint = new Superellipsoid();
	17422	+ static Superellipsoid selectedpoint;
17097	17423	static Sphere previousselectedpoint = null;
17098		- static Sphere debugpointG = new Sphere();
17099		- static Sphere debugpointP = new Sphere();
17100		- static Sphere debugpointC = new Sphere();
17101		- static Sphere debugpointR = new Sphere();
	17424	+ static Sphere debugpointG;
	17425	+ static Sphere debugpointP;
	17426	+ static Sphere debugpointC;
	17427	+ static Sphere debugpointR;
17102	17428
17103	17429	static Sphere debugpoints[] = new Sphere[8];
17104	17430
17105		- static
17106		- {
17107		- for (int i=0; i<8; i++)
17108		- {
17109		- debugpoints[i] = new Sphere();
17110		- }
17111		- }
17112		-
17113	17431	static void InitPoints(float radius)
17114	17432	{
17115	17433	for (int i=0; i<8; i++)