~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -18,7 +18,10 @@
18	18	import javax.imageio.ImageIO;
19	19	import javax.imageio.ImageWriteParam;
20	20	import javax.imageio.ImageWriter;
	21	+import javax.imageio.ImageReadParam;
	22	+import javax.imageio.ImageReader;
21	23	import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
	24	+import javax.imageio.stream.ImageInputStream;
22	25	import javax.imageio.stream.ImageOutputStream;
23	26	import javax.imageio.ImageWriteParam;
24	27
..	..	@@ -30,6 +33,7 @@
30	33	import java.nio.*;
31	34
32	35	import gleem.linalg.Mat4f;
	36	+import javax.imageio.ImageTypeSpecifier;
33	37
34	38	class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	39	{
..	..	@@ -44,6 +48,39 @@
44	48	static boolean ABORTED = false;
45	49
46	50	static int STEP = 1;
	51	+
	52	+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
	53	+ {
	54	+ int[] pixels = new int[bytes.length/3];
	55	+ for (int i=pixels.length; --i>=0;)
	56	+ {
	57	+ int i3 = i*3;
	58	+ pixels[i] = 0xFF;
	59	+ pixels[i] <<= 8;
	60	+ pixels[i] \|= bytes[i3+2] & 0xFF;
	61	+ pixels[i] <<= 8;
	62	+ pixels[i] \|= bytes[i3+1] & 0xFF;
	63	+ pixels[i] <<= 8;
	64	+ pixels[i] \|= bytes[i3] & 0xFF;
	65	+ }
	66	+ /*
	67	+ int r=0,g=0,b=0,a=0;
	68	+ for (int i=0; i<width; i++)
	69	+ for (int j=0; j<height; j++)
	70	+ {
	71	+ int index = j*width+i;
	72	+ int p = pixels[index];
	73	+ a = ((p>>24) & 0xFF);
	74	+ r = ((p>>16) & 0xFF);
	75	+ g = ((p>>8) & 0xFF);
	76	+ b = (p & 0xFF);
	77	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	78	+ }
	79	+ /**/
	80	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	81	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	82	+ return rendImage;
	83	+ }
47	84
48	85	/static/ private boolean CULLFACE = false; // true;
49	86	/static/ boolean NEAREST = false; // true;
..	..	@@ -60,7 +97,7 @@
60	97	//boolean REDUCETEXTURE = true;
61	98	boolean CACHETEXTURE = true;
62	99	boolean CLEANCACHE = false; // true;
63		- boolean MIPMAP = false; // true;
	100	+ boolean MIPMAP = false; // true; // never works...
64	101	boolean COMPRESSTEXTURE = false;
65	102	boolean KOMPACTTEXTURE = false; // true;
66	103	boolean RESIZETEXTURE = false;
..	..	@@ -169,7 +206,8 @@
169	206
170	207	SetCamera(cam);
171	208
172		- SetLight(new Camera(new cVector(10, 10, -20)));
	209	+ // Warning: not used.
	210	+ SetLight(new Camera(new cVector(15, 10, -20)));
173	211
174	212	object = o;
175	213
..	..	@@ -2405,6 +2443,21 @@
2405	2443	return currentGL;
2406	2444	}
2407	2445
	2446	+ static private BufferedImage CreateBim(TextureData texturedata)
	2447	+ {
	2448	+ Grafreed.Assert(texturedata != null);
	2449	+
	2450	+ int width = texturedata.getWidth();
	2451	+ int height = texturedata.getHeight();
	2452	+
	2453	+ Buffer buffer = texturedata.getBuffer();
	2454	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2455	+
	2456	+ byte[] bytes = bytebuf.array();
	2457	+
	2458	+ return CreateBim(bytes, width, height);
	2459	+ }
	2460	+
2408	2461	/**/
2409	2462	class CacheTexture
2410	2463	{
..	..	@@ -2413,28 +2466,31 @@
2413	2466
2414	2467	int resolution;
2415	2468
2416		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2469	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2417	2470	{
2418		- texture = tex;
	2471	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2472	+ texturedata = texdata;
2419	2473	resolution = res;
2420	2474	}
2421	2475	}
2422	2476	/**/
2423	2477
2424	2478	// TEXTURE static Texture texture;
2425		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2426		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2427		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2479	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2480	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2481	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2482	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2483	+
2428	2484	int pigmentdepth = 0;
2429	2485	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2430	2486	int bumpdepth = 0;
2431	2487	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2432	2488	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2433	2489	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2434		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2490	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2435	2491	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2436	2492
2437		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2493	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2438	2494	{
2439	2495	TextureData texturedata = null;
2440	2496
..	..	@@ -2453,13 +2509,34 @@
2453	2509	if (bump)
2454	2510	texturedata = ConvertBump(texturedata, false);
2455	2511
2456		- com.sun.opengl.util.texture.Texture texture =
2457		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2512	+// com.sun.opengl.util.texture.Texture texture =
	2513	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2458	2514
2459		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2460		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2515	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2516	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2461	2517
2462		- return texture;
	2518	+ return texturedata;
	2519	+ }
	2520	+
	2521	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2522	+ {
	2523	+ TextureData texturedata = null;
	2524	+
	2525	+ try
	2526	+ {
	2527	+ texturedata =
	2528	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2529	+ bim,
	2530	+ true);
	2531	+ } catch (Exception e)
	2532	+ {
	2533	+ throw new javax.media.opengl.GLException(e);
	2534	+ }
	2535	+
	2536	+ if (bump)
	2537	+ texturedata = ConvertBump(texturedata, false);
	2538	+
	2539	+ return texturedata;
2463	2540	}
2464	2541
2465	2542	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3532,6 +3609,8 @@
3532	3609
3533	3610	System.out.println("LOADING TEXTURE : " + name);
3534	3611
	3612	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3613	+
3535	3614	//
3536	3615	if (false) // compressbit > 0)
3537	3616	{
..	..	@@ -7930,7 +8009,7 @@
7930	8009	String pigment = Object3D.GetPigment(tex);
7931	8010	String bump = Object3D.GetBump(tex);
7932	8011
7933		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8012	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7934	8013	{
7935	8014	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7936	8015	// System.out.println("; bump = " + bump);
..	..	@@ -7945,8 +8024,8 @@
7945	8024	pigment = null;
7946	8025	}
7947	8026
7948		- ReleaseTexture(bump, true);
7949		- ReleaseTexture(pigment, false);
	8027	+ ReleaseTexture(tex, true);
	8028	+ ReleaseTexture(tex, false);
7950	8029	}
7951	8030
7952	8031	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -7964,7 +8043,7 @@
7964	8043
7965	8044	String pigment = Object3D.GetPigment(tex);
7966	8045
7967		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8046	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7968	8047	{
7969	8048	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7970	8049	// System.out.println("; bump = " + bump);
..	..	@@ -7975,7 +8054,7 @@
7975	8054	pigment = null;
7976	8055	}
7977	8056
7978		- ReleaseTexture(pigment, false);
	8057	+ ReleaseTexture(tex, false);
7979	8058	}
7980	8059
7981	8060	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -7993,7 +8072,7 @@
7993	8072
7994	8073	String bump = Object3D.GetBump(tex);
7995	8074
7996		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8075	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7997	8076	{
7998	8077	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7999	8078	// System.out.println("; bump = " + bump);
..	..	@@ -8004,10 +8083,10 @@
8004	8083	bump = null;
8005	8084	}
8006	8085
8007		- ReleaseTexture(bump, true);
	8086	+ ReleaseTexture(tex, true);
8008	8087	}
8009	8088
8010		- void ReleaseTexture(String tex, boolean bump)
	8089	+ void ReleaseTexture(cTexture tex, boolean bump)
8011	8090	{
8012	8091	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8013	8092	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8018,7 +8097,7 @@
8018	8097	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
8019	8098
8020	8099	if (tex != null)
8021		- texture = textures.get(tex);
	8100	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
8022	8101
8023	8102	// //assert( texture != null );
8024	8103	// if (texture == null)
..	..	@@ -8112,47 +8191,50 @@
8112	8191
8113	8192	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8114	8193	{
8115		- if (// DrawMode() != 0 \|\| /tex == null \|\|/
8116		- ambientOcclusion ) // \|\| !textureon)
8117		- {
8118		- return; // false;
8119		- }
8120		-
8121		- if (tex == null)
8122		- {
8123		- BindTexture(null,false,resolution);
8124		- BindTexture(null,true,resolution);
8125		- return;
8126		- }
	8194	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8195	+// ambientOcclusion ) // \|\| !textureon)
	8196	+// {
	8197	+// return; // false;
	8198	+// }
	8199	+//
	8200	+// if (tex == null)
	8201	+// {
	8202	+// BindTexture(null,false,resolution);
	8203	+// BindTexture(null,true,resolution);
	8204	+// return;
	8205	+// }
	8206	+//
	8207	+// String pigment = Object3D.GetPigment(tex);
	8208	+// String bump = Object3D.GetBump(tex);
	8209	+//
	8210	+// usedtextures.add(pigment);
	8211	+// usedtextures.add(bump);
	8212	+//
	8213	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8214	+// {
	8215	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8216	+// // System.out.println("; bump = " + bump);
	8217	+// }
	8218	+//
	8219	+// if (bump.equals(""))
	8220	+// {
	8221	+// bump = null;
	8222	+// }
	8223	+// if (pigment.equals(""))
	8224	+// {
	8225	+// pigment = null;
	8226	+// }
	8227	+//
	8228	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8229	+// BindTexture(pigment, false, resolution);
	8230	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8231	+// BindTexture(bump, true, resolution);
	8232	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8233	+//
	8234	+// return; // true;
8127	8235
8128		- String pigment = Object3D.GetPigment(tex);
8129		- String bump = Object3D.GetBump(tex);
8130		-
8131		- usedtextures.put(pigment, pigment);
8132		- usedtextures.put(bump, bump);
8133		-
8134		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8135		- {
8136		- // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8137		- // System.out.println("; bump = " + bump);
8138		- }
8139		-
8140		- if (bump.equals(""))
8141		- {
8142		- bump = null;
8143		- }
8144		- if (pigment.equals(""))
8145		- {
8146		- pigment = null;
8147		- }
8148		-
8149		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8150		- BindTexture(pigment, false, resolution);
8151		- GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8152		- BindTexture(bump, true, resolution);
8153		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8154		-
8155		- return; // true;
	8236	+ BindPigmentTexture(tex, resolution);
	8237	+ BindBumpTexture(tex, resolution);
8156	8238	}
8157	8239
8158	8240	/boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8171,9 +8253,9 @@
8171	8253
8172	8254	String pigment = Object3D.GetPigment(tex);
8173	8255
8174		- usedtextures.put(pigment, pigment);
	8256	+ usedtextures.add(tex);
8175	8257
8176		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8258	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8177	8259	{
8178	8260	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8179	8261	// System.out.println("; bump = " + bump);
..	..	@@ -8185,7 +8267,7 @@
8185	8267	}
8186	8268
8187	8269	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8188		- BindTexture(pigment, false, resolution);
	8270	+ BindTexture(tex, false, resolution);
8189	8271	}
8190	8272
8191	8273	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8204,9 +8286,9 @@
8204	8286
8205	8287	String bump = Object3D.GetBump(tex);
8206	8288
8207		- usedtextures.put(bump, bump);
	8289	+ usedtextures.add(tex);
8208	8290
8209		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8291	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8210	8292	{
8211	8293	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8212	8294	// System.out.println("; bump = " + bump);
..	..	@@ -8218,7 +8300,7 @@
8218	8300	}
8219	8301
8220	8302	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8221		- BindTexture(bump, true, resolution);
	8303	+ BindTexture(tex, true, resolution);
8222	8304	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8223	8305	}
8224	8306
..	..	@@ -8242,13 +8324,19 @@
8242	8324	return fileExists;
8243	8325	}
8244	8326
8245		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8327	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8246	8328	{
8247		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8329	+ CacheTexture texturecache = null;
8248	8330
8249	8331	if (tex != null)
8250	8332	{
8251		- String texname = tex;
	8333	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8334	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
	8335	+
	8336	+ if (texname.equals("") && texdata == null)
	8337	+ {
	8338	+ return null;
	8339	+ }
8252	8340
8253	8341	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8254	8342
..	..	@@ -8258,19 +8346,46 @@
8258	8346	// else
8259	8347	// if (!texname.startsWith("/"))
8260	8348	// texname = "/Users/nbriere/Textures/" + texname;
8261		- if (!FileExists(tex))
	8349	+ if (!FileExists(texname))
8262	8350	{
8263	8351	texname = fallbackTextureName;
8264	8352	}
8265	8353
8266	8354	if (CACHETEXTURE)
8267		- texture = textures.get(texname); // TEXTURE CACHE
8268		-
8269		- TextureData texturedata = null;
8270		-
8271		- if (texture == null \|\| texture.resolution < resolution)
8272	8355	{
8273		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8356	+ if (texdata == null)
	8357	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8358	+ else
	8359	+ texturecache = bimtextures.get(texdata);
	8360	+ }
	8361	+
	8362	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8363	+ {
	8364	+ TextureData texturedata = null;
	8365	+
	8366	+ if (texdata != null && textureon)
	8367	+ {
	8368	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8369	+
	8370	+ try
	8371	+ {
	8372	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8373	+ }
	8374	+ catch (Exception e)
	8375	+ {
	8376	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8377	+ }
	8378	+
	8379	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8380	+ bimtextures.put(texdata, texturecache);
	8381	+
	8382	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8383	+
	8384	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8385	+ //bim2 = bim;
	8386	+ }
	8387	+ else
	8388	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8274	8389	{
8275	8390	assert(!bump);
8276	8391	// if (bump)
..	..	@@ -8281,19 +8396,23 @@
8281	8396	// }
8282	8397	// else
8283	8398	// {
8284		- texture = textures.get(tex);
8285		- if (texture == null)
	8399	+ // texturecache = textures.get(texname); // suspicious
	8400	+ if (texturecache == null)
8286	8401	{
8287		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8402	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8288	8403	}
	8404	+ else
	8405	+ new Exception().printStackTrace();
8289	8406	// }
8290	8407	} else
8291		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8408	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8292	8409	{
8293	8410	assert(bump);
8294		- texture = textures.get(tex);
8295		- if (texture == null)
8296		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8411	+ // texturecache = textures.get(texname); // suspicious
	8412	+ if (texturecache == null)
	8413	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8414	+ else
	8415	+ new Exception().printStackTrace();
8297	8416	} else
8298	8417	{
8299	8418	//if (tex.equals("IMMORTAL"))
..	..	@@ -8301,11 +8420,13 @@
8301	8420	// texture = GetResourceTexture("default.png");
8302	8421	//} else
8303	8422	//{
8304		- if (tex.equals("WHITE_NOISE"))
	8423	+ if (texname.endsWith("WHITE_NOISE"))
8305	8424	{
8306		- texture = textures.get(tex);
8307		- if (texture == null)
8308		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8425	+ // texturecache = textures.get(texname); // suspicious
	8426	+ if (texturecache == null)
	8427	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8428	+ else
	8429	+ new Exception().printStackTrace();
8309	8430	} else
8310	8431	{
8311	8432	if (textureon)
..	..	@@ -8364,19 +8485,19 @@
8364	8485	if (texturedata == null)
8365	8486	throw new Exception();
8366	8487
8367		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8488	+ texturecache = new CacheTexture(texturedata,resolution);
8368	8489	//texture = GetTexture(tex, bump);
8369	8490	}
8370	8491	}
8371	8492	//}
8372	8493	}
8373	8494
8374		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8495	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8375	8496	{
8376	8497	//return false;
8377	8498
8378	8499	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8379		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8500	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8380	8501	{
8381	8502	// String ext = "_highres";
8382	8503	// if (REDUCETEXTURE)
..	..	@@ -8393,52 +8514,17 @@
8393	8514	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8394	8515	if (!cachefile.exists())
8395	8516	{
8396		- // cache to disk
8397		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8398		- //buffers[0].
8399		-
8400		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8401		- int[] pixels = new int[bytebuf.capacity()/3];
8402		-
8403		- // squared size heuristic...
8404		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8517	+ //if (texturedata.getWidth() == texturedata.getHeight())
8405	8518	{
8406		- for (int i=pixels.length; --i>=0;)
8407		- {
8408		- int i3 = i*3;
8409		- pixels[i] = 0xFF;
8410		- pixels[i] <<= 8;
8411		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8412		- pixels[i] <<= 8;
8413		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8414		- pixels[i] <<= 8;
8415		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8416		- }
8417		-
8418		- /*
8419		- int r=0,g=0,b=0,a=0;
8420		- for (int i=0; i<width; i++)
8421		- for (int j=0; j<height; j++)
8422		- {
8423		- int index = j*width+i;
8424		- int p = pixels[index];
8425		- a = ((p>>24) & 0xFF);
8426		- r = ((p>>16) & 0xFF);
8427		- g = ((p>>8) & 0xFF);
8428		- b = (p & 0xFF);
8429		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8430		- }
8431		- /**/
8432		- int width = (int)Math.sqrt(pixels.length); // squared
8433		- int height = width;
8434		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8435		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8519	+ BufferedImage rendImage = CreateBim(texturedata);
	8520	+
8436	8521	ImageWriter writer = null;
8437	8522	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8438	8523	if (iter.hasNext()) {
8439	8524	writer = (ImageWriter)iter.next();
8440	8525	}
8441		- float compressionQuality = 0.9f;
	8526	+
	8527	+ float compressionQuality = 0.85f;
8442	8528	try
8443	8529	{
8444	8530	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8455,18 +8541,20 @@
8455	8541	}
8456	8542	}
8457	8543	}
8458		-
	8544	+
	8545	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8546	+
8459	8547	//System.out.println("Texture = " + tex);
8460		- if (textures.containsKey(texname))
	8548	+ if (textures.containsKey(tex))
8461	8549	{
8462		- CacheTexture thetex = textures.get(texname);
	8550	+ CacheTexture thetex = textures.get(tex);
8463	8551	thetex.texture.disable();
8464	8552	thetex.texture.dispose();
8465		- textures.remove(texname);
	8553	+ textures.remove(tex);
8466	8554	}
8467	8555
8468		- texture.texturedata = texturedata;
8469		- textures.put(texname, texture);
	8556	+ //texture.texturedata = texturedata;
	8557	+ textures.put(tex, texturecache);
8470	8558
8471	8559	// newtex = true;
8472	8560	}
..	..	@@ -8482,10 +8570,44 @@
8482	8570	}
8483	8571	}
8484	8572
8485		- return texture;
	8573	+ return texturecache;
8486	8574	}
8487	8575
8488		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	8576	+ static void EmbedTextures(cTexture tex)
	8577	+ {
	8578	+ if (tex.pigmentdata == null)
	8579	+ {
	8580	+ //String texname = Object3D.GetPigment(tex);
	8581	+
	8582	+ CacheTexture texturecache = texturepigment.get(tex);
	8583	+
	8584	+ if (texturecache != null)
	8585	+ {
	8586	+ tex.pw = texturecache.texturedata.getWidth();
	8587	+ tex.ph = texturecache.texturedata.getHeight();
	8588	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8589	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8590	+ ;
	8591	+ //, tex.pw, tex.ph), 0.5f);
	8592	+ }
	8593	+ }
	8594	+
	8595	+ if (tex.bumpdata == null)
	8596	+ {
	8597	+ //String texname = Object3D.GetBump(tex);
	8598	+
	8599	+ CacheTexture texturecache = texturebump.get(tex);
	8600	+
	8601	+ if (texturecache != null)
	8602	+ {
	8603	+ tex.bw = texturecache.texturedata.getWidth();
	8604	+ tex.bh = texturecache.texturedata.getHeight();
	8605	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8606	+ }
	8607	+ }
	8608	+ }
	8609	+
	8610	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8489	8611	{
8490	8612	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8491	8613
..	..	@@ -8503,26 +8625,26 @@
8503	8625	return texture!=null?texture.texture:null;
8504	8626	}
8505	8627
8506		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
	8628	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8507	8629	{
8508	8630	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8509	8631
8510	8632	return texture!=null?texture.texturedata:null;
8511	8633	}
8512	8634
8513		- com.sun.opengl.util.texture.Texture BindTexture(String tex, boolean bump, int resolution) throws Exception
	8635	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8514	8636	{
8515	8637	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8516	8638	{
8517	8639	return false;
8518	8640	}
8519	8641
8520		- boolean newtex = false;
	8642	+ //boolean newtex = false;
8521	8643
8522	8644	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8523	8645
8524	8646	if (texture == null)
8525		- return texture;
	8647	+ return false;
8526	8648	/**/
8527	8649
8528	8650	if (textureon \|\| tex.equals("DEFAULT_TEXTURE") \|\| tex.equals("DEFAULT_TEXTURE_BUMP") \|\| tex.equals("WHITE_NOISE")) // \|\| tex.equals("IMMORTAL"))
..	..	@@ -8549,9 +8671,75 @@
8549	8671	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8550	8672	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8551	8673
8552		- return newtex;
	8674	+ return true; // Warning: not used.
8553	8675	}
8554	8676
	8677	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8678	+ {
	8679	+ try
	8680	+ {
	8681	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8682	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8683	+ ImageWriter writer = writers.next();
	8684	+
	8685	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8686	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8687	+ param.setCompressionQuality(quality);
	8688	+
	8689	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8690	+ writer.setOutput(ios);
	8691	+ writer.write(null, new IIOImage(image, null, null), param);
	8692	+
	8693	+ byte[] data = baos.toByteArray();
	8694	+ writer.dispose();
	8695	+ return data;
	8696	+ }
	8697	+ catch (Exception e)
	8698	+ {
	8699	+ e.printStackTrace();
	8700	+ return null;
	8701	+ }
	8702	+ }
	8703	+
	8704	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8705	+ {
	8706	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8707	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8708	+ ImageReader reader = writers.next();
	8709	+
	8710	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8711	+
	8712	+ ImageReadParam param = reader.getDefaultReadParam();
	8713	+ param.setDestination(bim);
	8714	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8715	+
	8716	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8717	+ reader.setInput(ios);
	8718	+ BufferedImage bim2 = reader.read(0, param);
	8719	+ reader.dispose();
	8720	+
	8721	+// WritableRaster raster = bim2.getRaster();
	8722	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8723	+// byte[] bytes = data.getData();
	8724	+//
	8725	+// int[] pixels = new int[bytes.length/3];
	8726	+// for (int i=pixels.length; --i>=0;)
	8727	+// {
	8728	+// int i3 = i*3;
	8729	+// pixels[i] = 0xFF;
	8730	+// pixels[i] <<= 8;
	8731	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8732	+// pixels[i] <<= 8;
	8733	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8734	+// pixels[i] <<= 8;
	8735	+// pixels[i] \|= bytes[i3] & 0xFF;
	8736	+// }
	8737	+//
	8738	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8739	+
	8740	+ return bim;
	8741	+ }
	8742	+
8555	8743	ShadowBuffer shadowPBuf;
8556	8744	AntialiasBuffer antialiasPBuf;
8557	8745	int MAXSTACK;
..	..	@@ -9512,7 +9700,7 @@
9512	9700
9513	9701	if (renderCamera != lightCamera)
9514	9702	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9515		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9703	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9516	9704
9517	9705	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9518	9706
..	..	@@ -9528,7 +9716,7 @@
9528	9716
9529	9717	if (renderCamera != lightCamera)
9530	9718	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9531		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9719	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9532	9720
9533	9721	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9534	9722
..	..	@@ -10729,7 +10917,7 @@
10729	10917	// if (parentcam != renderCamera) // not a light
10730	10918	if (cam != lightCamera)
10731	10919	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10732		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10920	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10733	10921
10734	10922	for (int j = 0; j < 4; j++)
10735	10923	{
..	..	@@ -10744,7 +10932,7 @@
10744	10932	// if (parentcam != renderCamera) // not a light
10745	10933	if (cam != lightCamera)
10746	10934	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10747		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	10935	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10748	10936
10749	10937	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10750	10938
..	..	@@ -11297,7 +11485,7 @@
11297	11485	}
11298	11486	}
11299	11487
11300		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11488	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11301	11489	{
11302	11490	//gl.glDepthFunc(GL.GL_LEQUAL);
11303	11491	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11305,24 +11493,21 @@
11305	11493
11306	11494	boolean texon = textureon;
11307	11495
11308		- if (RENDERPROGRAM > 0)
11309		- {
11310		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11311		- textureon = false;
11312		- }
	11496	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11497	+ textureon = false;
	11498	+
11313	11499	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11314	11500	//System.out.println("ALLO");
11315	11501	gl.glColorMask(false, false, false, false);
11316	11502	DrawObject(gl);
11317		- if (RENDERPROGRAM > 0)
11318		- {
11319		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11320		- textureon = texon;
11321		- }
	11503	+
	11504	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11505	+ textureon = texon;
	11506	+
11322	11507	gl.glColorMask(true, true, true, true);
11323	11508
11324	11509	gl.glDepthFunc(GL.GL_EQUAL);
11325		- //gl.glDepthMask(false);
	11510	+ gl.glDepthMask(false);
11326	11511	}
11327	11512
11328	11513	if (false) // DrawMode() == SHADOW)
..	..	@@ -11662,20 +11847,32 @@
11662	11847	ReleaseTextures(DEFAULT_TEXTURES);
11663	11848
11664	11849	if (CLEANCACHE)
11665		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11850	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11666	11851	{
11667		- String tex = e.nextElement();
	11852	+ cTexture tex = e.nextElement();
11668	11853
11669	11854	// System.out.println("Texture --------- " + tex);
11670	11855
11671		- if (tex.equals("WHITE_NOISE"))
	11856	+ if (tex.equals("WHITE_NOISE:"))
11672	11857	continue;
11673	11858
11674		- if (!usedtextures.containsKey(tex))
	11859	+ if (!usedtextures.contains(tex))
11675	11860	{
	11861	+ CacheTexture gettex = texturepigment.get(tex);
11676	11862	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11677		- textures.get(tex).texture.dispose();
11678		- textures.remove(tex);
	11863	+ if (gettex != null)
	11864	+ {
	11865	+ gettex.texture.dispose();
	11866	+ texturepigment.remove(tex);
	11867	+ }
	11868	+
	11869	+ gettex = texturebump.get(tex);
	11870	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11871	+ if (gettex != null)
	11872	+ {
	11873	+ gettex.texture.dispose();
	11874	+ texturebump.remove(tex);
	11875	+ }
11679	11876	}
11680	11877	}
11681	11878	}
..	..	@@ -12204,7 +12401,74 @@
12204	12401	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12205	12402
12206	12403	String program =
	12404	+ // Min shader
12207	12405	"!!ARBfp1.0\n" +
	12406	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12407	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12408	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12409	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12410	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12411	+ "PARAM light2cam0 = program.env[10];" +
	12412	+ "PARAM light2cam1 = program.env[11];" +
	12413	+ "PARAM light2cam2 = program.env[12];" +
	12414	+ "TEMP temp;" +
	12415	+ "TEMP light;" +
	12416	+ "TEMP ndotl;" +
	12417	+ "TEMP normal;" +
	12418	+ "TEMP depth;" +
	12419	+ "TEMP eye;" +
	12420	+ "TEMP pos;" +
	12421	+
	12422	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12423	+ Normalize("normal") +
	12424	+ "MOV light, state.light[0].position;" +
	12425	+ "DP3 ndotl.x, light, normal;" +
	12426	+
	12427	+ // shadow
	12428	+ "MOV pos, fragment.texcoord[1];" +
	12429	+ "MOV temp, pos;" +
	12430	+ ShadowTextureFetch("depth", "temp", "1") +
	12431	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12432	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12433	+
	12434	+ // No shadow when out of frustum
	12435	+ //"SGE temp.y, depth.z, zero123.y;" +
	12436	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12437	+
	12438	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12439	+
	12440	+ // Backlit
	12441	+ "MOV pos.w, zero123.y;" +
	12442	+ "DP4 eye.x, pos, light2cam0;" +
	12443	+ "DP4 eye.y, pos, light2cam1;" +
	12444	+ "DP4 eye.z, pos, light2cam2;" +
	12445	+ Normalize("eye") +
	12446	+
	12447	+ "DP3 ndotl.y, -eye, normal;" +
	12448	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12449	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12450	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12451	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12452	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12453	+
	12454	+ "MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12455	+
	12456	+ // Pigment
	12457	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12458	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12459	+ "MUL temp, temp, ndotl.x;" +
	12460	+
	12461	+ "MUL temp, temp, zero123.z;" +
	12462	+
	12463	+ //"MUL temp, temp, ndotl.y;" +
	12464	+
	12465	+ "MOV temp.w, zero123.y;" + // reset alpha
	12466	+ "MOV result.color, temp;" +
	12467	+ "END";
	12468	+
	12469	+ String program2 =
	12470	+ "!!ARBfp1.0\n" +
	12471	+
12208	12472	//"OPTION ARB_fragment_program_shadow;" +
12209	12473	"PARAM light2cam0 = program.env[10];" +
12210	12474	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12319,8 +12583,7 @@
12319	12583	"TEMP shininess;" +
12320	12584	"\n" +
12321	12585	"MOV texSamp, one;" +
12322		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12323		-
	12586	+
12324	12587	"MOV mapgrid.x, one2048th.x;" +
12325	12588	"MOV temp, fragment.texcoord[1];" +
12326	12589	/*
..	..	@@ -12341,20 +12604,20 @@
12341	12604	"MUL temp, floor, mapgrid.x;" +
12342	12605	//"TEX depth0, temp, texture[1], 2D;" +
12343	12606	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12344		- TextureFetch("depth0", "temp", "1") +
	12607	+ ShadowTextureFetch("depth0", "temp", "1") +
12345	12608	"") +
12346	12609	"ADD temp.x, temp.x, mapgrid.x;" +
12347	12610	//"TEX depth1, temp, texture[1], 2D;" +
12348	12611	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12349		- TextureFetch("depth1", "temp", "1") +
	12612	+ ShadowTextureFetch("depth1", "temp", "1") +
12350	12613	"") +
12351	12614	"ADD temp.y, temp.y, mapgrid.x;" +
12352	12615	//"TEX depth2, temp, texture[1], 2D;" +
12353		- TextureFetch("depth2", "temp", "1") +
	12616	+ ShadowTextureFetch("depth2", "temp", "1") +
12354	12617	"SUB temp.x, temp.x, mapgrid.x;" +
12355	12618	//"TEX depth3, temp, texture[1], 2D;" +
12356	12619	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12357		- TextureFetch("depth3", "temp", "1") +
	12620	+ ShadowTextureFetch("depth3", "temp", "1") +
12358	12621	"") +
12359	12622	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12360	12623	//"MOV params, material;" +
..	..	@@ -12725,7 +12988,7 @@
12725	12988	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12726	12989	"") +
12727	12990
12728		- // display shadow only (bump == 0)
	12991	+ // display shadow only (fakedepth == 0)
12729	12992	"SUB temp.x, half.x, shadow.x;" +
12730	12993	"MOV temp.y, -params5.z;" + // params6.x;" +
12731	12994	"SLT temp.z, temp.y, -one2048th.x;" +
..	..	@@ -13152,25 +13415,26 @@
13152	13415	return out;
13153	13416	}
13154	13417
13155		- String TextureFetch(String dest, String src, String unit)
	13418	+ // Also does frustum culling
	13419	+ String ShadowTextureFetch(String dest, String src, String unit)
13156	13420	{
13157	13421	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13158	13422	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13159	13423	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13424	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13425	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13160	13426	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13161		- "SLT " + src + ".z, " + src + ".x, one.x;" +
13162		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13163		- "SLT " + src + ".z, " + src + ".y, one.x;" +
13164		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13427	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13428	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13165	13429	//"SWZ buffer, temp, w,w,w,w;";
13166		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13430	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13167	13431	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13168	13432	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13169	13433	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13170		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13434	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13171	13435
13172		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13173		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13436	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13437	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13174	13438	}
13175	13439
13176	13440	String Shadow(String depth, String shadow)
..	..	@@ -13217,7 +13481,7 @@
13217	13481	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13218	13482	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13219	13483
13220		- // No shadow when out of frustrum
	13484	+ // No shadow when out of frustum
13221	13485	"SGE temp.x, " + depth + ".z, one.z;" +
13222	13486	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13223	13487	"";
..	..	@@ -14015,14 +14279,15 @@
14015	14279	drag = false;
14016	14280	//System.out.println("Mouse DOWN");
14017	14281	editObj = false;
14018		- ClickInfo info = new ClickInfo();
14019		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14020		- info.pane = this;
14021		- info.camera = renderCamera;
14022		- info.x = x;
14023		- info.y = y;
14024		- info.modifiers = modifiersex;
14025		- editObj = object.doEditClick(info, 0);
	14282	+ //ClickInfo info = new ClickInfo();
	14283	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14284	+ object.clickInfo.pane = this;
	14285	+ object.clickInfo.camera = renderCamera;
	14286	+ object.clickInfo.x = x;
	14287	+ object.clickInfo.y = y;
	14288	+ object.clickInfo.modifiers = modifiersex;
	14289	+ editObj = object.doEditClick(//info,
	14290	+ 0);
14026	14291	if (!editObj)
14027	14292	{
14028	14293	hasMarquee = true;
..	..	@@ -14422,15 +14687,16 @@
14422	14687	if (editObj)
14423	14688	{
14424	14689	drag = true;
14425		- ClickInfo info = new ClickInfo();
14426		- info.bounds.setBounds(0, 0,
	14690	+ //ClickInfo info = new ClickInfo();
	14691	+ object.clickInfo.bounds.setBounds(0, 0,
14427	14692	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14428		- info.pane = this;
14429		- info.camera = renderCamera;
14430		- info.x = x;
14431		- info.y = y;
14432		- object.GetWindow().copy
14433		- .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	14693	+ object.clickInfo.pane = this;
	14694	+ object.clickInfo.camera = renderCamera;
	14695	+ object.clickInfo.x = x;
	14696	+ object.clickInfo.y = y;
	14697	+ object //.GetWindow().copy
	14698	+ .doEditDrag(//info,
	14699	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14434	14700	} else
14435	14701	{
14436	14702	if (x < startX)
..	..	@@ -14579,24 +14845,27 @@
14579	14845	}
14580	14846	}
14581	14847
	14848	+// ClickInfo clickInfo = new ClickInfo();
	14849	+
14582	14850	public void mouseMoved(MouseEvent e)
14583	14851	{
14584	14852	//System.out.println("mouseMoved: " + e);
14585	14853	if (isRenderer)
14586	14854	return;
14587	14855
14588		- ClickInfo ci = new ClickInfo();
14589		- ci.x = e.getX();
14590		- ci.y = e.getY();
14591		- ci.modifiers = e.getModifiersEx();
14592		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14593		- ci.pane = this;
14594		- ci.camera = renderCamera;
	14856	+ // Mouse cursor feedback
	14857	+ object.clickInfo.x = e.getX();
	14858	+ object.clickInfo.y = e.getY();
	14859	+ object.clickInfo.modifiers = e.getModifiersEx();
	14860	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14861	+ object.clickInfo.pane = this;
	14862	+ object.clickInfo.camera = renderCamera;
14595	14863	if (!isRenderer)
14596	14864	{
14597	14865	//ObjEditor editWindow = object.editWindow;
14598	14866	//Object3D copy = editWindow.copy;
14599		- if (object.doEditClick(ci, 0))
	14867	+ if (object.doEditClick(//clickInfo,
	14868	+ 0))
14600	14869	{
14601	14870	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14602	14871	} else
..	..	@@ -14868,7 +15137,8 @@
14868	15137	// break;
14869	15138	case 'T':
14870	15139	CACHETEXTURE ^= true;
14871		- textures.clear();
	15140	+ texturepigment.clear();
	15141	+ texturebump.clear();
14872	15142	// repaint();
14873	15143	break;
14874	15144	case 'Y':
..	..	@@ -15621,8 +15891,6 @@
15621	15891
15622	15892	int width = getBounds().width;
15623	15893	int height = getBounds().height;
15624		- ClickInfo info = new ClickInfo();
15625		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15626	15894	//Image img = CreateImage(width, height);
15627	15895	//System.out.println("width = " + width + "; height = " + height + "\n");
15628	15896
..	..	@@ -15699,31 +15967,37 @@
15699	15967	}
15700	15968	if (object != null && !hasMarquee)
15701	15969	{
	15970	+ if (object.clickInfo == null)
	15971	+ object.clickInfo = new ClickInfo();
	15972	+ ClickInfo info = object.clickInfo;
	15973	+ //ClickInfo info = new ClickInfo();
	15974	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	15975	+
15702	15976	if (isRenderer)
15703	15977	{
15704		- info.flags++;
	15978	+ object.clickInfo.flags++;
15705	15979	double frameAspect = (double) width / (double) height;
15706	15980	if (frameAspect > renderCamera.aspect)
15707	15981	{
15708	15982	int desired = (int) ((double) height * renderCamera.aspect);
15709		- info.bounds.width -= width - desired;
15710		- info.bounds.x += (width - desired) / 2;
	15983	+ object.clickInfo.bounds.width -= width - desired;
	15984	+ object.clickInfo.bounds.x += (width - desired) / 2;
15711	15985	} else
15712	15986	{
15713	15987	int desired = (int) ((double) width / renderCamera.aspect);
15714		- info.bounds.height -= height - desired;
15715		- info.bounds.y += (height - desired) / 2;
	15988	+ object.clickInfo.bounds.height -= height - desired;
	15989	+ object.clickInfo.bounds.y += (height - desired) / 2;
15716	15990	}
15717	15991	}
15718	15992
15719		- info.g = gr;
15720		- info.camera = renderCamera;
	15993	+ object.clickInfo.g = gr;
	15994	+ object.clickInfo.camera = renderCamera;
15721	15995	/*
15722	15996	// Memory intensive (brep.verticescopy)
15723	15997	if (!(object instanceof Composite))
15724	15998	object.draw(info, 0, false); // SLOW :
15725	15999	*/
15726		- if (!isRenderer)
	16000	+ if (!isRenderer) // && drag)
15727	16001	{
15728	16002	Grafreed.Assert(object != null);
15729	16003	Grafreed.Assert(object.selection != null);
..	..	@@ -15731,9 +16005,9 @@
15731	16005	{
15732	16006	int hitSomething = object.selection.get(0).hitSomething;
15733	16007
15734		- info.DX = 0;
15735		- info.DY = 0;
15736		- info.W = 1;
	16008	+ object.clickInfo.DX = 0;
	16009	+ object.clickInfo.DY = 0;
	16010	+ object.clickInfo.W = 1;
15737	16011	if (hitSomething == Object3D.hitCenter)
15738	16012	{
15739	16013	info.DX = X;
..	..	@@ -15745,7 +16019,8 @@
15745	16019	info.DY -= info.bounds.height/2;
15746	16020	}
15747	16021
15748		- object.drawEditHandles(info, 0);
	16022	+ object.drawEditHandles(//info,
	16023	+ 0);
15749	16024
15750	16025	if (drag && (X != 0 \|\| Y != 0))
15751	16026	{
..	..	@@ -15758,7 +16033,7 @@
15758	16033	gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15759	16034	break;
15760	16035	case Object3D.hitScale: gr.setColor(Color.cyan);
15761		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16036	+ gr.drawLine(X, Y, 0, 0);
15762	16037	break;
15763	16038	}
15764	16039