~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
..	..	@@ -45,6 +44,39 @@
45	44	static boolean ABORTED = false;
46	45
47	46	static int STEP = 1;
	47	+
	48	+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
	49	+ {
	50	+ int[] pixels = new int[bytes.length/3];
	51	+ for (int i=pixels.length; --i>=0;)
	52	+ {
	53	+ int i3 = i*3;
	54	+ pixels[i] = 0xFF;
	55	+ pixels[i] <<= 8;
	56	+ pixels[i] \|= bytes[i3+2] & 0xFF;
	57	+ pixels[i] <<= 8;
	58	+ pixels[i] \|= bytes[i3+1] & 0xFF;
	59	+ pixels[i] <<= 8;
	60	+ pixels[i] \|= bytes[i3] & 0xFF;
	61	+ }
	62	+ /*
	63	+ int r=0,g=0,b=0,a=0;
	64	+ for (int i=0; i<width; i++)
	65	+ for (int j=0; j<height; j++)
	66	+ {
	67	+ int index = j*width+i;
	68	+ int p = pixels[index];
	69	+ a = ((p>>24) & 0xFF);
	70	+ r = ((p>>16) & 0xFF);
	71	+ g = ((p>>8) & 0xFF);
	72	+ b = (p & 0xFF);
	73	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	74	+ }
	75	+ /**/
	76	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	77	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	78	+ return rendImage;
	79	+ }
48	80
49	81	/static/ private boolean CULLFACE = false; // true;
50	82	/static/ boolean NEAREST = false; // true;
..	..	@@ -61,7 +93,7 @@
61	93	//boolean REDUCETEXTURE = true;
62	94	boolean CACHETEXTURE = true;
63	95	boolean CLEANCACHE = false; // true;
64		- boolean MIPMAP = false; // true;
	96	+ boolean MIPMAP = true; // false; // true;
65	97	boolean COMPRESSTEXTURE = false;
66	98	boolean KOMPACTTEXTURE = false; // true;
67	99	boolean RESIZETEXTURE = false;
..	..	@@ -327,7 +359,7 @@
327	359	cStatic.objectstack[materialdepth++] = obj;
328	360	//System.out.println("material " + material);
329	361	//Applet3D.tracein(this, selected);
330		- display.vector2buffer = obj.projectedVertices;
	362	+ //display.vector2buffer = obj.projectedVertices;
331	363	if (obj instanceof Camera)
332	364	{
333	365	display.options1[0] = material.shift;
..	..	@@ -336,14 +368,28 @@
336	368	display.options1[2] = material.shadowbias;
337	369	display.options1[3] = material.aniso;
338	370	display.options1[4] = material.anisoV;
	371	+// System.out.println("display.options1[0] " + display.options1[0]);
	372	+// System.out.println("display.options1[1] " + display.options1[1]);
	373	+// System.out.println("display.options1[2] " + display.options1[2]);
	374	+// System.out.println("display.options1[3] " + display.options1[3]);
	375	+// System.out.println("display.options1[4] " + display.options1[4]);
339	376	display.options2[0] = material.opacity;
340	377	display.options2[1] = material.diffuse;
341	378	display.options2[2] = material.factor;
	379	+// System.out.println("display.options2[0] " + display.options2[0]);
	380	+// System.out.println("display.options2[1] " + display.options2[1]);
	381	+// System.out.println("display.options2[2] " + display.options2[2]);
342	382
343	383	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	384	+// System.out.println("display.options3[0] " + display.options3[0]);
	385	+// System.out.println("display.options3[1] " + display.options3[1]);
	386	+// System.out.println("display.options3[2] " + display.options3[2]);
344	387	display.options4[0] = material.cameralight/0.2f;
345	388	display.options4[1] = material.subsurface;
346	389	display.options4[2] = material.sheen;
	390	+// System.out.println("display.options4[0] " + display.options4[0]);
	391	+// System.out.println("display.options4[1] " + display.options4[1]);
	392	+// System.out.println("display.options4[2] " + display.options4[2]);
347	393
348	394	// if (display.CURRENTANTIALIAS > 0)
349	395	// display.options3[3] /= 4;
..	..	@@ -359,7 +405,7 @@
359	405	/**/
360	406	} else
361	407	{
362		- DrawMaterial(material, selected);
	408	+ DrawMaterial(material, selected, obj.projectedVertices);
363	409	}
364	410	} else
365	411	{
..	..	@@ -383,8 +429,8 @@
383	429	cStatic.objectstack[materialdepth++] = obj;
384	430	//System.out.println("material " + material);
385	431	//Applet3D.tracein("selected ", selected);
386		- display.vector2buffer = obj.projectedVertices;
387		- display.DrawMaterial(material, selected);
	432	+ //display.vector2buffer = obj.projectedVertices;
	433	+ display.DrawMaterial(material, selected, obj.projectedVertices);
388	434	}
389	435	}
390	436
..	..	@@ -401,8 +447,8 @@
401	447	materialdepth -= 1;
402	448	if (materialdepth > 0)
403	449	{
404		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
405		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	450	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	451	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
406	452	}
407	453	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
408	454	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -422,8 +468,8 @@
422	468	materialdepth -= 1;
423	469	if (materialdepth > 0)
424	470	{
425		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
426		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	471	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	472	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
427	473	}
428	474	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
429	475	//else
..	..	@@ -464,10 +510,12 @@
464	510	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
465	511	{
466	512	//gl.glBegin(gl.GL_TRIANGLES);
467		- boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	513	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	514	+ // TEST LIVE NORMALS && !obj.dontselect
	515	+ ;
468	516	if (!hasnorm)
469	517	{
470		- // System.out.println("FUCK!!");
	518	+ // System.out.println("Mesh normal");
471	519	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
472	520	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
473	521	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1192,10 +1240,12 @@
1192	1240	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1193	1241	}
1194	1242	}
	1243	+
1195	1244	if (flipV)
1196	1245	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1197	1246	else
1198	1247	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1248	+
1199	1249	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1200	1250	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1201	1251
..	..	@@ -1215,10 +1265,12 @@
1215	1265	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1216	1266	}
1217	1267	}
	1268	+
1218	1269	if (flipV)
1219	1270	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1220	1271	else
1221	1272	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1273	+
1222	1274	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1223	1275	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1224	1276
..	..	@@ -1246,8 +1298,10 @@
1246	1298	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1247	1299	else
1248	1300	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1301	+
1249	1302	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1250	1303	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1304	+
1251	1305	count2 += 2;
1252	1306	count3 += 3;
1253	1307	}
..	..	@@ -1603,7 +1657,7 @@
1603	1657	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1604	1658	}
1605	1659
1606		- void DrawMaterial(cMaterial material, boolean selected)
	1660	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1607	1661	{
1608	1662	CameraPane display = this;
1609	1663	//new Exception().printStackTrace();
..	..	@@ -1638,7 +1692,7 @@
1638	1692	colorV[0] = display.modelParams0[0] * material.diffuse;
1639	1693	colorV[1] = display.modelParams0[1] * material.diffuse;
1640	1694	colorV[2] = display.modelParams0[2] * material.diffuse;
1641		- colorV[3] = material.opacity;
	1695	+ colorV[3] = 1; // material.opacity;
1642	1696
1643	1697	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1644	1698	//System.out.println("Opacity = " + opacity);
..	..	@@ -1746,9 +1800,9 @@
1746	1800	display.modelParams7[2] = 0;
1747	1801	display.modelParams7[3] = 0;
1748	1802
1749		- display.modelParams6[0] = 100; // criss de bug de bump
	1803	+ //display.modelParams6[0] = 100; // criss de bug de bump
1750	1804
1751		- Object3D.cVector2[] extparams = display.vector2buffer;
	1805	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1752	1806	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1753	1807	{
1754	1808	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -2044,7 +2098,7 @@
2044	2098	//System.err.println("Oeil on");
2045	2099	OEIL = true;
2046	2100	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2047		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2101	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2048	2102	//pingthread.StepToTarget(true);
2049	2103	}
2050	2104
..	..	@@ -2259,7 +2313,7 @@
2259	2313
2260	2314	void ToggleDebug()
2261	2315	{
2262		- DEBUG ^= true;
	2316	+ Globals.DEBUG ^= true;
2263	2317	}
2264	2318
2265	2319	void ToggleLookAt()
..	..	@@ -2277,10 +2331,17 @@
2277	2331	HANDLES ^= true;
2278	2332	}
2279	2333
	2334	+ Object3D paintFolder;
	2335	+
2280	2336	void TogglePaint()
2281	2337	{
2282	2338	PAINTMODE ^= true;
2283	2339	paintcount = 0;
	2340	+
	2341	+ if (PAINTMODE)
	2342	+ {
	2343	+ paintFolder = GetFolder();
	2344	+ }
2284	2345	}
2285	2346
2286	2347	void SwapCamera(int a, int b)
..	..	@@ -2377,6 +2438,21 @@
2377	2438	return currentGL;
2378	2439	}
2379	2440
	2441	+ static private BufferedImage CreateBim(TextureData texturedata)
	2442	+ {
	2443	+ Grafreed.Assert(texturedata != null);
	2444	+
	2445	+ int width = texturedata.getWidth();
	2446	+ int height = texturedata.getHeight();
	2447	+
	2448	+ Buffer buffer = texturedata.getBuffer();
	2449	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2450	+
	2451	+ byte[] bytes = bytebuf.array();
	2452	+
	2453	+ return CreateBim(bytes, width, height);
	2454	+ }
	2455	+
2380	2456	/**/
2381	2457	class CacheTexture
2382	2458	{
..	..	@@ -2385,28 +2461,31 @@
2385	2461
2386	2462	int resolution;
2387	2463
2388		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2464	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2389	2465	{
2390		- texture = tex;
	2466	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2467	+ texturedata = texdata;
2391	2468	resolution = res;
2392	2469	}
2393	2470	}
2394	2471	/**/
2395	2472
2396	2473	// 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>();
	2474	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2475	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2476	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2477	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2478	+
2400	2479	int pigmentdepth = 0;
2401	2480	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2402	2481	int bumpdepth = 0;
2403	2482	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2404	2483	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2405	2484	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2406		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2485	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2407	2486	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2408	2487
2409		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2488	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2410	2489	{
2411	2490	TextureData texturedata = null;
2412	2491
..	..	@@ -2425,13 +2504,34 @@
2425	2504	if (bump)
2426	2505	texturedata = ConvertBump(texturedata, false);
2427	2506
2428		- com.sun.opengl.util.texture.Texture texture =
2429		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2507	+// com.sun.opengl.util.texture.Texture texture =
	2508	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2430	2509
2431		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2432		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2510	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2511	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2433	2512
2434		- return texture;
	2513	+ return texturedata;
	2514	+ }
	2515	+
	2516	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2517	+ {
	2518	+ TextureData texturedata = null;
	2519	+
	2520	+ try
	2521	+ {
	2522	+ texturedata =
	2523	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2524	+ bim,
	2525	+ true);
	2526	+ } catch (Exception e)
	2527	+ {
	2528	+ throw new javax.media.opengl.GLException(e);
	2529	+ }
	2530	+
	2531	+ if (bump)
	2532	+ texturedata = ConvertBump(texturedata, false);
	2533	+
	2534	+ return texturedata;
2435	2535	}
2436	2536
2437	2537	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3504,6 +3604,8 @@
3504	3604
3505	3605	System.out.println("LOADING TEXTURE : " + name);
3506	3606
	3607	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3608	+
3507	3609	//
3508	3610	if (false) // compressbit > 0)
3509	3611	{
..	..	@@ -7902,7 +8004,7 @@
7902	8004	String pigment = Object3D.GetPigment(tex);
7903	8005	String bump = Object3D.GetBump(tex);
7904	8006
7905		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8007	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7906	8008	{
7907	8009	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7908	8010	// System.out.println("; bump = " + bump);
..	..	@@ -7917,8 +8019,8 @@
7917	8019	pigment = null;
7918	8020	}
7919	8021
7920		- ReleaseTexture(bump, true);
7921		- ReleaseTexture(pigment, false);
	8022	+ ReleaseTexture(tex, true);
	8023	+ ReleaseTexture(tex, false);
7922	8024	}
7923	8025
7924	8026	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -7936,7 +8038,7 @@
7936	8038
7937	8039	String pigment = Object3D.GetPigment(tex);
7938	8040
7939		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8041	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7940	8042	{
7941	8043	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7942	8044	// System.out.println("; bump = " + bump);
..	..	@@ -7947,7 +8049,7 @@
7947	8049	pigment = null;
7948	8050	}
7949	8051
7950		- ReleaseTexture(pigment, false);
	8052	+ ReleaseTexture(tex, false);
7951	8053	}
7952	8054
7953	8055	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -7965,7 +8067,7 @@
7965	8067
7966	8068	String bump = Object3D.GetBump(tex);
7967	8069
7968		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8070	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7969	8071	{
7970	8072	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7971	8073	// System.out.println("; bump = " + bump);
..	..	@@ -7976,10 +8078,10 @@
7976	8078	bump = null;
7977	8079	}
7978	8080
7979		- ReleaseTexture(bump, true);
	8081	+ ReleaseTexture(tex, true);
7980	8082	}
7981	8083
7982		- void ReleaseTexture(String tex, boolean bump)
	8084	+ void ReleaseTexture(cTexture tex, boolean bump)
7983	8085	{
7984	8086	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7985	8087	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7990,7 +8092,7 @@
7990	8092	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7991	8093
7992	8094	if (tex != null)
7993		- texture = textures.get(tex);
	8095	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7994	8096
7995	8097	// //assert( texture != null );
7996	8098	// if (texture == null)
..	..	@@ -8084,47 +8186,50 @@
8084	8186
8085	8187	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8086	8188	{
8087		- if (// DrawMode() != 0 \|\| /tex == null \|\|/
8088		- ambientOcclusion ) // \|\| !textureon)
8089		- {
8090		- return; // false;
8091		- }
8092		-
8093		- if (tex == null)
8094		- {
8095		- BindTexture(null,false,resolution);
8096		- BindTexture(null,true,resolution);
8097		- return;
8098		- }
	8189	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8190	+// ambientOcclusion ) // \|\| !textureon)
	8191	+// {
	8192	+// return; // false;
	8193	+// }
	8194	+//
	8195	+// if (tex == null)
	8196	+// {
	8197	+// BindTexture(null,false,resolution);
	8198	+// BindTexture(null,true,resolution);
	8199	+// return;
	8200	+// }
	8201	+//
	8202	+// String pigment = Object3D.GetPigment(tex);
	8203	+// String bump = Object3D.GetBump(tex);
	8204	+//
	8205	+// usedtextures.add(pigment);
	8206	+// usedtextures.add(bump);
	8207	+//
	8208	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8209	+// {
	8210	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8211	+// // System.out.println("; bump = " + bump);
	8212	+// }
	8213	+//
	8214	+// if (bump.equals(""))
	8215	+// {
	8216	+// bump = null;
	8217	+// }
	8218	+// if (pigment.equals(""))
	8219	+// {
	8220	+// pigment = null;
	8221	+// }
	8222	+//
	8223	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8224	+// BindTexture(pigment, false, resolution);
	8225	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8226	+// BindTexture(bump, true, resolution);
	8227	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8228	+//
	8229	+// return; // true;
8099	8230
8100		- String pigment = Object3D.GetPigment(tex);
8101		- String bump = Object3D.GetBump(tex);
8102		-
8103		- usedtextures.put(pigment, pigment);
8104		- usedtextures.put(bump, bump);
8105		-
8106		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8107		- {
8108		- // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8109		- // System.out.println("; bump = " + bump);
8110		- }
8111		-
8112		- if (bump.equals(""))
8113		- {
8114		- bump = null;
8115		- }
8116		- if (pigment.equals(""))
8117		- {
8118		- pigment = null;
8119		- }
8120		-
8121		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8122		- BindTexture(pigment, false, resolution);
8123		- GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8124		- BindTexture(bump, true, resolution);
8125		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8126		-
8127		- return; // true;
	8231	+ BindPigmentTexture(tex, resolution);
	8232	+ BindBumpTexture(tex, resolution);
8128	8233	}
8129	8234
8130	8235	/boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8143,9 +8248,9 @@
8143	8248
8144	8249	String pigment = Object3D.GetPigment(tex);
8145	8250
8146		- usedtextures.put(pigment, pigment);
	8251	+ usedtextures.add(tex);
8147	8252
8148		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8253	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8149	8254	{
8150	8255	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8151	8256	// System.out.println("; bump = " + bump);
..	..	@@ -8157,7 +8262,7 @@
8157	8262	}
8158	8263
8159	8264	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8160		- BindTexture(pigment, false, resolution);
	8265	+ BindTexture(tex, false, resolution);
8161	8266	}
8162	8267
8163	8268	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8176,9 +8281,9 @@
8176	8281
8177	8282	String bump = Object3D.GetBump(tex);
8178	8283
8179		- usedtextures.put(bump, bump);
	8284	+ usedtextures.add(tex);
8180	8285
8181		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8286	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8182	8287	{
8183	8288	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8184	8289	// System.out.println("; bump = " + bump);
..	..	@@ -8190,7 +8295,7 @@
8190	8295	}
8191	8296
8192	8297	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8193		- BindTexture(bump, true, resolution);
	8298	+ BindTexture(tex, true, resolution);
8194	8299	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8195	8300	}
8196	8301
..	..	@@ -8214,13 +8319,19 @@
8214	8319	return fileExists;
8215	8320	}
8216	8321
8217		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8322	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8218	8323	{
8219		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8324	+ CacheTexture texturecache = null;
8220	8325
8221	8326	if (tex != null)
8222	8327	{
8223		- String texname = tex;
	8328	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8329	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
	8330	+
	8331	+ if (texname.equals("") && texdata == null)
	8332	+ {
	8333	+ return null;
	8334	+ }
8224	8335
8225	8336	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8226	8337
..	..	@@ -8230,19 +8341,34 @@
8230	8341	// else
8231	8342	// if (!texname.startsWith("/"))
8232	8343	// texname = "/Users/nbriere/Textures/" + texname;
8233		- if (!FileExists(tex))
	8344	+ if (!FileExists(texname))
8234	8345	{
8235	8346	texname = fallbackTextureName;
8236	8347	}
8237	8348
8238	8349	if (CACHETEXTURE)
8239		- texture = textures.get(texname); // TEXTURE CACHE
8240		-
8241		- TextureData texturedata = null;
8242		-
8243		- if (texture == null \|\| texture.resolution < resolution)
8244	8350	{
8245		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8351	+ if (texdata == null)
	8352	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8353	+ else
	8354	+ texturecache = bimtextures.get(texdata);
	8355	+ }
	8356	+
	8357	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8358	+ {
	8359	+ TextureData texturedata = null;
	8360	+
	8361	+ if (texdata != null)
	8362	+ {
	8363	+ BufferedImage bim = //new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8364	+
	8365	+ CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8366	+
	8367	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8368	+ bimtextures.put(texdata, texturecache);
	8369	+ }
	8370	+ else
	8371	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8246	8372	{
8247	8373	assert(!bump);
8248	8374	// if (bump)
..	..	@@ -8253,19 +8379,23 @@
8253	8379	// }
8254	8380	// else
8255	8381	// {
8256		- texture = textures.get(tex);
8257		- if (texture == null)
	8382	+ // texturecache = textures.get(texname); // suspicious
	8383	+ if (texturecache == null)
8258	8384	{
8259		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8385	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8260	8386	}
	8387	+ else
	8388	+ new Exception().printStackTrace();
8261	8389	// }
8262	8390	} else
8263		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8391	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8264	8392	{
8265	8393	assert(bump);
8266		- texture = textures.get(tex);
8267		- if (texture == null)
8268		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8394	+ // texturecache = textures.get(texname); // suspicious
	8395	+ if (texturecache == null)
	8396	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8397	+ else
	8398	+ new Exception().printStackTrace();
8269	8399	} else
8270	8400	{
8271	8401	//if (tex.equals("IMMORTAL"))
..	..	@@ -8273,11 +8403,13 @@
8273	8403	// texture = GetResourceTexture("default.png");
8274	8404	//} else
8275	8405	//{
8276		- if (tex.equals("WHITE_NOISE"))
	8406	+ if (texname.endsWith("WHITE_NOISE"))
8277	8407	{
8278		- texture = textures.get(tex);
8279		- if (texture == null)
8280		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8408	+ // texturecache = textures.get(texname); // suspicious
	8409	+ if (texturecache == null)
	8410	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8411	+ else
	8412	+ new Exception().printStackTrace();
8281	8413	} else
8282	8414	{
8283	8415	if (textureon)
..	..	@@ -8336,19 +8468,19 @@
8336	8468	if (texturedata == null)
8337	8469	throw new Exception();
8338	8470
8339		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8471	+ texturecache = new CacheTexture(texturedata,resolution);
8340	8472	//texture = GetTexture(tex, bump);
8341	8473	}
8342	8474	}
8343	8475	//}
8344	8476	}
8345	8477
8346		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8478	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8347	8479	{
8348	8480	//return false;
8349	8481
8350	8482	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8351		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8483	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8352	8484	{
8353	8485	// String ext = "_highres";
8354	8486	// if (REDUCETEXTURE)
..	..	@@ -8365,52 +8497,17 @@
8365	8497	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8366	8498	if (!cachefile.exists())
8367	8499	{
8368		- // cache to disk
8369		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8370		- //buffers[0].
8371		-
8372		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8373		- int[] pixels = new int[bytebuf.capacity()/3];
8374		-
8375		- // squared size heuristic...
8376		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8500	+ //if (texturedata.getWidth() == texturedata.getHeight())
8377	8501	{
8378		- for (int i=pixels.length; --i>=0;)
8379		- {
8380		- int i3 = i*3;
8381		- pixels[i] = 0xFF;
8382		- pixels[i] <<= 8;
8383		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8384		- pixels[i] <<= 8;
8385		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8386		- pixels[i] <<= 8;
8387		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8388		- }
8389		-
8390		- /*
8391		- int r=0,g=0,b=0,a=0;
8392		- for (int i=0; i<width; i++)
8393		- for (int j=0; j<height; j++)
8394		- {
8395		- int index = j*width+i;
8396		- int p = pixels[index];
8397		- a = ((p>>24) & 0xFF);
8398		- r = ((p>>16) & 0xFF);
8399		- g = ((p>>8) & 0xFF);
8400		- b = (p & 0xFF);
8401		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8402		- }
8403		- /**/
8404		- int width = (int)Math.sqrt(pixels.length); // squared
8405		- int height = width;
8406		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8407		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8502	+ BufferedImage rendImage = CreateBim(texturedata);
	8503	+
8408	8504	ImageWriter writer = null;
8409	8505	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8410	8506	if (iter.hasNext()) {
8411	8507	writer = (ImageWriter)iter.next();
8412	8508	}
8413		- float compressionQuality = 0.9f;
	8509	+
	8510	+ float compressionQuality = 0.85f;
8414	8511	try
8415	8512	{
8416	8513	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8427,18 +8524,20 @@
8427	8524	}
8428	8525	}
8429	8526	}
8430		-
	8527	+
	8528	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8529	+
8431	8530	//System.out.println("Texture = " + tex);
8432		- if (textures.containsKey(texname))
	8531	+ if (textures.containsKey(tex))
8433	8532	{
8434		- CacheTexture thetex = textures.get(texname);
	8533	+ CacheTexture thetex = textures.get(tex);
8435	8534	thetex.texture.disable();
8436	8535	thetex.texture.dispose();
8437		- textures.remove(texname);
	8536	+ textures.remove(tex);
8438	8537	}
8439	8538
8440		- texture.texturedata = texturedata;
8441		- textures.put(texname, texture);
	8539	+ //texture.texturedata = texturedata;
	8540	+ textures.put(tex, texturecache);
8442	8541
8443	8542	// newtex = true;
8444	8543	}
..	..	@@ -8454,10 +8553,41 @@
8454	8553	}
8455	8554	}
8456	8555
8457		- return texture;
	8556	+ return texturecache;
8458	8557	}
8459	8558
8460		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	8559	+ static void EmbedTextures(cTexture tex)
	8560	+ {
	8561	+ if (tex.pigmentdata == null)
	8562	+ {
	8563	+ String texname = Object3D.GetPigment(tex);
	8564	+
	8565	+ CacheTexture texturecache = texturepigment.get(tex);
	8566	+
	8567	+ if (texturecache != null)
	8568	+ {
	8569	+ tex.pigmentdata = ((ByteBuffer)texturecache.texturedata.getBuffer()).array();
	8570	+ tex.pw = texturecache.texturedata.getWidth();
	8571	+ tex.ph = texturecache.texturedata.getHeight();
	8572	+ }
	8573	+ }
	8574	+
	8575	+ if (tex.bumpdata == null)
	8576	+ {
	8577	+ String texname = Object3D.GetBump(tex);
	8578	+
	8579	+ CacheTexture texturecache = texturebump.get(tex);
	8580	+
	8581	+ if (texturecache != null)
	8582	+ {
	8583	+ tex.bumpdata = ((ByteBuffer)texturecache.texturedata.getBuffer()).array();
	8584	+ tex.bw = texturecache.texturedata.getWidth();
	8585	+ tex.bh = texturecache.texturedata.getHeight();
	8586	+ }
	8587	+ }
	8588	+ }
	8589	+
	8590	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8461	8591	{
8462	8592	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8463	8593
..	..	@@ -8475,21 +8605,21 @@
8475	8605	return texture!=null?texture.texture:null;
8476	8606	}
8477	8607
8478		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
	8608	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8479	8609	{
8480	8610	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8481	8611
8482	8612	return texture!=null?texture.texturedata:null;
8483	8613	}
8484	8614
8485		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8615	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8486	8616	{
8487	8617	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8488	8618	{
8489	8619	return false;
8490	8620	}
8491	8621
8492		- boolean newtex = false;
	8622	+ //boolean newtex = false;
8493	8623
8494	8624	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8495	8625
..	..	@@ -8521,7 +8651,7 @@
8521	8651	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8522	8652	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8523	8653
8524		- return newtex;
	8654	+ return true; // Warning: not used.
8525	8655	}
8526	8656
8527	8657	ShadowBuffer shadowPBuf;
..	..	@@ -9359,11 +9489,35 @@
9359	9489	jy8[3] = 0.5f;
9360	9490	}
9361	9491
9362		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9492	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9363	9493	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9364	9494	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9365	9495	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9366	9496
	9497	+ void ResetOptions()
	9498	+ {
	9499	+ options1[0] = 100;
	9500	+ options1[1] = 0.025f;
	9501	+ options1[2] = 0.01f;
	9502	+ options1[3] = 0;
	9503	+ options1[4] = 0;
	9504	+
	9505	+ options2[0] = 0;
	9506	+ options2[1] = 0.75f;
	9507	+ options2[2] = 0;
	9508	+ options2[3] = 0;
	9509	+
	9510	+ options3[0] = 1;
	9511	+ options3[1] = 1;
	9512	+ options3[2] = 1;
	9513	+ options3[3] = 0;
	9514	+
	9515	+ options4[0] = 1;
	9516	+ options4[1] = 0;
	9517	+ options4[2] = 1;
	9518	+ options4[3] = 0;
	9519	+ }
	9520	+
9367	9521	static int imagecount = 0; // movie generation
9368	9522
9369	9523	static int jitter = 0;
..	..	@@ -10474,6 +10628,7 @@
10474	10628	ANTIALIAS = 0;
10475	10629	//System.out.println("RESTART");
10476	10630	AAtimer.restart();
	10631	+ Globals.TIMERRUNNING = true;
10477	10632	}
10478	10633	}
10479	10634	}
..	..	@@ -10541,7 +10696,8 @@
10541	10696	ambientOcclusion = false;
10542	10697	}
10543	10698
10544		- if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
	10699	+ if (//Globals.lighttouched &&
	10700	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10545	10701	{
10546	10702	//if (RENDERSHADOW) // ?
10547	10703	if (!IsFrozen())
..	..	@@ -10981,9 +11137,9 @@
10981	11137
10982	11138	gl.glMatrixMode(GL.GL_MODELVIEW);
10983	11139
10984		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10985		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10986		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11140	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11141	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11142	+gl.glEnable(gl.GL_MULTISAMPLE);
10987	11143	} else
10988	11144	{
10989	11145	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10994,7 +11150,7 @@
10994	11150	//System.out.println("BLENDING ON");
10995	11151	gl.glEnable(GL.GL_BLEND);
10996	11152	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10997		-
	11153	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10998	11154	gl.glMatrixMode(gl.GL_PROJECTION);
10999	11155	gl.glLoadIdentity();
11000	11156
..	..	@@ -11451,15 +11607,36 @@
11451	11607
11452	11608	static boolean zoomonce = false;
11453	11609
	11610	+ static void CreateSelectedPoint()
	11611	+ {
	11612	+ if (selectedpoint == null)
	11613	+ {
	11614	+ debugpointG = new Sphere();
	11615	+ debugpointP = new Sphere();
	11616	+ debugpointC = new Sphere();
	11617	+ debugpointR = new Sphere();
	11618	+
	11619	+ selectedpoint = new Superellipsoid();
	11620	+
	11621	+ for (int i=0; i<8; i++)
	11622	+ {
	11623	+ debugpoints[i] = new Sphere();
	11624	+ }
	11625	+ }
	11626	+ }
	11627	+
11454	11628	void DrawObject(GL gl, boolean draw)
11455	11629	{
	11630	+ // To clear camera values
	11631	+ ResetOptions();
	11632	+
11456	11633	//System.out.println("DRAW OBJECT " + mouseDown);
11457	11634	// DrawMode() = SELECTION;
11458	11635	//GL gl = getGL();
11459	11636	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11460	11637	{
11461	11638	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11462		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11639	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11463	11640	pingthread.StepToTarget(true); // true);
11464	11641	// zoomonce = false;
11465	11642	}
..	..	@@ -11531,8 +11708,9 @@
11531	11708
11532	11709	if (DrawMode() == DEFAULT)
11533	11710	{
11534		- if (DEBUG)
	11711	+ if (Globals.DEBUG)
11535	11712	{
	11713	+ CreateSelectedPoint();
11536	11714	float radius = 0.05f;
11537	11715	if (selectedpoint.radius != radius)
11538	11716	{
..	..	@@ -11586,20 +11764,32 @@
11586	11764	ReleaseTextures(DEFAULT_TEXTURES);
11587	11765
11588	11766	if (CLEANCACHE)
11589		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11767	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11590	11768	{
11591		- String tex = e.nextElement();
	11769	+ cTexture tex = e.nextElement();
11592	11770
11593	11771	// System.out.println("Texture --------- " + tex);
11594	11772
11595		- if (tex.equals("WHITE_NOISE"))
	11773	+ if (tex.equals("WHITE_NOISE:"))
11596	11774	continue;
11597	11775
11598		- if (!usedtextures.containsKey(tex))
	11776	+ if (!usedtextures.contains(tex))
11599	11777	{
	11778	+ CacheTexture gettex = texturepigment.get(tex);
11600	11779	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11601		- textures.get(tex).texture.dispose();
11602		- textures.remove(tex);
	11780	+ if (gettex != null)
	11781	+ {
	11782	+ gettex.texture.dispose();
	11783	+ texturepigment.remove(tex);
	11784	+ }
	11785	+
	11786	+ gettex = texturebump.get(tex);
	11787	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11788	+ if (gettex != null)
	11789	+ {
	11790	+ gettex.texture.dispose();
	11791	+ texturebump.remove(tex);
	11792	+ }
11603	11793	}
11604	11794	}
11605	11795	}
..	..	@@ -12019,7 +12209,7 @@
12019	12209	for (int i = tp.size(); --i >= 0;)
12020	12210	{
12021	12211	//for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12022		- LA.xformPos(light, tp.get(i).GlobalTransform(), light);
	12212	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
12023	12213	}
12024	12214
12025	12215
..	..	@@ -13289,7 +13479,8 @@
13289	13479	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13290	13480	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13291	13481	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13292		- Object3D.cVector2[] vector2buffer;
	13482	+
	13483	+ //Object3D.cVector2[] vector2buffer;
13293	13484
13294	13485	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13295	13486	// OUT : diff, spec
..	..	@@ -13305,9 +13496,10 @@
13305	13496	"DP3 " + dest + ".z," + "normals," + "eye;" +
13306	13497	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13307	13498	//"MOV " + dest + ".w," + "normal.z;" +
13308		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13309		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13310		- //"MOV " + dest + ".z," + "params2.w;" +
	13499	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13500	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13501	+
	13502	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13311	13503	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13312	13504	"RCP " + dest + ".w," + dest + ".w;" +
13313	13505	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13812,6 +14004,7 @@
13812	14004	else
13813	14005	if (evt.getSource() == AAtimer)
13814	14006	{
	14007	+ Globals.TIMERRUNNING = false;
13815	14008	if (mouseDown)
13816	14009	{
13817	14010	//new Exception().printStackTrace();
..	..	@@ -13871,7 +14064,7 @@
13871	14064
13872	14065	// fev 2014???
13873	14066	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13874		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14067	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13875	14068	pingthread.StepToTarget(true); // true);
13876	14069	}
13877	14070	// if (!LIVE)
..	..	@@ -13886,6 +14079,7 @@
13886	14079	return;
13887	14080
13888	14081	AAtimer.restart(); //
	14082	+ Globals.TIMERRUNNING = true;
13889	14083
13890	14084	// waslive = LIVE;
13891	14085	// LIVE = false;
..	..	@@ -14224,12 +14418,12 @@
14224	14418	void GoDown(int mod)
14225	14419	{
14226	14420	MODIFIERS \|= COMMAND;
14227		- /*
	14421	+ /**/
14228	14422	if((mod&SHIFT) == SHIFT)
14229	14423	manipCamera.RotatePosition(0, -speed);
14230	14424	else
14231		- manipCamera.BackForth(0, -speed*delta, getWidth());
14232		- */
	14425	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14426	+ /**/
14233	14427	if ((mod & SHIFT) == SHIFT)
14234	14428	{
14235	14429	mouseMode = mouseMode; // VR??
..	..	@@ -14245,12 +14439,12 @@
14245	14439	void GoUp(int mod)
14246	14440	{
14247	14441	MODIFIERS \|= COMMAND;
14248		- /*
	14442	+ /**/
14249	14443	if((mod&SHIFT) == SHIFT)
14250	14444	manipCamera.RotatePosition(0, speed);
14251	14445	else
14252		- manipCamera.BackForth(0, speed*delta, getWidth());
14253		- */
	14446	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14447	+ /**/
14254	14448	if ((mod & SHIFT) == SHIFT)
14255	14449	{
14256	14450	mouseMode = mouseMode;
..	..	@@ -14266,12 +14460,12 @@
14266	14460	void GoLeft(int mod)
14267	14461	{
14268	14462	MODIFIERS \|= COMMAND;
14269		- /*
	14463	+ /**/
14270	14464	if((mod&SHIFT) == SHIFT)
14271		- manipCamera.RotatePosition(speed, 0);
14272		- else
14273	14465	manipCamera.Translate(speed*delta, 0, getWidth());
14274		- */
	14466	+ else
	14467	+ manipCamera.RotatePosition(speed, 0);
	14468	+ /**/
14275	14469	if ((mod & SHIFT) == SHIFT)
14276	14470	{
14277	14471	mouseMode = mouseMode;
..	..	@@ -14287,12 +14481,12 @@
14287	14481	void GoRight(int mod)
14288	14482	{
14289	14483	MODIFIERS \|= COMMAND;
14290		- /*
	14484	+ /**/
14291	14485	if((mod&SHIFT) == SHIFT)
14292		- manipCamera.RotatePosition(-speed, 0);
14293		- else
14294	14486	manipCamera.Translate(-speed*delta, 0, getWidth());
14295		- */
	14487	+ else
	14488	+ manipCamera.RotatePosition(-speed, 0);
	14489	+ /**/
14296	14490	if ((mod & SHIFT) == SHIFT)
14297	14491	{
14298	14492	mouseMode = mouseMode;
..	..	@@ -14349,7 +14543,8 @@
14349	14543	info.camera = renderCamera;
14350	14544	info.x = x;
14351	14545	info.y = y;
14352		- object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	14546	+ object.GetWindow().copy
	14547	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14353	14548	} else
14354	14549	{
14355	14550	if (x < startX)
..	..	@@ -14513,7 +14708,9 @@
14513	14708	ci.camera = renderCamera;
14514	14709	if (!isRenderer)
14515	14710	{
14516		- if (object.editWindow.copy.doEditClick(ci, 0))
	14711	+ //ObjEditor editWindow = object.editWindow;
	14712	+ //Object3D copy = editWindow.copy;
	14713	+ if (object.doEditClick(ci, 0))
14517	14714	{
14518	14715	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14519	14716	} else
..	..	@@ -14528,7 +14725,8 @@
14528	14725	Globals.MOUSEDRAGGED = false;
14529	14726
14530	14727	movingcamera = false;
14531		- X = Y = 0;
	14728	+ X = 0; // getBounds().width/2;
	14729	+ Y = 0; // getBounds().height/2;
14532	14730	//System.out.println("mouseReleased: " + e);
14533	14731	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14534	14732	}
..	..	@@ -14784,7 +14982,8 @@
14784	14982	// break;
14785	14983	case 'T':
14786	14984	CACHETEXTURE ^= true;
14787		- textures.clear();
	14985	+ texturepigment.clear();
	14986	+ texturebump.clear();
14788	14987	// repaint();
14789	14988	break;
14790	14989	case 'Y':
..	..	@@ -14869,7 +15068,9 @@
14869	15068	case 'E' : COMPACT ^= true;
14870	15069	repaint();
14871	15070	break;
14872		- case 'W' : DEBUGHSB ^= true;
	15071	+ case 'W' : // Wide Window (fullscreen)
	15072	+ //DEBUGHSB ^= true;
	15073	+ ObjEditor.theFrame.ToggleFullScreen();
14873	15074	repaint();
14874	15075	break;
14875	15076	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14894,8 +15095,8 @@
14894	15095	RevertCamera();
14895	15096	repaint();
14896	15097	break;
14897		- case 'L':
14898	15098	case 'l':
	15099	+ //case 'L':
14899	15100	if (lightMode)
14900	15101	{
14901	15102	lightMode = false;
..	..	@@ -15038,9 +15239,9 @@
15038	15239	case '_':
15039	15240	kompactbit = 5;
15040	15241	break;
15041		- case '+':
15042		- kompactbit = 6;
15043		- break;
	15242	+// case '+':
	15243	+// kompactbit = 6;
	15244	+// break;
15044	15245	case ' ':
15045	15246	lightMode ^= true;
15046	15247	Globals.lighttouched = true;
..	..	@@ -15052,6 +15253,7 @@
15052	15253	case ESC:
15053	15254	RENDERPROGRAM += 1;
15054	15255	RENDERPROGRAM %= 3;
	15256	+
15055	15257	repaint();
15056	15258	break;
15057	15259	case 'Z':
..	..	@@ -15091,8 +15293,9 @@
15091	15293	case DELETE:
15092	15294	ClearSelection();
15093	15295	break;
15094		- /*
15095	15296	case '+':
	15297	+
	15298	+ /*
15096	15299	//fontsize += 1;
15097	15300	bbzoom *= 2;
15098	15301	repaint();
..	..	@@ -15109,17 +15312,17 @@
15109	15312	case '=':
15110	15313	IncDepth();
15111	15314	//fontsize += 1;
15112		- object.editWindow.refreshContents(true);
	15315	+ object.GetWindow().refreshContents(true);
15113	15316	maskbit = 6;
15114	15317	break;
15115	15318	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
15116	15319	DecDepth();
15117	15320	maskbit = 5;
15118	15321	//if(fontsize > 1) fontsize -= 1;
15119		- if (object.editWindow == null)
15120		- new Exception().printStackTrace();
15121		- else
15122		- object.editWindow.refreshContents(true);
	15322	+// if (object.editWindow == null)
	15323	+// new Exception().printStackTrace();
	15324	+// else
	15325	+ object.GetWindow().refreshContents(true);
15123	15326	break;
15124	15327	case '{':
15125	15328	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15343,7 +15546,7 @@
15343	15546	}
15344	15547	*/
15345	15548
15346		- object.editWindow.EditSelection();
	15549	+ object.GetWindow().EditSelection(false);
15347	15550	}
15348	15551
15349	15552	void SelectParent()
..	..	@@ -15360,10 +15563,10 @@
15360	15563	{
15361	15564	//selectees.remove(i);
15362	15565	System.out.println("select parent of " + elem);
15363		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15566	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15364	15567	} else
15365	15568	{
15366		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15569	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15367	15570	}
15368	15571
15369	15572	first = false;
..	..	@@ -15405,12 +15608,12 @@
15405	15608	for (int j = 0; j < group.children.size(); j++)
15406	15609	{
15407	15610	elem = (Object3D) group.children.elementAt(j);
15408		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15611	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15409	15612	first = false;
15410	15613	}
15411	15614	} else
15412	15615	{
15413		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15616	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15414	15617	}
15415	15618
15416	15619	first = false;
..	..	@@ -15421,21 +15624,21 @@
15421	15624	{
15422	15625	//Composite group = (Composite) object;
15423	15626	Object3D group = object;
15424		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15627	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15425	15628	}
15426	15629
15427	15630	void ResetTransform(int mask)
15428	15631	{
15429	15632	//Composite group = (Composite) object;
15430	15633	Object3D group = object;
15431		- group.editWindow.ResetTransform(mask);
	15634	+ group.GetWindow().ResetTransform(mask);
15432	15635	}
15433	15636
15434	15637	void FlipTransform()
15435	15638	{
15436	15639	//Composite group = (Composite) object;
15437	15640	Object3D group = object;
15438		- group.editWindow.FlipTransform();
	15641	+ group.GetWindow().FlipTransform();
15439	15642	// group.editWindow.ReduceMesh(true);
15440	15643	}
15441	15644
..	..	@@ -15443,7 +15646,7 @@
15443	15646	{
15444	15647	//Composite group = (Composite) object;
15445	15648	Object3D group = object;
15446		- group.editWindow.PrintMemory();
	15649	+ group.GetWindow().PrintMemory();
15447	15650	// group.editWindow.ReduceMesh(true);
15448	15651	}
15449	15652
..	..	@@ -15451,7 +15654,7 @@
15451	15654	{
15452	15655	//Composite group = (Composite) object;
15453	15656	Object3D group = object;
15454		- group.editWindow.ResetCentroid();
	15657	+ group.GetWindow().ResetCentroid();
15455	15658	}
15456	15659
15457	15660	void IncDepth()
..	..	@@ -15627,6 +15830,7 @@
15627	15830	info.bounds.y += (height - desired) / 2;
15628	15831	}
15629	15832	}
	15833	+
15630	15834	info.g = gr;
15631	15835	info.camera = renderCamera;
15632	15836	/*
..	..	@@ -15636,23 +15840,44 @@
15636	15840	*/
15637	15841	if (!isRenderer)
15638	15842	{
15639		- object.drawEditHandles(info, 0);
15640		-
15641		- if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	15843	+ Grafreed.Assert(object != null);
	15844	+ Grafreed.Assert(object.selection != null);
	15845	+ if (object.selection.Size() > 0)
15642	15846	{
15643		- switch (object.selection.get(0).hitSomething)
	15847	+ int hitSomething = object.selection.get(0).hitSomething;
	15848	+
	15849	+ info.DX = 0;
	15850	+ info.DY = 0;
	15851	+ info.W = 1;
	15852	+ if (hitSomething == Object3D.hitCenter)
15644	15853	{
15645		- case Object3D.hitCenter: gr.setColor(Color.pink);
15646		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15647		- break;
15648		- case Object3D.hitRotate: gr.setColor(Color.yellow);
15649		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15650		- break;
15651		- case Object3D.hitScale: gr.setColor(Color.cyan);
15652		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15653		- break;
	15854	+ info.DX = X;
	15855	+ if (X != 0)
	15856	+ info.DX -= info.bounds.width/2;
	15857	+
	15858	+ info.DY = Y;
	15859	+ if (Y != 0)
	15860	+ info.DY -= info.bounds.height/2;
15654	15861	}
15655		-
	15862	+
	15863	+ object.drawEditHandles(info, 0);
	15864	+
	15865	+ if (drag && (X != 0 \|\| Y != 0))
	15866	+ {
	15867	+ switch (hitSomething)
	15868	+ {
	15869	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15870	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15871	+ break;
	15872	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15873	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15874	+ break;
	15875	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15876	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15877	+ break;
	15878	+ }
	15879	+
	15880	+ }
15656	15881	}
15657	15882	}
15658	15883	}
..	..	@@ -16355,16 +16580,16 @@
16355	16580	cStatic.objectstack[materialdepth++] = checker;
16356	16581	//System.out.println("material " + material);
16357	16582	//Applet3D.tracein(this, selected);
16358		- vector2buffer = checker.projectedVertices;
	16583	+ //vector2buffer = checker.projectedVertices;
16359	16584
16360	16585	//checker.GetMaterial().Draw(this, false); // true);
16361		- DrawMaterial(checker.GetMaterial(), false); // true);
	16586	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16362	16587
16363	16588	materialdepth -= 1;
16364	16589	if (materialdepth > 0)
16365	16590	{
16366		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16367		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16591	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16592	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16368	16593	}
16369	16594	//checker.GetMaterial().opacity = 1f;
16370	16595	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16450,6 +16675,14 @@
16450	16675	}
16451	16676	}
16452	16677
	16678	+ private Object3D GetFolder()
	16679	+ {
	16680	+ Object3D folder = object.GetWindow().copy;
	16681	+ if (object.GetWindow().copy.selection.Size() > 0)
	16682	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16683	+ return folder;
	16684	+ }
	16685	+
16453	16686	class SelectBuffer implements GLEventListener
16454	16687	{
16455	16688
..	..	@@ -16529,6 +16762,17 @@
16529	16762
16530	16763	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16531	16764
	16765	+ if (PAINTMODE)
	16766	+ {
	16767	+ if (object.GetWindow().copy.selection.Size() > 0)
	16768	+ {
	16769	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16770	+
	16771	+ // Make what you paint not selectable.
	16772	+ paintobj.ResetSelectable();
	16773	+ }
	16774	+ }
	16775	+
16532	16776	//int tmp = selection_view;
16533	16777	//selection_view = -1;
16534	16778	int temp = DrawMode();
..	..	@@ -16540,6 +16784,17 @@
16540	16784	// temp = DEFAULT; // patch for selection debug
16541	16785	Globals.drawMode = temp; // WARNING
16542	16786
	16787	+ if (PAINTMODE)
	16788	+ {
	16789	+ if (object.GetWindow().copy.selection.Size() > 0)
	16790	+ {
	16791	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16792	+
	16793	+ // Revert.
	16794	+ paintobj.RestoreSelectable();
	16795	+ }
	16796	+ }
	16797	+
16543	16798	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16544	16799
16545	16800	// trying different ways of getting the depth info over
..	..	@@ -16587,6 +16842,8 @@
16587	16842	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16588	16843	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16589	16844	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	16845	+
	16846	+ CreateSelectedPoint();
16590	16847
16591	16848	// Will fit the mesh !!!
16592	16849	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16641,29 +16898,31 @@
16641	16898	}
16642	16899
16643	16900	if (!movingcamera && !PAINTMODE)
16644		- object.editWindow.ScreenFitPoint(); // fev 2014
	16901	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16645	16902
16646		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16903	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16647	16904	{
16648		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16905	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16649	16906
16650		- Object3D group = new Object3D("inst" + paintcount++);
	16907	+ if (object.GetWindow().copy.selection.Size() > 0)
	16908	+ {
	16909	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16651	16910
16652		- group.CreateMaterial(); // use a void leaf to select instances
16653		-
16654		- group.add(paintobj); // link
16655		-
16656		- object.editWindow.SnapObject(group);
16657		-
16658		- Object3D folder = object.editWindow.copy;
16659		-
16660		- if (object.editWindow.copy.selection.Size() > 0)
16661		- folder = object.editWindow.copy.selection.elementAt(0);
16662		-
16663		- folder.add(group);
16664		-
16665		- object.editWindow.ResetModel();
16666		- object.editWindow.refreshContents();
	16911	+ Object3D inst = new Object3D("inst" + paintcount++);
	16912	+
	16913	+ inst.CreateMaterial(); // use a void leaf to select instances
	16914	+
	16915	+ inst.add(paintobj); // link
	16916	+
	16917	+ object.GetWindow().SnapObject(inst);
	16918	+
	16919	+ Object3D folder = paintFolder; // GetFolder();
	16920	+
	16921	+ folder.add(inst);
	16922	+
	16923	+ object.GetWindow().ResetModel();
	16924	+ object.GetWindow().refreshContents();
	16925	+ }
16667	16926	}
16668	16927	else
16669	16928	paintcount = 0;
..	..	@@ -16702,6 +16961,11 @@
16702	16961	//System.out.println("objects[color] = " + objects[color]);
16703	16962	//objects[color].Select();
16704	16963	indexcount = 0;
	16964	+ ObjEditor window = object.GetWindow();
	16965	+ if (window != null && deselect)
	16966	+ {
	16967	+ window.Select(null, deselect, true);
	16968	+ }
16705	16969	object.Select(color, deselect);
16706	16970	}
16707	16971
..	..	@@ -17227,23 +17491,15 @@
17227	17491	int AAbuffersize = 0;
17228	17492
17229	17493	//double[] selectedpoint = new double[3];
17230		- static Superellipsoid selectedpoint = new Superellipsoid();
	17494	+ static Superellipsoid selectedpoint;
17231	17495	static Sphere previousselectedpoint = null;
17232		- static Sphere debugpointG = new Sphere();
17233		- static Sphere debugpointP = new Sphere();
17234		- static Sphere debugpointC = new Sphere();
17235		- static Sphere debugpointR = new Sphere();
	17496	+ static Sphere debugpointG;
	17497	+ static Sphere debugpointP;
	17498	+ static Sphere debugpointC;
	17499	+ static Sphere debugpointR;
17236	17500
17237	17501	static Sphere debugpoints[] = new Sphere[8];
17238	17502
17239		- static
17240		- {
17241		- for (int i=0; i<8; i++)
17242		- {
17243		- debugpoints[i] = new Sphere();
17244		- }
17245		- }
17246		-
17247	17503	static void InitPoints(float radius)
17248	17504	{
17249	17505	for (int i=0; i<8; i++)