~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
..	..	@@ -1611,7 +1657,7 @@
1611	1657	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1612	1658	}
1613	1659
1614		- void DrawMaterial(cMaterial material, boolean selected)
	1660	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1615	1661	{
1616	1662	CameraPane display = this;
1617	1663	//new Exception().printStackTrace();
..	..	@@ -1646,7 +1692,7 @@
1646	1692	colorV[0] = display.modelParams0[0] * material.diffuse;
1647	1693	colorV[1] = display.modelParams0[1] * material.diffuse;
1648	1694	colorV[2] = display.modelParams0[2] * material.diffuse;
1649		- colorV[3] = material.opacity;
	1695	+ colorV[3] = 1; // material.opacity;
1650	1696
1651	1697	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1652	1698	//System.out.println("Opacity = " + opacity);
..	..	@@ -1754,9 +1800,9 @@
1754	1800	display.modelParams7[2] = 0;
1755	1801	display.modelParams7[3] = 0;
1756	1802
1757		- display.modelParams6[0] = 100; // criss de bug de bump
	1803	+ //display.modelParams6[0] = 100; // criss de bug de bump
1758	1804
1759		- Object3D.cVector2[] extparams = display.vector2buffer;
	1805	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1760	1806	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1761	1807	{
1762	1808	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -2052,7 +2098,7 @@
2052	2098	//System.err.println("Oeil on");
2053	2099	OEIL = true;
2054	2100	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2055		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2101	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2056	2102	//pingthread.StepToTarget(true);
2057	2103	}
2058	2104
..	..	@@ -2267,7 +2313,7 @@
2267	2313
2268	2314	void ToggleDebug()
2269	2315	{
2270		- DEBUG ^= true;
	2316	+ Globals.DEBUG ^= true;
2271	2317	}
2272	2318
2273	2319	void ToggleLookAt()
..	..	@@ -2285,10 +2331,17 @@
2285	2331	HANDLES ^= true;
2286	2332	}
2287	2333
	2334	+ Object3D paintFolder;
	2335	+
2288	2336	void TogglePaint()
2289	2337	{
2290	2338	PAINTMODE ^= true;
2291	2339	paintcount = 0;
	2340	+
	2341	+ if (PAINTMODE)
	2342	+ {
	2343	+ paintFolder = GetFolder();
	2344	+ }
2292	2345	}
2293	2346
2294	2347	void SwapCamera(int a, int b)
..	..	@@ -2385,6 +2438,21 @@
2385	2438	return currentGL;
2386	2439	}
2387	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	+
2388	2456	/**/
2389	2457	class CacheTexture
2390	2458	{
..	..	@@ -2393,28 +2461,31 @@
2393	2461
2394	2462	int resolution;
2395	2463
2396		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2464	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2397	2465	{
2398		- texture = tex;
	2466	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2467	+ texturedata = texdata;
2399	2468	resolution = res;
2400	2469	}
2401	2470	}
2402	2471	/**/
2403	2472
2404	2473	// TEXTURE static Texture texture;
2405		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2406		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2407		- 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	+
2408	2479	int pigmentdepth = 0;
2409	2480	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2410	2481	int bumpdepth = 0;
2411	2482	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2412	2483	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2413	2484	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2414		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2485	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2415	2486	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2416	2487
2417		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2488	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2418	2489	{
2419	2490	TextureData texturedata = null;
2420	2491
..	..	@@ -2433,13 +2504,34 @@
2433	2504	if (bump)
2434	2505	texturedata = ConvertBump(texturedata, false);
2435	2506
2436		- com.sun.opengl.util.texture.Texture texture =
2437		- 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);
2438	2509
2439		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2440		- 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);
2441	2512
2442		- 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;
2443	2535	}
2444	2536
2445	2537	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3512,6 +3604,8 @@
3512	3604
3513	3605	System.out.println("LOADING TEXTURE : " + name);
3514	3606
	3607	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3608	+
3515	3609	//
3516	3610	if (false) // compressbit > 0)
3517	3611	{
..	..	@@ -7910,7 +8004,7 @@
7910	8004	String pigment = Object3D.GetPigment(tex);
7911	8005	String bump = Object3D.GetBump(tex);
7912	8006
7913		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8007	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7914	8008	{
7915	8009	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7916	8010	// System.out.println("; bump = " + bump);
..	..	@@ -7925,8 +8019,8 @@
7925	8019	pigment = null;
7926	8020	}
7927	8021
7928		- ReleaseTexture(bump, true);
7929		- ReleaseTexture(pigment, false);
	8022	+ ReleaseTexture(tex, true);
	8023	+ ReleaseTexture(tex, false);
7930	8024	}
7931	8025
7932	8026	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -7944,7 +8038,7 @@
7944	8038
7945	8039	String pigment = Object3D.GetPigment(tex);
7946	8040
7947		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8041	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7948	8042	{
7949	8043	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7950	8044	// System.out.println("; bump = " + bump);
..	..	@@ -7955,7 +8049,7 @@
7955	8049	pigment = null;
7956	8050	}
7957	8051
7958		- ReleaseTexture(pigment, false);
	8052	+ ReleaseTexture(tex, false);
7959	8053	}
7960	8054
7961	8055	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -7973,7 +8067,7 @@
7973	8067
7974	8068	String bump = Object3D.GetBump(tex);
7975	8069
7976		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8070	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7977	8071	{
7978	8072	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7979	8073	// System.out.println("; bump = " + bump);
..	..	@@ -7984,10 +8078,10 @@
7984	8078	bump = null;
7985	8079	}
7986	8080
7987		- ReleaseTexture(bump, true);
	8081	+ ReleaseTexture(tex, true);
7988	8082	}
7989	8083
7990		- void ReleaseTexture(String tex, boolean bump)
	8084	+ void ReleaseTexture(cTexture tex, boolean bump)
7991	8085	{
7992	8086	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7993	8087	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7998,7 +8092,7 @@
7998	8092	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7999	8093
8000	8094	if (tex != null)
8001		- texture = textures.get(tex);
	8095	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
8002	8096
8003	8097	// //assert( texture != null );
8004	8098	// if (texture == null)
..	..	@@ -8092,47 +8186,50 @@
8092	8186
8093	8187	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8094	8188	{
8095		- if (// DrawMode() != 0 \|\| /tex == null \|\|/
8096		- ambientOcclusion ) // \|\| !textureon)
8097		- {
8098		- return; // false;
8099		- }
8100		-
8101		- if (tex == null)
8102		- {
8103		- BindTexture(null,false,resolution);
8104		- BindTexture(null,true,resolution);
8105		- return;
8106		- }
	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;
8107	8230
8108		- String pigment = Object3D.GetPigment(tex);
8109		- String bump = Object3D.GetBump(tex);
8110		-
8111		- usedtextures.put(pigment, pigment);
8112		- usedtextures.put(bump, bump);
8113		-
8114		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8115		- {
8116		- // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8117		- // System.out.println("; bump = " + bump);
8118		- }
8119		-
8120		- if (bump.equals(""))
8121		- {
8122		- bump = null;
8123		- }
8124		- if (pigment.equals(""))
8125		- {
8126		- pigment = null;
8127		- }
8128		-
8129		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8130		- BindTexture(pigment, false, resolution);
8131		- GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8132		- BindTexture(bump, true, resolution);
8133		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8134		-
8135		- return; // true;
	8231	+ BindPigmentTexture(tex, resolution);
	8232	+ BindBumpTexture(tex, resolution);
8136	8233	}
8137	8234
8138	8235	/boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8151,9 +8248,9 @@
8151	8248
8152	8249	String pigment = Object3D.GetPigment(tex);
8153	8250
8154		- usedtextures.put(pigment, pigment);
	8251	+ usedtextures.add(tex);
8155	8252
8156		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8253	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8157	8254	{
8158	8255	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8159	8256	// System.out.println("; bump = " + bump);
..	..	@@ -8165,7 +8262,7 @@
8165	8262	}
8166	8263
8167	8264	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8168		- BindTexture(pigment, false, resolution);
	8265	+ BindTexture(tex, false, resolution);
8169	8266	}
8170	8267
8171	8268	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8184,9 +8281,9 @@
8184	8281
8185	8282	String bump = Object3D.GetBump(tex);
8186	8283
8187		- usedtextures.put(bump, bump);
	8284	+ usedtextures.add(tex);
8188	8285
8189		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8286	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8190	8287	{
8191	8288	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8192	8289	// System.out.println("; bump = " + bump);
..	..	@@ -8198,7 +8295,7 @@
8198	8295	}
8199	8296
8200	8297	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8201		- BindTexture(bump, true, resolution);
	8298	+ BindTexture(tex, true, resolution);
8202	8299	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8203	8300	}
8204	8301
..	..	@@ -8222,13 +8319,19 @@
8222	8319	return fileExists;
8223	8320	}
8224	8321
8225		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8322	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8226	8323	{
8227		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8324	+ CacheTexture texturecache = null;
8228	8325
8229	8326	if (tex != null)
8230	8327	{
8231		- 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	+ }
8232	8335
8233	8336	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8234	8337
..	..	@@ -8238,19 +8341,34 @@
8238	8341	// else
8239	8342	// if (!texname.startsWith("/"))
8240	8343	// texname = "/Users/nbriere/Textures/" + texname;
8241		- if (!FileExists(tex))
	8344	+ if (!FileExists(texname))
8242	8345	{
8243	8346	texname = fallbackTextureName;
8244	8347	}
8245	8348
8246	8349	if (CACHETEXTURE)
8247		- texture = textures.get(texname); // TEXTURE CACHE
8248		-
8249		- TextureData texturedata = null;
8250		-
8251		- if (texture == null \|\| texture.resolution < resolution)
8252	8350	{
8253		- 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(""))
8254	8372	{
8255	8373	assert(!bump);
8256	8374	// if (bump)
..	..	@@ -8261,19 +8379,23 @@
8261	8379	// }
8262	8380	// else
8263	8381	// {
8264		- texture = textures.get(tex);
8265		- if (texture == null)
	8382	+ // texturecache = textures.get(texname); // suspicious
	8383	+ if (texturecache == null)
8266	8384	{
8267		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8385	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8268	8386	}
	8387	+ else
	8388	+ new Exception().printStackTrace();
8269	8389	// }
8270	8390	} else
8271		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8391	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8272	8392	{
8273	8393	assert(bump);
8274		- texture = textures.get(tex);
8275		- if (texture == null)
8276		- 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();
8277	8399	} else
8278	8400	{
8279	8401	//if (tex.equals("IMMORTAL"))
..	..	@@ -8281,11 +8403,13 @@
8281	8403	// texture = GetResourceTexture("default.png");
8282	8404	//} else
8283	8405	//{
8284		- if (tex.equals("WHITE_NOISE"))
	8406	+ if (texname.endsWith("WHITE_NOISE"))
8285	8407	{
8286		- texture = textures.get(tex);
8287		- if (texture == null)
8288		- 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();
8289	8413	} else
8290	8414	{
8291	8415	if (textureon)
..	..	@@ -8344,19 +8468,19 @@
8344	8468	if (texturedata == null)
8345	8469	throw new Exception();
8346	8470
8347		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8471	+ texturecache = new CacheTexture(texturedata,resolution);
8348	8472	//texture = GetTexture(tex, bump);
8349	8473	}
8350	8474	}
8351	8475	//}
8352	8476	}
8353	8477
8354		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8478	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8355	8479	{
8356	8480	//return false;
8357	8481
8358	8482	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8359		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8483	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8360	8484	{
8361	8485	// String ext = "_highres";
8362	8486	// if (REDUCETEXTURE)
..	..	@@ -8373,52 +8497,17 @@
8373	8497	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8374	8498	if (!cachefile.exists())
8375	8499	{
8376		- // cache to disk
8377		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8378		- //buffers[0].
8379		-
8380		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8381		- int[] pixels = new int[bytebuf.capacity()/3];
8382		-
8383		- // squared size heuristic...
8384		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8500	+ //if (texturedata.getWidth() == texturedata.getHeight())
8385	8501	{
8386		- for (int i=pixels.length; --i>=0;)
8387		- {
8388		- int i3 = i*3;
8389		- pixels[i] = 0xFF;
8390		- pixels[i] <<= 8;
8391		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8392		- pixels[i] <<= 8;
8393		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8394		- pixels[i] <<= 8;
8395		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8396		- }
8397		-
8398		- /*
8399		- int r=0,g=0,b=0,a=0;
8400		- for (int i=0; i<width; i++)
8401		- for (int j=0; j<height; j++)
8402		- {
8403		- int index = j*width+i;
8404		- int p = pixels[index];
8405		- a = ((p>>24) & 0xFF);
8406		- r = ((p>>16) & 0xFF);
8407		- g = ((p>>8) & 0xFF);
8408		- b = (p & 0xFF);
8409		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8410		- }
8411		- /**/
8412		- int width = (int)Math.sqrt(pixels.length); // squared
8413		- int height = width;
8414		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8415		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8502	+ BufferedImage rendImage = CreateBim(texturedata);
	8503	+
8416	8504	ImageWriter writer = null;
8417	8505	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8418	8506	if (iter.hasNext()) {
8419	8507	writer = (ImageWriter)iter.next();
8420	8508	}
8421		- float compressionQuality = 0.9f;
	8509	+
	8510	+ float compressionQuality = 0.85f;
8422	8511	try
8423	8512	{
8424	8513	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8435,18 +8524,20 @@
8435	8524	}
8436	8525	}
8437	8526	}
8438		-
	8527	+
	8528	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8529	+
8439	8530	//System.out.println("Texture = " + tex);
8440		- if (textures.containsKey(texname))
	8531	+ if (textures.containsKey(tex))
8441	8532	{
8442		- CacheTexture thetex = textures.get(texname);
	8533	+ CacheTexture thetex = textures.get(tex);
8443	8534	thetex.texture.disable();
8444	8535	thetex.texture.dispose();
8445		- textures.remove(texname);
	8536	+ textures.remove(tex);
8446	8537	}
8447	8538
8448		- texture.texturedata = texturedata;
8449		- textures.put(texname, texture);
	8539	+ //texture.texturedata = texturedata;
	8540	+ textures.put(tex, texturecache);
8450	8541
8451	8542	// newtex = true;
8452	8543	}
..	..	@@ -8462,10 +8553,41 @@
8462	8553	}
8463	8554	}
8464	8555
8465		- return texture;
	8556	+ return texturecache;
8466	8557	}
8467	8558
8468		- 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
8469	8591	{
8470	8592	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8471	8593
..	..	@@ -8483,21 +8605,21 @@
8483	8605	return texture!=null?texture.texture:null;
8484	8606	}
8485	8607
8486		- 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
8487	8609	{
8488	8610	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8489	8611
8490	8612	return texture!=null?texture.texturedata:null;
8491	8613	}
8492	8614
8493		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8615	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8494	8616	{
8495	8617	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8496	8618	{
8497	8619	return false;
8498	8620	}
8499	8621
8500		- boolean newtex = false;
	8622	+ //boolean newtex = false;
8501	8623
8502	8624	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8503	8625
..	..	@@ -8529,7 +8651,7 @@
8529	8651	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8530	8652	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8531	8653
8532		- return newtex;
	8654	+ return true; // Warning: not used.
8533	8655	}
8534	8656
8535	8657	ShadowBuffer shadowPBuf;
..	..	@@ -9367,11 +9489,35 @@
9367	9489	jy8[3] = 0.5f;
9368	9490	}
9369	9491
9370		- 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
9371	9493	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9372	9494	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9373	9495	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9374	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	+
9375	9521	static int imagecount = 0; // movie generation
9376	9522
9377	9523	static int jitter = 0;
..	..	@@ -10482,6 +10628,7 @@
10482	10628	ANTIALIAS = 0;
10483	10629	//System.out.println("RESTART");
10484	10630	AAtimer.restart();
	10631	+ Globals.TIMERRUNNING = true;
10485	10632	}
10486	10633	}
10487	10634	}
..	..	@@ -10549,7 +10696,8 @@
10549	10696	ambientOcclusion = false;
10550	10697	}
10551	10698
10552		- if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
	10699	+ if (//Globals.lighttouched &&
	10700	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10553	10701	{
10554	10702	//if (RENDERSHADOW) // ?
10555	10703	if (!IsFrozen())
..	..	@@ -10989,9 +11137,9 @@
10989	11137
10990	11138	gl.glMatrixMode(GL.GL_MODELVIEW);
10991	11139
10992		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10993		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10994		-//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);
10995	11143	} else
10996	11144	{
10997	11145	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -11002,7 +11150,7 @@
11002	11150	//System.out.println("BLENDING ON");
11003	11151	gl.glEnable(GL.GL_BLEND);
11004	11152	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
11005		-
	11153	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
11006	11154	gl.glMatrixMode(gl.GL_PROJECTION);
11007	11155	gl.glLoadIdentity();
11008	11156
..	..	@@ -11459,15 +11607,36 @@
11459	11607
11460	11608	static boolean zoomonce = false;
11461	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	+
11462	11628	void DrawObject(GL gl, boolean draw)
11463	11629	{
	11630	+ // To clear camera values
	11631	+ ResetOptions();
	11632	+
11464	11633	//System.out.println("DRAW OBJECT " + mouseDown);
11465	11634	// DrawMode() = SELECTION;
11466	11635	//GL gl = getGL();
11467	11636	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11468	11637	{
11469	11638	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11470		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11639	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11471	11640	pingthread.StepToTarget(true); // true);
11472	11641	// zoomonce = false;
11473	11642	}
..	..	@@ -11539,8 +11708,9 @@
11539	11708
11540	11709	if (DrawMode() == DEFAULT)
11541	11710	{
11542		- if (DEBUG)
	11711	+ if (Globals.DEBUG)
11543	11712	{
	11713	+ CreateSelectedPoint();
11544	11714	float radius = 0.05f;
11545	11715	if (selectedpoint.radius != radius)
11546	11716	{
..	..	@@ -11594,20 +11764,32 @@
11594	11764	ReleaseTextures(DEFAULT_TEXTURES);
11595	11765
11596	11766	if (CLEANCACHE)
11597		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11767	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11598	11768	{
11599		- String tex = e.nextElement();
	11769	+ cTexture tex = e.nextElement();
11600	11770
11601	11771	// System.out.println("Texture --------- " + tex);
11602	11772
11603		- if (tex.equals("WHITE_NOISE"))
	11773	+ if (tex.equals("WHITE_NOISE:"))
11604	11774	continue;
11605	11775
11606		- if (!usedtextures.containsKey(tex))
	11776	+ if (!usedtextures.contains(tex))
11607	11777	{
	11778	+ CacheTexture gettex = texturepigment.get(tex);
11608	11779	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11609		- textures.get(tex).texture.dispose();
11610		- 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	+ }
11611	11793	}
11612	11794	}
11613	11795	}
..	..	@@ -12027,7 +12209,7 @@
12027	12209	for (int i = tp.size(); --i >= 0;)
12028	12210	{
12029	12211	//for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12030		- LA.xformPos(light, tp.get(i).GlobalTransform(), light);
	12212	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
12031	12213	}
12032	12214
12033	12215
..	..	@@ -13297,7 +13479,8 @@
13297	13479	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13298	13480	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13299	13481	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13300		- Object3D.cVector2[] vector2buffer;
	13482	+
	13483	+ //Object3D.cVector2[] vector2buffer;
13301	13484
13302	13485	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13303	13486	// OUT : diff, spec
..	..	@@ -13313,9 +13496,10 @@
13313	13496	"DP3 " + dest + ".z," + "normals," + "eye;" +
13314	13497	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13315	13498	//"MOV " + dest + ".w," + "normal.z;" +
13316		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13317		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13318		- //"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
13319	13503	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13320	13504	"RCP " + dest + ".w," + dest + ".w;" +
13321	13505	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13820,6 +14004,7 @@
13820	14004	else
13821	14005	if (evt.getSource() == AAtimer)
13822	14006	{
	14007	+ Globals.TIMERRUNNING = false;
13823	14008	if (mouseDown)
13824	14009	{
13825	14010	//new Exception().printStackTrace();
..	..	@@ -13879,7 +14064,7 @@
13879	14064
13880	14065	// fev 2014???
13881	14066	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13882		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14067	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13883	14068	pingthread.StepToTarget(true); // true);
13884	14069	}
13885	14070	// if (!LIVE)
..	..	@@ -13894,6 +14079,7 @@
13894	14079	return;
13895	14080
13896	14081	AAtimer.restart(); //
	14082	+ Globals.TIMERRUNNING = true;
13897	14083
13898	14084	// waslive = LIVE;
13899	14085	// LIVE = false;
..	..	@@ -14232,12 +14418,12 @@
14232	14418	void GoDown(int mod)
14233	14419	{
14234	14420	MODIFIERS \|= COMMAND;
14235		- /*
	14421	+ /**/
14236	14422	if((mod&SHIFT) == SHIFT)
14237	14423	manipCamera.RotatePosition(0, -speed);
14238	14424	else
14239		- manipCamera.BackForth(0, -speed*delta, getWidth());
14240		- */
	14425	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14426	+ /**/
14241	14427	if ((mod & SHIFT) == SHIFT)
14242	14428	{
14243	14429	mouseMode = mouseMode; // VR??
..	..	@@ -14253,12 +14439,12 @@
14253	14439	void GoUp(int mod)
14254	14440	{
14255	14441	MODIFIERS \|= COMMAND;
14256		- /*
	14442	+ /**/
14257	14443	if((mod&SHIFT) == SHIFT)
14258	14444	manipCamera.RotatePosition(0, speed);
14259	14445	else
14260		- manipCamera.BackForth(0, speed*delta, getWidth());
14261		- */
	14446	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14447	+ /**/
14262	14448	if ((mod & SHIFT) == SHIFT)
14263	14449	{
14264	14450	mouseMode = mouseMode;
..	..	@@ -14274,12 +14460,12 @@
14274	14460	void GoLeft(int mod)
14275	14461	{
14276	14462	MODIFIERS \|= COMMAND;
14277		- /*
	14463	+ /**/
14278	14464	if((mod&SHIFT) == SHIFT)
14279		- manipCamera.RotatePosition(speed, 0);
14280		- else
14281	14465	manipCamera.Translate(speed*delta, 0, getWidth());
14282		- */
	14466	+ else
	14467	+ manipCamera.RotatePosition(speed, 0);
	14468	+ /**/
14283	14469	if ((mod & SHIFT) == SHIFT)
14284	14470	{
14285	14471	mouseMode = mouseMode;
..	..	@@ -14295,12 +14481,12 @@
14295	14481	void GoRight(int mod)
14296	14482	{
14297	14483	MODIFIERS \|= COMMAND;
14298		- /*
	14484	+ /**/
14299	14485	if((mod&SHIFT) == SHIFT)
14300		- manipCamera.RotatePosition(-speed, 0);
14301		- else
14302	14486	manipCamera.Translate(-speed*delta, 0, getWidth());
14303		- */
	14487	+ else
	14488	+ manipCamera.RotatePosition(-speed, 0);
	14489	+ /**/
14304	14490	if ((mod & SHIFT) == SHIFT)
14305	14491	{
14306	14492	mouseMode = mouseMode;
..	..	@@ -14357,7 +14543,8 @@
14357	14543	info.camera = renderCamera;
14358	14544	info.x = x;
14359	14545	info.y = y;
14360		- object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	14546	+ object.GetWindow().copy
	14547	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14361	14548	} else
14362	14549	{
14363	14550	if (x < startX)
..	..	@@ -14521,7 +14708,9 @@
14521	14708	ci.camera = renderCamera;
14522	14709	if (!isRenderer)
14523	14710	{
14524		- if (object.editWindow.copy.doEditClick(ci, 0))
	14711	+ //ObjEditor editWindow = object.editWindow;
	14712	+ //Object3D copy = editWindow.copy;
	14713	+ if (object.doEditClick(ci, 0))
14525	14714	{
14526	14715	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14527	14716	} else
..	..	@@ -14536,7 +14725,8 @@
14536	14725	Globals.MOUSEDRAGGED = false;
14537	14726
14538	14727	movingcamera = false;
14539		- X = Y = 0;
	14728	+ X = 0; // getBounds().width/2;
	14729	+ Y = 0; // getBounds().height/2;
14540	14730	//System.out.println("mouseReleased: " + e);
14541	14731	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14542	14732	}
..	..	@@ -14792,7 +14982,8 @@
14792	14982	// break;
14793	14983	case 'T':
14794	14984	CACHETEXTURE ^= true;
14795		- textures.clear();
	14985	+ texturepigment.clear();
	14986	+ texturebump.clear();
14796	14987	// repaint();
14797	14988	break;
14798	14989	case 'Y':
..	..	@@ -14877,7 +15068,9 @@
14877	15068	case 'E' : COMPACT ^= true;
14878	15069	repaint();
14879	15070	break;
14880		- case 'W' : DEBUGHSB ^= true;
	15071	+ case 'W' : // Wide Window (fullscreen)
	15072	+ //DEBUGHSB ^= true;
	15073	+ ObjEditor.theFrame.ToggleFullScreen();
14881	15074	repaint();
14882	15075	break;
14883	15076	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14902,8 +15095,8 @@
14902	15095	RevertCamera();
14903	15096	repaint();
14904	15097	break;
14905		- case 'L':
14906	15098	case 'l':
	15099	+ //case 'L':
14907	15100	if (lightMode)
14908	15101	{
14909	15102	lightMode = false;
..	..	@@ -15046,9 +15239,9 @@
15046	15239	case '_':
15047	15240	kompactbit = 5;
15048	15241	break;
15049		- case '+':
15050		- kompactbit = 6;
15051		- break;
	15242	+// case '+':
	15243	+// kompactbit = 6;
	15244	+// break;
15052	15245	case ' ':
15053	15246	lightMode ^= true;
15054	15247	Globals.lighttouched = true;
..	..	@@ -15060,6 +15253,7 @@
15060	15253	case ESC:
15061	15254	RENDERPROGRAM += 1;
15062	15255	RENDERPROGRAM %= 3;
	15256	+
15063	15257	repaint();
15064	15258	break;
15065	15259	case 'Z':
..	..	@@ -15099,8 +15293,9 @@
15099	15293	case DELETE:
15100	15294	ClearSelection();
15101	15295	break;
15102		- /*
15103	15296	case '+':
	15297	+
	15298	+ /*
15104	15299	//fontsize += 1;
15105	15300	bbzoom *= 2;
15106	15301	repaint();
..	..	@@ -15117,17 +15312,17 @@
15117	15312	case '=':
15118	15313	IncDepth();
15119	15314	//fontsize += 1;
15120		- object.editWindow.refreshContents(true);
	15315	+ object.GetWindow().refreshContents(true);
15121	15316	maskbit = 6;
15122	15317	break;
15123	15318	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
15124	15319	DecDepth();
15125	15320	maskbit = 5;
15126	15321	//if(fontsize > 1) fontsize -= 1;
15127		- if (object.editWindow == null)
15128		- new Exception().printStackTrace();
15129		- else
15130		- object.editWindow.refreshContents(true);
	15322	+// if (object.editWindow == null)
	15323	+// new Exception().printStackTrace();
	15324	+// else
	15325	+ object.GetWindow().refreshContents(true);
15131	15326	break;
15132	15327	case '{':
15133	15328	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15351,7 +15546,7 @@
15351	15546	}
15352	15547	*/
15353	15548
15354		- object.editWindow.EditSelection();
	15549	+ object.GetWindow().EditSelection(false);
15355	15550	}
15356	15551
15357	15552	void SelectParent()
..	..	@@ -15368,10 +15563,10 @@
15368	15563	{
15369	15564	//selectees.remove(i);
15370	15565	System.out.println("select parent of " + elem);
15371		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15566	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15372	15567	} else
15373	15568	{
15374		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15569	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15375	15570	}
15376	15571
15377	15572	first = false;
..	..	@@ -15413,12 +15608,12 @@
15413	15608	for (int j = 0; j < group.children.size(); j++)
15414	15609	{
15415	15610	elem = (Object3D) group.children.elementAt(j);
15416		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15611	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15417	15612	first = false;
15418	15613	}
15419	15614	} else
15420	15615	{
15421		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15616	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15422	15617	}
15423	15618
15424	15619	first = false;
..	..	@@ -15429,21 +15624,21 @@
15429	15624	{
15430	15625	//Composite group = (Composite) object;
15431	15626	Object3D group = object;
15432		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15627	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15433	15628	}
15434	15629
15435	15630	void ResetTransform(int mask)
15436	15631	{
15437	15632	//Composite group = (Composite) object;
15438	15633	Object3D group = object;
15439		- group.editWindow.ResetTransform(mask);
	15634	+ group.GetWindow().ResetTransform(mask);
15440	15635	}
15441	15636
15442	15637	void FlipTransform()
15443	15638	{
15444	15639	//Composite group = (Composite) object;
15445	15640	Object3D group = object;
15446		- group.editWindow.FlipTransform();
	15641	+ group.GetWindow().FlipTransform();
15447	15642	// group.editWindow.ReduceMesh(true);
15448	15643	}
15449	15644
..	..	@@ -15451,7 +15646,7 @@
15451	15646	{
15452	15647	//Composite group = (Composite) object;
15453	15648	Object3D group = object;
15454		- group.editWindow.PrintMemory();
	15649	+ group.GetWindow().PrintMemory();
15455	15650	// group.editWindow.ReduceMesh(true);
15456	15651	}
15457	15652
..	..	@@ -15459,7 +15654,7 @@
15459	15654	{
15460	15655	//Composite group = (Composite) object;
15461	15656	Object3D group = object;
15462		- group.editWindow.ResetCentroid();
	15657	+ group.GetWindow().ResetCentroid();
15463	15658	}
15464	15659
15465	15660	void IncDepth()
..	..	@@ -15635,6 +15830,7 @@
15635	15830	info.bounds.y += (height - desired) / 2;
15636	15831	}
15637	15832	}
	15833	+
15638	15834	info.g = gr;
15639	15835	info.camera = renderCamera;
15640	15836	/*
..	..	@@ -15644,23 +15840,44 @@
15644	15840	*/
15645	15841	if (!isRenderer)
15646	15842	{
15647		- object.drawEditHandles(info, 0);
15648		-
15649		- 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)
15650	15846	{
15651		- 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)
15652	15853	{
15653		- case Object3D.hitCenter: gr.setColor(Color.pink);
15654		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15655		- break;
15656		- case Object3D.hitRotate: gr.setColor(Color.yellow);
15657		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15658		- break;
15659		- case Object3D.hitScale: gr.setColor(Color.cyan);
15660		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15661		- 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;
15662	15861	}
15663		-
	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	+ }
15664	15881	}
15665	15882	}
15666	15883	}
..	..	@@ -16363,16 +16580,16 @@
16363	16580	cStatic.objectstack[materialdepth++] = checker;
16364	16581	//System.out.println("material " + material);
16365	16582	//Applet3D.tracein(this, selected);
16366		- vector2buffer = checker.projectedVertices;
	16583	+ //vector2buffer = checker.projectedVertices;
16367	16584
16368	16585	//checker.GetMaterial().Draw(this, false); // true);
16369		- DrawMaterial(checker.GetMaterial(), false); // true);
	16586	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16370	16587
16371	16588	materialdepth -= 1;
16372	16589	if (materialdepth > 0)
16373	16590	{
16374		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16375		- 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);
16376	16593	}
16377	16594	//checker.GetMaterial().opacity = 1f;
16378	16595	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16458,6 +16675,14 @@
16458	16675	}
16459	16676	}
16460	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	+
16461	16686	class SelectBuffer implements GLEventListener
16462	16687	{
16463	16688
..	..	@@ -16537,6 +16762,17 @@
16537	16762
16538	16763	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16539	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	+
16540	16776	//int tmp = selection_view;
16541	16777	//selection_view = -1;
16542	16778	int temp = DrawMode();
..	..	@@ -16548,6 +16784,17 @@
16548	16784	// temp = DEFAULT; // patch for selection debug
16549	16785	Globals.drawMode = temp; // WARNING
16550	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	+
16551	16798	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16552	16799
16553	16800	// trying different ways of getting the depth info over
..	..	@@ -16595,6 +16842,8 @@
16595	16842	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16596	16843	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16597	16844	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	16845	+
	16846	+ CreateSelectedPoint();
16598	16847
16599	16848	// Will fit the mesh !!!
16600	16849	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16649,29 +16898,31 @@
16649	16898	}
16650	16899
16651	16900	if (!movingcamera && !PAINTMODE)
16652		- object.editWindow.ScreenFitPoint(); // fev 2014
	16901	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16653	16902
16654		- 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)
16655	16904	{
16656		- 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);
16657	16906
16658		- Object3D group = new Object3D("inst" + paintcount++);
	16907	+ if (object.GetWindow().copy.selection.Size() > 0)
	16908	+ {
	16909	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16659	16910
16660		- group.CreateMaterial(); // use a void leaf to select instances
16661		-
16662		- group.add(paintobj); // link
16663		-
16664		- object.editWindow.SnapObject(group);
16665		-
16666		- Object3D folder = object.editWindow.copy;
16667		-
16668		- if (object.editWindow.copy.selection.Size() > 0)
16669		- folder = object.editWindow.copy.selection.elementAt(0);
16670		-
16671		- folder.add(group);
16672		-
16673		- object.editWindow.ResetModel();
16674		- 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	+ }
16675	16926	}
16676	16927	else
16677	16928	paintcount = 0;
..	..	@@ -16710,6 +16961,11 @@
16710	16961	//System.out.println("objects[color] = " + objects[color]);
16711	16962	//objects[color].Select();
16712	16963	indexcount = 0;
	16964	+ ObjEditor window = object.GetWindow();
	16965	+ if (window != null && deselect)
	16966	+ {
	16967	+ window.Select(null, deselect, true);
	16968	+ }
16713	16969	object.Select(color, deselect);
16714	16970	}
16715	16971
..	..	@@ -17235,23 +17491,15 @@
17235	17491	int AAbuffersize = 0;
17236	17492
17237	17493	//double[] selectedpoint = new double[3];
17238		- static Superellipsoid selectedpoint = new Superellipsoid();
	17494	+ static Superellipsoid selectedpoint;
17239	17495	static Sphere previousselectedpoint = null;
17240		- static Sphere debugpointG = new Sphere();
17241		- static Sphere debugpointP = new Sphere();
17242		- static Sphere debugpointC = new Sphere();
17243		- static Sphere debugpointR = new Sphere();
	17496	+ static Sphere debugpointG;
	17497	+ static Sphere debugpointP;
	17498	+ static Sphere debugpointC;
	17499	+ static Sphere debugpointR;
17244	17500
17245	17501	static Sphere debugpoints[] = new Sphere[8];
17246	17502
17247		- static
17248		- {
17249		- for (int i=0; i<8; i++)
17250		- {
17251		- debugpoints[i] = new Sphere();
17252		- }
17253		- }
17254		-
17255	17503	static void InitPoints(float radius)
17256	17504	{
17257	17505	for (int i=0; i<8; i++)