~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;
..	..	@@ -2065,7 +2102,7 @@
2065	2102	//System.err.println("Oeil on");
2066	2103	OEIL = true;
2067	2104	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2068		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2105	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2069	2106	//pingthread.StepToTarget(true);
2070	2107	}
2071	2108
..	..	@@ -2298,10 +2335,17 @@
2298	2335	HANDLES ^= true;
2299	2336	}
2300	2337
	2338	+ Object3D paintFolder;
	2339	+
2301	2340	void TogglePaint()
2302	2341	{
2303	2342	PAINTMODE ^= true;
2304	2343	paintcount = 0;
	2344	+
	2345	+ if (PAINTMODE)
	2346	+ {
	2347	+ paintFolder = GetFolder();
	2348	+ }
2305	2349	}
2306	2350
2307	2351	void SwapCamera(int a, int b)
..	..	@@ -2398,126 +2442,19 @@
2398	2442	return currentGL;
2399	2443	}
2400	2444
2401		- private void GetRemoteZip(String url, String name, boolean unzip, boolean save)
	2445	+ static private BufferedImage CreateBim(TextureData texturedata)
2402	2446	{
2403		- java.net.URL u;
2404		- InputStream is = null;
2405		- DataInputStream dis;
2406		- java.util.zip.ZipInputStream zis;
2407		- //String s;
2408		-
2409		- System.out.println("GetRemoteZip " + name);
2410		-
2411		- int total = 0; // dis.available();
2412		-
2413		- byte[] bytes = new byte[16384];
2414		-
2415		- try
2416		- {
2417		- u = new java.net.URL(url + name);
2418		- is = u.openStream();
2419		-
2420		- System.out.println(url + name);
2421		-
2422		- if (unzip)
2423		- {
2424		- //dis = new DataInputStream(new BufferedInputStream(is));
2425		- zis = new java.util.zip.ZipInputStream(new BufferedInputStream(is));
2426		- //while ((s = dis.readLine()) != null)
2427		-
2428		- if (save)
2429		- new java.io.File(name).mkdirs();
2430		-
2431		- // FileOutputStream stream = new FileOutputStream("test.zip");
2432		- //
2433		- // int count;
2434		- //
2435		- // while ((count = dis.read(bytes)) != -1)
2436		- // {
2437		- // //System.out.println(s);
2438		- // System.out.println(count);
2439		- // total += count;
2440		- // stream.write(bytes);
2441		- // }
2442		- //
2443		- // stream.close();
2444		-
2445		- // now iterate through each item in the stream. The get next
2446		- // entry call will return a ZipEntry for each file in the
2447		- // stream
2448		- java.util.zip.ZipEntry entry;
2449		- while((entry = zis.getNextEntry())!=null)
2450		- {
2451		- if (entry.getName().endsWith(".gsm"))
2452		- {
2453		- continue;
2454		- }
2455		-
2456		- String s = String.format("Entry: %s len %d added %TD",
2457		- entry.getName(), entry.getSize(),
2458		- new java.util.Date(entry.getTime()));
2459		- System.out.println(s);
2460		-
2461		- if (save)
2462		- {
2463		- // Once we get the entry from the stream, the stream is
2464		- // positioned read to read the raw data, and we keep
2465		- // reading until read returns 0 or less.
2466		- String outpath = name + "/" + entry.getName();
2467		- FileOutputStream output = null;
2468		- try
2469		- {
2470		- output = new FileOutputStream(outpath);
2471		- int len = 0;
2472		- while ((len = zis.read(bytes)) > 0)
2473		- {
2474		- output.write(bytes, 0, len);
2475		- }
2476		- }
2477		- finally
2478		- {
2479		- // we must always close the output file
2480		- if(output!=null) output.close();
2481		- }
2482		- }
2483		- }
2484		- }
2485		- }
2486		- catch (java.net.MalformedURLException mue)
2487		- {
2488		- System.err.println("Ouch - a MalformedURLException happened.");
2489		- mue.printStackTrace();
2490		- //System.exit(2);
2491		- }
2492		- catch (IOException ioe)
2493		- {
2494		- //System.err.println("Oops - an IOException happened.");
2495		- //ioe.printStackTrace();
2496		- //System.exit(3);
2497		- }
2498		- finally
2499		- {
2500		- try
2501		- {
2502		- if (is != null)
2503		- is.close();
2504		- }
2505		- catch (IOException ioe)
2506		- {
2507		- }
2508		- }
2509		-
2510		- // System.out.println("length = " + total);
2511		-
2512		-// try
2513		-// {
2514		-// Runtime.getRuntime().exec("/usr/local/bin/wget https://archive3d.net/?a=download&do=get&id=7caca905");
2515		-// }
2516		-// catch (Exception e)
2517		-// {
2518		-// e.printStackTrace();
2519		-// }
2520		-
	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);
2521	2458	}
2522	2459
2523	2460	/**/
..	..	@@ -2528,28 +2465,31 @@
2528	2465
2529	2466	int resolution;
2530	2467
2531		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2468	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2532	2469	{
2533		- texture = tex;
	2470	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2471	+ texturedata = texdata;
2534	2472	resolution = res;
2535	2473	}
2536	2474	}
2537	2475	/**/
2538	2476
2539	2477	// TEXTURE static Texture texture;
2540		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2541		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2542		- 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	+
2543	2483	int pigmentdepth = 0;
2544	2484	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2545	2485	int bumpdepth = 0;
2546	2486	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2547	2487	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2548	2488	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2549		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2489	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2550	2490	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2551	2491
2552		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2492	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2553	2493	{
2554	2494	TextureData texturedata = null;
2555	2495
..	..	@@ -2568,13 +2508,34 @@
2568	2508	if (bump)
2569	2509	texturedata = ConvertBump(texturedata, false);
2570	2510
2571		- com.sun.opengl.util.texture.Texture texture =
2572		- 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);
2573	2513
2574		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2575		- 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);
2576	2516
2577		- 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;
2578	2539	}
2579	2540
2580	2541	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3647,6 +3608,8 @@
3647	3608
3648	3609	System.out.println("LOADING TEXTURE : " + name);
3649	3610
	3611	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3612	+
3650	3613	//
3651	3614	if (false) // compressbit > 0)
3652	3615	{
..	..	@@ -8045,7 +8008,7 @@
8045	8008	String pigment = Object3D.GetPigment(tex);
8046	8009	String bump = Object3D.GetBump(tex);
8047	8010
8048		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8011	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8049	8012	{
8050	8013	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
8051	8014	// System.out.println("; bump = " + bump);
..	..	@@ -8060,8 +8023,8 @@
8060	8023	pigment = null;
8061	8024	}
8062	8025
8063		- ReleaseTexture(bump, true);
8064		- ReleaseTexture(pigment, false);
	8026	+ ReleaseTexture(tex, true);
	8027	+ ReleaseTexture(tex, false);
8065	8028	}
8066	8029
8067	8030	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -8079,7 +8042,7 @@
8079	8042
8080	8043	String pigment = Object3D.GetPigment(tex);
8081	8044
8082		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8045	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8083	8046	{
8084	8047	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
8085	8048	// System.out.println("; bump = " + bump);
..	..	@@ -8090,7 +8053,7 @@
8090	8053	pigment = null;
8091	8054	}
8092	8055
8093		- ReleaseTexture(pigment, false);
	8056	+ ReleaseTexture(tex, false);
8094	8057	}
8095	8058
8096	8059	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -8108,7 +8071,7 @@
8108	8071
8109	8072	String bump = Object3D.GetBump(tex);
8110	8073
8111		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8074	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8112	8075	{
8113	8076	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
8114	8077	// System.out.println("; bump = " + bump);
..	..	@@ -8119,10 +8082,10 @@
8119	8082	bump = null;
8120	8083	}
8121	8084
8122		- ReleaseTexture(bump, true);
	8085	+ ReleaseTexture(tex, true);
8123	8086	}
8124	8087
8125		- void ReleaseTexture(String tex, boolean bump)
	8088	+ void ReleaseTexture(cTexture tex, boolean bump)
8126	8089	{
8127	8090	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8128	8091	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8133,7 +8096,7 @@
8133	8096	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
8134	8097
8135	8098	if (tex != null)
8136		- texture = textures.get(tex);
	8099	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
8137	8100
8138	8101	// //assert( texture != null );
8139	8102	// if (texture == null)
..	..	@@ -8227,47 +8190,50 @@
8227	8190
8228	8191	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8229	8192	{
8230		- if (// DrawMode() != 0 \|\| /tex == null \|\|/
8231		- ambientOcclusion ) // \|\| !textureon)
8232		- {
8233		- return; // false;
8234		- }
8235		-
8236		- if (tex == null)
8237		- {
8238		- BindTexture(null,false,resolution);
8239		- BindTexture(null,true,resolution);
8240		- return;
8241		- }
	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;
8242	8234
8243		- String pigment = Object3D.GetPigment(tex);
8244		- String bump = Object3D.GetBump(tex);
8245		-
8246		- usedtextures.put(pigment, pigment);
8247		- usedtextures.put(bump, bump);
8248		-
8249		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8250		- {
8251		- // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8252		- // System.out.println("; bump = " + bump);
8253		- }
8254		-
8255		- if (bump.equals(""))
8256		- {
8257		- bump = null;
8258		- }
8259		- if (pigment.equals(""))
8260		- {
8261		- pigment = null;
8262		- }
8263		-
8264		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8265		- BindTexture(pigment, false, resolution);
8266		- GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8267		- BindTexture(bump, true, resolution);
8268		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8269		-
8270		- return; // true;
	8235	+ BindPigmentTexture(tex, resolution);
	8236	+ BindBumpTexture(tex, resolution);
8271	8237	}
8272	8238
8273	8239	/boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8286,9 +8252,9 @@
8286	8252
8287	8253	String pigment = Object3D.GetPigment(tex);
8288	8254
8289		- usedtextures.put(pigment, pigment);
	8255	+ usedtextures.add(tex);
8290	8256
8291		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8257	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8292	8258	{
8293	8259	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8294	8260	// System.out.println("; bump = " + bump);
..	..	@@ -8300,7 +8266,7 @@
8300	8266	}
8301	8267
8302	8268	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8303		- BindTexture(pigment, false, resolution);
	8269	+ BindTexture(tex, false, resolution);
8304	8270	}
8305	8271
8306	8272	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8319,9 +8285,9 @@
8319	8285
8320	8286	String bump = Object3D.GetBump(tex);
8321	8287
8322		- usedtextures.put(bump, bump);
	8288	+ usedtextures.add(tex);
8323	8289
8324		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8290	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8325	8291	{
8326	8292	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8327	8293	// System.out.println("; bump = " + bump);
..	..	@@ -8333,7 +8299,7 @@
8333	8299	}
8334	8300
8335	8301	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8336		- BindTexture(bump, true, resolution);
	8302	+ BindTexture(tex, true, resolution);
8337	8303	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8338	8304	}
8339	8305
..	..	@@ -8357,13 +8323,19 @@
8357	8323	return fileExists;
8358	8324	}
8359	8325
8360		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8326	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8361	8327	{
8362		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8328	+ CacheTexture texturecache = null;
8363	8329
8364	8330	if (tex != null)
8365	8331	{
8366		- 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	+ }
8367	8339
8368	8340	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8369	8341
..	..	@@ -8373,19 +8345,46 @@
8373	8345	// else
8374	8346	// if (!texname.startsWith("/"))
8375	8347	// texname = "/Users/nbriere/Textures/" + texname;
8376		- if (!FileExists(tex))
	8348	+ if (!FileExists(texname))
8377	8349	{
8378	8350	texname = fallbackTextureName;
8379	8351	}
8380	8352
8381	8353	if (CACHETEXTURE)
8382		- texture = textures.get(texname); // TEXTURE CACHE
8383		-
8384		- TextureData texturedata = null;
8385		-
8386		- if (texture == null \|\| texture.resolution < resolution)
8387	8354	{
8388		- 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(""))
8389	8388	{
8390	8389	assert(!bump);
8391	8390	// if (bump)
..	..	@@ -8396,19 +8395,23 @@
8396	8395	// }
8397	8396	// else
8398	8397	// {
8399		- texture = textures.get(tex);
8400		- if (texture == null)
	8398	+ // texturecache = textures.get(texname); // suspicious
	8399	+ if (texturecache == null)
8401	8400	{
8402		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8401	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8403	8402	}
	8403	+ else
	8404	+ new Exception().printStackTrace();
8404	8405	// }
8405	8406	} else
8406		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8407	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8407	8408	{
8408	8409	assert(bump);
8409		- texture = textures.get(tex);
8410		- if (texture == null)
8411		- 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();
8412	8415	} else
8413	8416	{
8414	8417	//if (tex.equals("IMMORTAL"))
..	..	@@ -8416,11 +8419,13 @@
8416	8419	// texture = GetResourceTexture("default.png");
8417	8420	//} else
8418	8421	//{
8419		- if (tex.equals("WHITE_NOISE"))
	8422	+ if (texname.endsWith("WHITE_NOISE"))
8420	8423	{
8421		- texture = textures.get(tex);
8422		- if (texture == null)
8423		- 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();
8424	8429	} else
8425	8430	{
8426	8431	if (textureon)
..	..	@@ -8479,19 +8484,19 @@
8479	8484	if (texturedata == null)
8480	8485	throw new Exception();
8481	8486
8482		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8487	+ texturecache = new CacheTexture(texturedata,resolution);
8483	8488	//texture = GetTexture(tex, bump);
8484	8489	}
8485	8490	}
8486	8491	//}
8487	8492	}
8488	8493
8489		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8494	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8490	8495	{
8491	8496	//return false;
8492	8497
8493	8498	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8494		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8499	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8495	8500	{
8496	8501	// String ext = "_highres";
8497	8502	// if (REDUCETEXTURE)
..	..	@@ -8508,52 +8513,17 @@
8508	8513	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8509	8514	if (!cachefile.exists())
8510	8515	{
8511		- // cache to disk
8512		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8513		- //buffers[0].
8514		-
8515		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8516		- int[] pixels = new int[bytebuf.capacity()/3];
8517		-
8518		- // squared size heuristic...
8519		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8516	+ //if (texturedata.getWidth() == texturedata.getHeight())
8520	8517	{
8521		- for (int i=pixels.length; --i>=0;)
8522		- {
8523		- int i3 = i*3;
8524		- pixels[i] = 0xFF;
8525		- pixels[i] <<= 8;
8526		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8527		- pixels[i] <<= 8;
8528		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8529		- pixels[i] <<= 8;
8530		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8531		- }
8532		-
8533		- /*
8534		- int r=0,g=0,b=0,a=0;
8535		- for (int i=0; i<width; i++)
8536		- for (int j=0; j<height; j++)
8537		- {
8538		- int index = j*width+i;
8539		- int p = pixels[index];
8540		- a = ((p>>24) & 0xFF);
8541		- r = ((p>>16) & 0xFF);
8542		- g = ((p>>8) & 0xFF);
8543		- b = (p & 0xFF);
8544		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8545		- }
8546		- /**/
8547		- int width = (int)Math.sqrt(pixels.length); // squared
8548		- int height = width;
8549		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8550		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8518	+ BufferedImage rendImage = CreateBim(texturedata);
	8519	+
8551	8520	ImageWriter writer = null;
8552	8521	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8553	8522	if (iter.hasNext()) {
8554	8523	writer = (ImageWriter)iter.next();
8555	8524	}
8556		- float compressionQuality = 0.9f;
	8525	+
	8526	+ float compressionQuality = 0.85f;
8557	8527	try
8558	8528	{
8559	8529	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8570,18 +8540,20 @@
8570	8540	}
8571	8541	}
8572	8542	}
8573		-
	8543	+
	8544	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8545	+
8574	8546	//System.out.println("Texture = " + tex);
8575		- if (textures.containsKey(texname))
	8547	+ if (textures.containsKey(tex))
8576	8548	{
8577		- CacheTexture thetex = textures.get(texname);
	8549	+ CacheTexture thetex = textures.get(tex);
8578	8550	thetex.texture.disable();
8579	8551	thetex.texture.dispose();
8580		- textures.remove(texname);
	8552	+ textures.remove(tex);
8581	8553	}
8582	8554
8583		- texture.texturedata = texturedata;
8584		- textures.put(texname, texture);
	8555	+ //texture.texturedata = texturedata;
	8556	+ textures.put(tex, texturecache);
8585	8557
8586	8558	// newtex = true;
8587	8559	}
..	..	@@ -8597,10 +8569,44 @@
8597	8569	}
8598	8570	}
8599	8571
8600		- return texture;
	8572	+ return texturecache;
8601	8573	}
8602	8574
8603		- 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
8604	8610	{
8605	8611	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8606	8612
..	..	@@ -8618,21 +8624,21 @@
8618	8624	return texture!=null?texture.texture:null;
8619	8625	}
8620	8626
8621		- 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
8622	8628	{
8623	8629	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8624	8630
8625	8631	return texture!=null?texture.texturedata:null;
8626	8632	}
8627	8633
8628		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8634	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8629	8635	{
8630	8636	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8631	8637	{
8632	8638	return false;
8633	8639	}
8634	8640
8635		- boolean newtex = false;
	8641	+ //boolean newtex = false;
8636	8642
8637	8643	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8638	8644
..	..	@@ -8664,9 +8670,75 @@
8664	8670	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8665	8671	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8666	8672
8667		- return newtex;
	8673	+ return true; // Warning: not used.
8668	8674	}
8669	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	+
8670	8742	ShadowBuffer shadowPBuf;
8671	8743	AntialiasBuffer antialiasPBuf;
8672	8744	int MAXSTACK;
..	..	@@ -11150,9 +11222,9 @@
11150	11222
11151	11223	gl.glMatrixMode(GL.GL_MODELVIEW);
11152	11224
11153		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11154		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
11155		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11225	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11226	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11227	+gl.glEnable(gl.GL_MULTISAMPLE);
11156	11228	} else
11157	11229	{
11158	11230	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -11163,7 +11235,7 @@
11163	11235	//System.out.println("BLENDING ON");
11164	11236	gl.glEnable(GL.GL_BLEND);
11165	11237	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
11166		-
	11238	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
11167	11239	gl.glMatrixMode(gl.GL_PROJECTION);
11168	11240	gl.glLoadIdentity();
11169	11241
..	..	@@ -11412,7 +11484,7 @@
11412	11484	}
11413	11485	}
11414	11486
11415		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11487	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11416	11488	{
11417	11489	//gl.glDepthFunc(GL.GL_LEQUAL);
11418	11490	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11420,24 +11492,21 @@
11420	11492
11421	11493	boolean texon = textureon;
11422	11494
11423		- if (RENDERPROGRAM > 0)
11424		- {
11425		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11426		- textureon = false;
11427		- }
	11495	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11496	+ textureon = false;
	11497	+
11428	11498	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11429	11499	//System.out.println("ALLO");
11430	11500	gl.glColorMask(false, false, false, false);
11431	11501	DrawObject(gl);
11432		- if (RENDERPROGRAM > 0)
11433		- {
11434		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11435		- textureon = texon;
11436		- }
	11502	+
	11503	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11504	+ textureon = texon;
	11505	+
11437	11506	gl.glColorMask(true, true, true, true);
11438	11507
11439	11508	gl.glDepthFunc(GL.GL_EQUAL);
11440		- //gl.glDepthMask(false);
	11509	+ gl.glDepthMask(false);
11441	11510	}
11442	11511
11443	11512	if (false) // DrawMode() == SHADOW)
..	..	@@ -11649,7 +11718,7 @@
11649	11718	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11650	11719	{
11651	11720	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11652		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11721	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11653	11722	pingthread.StepToTarget(true); // true);
11654	11723	// zoomonce = false;
11655	11724	}
..	..	@@ -11777,20 +11846,32 @@
11777	11846	ReleaseTextures(DEFAULT_TEXTURES);
11778	11847
11779	11848	if (CLEANCACHE)
11780		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11849	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11781	11850	{
11782		- String tex = e.nextElement();
	11851	+ cTexture tex = e.nextElement();
11783	11852
11784	11853	// System.out.println("Texture --------- " + tex);
11785	11854
11786		- if (tex.equals("WHITE_NOISE"))
	11855	+ if (tex.equals("WHITE_NOISE:"))
11787	11856	continue;
11788	11857
11789		- if (!usedtextures.containsKey(tex))
	11858	+ if (!usedtextures.contains(tex))
11790	11859	{
	11860	+ CacheTexture gettex = texturepigment.get(tex);
11791	11861	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11792		- textures.get(tex).texture.dispose();
11793		- 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	+ }
11794	11875	}
11795	11876	}
11796	11877	}
..	..	@@ -12319,7 +12400,51 @@
12319	12400	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12320	12401
12321	12402	String program =
	12403	+ // Min shader
12322	12404	"!!ARBfp1.0\n" +
	12405	+ "PARAM zero123 = { 0.0, 1.0, 2.0, 3.0 };" +
	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	+ "MUL temp, temp, ndotl.x;" +
	12437	+
	12438	+ "MUL temp, temp, zero123.z;" +
	12439	+
	12440	+ "MOV temp.w, zero123.y;" + // reset alpha
	12441	+
	12442	+ "MOV result.color, temp;" +
	12443	+ "END";
	12444	+
	12445	+ String program2 =
	12446	+ "!!ARBfp1.0\n" +
	12447	+
12323	12448	//"OPTION ARB_fragment_program_shadow;" +
12324	12449	"PARAM light2cam0 = program.env[10];" +
12325	12450	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12434,8 +12559,7 @@
12434	12559	"TEMP shininess;" +
12435	12560	"\n" +
12436	12561	"MOV texSamp, one;" +
12437		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12438		-
	12562	+
12439	12563	"MOV mapgrid.x, one2048th.x;" +
12440	12564	"MOV temp, fragment.texcoord[1];" +
12441	12565	/*
..	..	@@ -12840,7 +12964,7 @@
12840	12964	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12841	12965	"") +
12842	12966
12843		- // display shadow only (bump == 0)
	12967	+ // display shadow only (fakedepth == 0)
12844	12968	"SUB temp.x, half.x, shadow.x;" +
12845	12969	"MOV temp.y, -params5.z;" + // params6.x;" +
12846	12970	"SLT temp.z, temp.y, -one2048th.x;" +
..	..	@@ -13332,7 +13456,7 @@
13332	13456	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13333	13457	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13334	13458
13335		- // No shadow when out of frustrum
	13459	+ // No shadow when out of frustum
13336	13460	"SGE temp.x, " + depth + ".z, one.z;" +
13337	13461	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13338	13462	"";
..	..	@@ -14065,7 +14189,7 @@
14065	14189
14066	14190	// fev 2014???
14067	14191	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
14068		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14192	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
14069	14193	pingthread.StepToTarget(true); // true);
14070	14194	}
14071	14195	// if (!LIVE)
..	..	@@ -14419,12 +14543,12 @@
14419	14543	void GoDown(int mod)
14420	14544	{
14421	14545	MODIFIERS \|= COMMAND;
14422		- /*
	14546	+ /**/
14423	14547	if((mod&SHIFT) == SHIFT)
14424	14548	manipCamera.RotatePosition(0, -speed);
14425	14549	else
14426		- manipCamera.BackForth(0, -speed*delta, getWidth());
14427		- */
	14550	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14551	+ /**/
14428	14552	if ((mod & SHIFT) == SHIFT)
14429	14553	{
14430	14554	mouseMode = mouseMode; // VR??
..	..	@@ -14440,12 +14564,12 @@
14440	14564	void GoUp(int mod)
14441	14565	{
14442	14566	MODIFIERS \|= COMMAND;
14443		- /*
	14567	+ /**/
14444	14568	if((mod&SHIFT) == SHIFT)
14445	14569	manipCamera.RotatePosition(0, speed);
14446	14570	else
14447		- manipCamera.BackForth(0, speed*delta, getWidth());
14448		- */
	14571	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14572	+ /**/
14449	14573	if ((mod & SHIFT) == SHIFT)
14450	14574	{
14451	14575	mouseMode = mouseMode;
..	..	@@ -14461,12 +14585,12 @@
14461	14585	void GoLeft(int mod)
14462	14586	{
14463	14587	MODIFIERS \|= COMMAND;
14464		- /*
	14588	+ /**/
14465	14589	if((mod&SHIFT) == SHIFT)
14466		- manipCamera.RotatePosition(speed, 0);
14467		- else
14468	14590	manipCamera.Translate(speed*delta, 0, getWidth());
14469		- */
	14591	+ else
	14592	+ manipCamera.RotatePosition(speed, 0);
	14593	+ /**/
14470	14594	if ((mod & SHIFT) == SHIFT)
14471	14595	{
14472	14596	mouseMode = mouseMode;
..	..	@@ -14482,12 +14606,12 @@
14482	14606	void GoRight(int mod)
14483	14607	{
14484	14608	MODIFIERS \|= COMMAND;
14485		- /*
	14609	+ /**/
14486	14610	if((mod&SHIFT) == SHIFT)
14487		- manipCamera.RotatePosition(-speed, 0);
14488		- else
14489	14611	manipCamera.Translate(-speed*delta, 0, getWidth());
14490		- */
	14612	+ else
	14613	+ manipCamera.RotatePosition(-speed, 0);
	14614	+ /**/
14491	14615	if ((mod & SHIFT) == SHIFT)
14492	14616	{
14493	14617	mouseMode = mouseMode;
..	..	@@ -14726,7 +14850,8 @@
14726	14850	Globals.MOUSEDRAGGED = false;
14727	14851
14728	14852	movingcamera = false;
14729		- X = Y = 0;
	14853	+ X = 0; // getBounds().width/2;
	14854	+ Y = 0; // getBounds().height/2;
14730	14855	//System.out.println("mouseReleased: " + e);
14731	14856	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14732	14857	}
..	..	@@ -14982,7 +15107,8 @@
14982	15107	// break;
14983	15108	case 'T':
14984	15109	CACHETEXTURE ^= true;
14985		- textures.clear();
	15110	+ texturepigment.clear();
	15111	+ texturebump.clear();
14986	15112	// repaint();
14987	15113	break;
14988	15114	case 'Y':
..	..	@@ -15067,7 +15193,9 @@
15067	15193	case 'E' : COMPACT ^= true;
15068	15194	repaint();
15069	15195	break;
15070		- case 'W' : DEBUGHSB ^= true;
	15196	+ case 'W' : // Wide Window (fullscreen)
	15197	+ //DEBUGHSB ^= true;
	15198	+ ObjEditor.theFrame.ToggleFullScreen();
15071	15199	repaint();
15072	15200	break;
15073	15201	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -15093,13 +15221,7 @@
15093	15221	repaint();
15094	15222	break;
15095	15223	case 'l':
15096		- lightMode ^= true;
15097		- Globals.lighttouched = true;
15098		- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
15099		- targetLookAt.set(manipCamera.lookAt);
15100		- repaint();
15101		- break;
15102		- case 'L':
	15224	+ //case 'L':
15103	15225	if (lightMode)
15104	15226	{
15105	15227	lightMode = false;
..	..	@@ -15246,7 +15368,10 @@
15246	15368	// kompactbit = 6;
15247	15369	// break;
15248	15370	case ' ':
15249		- ObjEditor.theFrame.ToggleFullScreen();
	15371	+ lightMode ^= true;
	15372	+ Globals.lighttouched = true;
	15373	+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
	15374	+ targetLookAt.set(manipCamera.lookAt);
15250	15375	repaint();
15251	15376	break;
15252	15377	//case '`' :
..	..	@@ -15295,12 +15420,6 @@
15295	15420	break;
15296	15421	case '+':
15297	15422
15298		- //for (int i=0; i<0x7FFFFFFF; i++)
15299		- {
15300		- //String.format("%08X", i); // "7caca905"
15301		- GetRemoteZip("https://archive3d.net/?a=download&do=get&id=", "7caca905", true, true);
15302		- }
15303		-
15304	15423	/*
15305	15424	//fontsize += 1;
15306	15425	bbzoom *= 2;
..	..	@@ -15318,17 +15437,17 @@
15318	15437	case '=':
15319	15438	IncDepth();
15320	15439	//fontsize += 1;
15321		- object.editWindow.refreshContents(true);
	15440	+ object.GetWindow().refreshContents(true);
15322	15441	maskbit = 6;
15323	15442	break;
15324	15443	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
15325	15444	DecDepth();
15326	15445	maskbit = 5;
15327	15446	//if(fontsize > 1) fontsize -= 1;
15328		- if (object.editWindow == null)
15329		- new Exception().printStackTrace();
15330		- else
15331		- object.editWindow.refreshContents(true);
	15447	+// if (object.editWindow == null)
	15448	+// new Exception().printStackTrace();
	15449	+// else
	15450	+ object.GetWindow().refreshContents(true);
15332	15451	break;
15333	15452	case '{':
15334	15453	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15552,7 +15671,7 @@
15552	15671	}
15553	15672	*/
15554	15673
15555		- object.editWindow.EditSelection(false);
	15674	+ object.GetWindow().EditSelection(false);
15556	15675	}
15557	15676
15558	15677	void SelectParent()
..	..	@@ -15569,10 +15688,10 @@
15569	15688	{
15570	15689	//selectees.remove(i);
15571	15690	System.out.println("select parent of " + elem);
15572		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15691	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15573	15692	} else
15574	15693	{
15575		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15694	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15576	15695	}
15577	15696
15578	15697	first = false;
..	..	@@ -15614,12 +15733,12 @@
15614	15733	for (int j = 0; j < group.children.size(); j++)
15615	15734	{
15616	15735	elem = (Object3D) group.children.elementAt(j);
15617		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15736	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15618	15737	first = false;
15619	15738	}
15620	15739	} else
15621	15740	{
15622		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15741	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15623	15742	}
15624	15743
15625	15744	first = false;
..	..	@@ -15630,21 +15749,21 @@
15630	15749	{
15631	15750	//Composite group = (Composite) object;
15632	15751	Object3D group = object;
15633		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15752	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15634	15753	}
15635	15754
15636	15755	void ResetTransform(int mask)
15637	15756	{
15638	15757	//Composite group = (Composite) object;
15639	15758	Object3D group = object;
15640		- group.editWindow.ResetTransform(mask);
	15759	+ group.GetWindow().ResetTransform(mask);
15641	15760	}
15642	15761
15643	15762	void FlipTransform()
15644	15763	{
15645	15764	//Composite group = (Composite) object;
15646	15765	Object3D group = object;
15647		- group.editWindow.FlipTransform();
	15766	+ group.GetWindow().FlipTransform();
15648	15767	// group.editWindow.ReduceMesh(true);
15649	15768	}
15650	15769
..	..	@@ -15652,7 +15771,7 @@
15652	15771	{
15653	15772	//Composite group = (Composite) object;
15654	15773	Object3D group = object;
15655		- group.editWindow.PrintMemory();
	15774	+ group.GetWindow().PrintMemory();
15656	15775	// group.editWindow.ReduceMesh(true);
15657	15776	}
15658	15777
..	..	@@ -15660,7 +15779,7 @@
15660	15779	{
15661	15780	//Composite group = (Composite) object;
15662	15781	Object3D group = object;
15663		- group.editWindow.ResetCentroid();
	15782	+ group.GetWindow().ResetCentroid();
15664	15783	}
15665	15784
15666	15785	void IncDepth()
..	..	@@ -15836,6 +15955,7 @@
15836	15955	info.bounds.y += (height - desired) / 2;
15837	15956	}
15838	15957	}
	15958	+
15839	15959	info.g = gr;
15840	15960	info.camera = renderCamera;
15841	15961	/*
..	..	@@ -15845,23 +15965,44 @@
15845	15965	*/
15846	15966	if (!isRenderer)
15847	15967	{
15848		- object.drawEditHandles(info, 0);
15849		-
15850		- if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	15968	+ Grafreed.Assert(object != null);
	15969	+ Grafreed.Assert(object.selection != null);
	15970	+ if (object.selection.Size() > 0)
15851	15971	{
15852		- switch (object.selection.get(0).hitSomething)
	15972	+ int hitSomething = object.selection.get(0).hitSomething;
	15973	+
	15974	+ info.DX = 0;
	15975	+ info.DY = 0;
	15976	+ info.W = 1;
	15977	+ if (hitSomething == Object3D.hitCenter)
15853	15978	{
15854		- case Object3D.hitCenter: gr.setColor(Color.pink);
15855		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15856		- break;
15857		- case Object3D.hitRotate: gr.setColor(Color.yellow);
15858		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15859		- break;
15860		- case Object3D.hitScale: gr.setColor(Color.cyan);
15861		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15862		- break;
	15979	+ info.DX = X;
	15980	+ if (X != 0)
	15981	+ info.DX -= info.bounds.width/2;
	15982	+
	15983	+ info.DY = Y;
	15984	+ if (Y != 0)
	15985	+ info.DY -= info.bounds.height/2;
15863	15986	}
15864		-
	15987	+
	15988	+ object.drawEditHandles(info, 0);
	15989	+
	15990	+ if (drag && (X != 0 \|\| Y != 0))
	15991	+ {
	15992	+ switch (hitSomething)
	15993	+ {
	15994	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15995	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15996	+ break;
	15997	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15998	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15999	+ break;
	16000	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16001	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16002	+ break;
	16003	+ }
	16004	+
	16005	+ }
15865	16006	}
15866	16007	}
15867	16008	}
..	..	@@ -16659,6 +16800,14 @@
16659	16800	}
16660	16801	}
16661	16802
	16803	+ private Object3D GetFolder()
	16804	+ {
	16805	+ Object3D folder = object.GetWindow().copy;
	16806	+ if (object.GetWindow().copy.selection.Size() > 0)
	16807	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16808	+ return folder;
	16809	+ }
	16810	+
16662	16811	class SelectBuffer implements GLEventListener
16663	16812	{
16664	16813
..	..	@@ -16738,6 +16887,17 @@
16738	16887
16739	16888	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16740	16889
	16890	+ if (PAINTMODE)
	16891	+ {
	16892	+ if (object.GetWindow().copy.selection.Size() > 0)
	16893	+ {
	16894	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16895	+
	16896	+ // Make what you paint not selectable.
	16897	+ paintobj.ResetSelectable();
	16898	+ }
	16899	+ }
	16900	+
16741	16901	//int tmp = selection_view;
16742	16902	//selection_view = -1;
16743	16903	int temp = DrawMode();
..	..	@@ -16749,6 +16909,17 @@
16749	16909	// temp = DEFAULT; // patch for selection debug
16750	16910	Globals.drawMode = temp; // WARNING
16751	16911
	16912	+ if (PAINTMODE)
	16913	+ {
	16914	+ if (object.GetWindow().copy.selection.Size() > 0)
	16915	+ {
	16916	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16917	+
	16918	+ // Revert.
	16919	+ paintobj.RestoreSelectable();
	16920	+ }
	16921	+ }
	16922	+
16752	16923	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16753	16924
16754	16925	// trying different ways of getting the depth info over
..	..	@@ -16852,29 +17023,31 @@
16852	17023	}
16853	17024
16854	17025	if (!movingcamera && !PAINTMODE)
16855		- object.editWindow.ScreenFitPoint(); // fev 2014
	17026	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16856	17027
16857		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17028	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16858	17029	{
16859		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17030	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16860	17031
16861		- Object3D group = new Object3D("inst" + paintcount++);
	17032	+ if (object.GetWindow().copy.selection.Size() > 0)
	17033	+ {
	17034	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16862	17035
16863		- group.CreateMaterial(); // use a void leaf to select instances
16864		-
16865		- group.add(paintobj); // link
16866		-
16867		- object.editWindow.SnapObject(group);
16868		-
16869		- Object3D folder = object.editWindow.copy;
16870		-
16871		- if (object.editWindow.copy.selection.Size() > 0)
16872		- folder = object.editWindow.copy.selection.elementAt(0);
16873		-
16874		- folder.add(group);
16875		-
16876		- object.editWindow.ResetModel();
16877		- object.editWindow.refreshContents();
	17036	+ Object3D inst = new Object3D("inst" + paintcount++);
	17037	+
	17038	+ inst.CreateMaterial(); // use a void leaf to select instances
	17039	+
	17040	+ inst.add(paintobj); // link
	17041	+
	17042	+ object.GetWindow().SnapObject(inst);
	17043	+
	17044	+ Object3D folder = paintFolder; // GetFolder();
	17045	+
	17046	+ folder.add(inst);
	17047	+
	17048	+ object.GetWindow().ResetModel();
	17049	+ object.GetWindow().refreshContents();
	17050	+ }
16878	17051	}
16879	17052	else
16880	17053	paintcount = 0;