~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;
..	..	@@ -2405,6 +2442,21 @@
2405	2442	return currentGL;
2406	2443	}
2407	2444
	2445	+ static private BufferedImage CreateBim(TextureData texturedata)
	2446	+ {
	2447	+ Grafreed.Assert(texturedata != null);
	2448	+
	2449	+ int width = texturedata.getWidth();
	2450	+ int height = texturedata.getHeight();
	2451	+
	2452	+ Buffer buffer = texturedata.getBuffer();
	2453	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2454	+
	2455	+ byte[] bytes = bytebuf.array();
	2456	+
	2457	+ return CreateBim(bytes, width, height);
	2458	+ }
	2459	+
2408	2460	/**/
2409	2461	class CacheTexture
2410	2462	{
..	..	@@ -2413,28 +2465,31 @@
2413	2465
2414	2466	int resolution;
2415	2467
2416		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2468	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2417	2469	{
2418		- texture = tex;
	2470	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2471	+ texturedata = texdata;
2419	2472	resolution = res;
2420	2473	}
2421	2474	}
2422	2475	/**/
2423	2476
2424	2477	// 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>();
	2478	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2479	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2480	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2481	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2482	+
2428	2483	int pigmentdepth = 0;
2429	2484	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2430	2485	int bumpdepth = 0;
2431	2486	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2432	2487	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2433	2488	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2434		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2489	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2435	2490	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2436	2491
2437		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2492	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2438	2493	{
2439	2494	TextureData texturedata = null;
2440	2495
..	..	@@ -2453,13 +2508,34 @@
2453	2508	if (bump)
2454	2509	texturedata = ConvertBump(texturedata, false);
2455	2510
2456		- com.sun.opengl.util.texture.Texture texture =
2457		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2511	+// com.sun.opengl.util.texture.Texture texture =
	2512	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2458	2513
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);
	2514	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2515	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2461	2516
2462		- return texture;
	2517	+ return texturedata;
	2518	+ }
	2519	+
	2520	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2521	+ {
	2522	+ TextureData texturedata = null;
	2523	+
	2524	+ try
	2525	+ {
	2526	+ texturedata =
	2527	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2528	+ bim,
	2529	+ true);
	2530	+ } catch (Exception e)
	2531	+ {
	2532	+ throw new javax.media.opengl.GLException(e);
	2533	+ }
	2534	+
	2535	+ if (bump)
	2536	+ texturedata = ConvertBump(texturedata, false);
	2537	+
	2538	+ return texturedata;
2463	2539	}
2464	2540
2465	2541	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3532,6 +3608,8 @@
3532	3608
3533	3609	System.out.println("LOADING TEXTURE : " + name);
3534	3610
	3611	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3612	+
3535	3613	//
3536	3614	if (false) // compressbit > 0)
3537	3615	{
..	..	@@ -7945,8 +8023,8 @@
7945	8023	pigment = null;
7946	8024	}
7947	8025
7948		- ReleaseTexture(bump, true);
7949		- ReleaseTexture(pigment, false);
	8026	+ ReleaseTexture(tex, true);
	8027	+ ReleaseTexture(tex, false);
7950	8028	}
7951	8029
7952	8030	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -7975,7 +8053,7 @@
7975	8053	pigment = null;
7976	8054	}
7977	8055
7978		- ReleaseTexture(pigment, false);
	8056	+ ReleaseTexture(tex, false);
7979	8057	}
7980	8058
7981	8059	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -8004,10 +8082,10 @@
8004	8082	bump = null;
8005	8083	}
8006	8084
8007		- ReleaseTexture(bump, true);
	8085	+ ReleaseTexture(tex, true);
8008	8086	}
8009	8087
8010		- void ReleaseTexture(String tex, boolean bump)
	8088	+ void ReleaseTexture(cTexture tex, boolean bump)
8011	8089	{
8012	8090	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8013	8091	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8018,7 +8096,7 @@
8018	8096	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
8019	8097
8020	8098	if (tex != null)
8021		- texture = textures.get(tex);
	8099	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
8022	8100
8023	8101	// //assert( texture != null );
8024	8102	// if (texture == null)
..	..	@@ -8112,47 +8190,50 @@
8112	8190
8113	8191	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8114	8192	{
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		- }
	8193	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8194	+// ambientOcclusion ) // \|\| !textureon)
	8195	+// {
	8196	+// return; // false;
	8197	+// }
	8198	+//
	8199	+// if (tex == null)
	8200	+// {
	8201	+// BindTexture(null,false,resolution);
	8202	+// BindTexture(null,true,resolution);
	8203	+// return;
	8204	+// }
	8205	+//
	8206	+// String pigment = Object3D.GetPigment(tex);
	8207	+// String bump = Object3D.GetBump(tex);
	8208	+//
	8209	+// usedtextures.add(pigment);
	8210	+// usedtextures.add(bump);
	8211	+//
	8212	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8213	+// {
	8214	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8215	+// // System.out.println("; bump = " + bump);
	8216	+// }
	8217	+//
	8218	+// if (bump.equals(""))
	8219	+// {
	8220	+// bump = null;
	8221	+// }
	8222	+// if (pigment.equals(""))
	8223	+// {
	8224	+// pigment = null;
	8225	+// }
	8226	+//
	8227	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8228	+// BindTexture(pigment, false, resolution);
	8229	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8230	+// BindTexture(bump, true, resolution);
	8231	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8232	+//
	8233	+// return; // true;
8127	8234
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;
	8235	+ BindPigmentTexture(tex, resolution);
	8236	+ BindBumpTexture(tex, resolution);
8156	8237	}
8157	8238
8158	8239	/boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8171,7 +8252,7 @@
8171	8252
8172	8253	String pigment = Object3D.GetPigment(tex);
8173	8254
8174		- usedtextures.put(pigment, pigment);
	8255	+ usedtextures.add(tex);
8175	8256
8176	8257	//if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8177	8258	{
..	..	@@ -8185,7 +8266,7 @@
8185	8266	}
8186	8267
8187	8268	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8188		- BindTexture(pigment, false, resolution);
	8269	+ BindTexture(tex, false, resolution);
8189	8270	}
8190	8271
8191	8272	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8204,7 +8285,7 @@
8204	8285
8205	8286	String bump = Object3D.GetBump(tex);
8206	8287
8207		- usedtextures.put(bump, bump);
	8288	+ usedtextures.add(tex);
8208	8289
8209	8290	//if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8210	8291	{
..	..	@@ -8218,7 +8299,7 @@
8218	8299	}
8219	8300
8220	8301	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8221		- BindTexture(bump, true, resolution);
	8302	+ BindTexture(tex, true, resolution);
8222	8303	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8223	8304	}
8224	8305
..	..	@@ -8242,13 +8323,19 @@
8242	8323	return fileExists;
8243	8324	}
8244	8325
8245		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8326	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8246	8327	{
8247		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8328	+ CacheTexture texturecache = null;
8248	8329
8249	8330	if (tex != null)
8250	8331	{
8251		- String texname = tex;
	8332	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8333	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
	8334	+
	8335	+ if (texname.equals("") && texdata == null)
	8336	+ {
	8337	+ return null;
	8338	+ }
8252	8339
8253	8340	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8254	8341
..	..	@@ -8258,19 +8345,46 @@
8258	8345	// else
8259	8346	// if (!texname.startsWith("/"))
8260	8347	// texname = "/Users/nbriere/Textures/" + texname;
8261		- if (!FileExists(tex))
	8348	+ if (!FileExists(texname))
8262	8349	{
8263	8350	texname = fallbackTextureName;
8264	8351	}
8265	8352
8266	8353	if (CACHETEXTURE)
8267		- texture = textures.get(texname); // TEXTURE CACHE
8268		-
8269		- TextureData texturedata = null;
8270		-
8271		- if (texture == null \|\| texture.resolution < resolution)
8272	8354	{
8273		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8355	+ if (texdata == null)
	8356	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8357	+ else
	8358	+ texturecache = bimtextures.get(texdata);
	8359	+ }
	8360	+
	8361	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8362	+ {
	8363	+ TextureData texturedata = null;
	8364	+
	8365	+ if (texdata != null && textureon)
	8366	+ {
	8367	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8368	+
	8369	+ try
	8370	+ {
	8371	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8372	+ }
	8373	+ catch (Exception e)
	8374	+ {
	8375	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8376	+ }
	8377	+
	8378	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8379	+ bimtextures.put(texdata, texturecache);
	8380	+
	8381	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8382	+
	8383	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8384	+ //bim2 = bim;
	8385	+ }
	8386	+ else
	8387	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8274	8388	{
8275	8389	assert(!bump);
8276	8390	// if (bump)
..	..	@@ -8281,19 +8395,23 @@
8281	8395	// }
8282	8396	// else
8283	8397	// {
8284		- texture = textures.get(tex);
8285		- if (texture == null)
	8398	+ // texturecache = textures.get(texname); // suspicious
	8399	+ if (texturecache == null)
8286	8400	{
8287		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8401	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8288	8402	}
	8403	+ else
	8404	+ new Exception().printStackTrace();
8289	8405	// }
8290	8406	} else
8291		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8407	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8292	8408	{
8293	8409	assert(bump);
8294		- texture = textures.get(tex);
8295		- if (texture == null)
8296		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8410	+ // texturecache = textures.get(texname); // suspicious
	8411	+ if (texturecache == null)
	8412	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8413	+ else
	8414	+ new Exception().printStackTrace();
8297	8415	} else
8298	8416	{
8299	8417	//if (tex.equals("IMMORTAL"))
..	..	@@ -8301,11 +8419,13 @@
8301	8419	// texture = GetResourceTexture("default.png");
8302	8420	//} else
8303	8421	//{
8304		- if (tex.equals("WHITE_NOISE"))
	8422	+ if (texname.endsWith("WHITE_NOISE"))
8305	8423	{
8306		- texture = textures.get(tex);
8307		- if (texture == null)
8308		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8424	+ // texturecache = textures.get(texname); // suspicious
	8425	+ if (texturecache == null)
	8426	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8427	+ else
	8428	+ new Exception().printStackTrace();
8309	8429	} else
8310	8430	{
8311	8431	if (textureon)
..	..	@@ -8364,19 +8484,19 @@
8364	8484	if (texturedata == null)
8365	8485	throw new Exception();
8366	8486
8367		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8487	+ texturecache = new CacheTexture(texturedata,resolution);
8368	8488	//texture = GetTexture(tex, bump);
8369	8489	}
8370	8490	}
8371	8491	//}
8372	8492	}
8373	8493
8374		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8494	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8375	8495	{
8376	8496	//return false;
8377	8497
8378	8498	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8379		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8499	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8380	8500	{
8381	8501	// String ext = "_highres";
8382	8502	// if (REDUCETEXTURE)
..	..	@@ -8393,52 +8513,17 @@
8393	8513	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8394	8514	if (!cachefile.exists())
8395	8515	{
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))
	8516	+ //if (texturedata.getWidth() == texturedata.getHeight())
8405	8517	{
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);
	8518	+ BufferedImage rendImage = CreateBim(texturedata);
	8519	+
8436	8520	ImageWriter writer = null;
8437	8521	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8438	8522	if (iter.hasNext()) {
8439	8523	writer = (ImageWriter)iter.next();
8440	8524	}
8441		- float compressionQuality = 0.9f;
	8525	+
	8526	+ float compressionQuality = 0.85f;
8442	8527	try
8443	8528	{
8444	8529	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8455,18 +8540,20 @@
8455	8540	}
8456	8541	}
8457	8542	}
8458		-
	8543	+
	8544	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8545	+
8459	8546	//System.out.println("Texture = " + tex);
8460		- if (textures.containsKey(texname))
	8547	+ if (textures.containsKey(tex))
8461	8548	{
8462		- CacheTexture thetex = textures.get(texname);
	8549	+ CacheTexture thetex = textures.get(tex);
8463	8550	thetex.texture.disable();
8464	8551	thetex.texture.dispose();
8465		- textures.remove(texname);
	8552	+ textures.remove(tex);
8466	8553	}
8467	8554
8468		- texture.texturedata = texturedata;
8469		- textures.put(texname, texture);
	8555	+ //texture.texturedata = texturedata;
	8556	+ textures.put(tex, texturecache);
8470	8557
8471	8558	// newtex = true;
8472	8559	}
..	..	@@ -8482,10 +8569,44 @@
8482	8569	}
8483	8570	}
8484	8571
8485		- return texture;
	8572	+ return texturecache;
8486	8573	}
8487	8574
8488		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	8575	+ static void EmbedTextures(cTexture tex)
	8576	+ {
	8577	+ if (tex.pigmentdata == null)
	8578	+ {
	8579	+ //String texname = Object3D.GetPigment(tex);
	8580	+
	8581	+ CacheTexture texturecache = texturepigment.get(tex);
	8582	+
	8583	+ if (texturecache != null)
	8584	+ {
	8585	+ tex.pw = texturecache.texturedata.getWidth();
	8586	+ tex.ph = texturecache.texturedata.getHeight();
	8587	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8588	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8589	+ ;
	8590	+ //, tex.pw, tex.ph), 0.5f);
	8591	+ }
	8592	+ }
	8593	+
	8594	+ if (tex.bumpdata == null)
	8595	+ {
	8596	+ //String texname = Object3D.GetBump(tex);
	8597	+
	8598	+ CacheTexture texturecache = texturebump.get(tex);
	8599	+
	8600	+ if (texturecache != null)
	8601	+ {
	8602	+ tex.bw = texturecache.texturedata.getWidth();
	8603	+ tex.bh = texturecache.texturedata.getHeight();
	8604	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8605	+ }
	8606	+ }
	8607	+ }
	8608	+
	8609	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8489	8610	{
8490	8611	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8491	8612
..	..	@@ -8503,14 +8624,14 @@
8503	8624	return texture!=null?texture.texture:null;
8504	8625	}
8505	8626
8506		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
	8627	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8507	8628	{
8508	8629	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8509	8630
8510	8631	return texture!=null?texture.texturedata:null;
8511	8632	}
8512	8633
8513		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8634	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8514	8635	{
8515	8636	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8516	8637	{
..	..	@@ -8552,6 +8673,72 @@
8552	8673	return true; // Warning: not used.
8553	8674	}
8554	8675
	8676	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8677	+ {
	8678	+ try
	8679	+ {
	8680	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8681	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8682	+ ImageWriter writer = writers.next();
	8683	+
	8684	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8685	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8686	+ param.setCompressionQuality(quality);
	8687	+
	8688	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8689	+ writer.setOutput(ios);
	8690	+ writer.write(null, new IIOImage(image, null, null), param);
	8691	+
	8692	+ byte[] data = baos.toByteArray();
	8693	+ writer.dispose();
	8694	+ return data;
	8695	+ }
	8696	+ catch (Exception e)
	8697	+ {
	8698	+ e.printStackTrace();
	8699	+ return null;
	8700	+ }
	8701	+ }
	8702	+
	8703	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8704	+ {
	8705	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8706	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8707	+ ImageReader reader = writers.next();
	8708	+
	8709	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8710	+
	8711	+ ImageReadParam param = reader.getDefaultReadParam();
	8712	+ param.setDestination(bim);
	8713	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8714	+
	8715	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8716	+ reader.setInput(ios);
	8717	+ BufferedImage bim2 = reader.read(0, param);
	8718	+ reader.dispose();
	8719	+
	8720	+// WritableRaster raster = bim2.getRaster();
	8721	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8722	+// byte[] bytes = data.getData();
	8723	+//
	8724	+// int[] pixels = new int[bytes.length/3];
	8725	+// for (int i=pixels.length; --i>=0;)
	8726	+// {
	8727	+// int i3 = i*3;
	8728	+// pixels[i] = 0xFF;
	8729	+// pixels[i] <<= 8;
	8730	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8731	+// pixels[i] <<= 8;
	8732	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8733	+// pixels[i] <<= 8;
	8734	+// pixels[i] \|= bytes[i3] & 0xFF;
	8735	+// }
	8736	+//
	8737	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8738	+
	8739	+ return bim;
	8740	+ }
	8741	+
8555	8742	ShadowBuffer shadowPBuf;
8556	8743	AntialiasBuffer antialiasPBuf;
8557	8744	int MAXSTACK;
..	..	@@ -9512,7 +9699,7 @@
9512	9699
9513	9700	if (renderCamera != lightCamera)
9514	9701	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9515		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9702	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9516	9703
9517	9704	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9518	9705
..	..	@@ -9528,7 +9715,7 @@
9528	9715
9529	9716	if (renderCamera != lightCamera)
9530	9717	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9531		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9718	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9532	9719
9533	9720	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9534	9721
..	..	@@ -10729,7 +10916,7 @@
10729	10916	// if (parentcam != renderCamera) // not a light
10730	10917	if (cam != lightCamera)
10731	10918	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10732		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10919	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10733	10920
10734	10921	for (int j = 0; j < 4; j++)
10735	10922	{
..	..	@@ -10744,7 +10931,7 @@
10744	10931	// if (parentcam != renderCamera) // not a light
10745	10932	if (cam != lightCamera)
10746	10933	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10747		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	10934	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10748	10935
10749	10936	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10750	10937
..	..	@@ -11297,7 +11484,7 @@
11297	11484	}
11298	11485	}
11299	11486
11300		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11487	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11301	11488	{
11302	11489	//gl.glDepthFunc(GL.GL_LEQUAL);
11303	11490	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11305,24 +11492,21 @@
11305	11492
11306	11493	boolean texon = textureon;
11307	11494
11308		- if (RENDERPROGRAM > 0)
11309		- {
11310		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11311		- textureon = false;
11312		- }
	11495	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11496	+ textureon = false;
	11497	+
11313	11498	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11314	11499	//System.out.println("ALLO");
11315	11500	gl.glColorMask(false, false, false, false);
11316	11501	DrawObject(gl);
11317		- if (RENDERPROGRAM > 0)
11318		- {
11319		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11320		- textureon = texon;
11321		- }
	11502	+
	11503	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11504	+ textureon = texon;
	11505	+
11322	11506	gl.glColorMask(true, true, true, true);
11323	11507
11324	11508	gl.glDepthFunc(GL.GL_EQUAL);
11325		- //gl.glDepthMask(false);
	11509	+ gl.glDepthMask(false);
11326	11510	}
11327	11511
11328	11512	if (false) // DrawMode() == SHADOW)
..	..	@@ -11662,20 +11846,32 @@
11662	11846	ReleaseTextures(DEFAULT_TEXTURES);
11663	11847
11664	11848	if (CLEANCACHE)
11665		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11849	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11666	11850	{
11667		- String tex = e.nextElement();
	11851	+ cTexture tex = e.nextElement();
11668	11852
11669	11853	// System.out.println("Texture --------- " + tex);
11670	11854
11671		- if (tex.equals("WHITE_NOISE"))
	11855	+ if (tex.equals("WHITE_NOISE:"))
11672	11856	continue;
11673	11857
11674		- if (!usedtextures.containsKey(tex))
	11858	+ if (!usedtextures.contains(tex))
11675	11859	{
	11860	+ CacheTexture gettex = texturepigment.get(tex);
11676	11861	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11677		- textures.get(tex).texture.dispose();
11678		- textures.remove(tex);
	11862	+ if (gettex != null)
	11863	+ {
	11864	+ gettex.texture.dispose();
	11865	+ texturepigment.remove(tex);
	11866	+ }
	11867	+
	11868	+ gettex = texturebump.get(tex);
	11869	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11870	+ if (gettex != null)
	11871	+ {
	11872	+ gettex.texture.dispose();
	11873	+ texturebump.remove(tex);
	11874	+ }
11679	11875	}
11680	11876	}
11681	11877	}
..	..	@@ -12204,7 +12400,52 @@
12204	12400	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12205	12401
12206	12402	String program =
	12403	+ // Min shader
12207	12404	"!!ARBfp1.0\n" +
	12405	+ "PARAM zero123 = { 0.0, 1.0, 2.0, 1.25 };" +
	12406	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12407	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12408	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12409	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12410	+ "TEMP temp;" +
	12411	+ "TEMP light;" +
	12412	+ "TEMP ndotl;" +
	12413	+ "TEMP normal;" +
	12414	+ "TEMP depth;" +
	12415	+
	12416	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12417	+
	12418	+ "MOV light, state.light[0].position;" +
	12419	+ "DP3 ndotl.x, light, normal;" +
	12420	+
	12421	+ // shadow
	12422	+ "MOV temp, fragment.texcoord[1];" +
	12423	+ TextureFetch("depth", "temp", "1") +
	12424	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12425	+ "SLT temp.x, fragment.texcoord[1].z, depth.z;" +
	12426	+
	12427	+
	12428	+ // No shadow when out of frustum
	12429	+ //"SGE temp.y, depth.z, zero123.y;" +
	12430	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12431	+
	12432	+ "MUL ndotl.x, ndotl.x, temp.x;" +
	12433	+ "MAX ndotl.x, ndotl.x, pow2.y;" +
	12434	+
	12435	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12436	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12437	+ "MUL temp, temp, ndotl.x;" +
	12438	+
	12439	+ "MUL temp, temp, zero123.z;" +
	12440	+
	12441	+ "MOV temp.w, zero123.y;" + // reset alpha
	12442	+
	12443	+ "MOV result.color, temp;" +
	12444	+ "END";
	12445	+
	12446	+ String program2 =
	12447	+ "!!ARBfp1.0\n" +
	12448	+
12208	12449	//"OPTION ARB_fragment_program_shadow;" +
12209	12450	"PARAM light2cam0 = program.env[10];" +
12210	12451	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12319,8 +12560,7 @@
12319	12560	"TEMP shininess;" +
12320	12561	"\n" +
12321	12562	"MOV texSamp, one;" +
12322		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12323		-
	12563	+
12324	12564	"MOV mapgrid.x, one2048th.x;" +
12325	12565	"MOV temp, fragment.texcoord[1];" +
12326	12566	/*
..	..	@@ -12725,7 +12965,7 @@
12725	12965	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12726	12966	"") +
12727	12967
12728		- // display shadow only (bump == 0)
	12968	+ // display shadow only (fakedepth == 0)
12729	12969	"SUB temp.x, half.x, shadow.x;" +
12730	12970	"MOV temp.y, -params5.z;" + // params6.x;" +
12731	12971	"SLT temp.z, temp.y, -one2048th.x;" +
..	..	@@ -13157,20 +13397,20 @@
13157	13397	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13158	13398	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13159	13399	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13400	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13401	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13160	13402	"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;" +
	13403	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13404	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13165	13405	//"SWZ buffer, temp, w,w,w,w;";
13166		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13406	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13167	13407	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13168	13408	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13169	13409	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13170		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13410	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13171	13411
13172		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13173		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13412	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13413	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13174	13414	}
13175	13415
13176	13416	String Shadow(String depth, String shadow)
..	..	@@ -13217,7 +13457,7 @@
13217	13457	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13218	13458	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13219	13459
13220		- // No shadow when out of frustrum
	13460	+ // No shadow when out of frustum
13221	13461	"SGE temp.x, " + depth + ".z, one.z;" +
13222	13462	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13223	13463	"";
..	..	@@ -14015,14 +14255,15 @@
14015	14255	drag = false;
14016	14256	//System.out.println("Mouse DOWN");
14017	14257	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);
	14258	+ //ClickInfo info = new ClickInfo();
	14259	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14260	+ object.clickInfo.pane = this;
	14261	+ object.clickInfo.camera = renderCamera;
	14262	+ object.clickInfo.x = x;
	14263	+ object.clickInfo.y = y;
	14264	+ object.clickInfo.modifiers = modifiersex;
	14265	+ editObj = object.doEditClick(//info,
	14266	+ 0);
14026	14267	if (!editObj)
14027	14268	{
14028	14269	hasMarquee = true;
..	..	@@ -14422,15 +14663,16 @@
14422	14663	if (editObj)
14423	14664	{
14424	14665	drag = true;
14425		- ClickInfo info = new ClickInfo();
14426		- info.bounds.setBounds(0, 0,
	14666	+ //ClickInfo info = new ClickInfo();
	14667	+ object.clickInfo.bounds.setBounds(0, 0,
14427	14668	(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);
	14669	+ object.clickInfo.pane = this;
	14670	+ object.clickInfo.camera = renderCamera;
	14671	+ object.clickInfo.x = x;
	14672	+ object.clickInfo.y = y;
	14673	+ object //.GetWindow().copy
	14674	+ .doEditDrag(//info,
	14675	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14434	14676	} else
14435	14677	{
14436	14678	if (x < startX)
..	..	@@ -14579,24 +14821,27 @@
14579	14821	}
14580	14822	}
14581	14823
	14824	+// ClickInfo clickInfo = new ClickInfo();
	14825	+
14582	14826	public void mouseMoved(MouseEvent e)
14583	14827	{
14584	14828	//System.out.println("mouseMoved: " + e);
14585	14829	if (isRenderer)
14586	14830	return;
14587	14831
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;
	14832	+ // Mouse cursor feedback
	14833	+ object.clickInfo.x = e.getX();
	14834	+ object.clickInfo.y = e.getY();
	14835	+ object.clickInfo.modifiers = e.getModifiersEx();
	14836	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14837	+ object.clickInfo.pane = this;
	14838	+ object.clickInfo.camera = renderCamera;
14595	14839	if (!isRenderer)
14596	14840	{
14597	14841	//ObjEditor editWindow = object.editWindow;
14598	14842	//Object3D copy = editWindow.copy;
14599		- if (object.doEditClick(ci, 0))
	14843	+ if (object.doEditClick(//clickInfo,
	14844	+ 0))
14600	14845	{
14601	14846	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14602	14847	} else
..	..	@@ -14868,7 +15113,8 @@
14868	15113	// break;
14869	15114	case 'T':
14870	15115	CACHETEXTURE ^= true;
14871		- textures.clear();
	15116	+ texturepigment.clear();
	15117	+ texturebump.clear();
14872	15118	// repaint();
14873	15119	break;
14874	15120	case 'Y':
..	..	@@ -15621,8 +15867,6 @@
15621	15867
15622	15868	int width = getBounds().width;
15623	15869	int height = getBounds().height;
15624		- ClickInfo info = new ClickInfo();
15625		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15626	15870	//Image img = CreateImage(width, height);
15627	15871	//System.out.println("width = " + width + "; height = " + height + "\n");
15628	15872
..	..	@@ -15699,31 +15943,37 @@
15699	15943	}
15700	15944	if (object != null && !hasMarquee)
15701	15945	{
	15946	+ if (object.clickInfo == null)
	15947	+ object.clickInfo = new ClickInfo();
	15948	+ ClickInfo info = object.clickInfo;
	15949	+ //ClickInfo info = new ClickInfo();
	15950	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	15951	+
15702	15952	if (isRenderer)
15703	15953	{
15704		- info.flags++;
	15954	+ object.clickInfo.flags++;
15705	15955	double frameAspect = (double) width / (double) height;
15706	15956	if (frameAspect > renderCamera.aspect)
15707	15957	{
15708	15958	int desired = (int) ((double) height * renderCamera.aspect);
15709		- info.bounds.width -= width - desired;
15710		- info.bounds.x += (width - desired) / 2;
	15959	+ object.clickInfo.bounds.width -= width - desired;
	15960	+ object.clickInfo.bounds.x += (width - desired) / 2;
15711	15961	} else
15712	15962	{
15713	15963	int desired = (int) ((double) width / renderCamera.aspect);
15714		- info.bounds.height -= height - desired;
15715		- info.bounds.y += (height - desired) / 2;
	15964	+ object.clickInfo.bounds.height -= height - desired;
	15965	+ object.clickInfo.bounds.y += (height - desired) / 2;
15716	15966	}
15717	15967	}
15718	15968
15719		- info.g = gr;
15720		- info.camera = renderCamera;
	15969	+ object.clickInfo.g = gr;
	15970	+ object.clickInfo.camera = renderCamera;
15721	15971	/*
15722	15972	// Memory intensive (brep.verticescopy)
15723	15973	if (!(object instanceof Composite))
15724	15974	object.draw(info, 0, false); // SLOW :
15725	15975	*/
15726		- if (!isRenderer)
	15976	+ if (!isRenderer) // && drag)
15727	15977	{
15728	15978	Grafreed.Assert(object != null);
15729	15979	Grafreed.Assert(object.selection != null);
..	..	@@ -15731,9 +15981,9 @@
15731	15981	{
15732	15982	int hitSomething = object.selection.get(0).hitSomething;
15733	15983
15734		- info.DX = 0;
15735		- info.DY = 0;
15736		- info.W = 1;
	15984	+ object.clickInfo.DX = 0;
	15985	+ object.clickInfo.DY = 0;
	15986	+ object.clickInfo.W = 1;
15737	15987	if (hitSomething == Object3D.hitCenter)
15738	15988	{
15739	15989	info.DX = X;
..	..	@@ -15745,7 +15995,8 @@
15745	15995	info.DY -= info.bounds.height/2;
15746	15996	}
15747	15997
15748		- object.drawEditHandles(info, 0);
	15998	+ object.drawEditHandles(//info,
	15999	+ 0);
15749	16000
15750	16001	if (drag && (X != 0 \|\| Y != 0))
15751	16002	{
..	..	@@ -15758,7 +16009,7 @@
15758	16009	gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15759	16010	break;
15760	16011	case Object3D.hitScale: gr.setColor(Color.cyan);
15761		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16012	+ gr.drawLine(X, Y, 0, 0);
15762	16013	break;
15763	16014	}
15764	16015