~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -18,7 +18,10 @@
18	18	import javax.imageio.ImageIO;
19	19	import javax.imageio.ImageWriteParam;
20	20	import javax.imageio.ImageWriter;
	21	+import javax.imageio.ImageReadParam;
	22	+import javax.imageio.ImageReader;
21	23	import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
	24	+import javax.imageio.stream.ImageInputStream;
22	25	import javax.imageio.stream.ImageOutputStream;
23	26	import javax.imageio.ImageWriteParam;
24	27
..	..	@@ -30,6 +33,7 @@
30	33	import java.nio.*;
31	34
32	35	import gleem.linalg.Mat4f;
	36	+import javax.imageio.ImageTypeSpecifier;
33	37
34	38	class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	39	{
..	..	@@ -44,6 +48,39 @@
44	48	static boolean ABORTED = false;
45	49
46	50	static int STEP = 1;
	51	+
	52	+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
	53	+ {
	54	+ int[] pixels = new int[bytes.length/3];
	55	+ for (int i=pixels.length; --i>=0;)
	56	+ {
	57	+ int i3 = i*3;
	58	+ pixels[i] = 0xFF;
	59	+ pixels[i] <<= 8;
	60	+ pixels[i] \|= bytes[i3+2] & 0xFF;
	61	+ pixels[i] <<= 8;
	62	+ pixels[i] \|= bytes[i3+1] & 0xFF;
	63	+ pixels[i] <<= 8;
	64	+ pixels[i] \|= bytes[i3] & 0xFF;
	65	+ }
	66	+ /*
	67	+ int r=0,g=0,b=0,a=0;
	68	+ for (int i=0; i<width; i++)
	69	+ for (int j=0; j<height; j++)
	70	+ {
	71	+ int index = j*width+i;
	72	+ int p = pixels[index];
	73	+ a = ((p>>24) & 0xFF);
	74	+ r = ((p>>16) & 0xFF);
	75	+ g = ((p>>8) & 0xFF);
	76	+ b = (p & 0xFF);
	77	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	78	+ }
	79	+ /**/
	80	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	81	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	82	+ return rendImage;
	83	+ }
47	84
48	85	/static/ private boolean CULLFACE = false; // true;
49	86	/static/ boolean NEAREST = false; // true;
..	..	@@ -60,7 +97,7 @@
60	97	//boolean REDUCETEXTURE = true;
61	98	boolean CACHETEXTURE = true;
62	99	boolean CLEANCACHE = false; // true;
63		- boolean MIPMAP = false; // true;
	100	+ boolean MIPMAP = false; // true; // never works...
64	101	boolean COMPRESSTEXTURE = false;
65	102	boolean KOMPACTTEXTURE = false; // true;
66	103	boolean RESIZETEXTURE = false;
..	..	@@ -169,7 +206,8 @@
169	206
170	207	SetCamera(cam);
171	208
172		- SetLight(new Camera(new cVector(10, 10, -20)));
	209	+ // Warning: not used.
	210	+ SetLight(new Camera(new cVector(15, 10, -20)));
173	211
174	212	object = o;
175	213
..	..	@@ -2065,7 +2103,7 @@
2065	2103	//System.err.println("Oeil on");
2066	2104	OEIL = true;
2067	2105	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2068		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2106	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2069	2107	//pingthread.StepToTarget(true);
2070	2108	}
2071	2109
..	..	@@ -2298,10 +2336,17 @@
2298	2336	HANDLES ^= true;
2299	2337	}
2300	2338
	2339	+ Object3D paintFolder;
	2340	+
2301	2341	void TogglePaint()
2302	2342	{
2303	2343	PAINTMODE ^= true;
2304	2344	paintcount = 0;
	2345	+
	2346	+ if (PAINTMODE)
	2347	+ {
	2348	+ paintFolder = GetFolder();
	2349	+ }
2305	2350	}
2306	2351
2307	2352	void SwapCamera(int a, int b)
..	..	@@ -2398,126 +2443,19 @@
2398	2443	return currentGL;
2399	2444	}
2400	2445
2401		- private void GetRemoteZip(String url, String name, boolean unzip, boolean save)
	2446	+ static private BufferedImage CreateBim(TextureData texturedata)
2402	2447	{
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		-
	2448	+ Grafreed.Assert(texturedata != null);
	2449	+
	2450	+ int width = texturedata.getWidth();
	2451	+ int height = texturedata.getHeight();
	2452	+
	2453	+ Buffer buffer = texturedata.getBuffer();
	2454	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2455	+
	2456	+ byte[] bytes = bytebuf.array();
	2457	+
	2458	+ return CreateBim(bytes, width, height);
2521	2459	}
2522	2460
2523	2461	/**/
..	..	@@ -2528,28 +2466,31 @@
2528	2466
2529	2467	int resolution;
2530	2468
2531		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2469	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2532	2470	{
2533		- texture = tex;
	2471	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2472	+ texturedata = texdata;
2534	2473	resolution = res;
2535	2474	}
2536	2475	}
2537	2476	/**/
2538	2477
2539	2478	// 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>();
	2479	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2480	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2481	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2482	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2483	+
2543	2484	int pigmentdepth = 0;
2544	2485	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2545	2486	int bumpdepth = 0;
2546	2487	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2547	2488	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2548	2489	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2549		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2490	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2550	2491	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2551	2492
2552		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2493	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2553	2494	{
2554	2495	TextureData texturedata = null;
2555	2496
..	..	@@ -2568,13 +2509,34 @@
2568	2509	if (bump)
2569	2510	texturedata = ConvertBump(texturedata, false);
2570	2511
2571		- com.sun.opengl.util.texture.Texture texture =
2572		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2512	+// com.sun.opengl.util.texture.Texture texture =
	2513	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2573	2514
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);
	2515	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2516	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2576	2517
2577		- return texture;
	2518	+ return texturedata;
	2519	+ }
	2520	+
	2521	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2522	+ {
	2523	+ TextureData texturedata = null;
	2524	+
	2525	+ try
	2526	+ {
	2527	+ texturedata =
	2528	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2529	+ bim,
	2530	+ true);
	2531	+ } catch (Exception e)
	2532	+ {
	2533	+ throw new javax.media.opengl.GLException(e);
	2534	+ }
	2535	+
	2536	+ if (bump)
	2537	+ texturedata = ConvertBump(texturedata, false);
	2538	+
	2539	+ return texturedata;
2578	2540	}
2579	2541
2580	2542	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3647,6 +3609,8 @@
3647	3609
3648	3610	System.out.println("LOADING TEXTURE : " + name);
3649	3611
	3612	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3613	+
3650	3614	//
3651	3615	if (false) // compressbit > 0)
3652	3616	{
..	..	@@ -8045,7 +8009,7 @@
8045	8009	String pigment = Object3D.GetPigment(tex);
8046	8010	String bump = Object3D.GetBump(tex);
8047	8011
8048		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8012	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8049	8013	{
8050	8014	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
8051	8015	// System.out.println("; bump = " + bump);
..	..	@@ -8060,8 +8024,8 @@
8060	8024	pigment = null;
8061	8025	}
8062	8026
8063		- ReleaseTexture(bump, true);
8064		- ReleaseTexture(pigment, false);
	8027	+ ReleaseTexture(tex, true);
	8028	+ ReleaseTexture(tex, false);
8065	8029	}
8066	8030
8067	8031	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -8079,7 +8043,7 @@
8079	8043
8080	8044	String pigment = Object3D.GetPigment(tex);
8081	8045
8082		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8046	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8083	8047	{
8084	8048	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
8085	8049	// System.out.println("; bump = " + bump);
..	..	@@ -8090,7 +8054,7 @@
8090	8054	pigment = null;
8091	8055	}
8092	8056
8093		- ReleaseTexture(pigment, false);
	8057	+ ReleaseTexture(tex, false);
8094	8058	}
8095	8059
8096	8060	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -8108,7 +8072,7 @@
8108	8072
8109	8073	String bump = Object3D.GetBump(tex);
8110	8074
8111		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8075	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8112	8076	{
8113	8077	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
8114	8078	// System.out.println("; bump = " + bump);
..	..	@@ -8119,10 +8083,10 @@
8119	8083	bump = null;
8120	8084	}
8121	8085
8122		- ReleaseTexture(bump, true);
	8086	+ ReleaseTexture(tex, true);
8123	8087	}
8124	8088
8125		- void ReleaseTexture(String tex, boolean bump)
	8089	+ void ReleaseTexture(cTexture tex, boolean bump)
8126	8090	{
8127	8091	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8128	8092	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8133,7 +8097,7 @@
8133	8097	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
8134	8098
8135	8099	if (tex != null)
8136		- texture = textures.get(tex);
	8100	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
8137	8101
8138	8102	// //assert( texture != null );
8139	8103	// if (texture == null)
..	..	@@ -8227,47 +8191,50 @@
8227	8191
8228	8192	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8229	8193	{
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		- }
	8194	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8195	+// ambientOcclusion ) // \|\| !textureon)
	8196	+// {
	8197	+// return; // false;
	8198	+// }
	8199	+//
	8200	+// if (tex == null)
	8201	+// {
	8202	+// BindTexture(null,false,resolution);
	8203	+// BindTexture(null,true,resolution);
	8204	+// return;
	8205	+// }
	8206	+//
	8207	+// String pigment = Object3D.GetPigment(tex);
	8208	+// String bump = Object3D.GetBump(tex);
	8209	+//
	8210	+// usedtextures.add(pigment);
	8211	+// usedtextures.add(bump);
	8212	+//
	8213	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8214	+// {
	8215	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8216	+// // System.out.println("; bump = " + bump);
	8217	+// }
	8218	+//
	8219	+// if (bump.equals(""))
	8220	+// {
	8221	+// bump = null;
	8222	+// }
	8223	+// if (pigment.equals(""))
	8224	+// {
	8225	+// pigment = null;
	8226	+// }
	8227	+//
	8228	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8229	+// BindTexture(pigment, false, resolution);
	8230	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8231	+// BindTexture(bump, true, resolution);
	8232	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8233	+//
	8234	+// return; // true;
8242	8235
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;
	8236	+ BindPigmentTexture(tex, resolution);
	8237	+ BindBumpTexture(tex, resolution);
8271	8238	}
8272	8239
8273	8240	/boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8286,9 +8253,9 @@
8286	8253
8287	8254	String pigment = Object3D.GetPigment(tex);
8288	8255
8289		- usedtextures.put(pigment, pigment);
	8256	+ usedtextures.add(tex);
8290	8257
8291		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8258	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8292	8259	{
8293	8260	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8294	8261	// System.out.println("; bump = " + bump);
..	..	@@ -8300,7 +8267,7 @@
8300	8267	}
8301	8268
8302	8269	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8303		- BindTexture(pigment, false, resolution);
	8270	+ BindTexture(tex, false, resolution);
8304	8271	}
8305	8272
8306	8273	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8319,9 +8286,9 @@
8319	8286
8320	8287	String bump = Object3D.GetBump(tex);
8321	8288
8322		- usedtextures.put(bump, bump);
	8289	+ usedtextures.add(tex);
8323	8290
8324		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8291	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8325	8292	{
8326	8293	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8327	8294	// System.out.println("; bump = " + bump);
..	..	@@ -8333,7 +8300,7 @@
8333	8300	}
8334	8301
8335	8302	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8336		- BindTexture(bump, true, resolution);
	8303	+ BindTexture(tex, true, resolution);
8337	8304	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8338	8305	}
8339	8306
..	..	@@ -8357,13 +8324,19 @@
8357	8324	return fileExists;
8358	8325	}
8359	8326
8360		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8327	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8361	8328	{
8362		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8329	+ CacheTexture texturecache = null;
8363	8330
8364	8331	if (tex != null)
8365	8332	{
8366		- String texname = tex;
	8333	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8334	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
	8335	+
	8336	+ if (texname.equals("") && texdata == null)
	8337	+ {
	8338	+ return null;
	8339	+ }
8367	8340
8368	8341	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8369	8342
..	..	@@ -8373,19 +8346,46 @@
8373	8346	// else
8374	8347	// if (!texname.startsWith("/"))
8375	8348	// texname = "/Users/nbriere/Textures/" + texname;
8376		- if (!FileExists(tex))
	8349	+ if (!FileExists(texname))
8377	8350	{
8378	8351	texname = fallbackTextureName;
8379	8352	}
8380	8353
8381	8354	if (CACHETEXTURE)
8382		- texture = textures.get(texname); // TEXTURE CACHE
8383		-
8384		- TextureData texturedata = null;
8385		-
8386		- if (texture == null \|\| texture.resolution < resolution)
8387	8355	{
8388		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8356	+ if (texdata == null)
	8357	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8358	+ else
	8359	+ texturecache = bimtextures.get(texdata);
	8360	+ }
	8361	+
	8362	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8363	+ {
	8364	+ TextureData texturedata = null;
	8365	+
	8366	+ if (texdata != null && textureon)
	8367	+ {
	8368	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8369	+
	8370	+ try
	8371	+ {
	8372	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8373	+ }
	8374	+ catch (Exception e)
	8375	+ {
	8376	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8377	+ }
	8378	+
	8379	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8380	+ bimtextures.put(texdata, texturecache);
	8381	+
	8382	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8383	+
	8384	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8385	+ //bim2 = bim;
	8386	+ }
	8387	+ else
	8388	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8389	8389	{
8390	8390	assert(!bump);
8391	8391	// if (bump)
..	..	@@ -8396,19 +8396,23 @@
8396	8396	// }
8397	8397	// else
8398	8398	// {
8399		- texture = textures.get(tex);
8400		- if (texture == null)
	8399	+ // texturecache = textures.get(texname); // suspicious
	8400	+ if (texturecache == null)
8401	8401	{
8402		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8402	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8403	8403	}
	8404	+ else
	8405	+ new Exception().printStackTrace();
8404	8406	// }
8405	8407	} else
8406		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8408	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8407	8409	{
8408	8410	assert(bump);
8409		- texture = textures.get(tex);
8410		- if (texture == null)
8411		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8411	+ // texturecache = textures.get(texname); // suspicious
	8412	+ if (texturecache == null)
	8413	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8414	+ else
	8415	+ new Exception().printStackTrace();
8412	8416	} else
8413	8417	{
8414	8418	//if (tex.equals("IMMORTAL"))
..	..	@@ -8416,11 +8420,13 @@
8416	8420	// texture = GetResourceTexture("default.png");
8417	8421	//} else
8418	8422	//{
8419		- if (tex.equals("WHITE_NOISE"))
	8423	+ if (texname.endsWith("WHITE_NOISE"))
8420	8424	{
8421		- texture = textures.get(tex);
8422		- if (texture == null)
8423		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8425	+ // texturecache = textures.get(texname); // suspicious
	8426	+ if (texturecache == null)
	8427	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8428	+ else
	8429	+ new Exception().printStackTrace();
8424	8430	} else
8425	8431	{
8426	8432	if (textureon)
..	..	@@ -8479,19 +8485,19 @@
8479	8485	if (texturedata == null)
8480	8486	throw new Exception();
8481	8487
8482		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8488	+ texturecache = new CacheTexture(texturedata,resolution);
8483	8489	//texture = GetTexture(tex, bump);
8484	8490	}
8485	8491	}
8486	8492	//}
8487	8493	}
8488	8494
8489		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8495	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8490	8496	{
8491	8497	//return false;
8492	8498
8493	8499	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8494		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8500	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8495	8501	{
8496	8502	// String ext = "_highres";
8497	8503	// if (REDUCETEXTURE)
..	..	@@ -8508,52 +8514,17 @@
8508	8514	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8509	8515	if (!cachefile.exists())
8510	8516	{
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))
	8517	+ //if (texturedata.getWidth() == texturedata.getHeight())
8520	8518	{
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);
	8519	+ BufferedImage rendImage = CreateBim(texturedata);
	8520	+
8551	8521	ImageWriter writer = null;
8552	8522	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8553	8523	if (iter.hasNext()) {
8554	8524	writer = (ImageWriter)iter.next();
8555	8525	}
8556		- float compressionQuality = 0.9f;
	8526	+
	8527	+ float compressionQuality = 0.85f;
8557	8528	try
8558	8529	{
8559	8530	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8570,18 +8541,20 @@
8570	8541	}
8571	8542	}
8572	8543	}
8573		-
	8544	+
	8545	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8546	+
8574	8547	//System.out.println("Texture = " + tex);
8575		- if (textures.containsKey(texname))
	8548	+ if (textures.containsKey(tex))
8576	8549	{
8577		- CacheTexture thetex = textures.get(texname);
	8550	+ CacheTexture thetex = textures.get(tex);
8578	8551	thetex.texture.disable();
8579	8552	thetex.texture.dispose();
8580		- textures.remove(texname);
	8553	+ textures.remove(tex);
8581	8554	}
8582	8555
8583		- texture.texturedata = texturedata;
8584		- textures.put(texname, texture);
	8556	+ //texture.texturedata = texturedata;
	8557	+ textures.put(tex, texturecache);
8585	8558
8586	8559	// newtex = true;
8587	8560	}
..	..	@@ -8597,10 +8570,44 @@
8597	8570	}
8598	8571	}
8599	8572
8600		- return texture;
	8573	+ return texturecache;
8601	8574	}
8602	8575
8603		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	8576	+ static void EmbedTextures(cTexture tex)
	8577	+ {
	8578	+ if (tex.pigmentdata == null)
	8579	+ {
	8580	+ //String texname = Object3D.GetPigment(tex);
	8581	+
	8582	+ CacheTexture texturecache = texturepigment.get(tex);
	8583	+
	8584	+ if (texturecache != null)
	8585	+ {
	8586	+ tex.pw = texturecache.texturedata.getWidth();
	8587	+ tex.ph = texturecache.texturedata.getHeight();
	8588	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8589	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8590	+ ;
	8591	+ //, tex.pw, tex.ph), 0.5f);
	8592	+ }
	8593	+ }
	8594	+
	8595	+ if (tex.bumpdata == null)
	8596	+ {
	8597	+ //String texname = Object3D.GetBump(tex);
	8598	+
	8599	+ CacheTexture texturecache = texturebump.get(tex);
	8600	+
	8601	+ if (texturecache != null)
	8602	+ {
	8603	+ tex.bw = texturecache.texturedata.getWidth();
	8604	+ tex.bh = texturecache.texturedata.getHeight();
	8605	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8606	+ }
	8607	+ }
	8608	+ }
	8609	+
	8610	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8604	8611	{
8605	8612	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8606	8613
..	..	@@ -8618,21 +8625,21 @@
8618	8625	return texture!=null?texture.texture:null;
8619	8626	}
8620	8627
8621		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
	8628	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8622	8629	{
8623	8630	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8624	8631
8625	8632	return texture!=null?texture.texturedata:null;
8626	8633	}
8627	8634
8628		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8635	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8629	8636	{
8630	8637	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8631	8638	{
8632	8639	return false;
8633	8640	}
8634	8641
8635		- boolean newtex = false;
	8642	+ //boolean newtex = false;
8636	8643
8637	8644	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8638	8645
..	..	@@ -8664,9 +8671,75 @@
8664	8671	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8665	8672	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8666	8673
8667		- return newtex;
	8674	+ return true; // Warning: not used.
8668	8675	}
8669	8676
	8677	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8678	+ {
	8679	+ try
	8680	+ {
	8681	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8682	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8683	+ ImageWriter writer = writers.next();
	8684	+
	8685	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8686	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8687	+ param.setCompressionQuality(quality);
	8688	+
	8689	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8690	+ writer.setOutput(ios);
	8691	+ writer.write(null, new IIOImage(image, null, null), param);
	8692	+
	8693	+ byte[] data = baos.toByteArray();
	8694	+ writer.dispose();
	8695	+ return data;
	8696	+ }
	8697	+ catch (Exception e)
	8698	+ {
	8699	+ e.printStackTrace();
	8700	+ return null;
	8701	+ }
	8702	+ }
	8703	+
	8704	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8705	+ {
	8706	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8707	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8708	+ ImageReader reader = writers.next();
	8709	+
	8710	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8711	+
	8712	+ ImageReadParam param = reader.getDefaultReadParam();
	8713	+ param.setDestination(bim);
	8714	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8715	+
	8716	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8717	+ reader.setInput(ios);
	8718	+ BufferedImage bim2 = reader.read(0, param);
	8719	+ reader.dispose();
	8720	+
	8721	+// WritableRaster raster = bim2.getRaster();
	8722	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8723	+// byte[] bytes = data.getData();
	8724	+//
	8725	+// int[] pixels = new int[bytes.length/3];
	8726	+// for (int i=pixels.length; --i>=0;)
	8727	+// {
	8728	+// int i3 = i*3;
	8729	+// pixels[i] = 0xFF;
	8730	+// pixels[i] <<= 8;
	8731	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8732	+// pixels[i] <<= 8;
	8733	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8734	+// pixels[i] <<= 8;
	8735	+// pixels[i] \|= bytes[i3] & 0xFF;
	8736	+// }
	8737	+//
	8738	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8739	+
	8740	+ return bim;
	8741	+ }
	8742	+
8670	8743	ShadowBuffer shadowPBuf;
8671	8744	AntialiasBuffer antialiasPBuf;
8672	8745	int MAXSTACK;
..	..	@@ -9627,7 +9700,7 @@
9627	9700
9628	9701	if (renderCamera != lightCamera)
9629	9702	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9630		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9703	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9631	9704
9632	9705	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9633	9706
..	..	@@ -9643,7 +9716,7 @@
9643	9716
9644	9717	if (renderCamera != lightCamera)
9645	9718	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9646		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9719	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9647	9720
9648	9721	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9649	9722
..	..	@@ -10844,7 +10917,7 @@
10844	10917	// if (parentcam != renderCamera) // not a light
10845	10918	if (cam != lightCamera)
10846	10919	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10847		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10920	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10848	10921
10849	10922	for (int j = 0; j < 4; j++)
10850	10923	{
..	..	@@ -10859,7 +10932,7 @@
10859	10932	// if (parentcam != renderCamera) // not a light
10860	10933	if (cam != lightCamera)
10861	10934	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10862		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	10935	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10863	10936
10864	10937	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10865	10938
..	..	@@ -11150,9 +11223,9 @@
11150	11223
11151	11224	gl.glMatrixMode(GL.GL_MODELVIEW);
11152	11225
11153		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11154		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
11155		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11226	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11227	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11228	+gl.glEnable(gl.GL_MULTISAMPLE);
11156	11229	} else
11157	11230	{
11158	11231	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -11163,7 +11236,7 @@
11163	11236	//System.out.println("BLENDING ON");
11164	11237	gl.glEnable(GL.GL_BLEND);
11165	11238	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
11166		-
	11239	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
11167	11240	gl.glMatrixMode(gl.GL_PROJECTION);
11168	11241	gl.glLoadIdentity();
11169	11242
..	..	@@ -11412,7 +11485,7 @@
11412	11485	}
11413	11486	}
11414	11487
11415		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11488	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11416	11489	{
11417	11490	//gl.glDepthFunc(GL.GL_LEQUAL);
11418	11491	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11420,24 +11493,21 @@
11420	11493
11421	11494	boolean texon = textureon;
11422	11495
11423		- if (RENDERPROGRAM > 0)
11424		- {
11425		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11426		- textureon = false;
11427		- }
	11496	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11497	+ textureon = false;
	11498	+
11428	11499	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11429	11500	//System.out.println("ALLO");
11430	11501	gl.glColorMask(false, false, false, false);
11431	11502	DrawObject(gl);
11432		- if (RENDERPROGRAM > 0)
11433		- {
11434		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11435		- textureon = texon;
11436		- }
	11503	+
	11504	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11505	+ textureon = texon;
	11506	+
11437	11507	gl.glColorMask(true, true, true, true);
11438	11508
11439	11509	gl.glDepthFunc(GL.GL_EQUAL);
11440		- //gl.glDepthMask(false);
	11510	+ gl.glDepthMask(false);
11441	11511	}
11442	11512
11443	11513	if (false) // DrawMode() == SHADOW)
..	..	@@ -11649,7 +11719,7 @@
11649	11719	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11650	11720	{
11651	11721	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11652		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11722	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11653	11723	pingthread.StepToTarget(true); // true);
11654	11724	// zoomonce = false;
11655	11725	}
..	..	@@ -11777,20 +11847,32 @@
11777	11847	ReleaseTextures(DEFAULT_TEXTURES);
11778	11848
11779	11849	if (CLEANCACHE)
11780		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11850	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11781	11851	{
11782		- String tex = e.nextElement();
	11852	+ cTexture tex = e.nextElement();
11783	11853
11784	11854	// System.out.println("Texture --------- " + tex);
11785	11855
11786		- if (tex.equals("WHITE_NOISE"))
	11856	+ if (tex.equals("WHITE_NOISE:"))
11787	11857	continue;
11788	11858
11789		- if (!usedtextures.containsKey(tex))
	11859	+ if (!usedtextures.contains(tex))
11790	11860	{
	11861	+ CacheTexture gettex = texturepigment.get(tex);
11791	11862	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11792		- textures.get(tex).texture.dispose();
11793		- textures.remove(tex);
	11863	+ if (gettex != null)
	11864	+ {
	11865	+ gettex.texture.dispose();
	11866	+ texturepigment.remove(tex);
	11867	+ }
	11868	+
	11869	+ gettex = texturebump.get(tex);
	11870	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11871	+ if (gettex != null)
	11872	+ {
	11873	+ gettex.texture.dispose();
	11874	+ texturebump.remove(tex);
	11875	+ }
11794	11876	}
11795	11877	}
11796	11878	}
..	..	@@ -12319,7 +12401,74 @@
12319	12401	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12320	12402
12321	12403	String program =
	12404	+ // Min shader
12322	12405	"!!ARBfp1.0\n" +
	12406	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12407	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12408	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12409	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12410	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12411	+ "PARAM light2cam0 = program.env[10];" +
	12412	+ "PARAM light2cam1 = program.env[11];" +
	12413	+ "PARAM light2cam2 = program.env[12];" +
	12414	+ "TEMP temp;" +
	12415	+ "TEMP light;" +
	12416	+ "TEMP ndotl;" +
	12417	+ "TEMP normal;" +
	12418	+ "TEMP depth;" +
	12419	+ "TEMP eye;" +
	12420	+ "TEMP pos;" +
	12421	+
	12422	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12423	+ Normalize("normal") +
	12424	+ "MOV light, state.light[0].position;" +
	12425	+ "DP3 ndotl.x, light, normal;" +
	12426	+
	12427	+ // shadow
	12428	+ "MOV pos, fragment.texcoord[1];" +
	12429	+ "MOV temp, pos;" +
	12430	+ ShadowTextureFetch("depth", "temp", "1") +
	12431	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12432	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12433	+
	12434	+ // No shadow when out of frustum
	12435	+ //"SGE temp.y, depth.z, zero123.y;" +
	12436	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12437	+
	12438	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12439	+
	12440	+ // Backlit
	12441	+ "MOV pos.w, zero123.y;" +
	12442	+ "DP4 eye.x, pos, light2cam0;" +
	12443	+ "DP4 eye.y, pos, light2cam1;" +
	12444	+ "DP4 eye.z, pos, light2cam2;" +
	12445	+ Normalize("eye") +
	12446	+
	12447	+ "DP3 ndotl.y, -eye, normal;" +
	12448	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12449	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12450	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12451	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12452	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12453	+
	12454	+ "MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12455	+
	12456	+ // Pigment
	12457	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12458	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12459	+ "MUL temp, temp, ndotl.x;" +
	12460	+
	12461	+ "MUL temp, temp, zero123.z;" +
	12462	+
	12463	+ //"MUL temp, temp, ndotl.y;" +
	12464	+
	12465	+ "MOV temp.w, zero123.y;" + // reset alpha
	12466	+ "MOV result.color, temp;" +
	12467	+ "END";
	12468	+
	12469	+ String program2 =
	12470	+ "!!ARBfp1.0\n" +
	12471	+
12323	12472	//"OPTION ARB_fragment_program_shadow;" +
12324	12473	"PARAM light2cam0 = program.env[10];" +
12325	12474	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12434,8 +12583,7 @@
12434	12583	"TEMP shininess;" +
12435	12584	"\n" +
12436	12585	"MOV texSamp, one;" +
12437		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12438		-
	12586	+
12439	12587	"MOV mapgrid.x, one2048th.x;" +
12440	12588	"MOV temp, fragment.texcoord[1];" +
12441	12589	/*
..	..	@@ -12456,20 +12604,20 @@
12456	12604	"MUL temp, floor, mapgrid.x;" +
12457	12605	//"TEX depth0, temp, texture[1], 2D;" +
12458	12606	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12459		- TextureFetch("depth0", "temp", "1") +
	12607	+ ShadowTextureFetch("depth0", "temp", "1") +
12460	12608	"") +
12461	12609	"ADD temp.x, temp.x, mapgrid.x;" +
12462	12610	//"TEX depth1, temp, texture[1], 2D;" +
12463	12611	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12464		- TextureFetch("depth1", "temp", "1") +
	12612	+ ShadowTextureFetch("depth1", "temp", "1") +
12465	12613	"") +
12466	12614	"ADD temp.y, temp.y, mapgrid.x;" +
12467	12615	//"TEX depth2, temp, texture[1], 2D;" +
12468		- TextureFetch("depth2", "temp", "1") +
	12616	+ ShadowTextureFetch("depth2", "temp", "1") +
12469	12617	"SUB temp.x, temp.x, mapgrid.x;" +
12470	12618	//"TEX depth3, temp, texture[1], 2D;" +
12471	12619	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12472		- TextureFetch("depth3", "temp", "1") +
	12620	+ ShadowTextureFetch("depth3", "temp", "1") +
12473	12621	"") +
12474	12622	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12475	12623	//"MOV params, material;" +
..	..	@@ -12840,7 +12988,7 @@
12840	12988	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12841	12989	"") +
12842	12990
12843		- // display shadow only (bump == 0)
	12991	+ // display shadow only (fakedepth == 0)
12844	12992	"SUB temp.x, half.x, shadow.x;" +
12845	12993	"MOV temp.y, -params5.z;" + // params6.x;" +
12846	12994	"SLT temp.z, temp.y, -one2048th.x;" +
..	..	@@ -13267,25 +13415,26 @@
13267	13415	return out;
13268	13416	}
13269	13417
13270		- String TextureFetch(String dest, String src, String unit)
	13418	+ // Also does frustum culling
	13419	+ String ShadowTextureFetch(String dest, String src, String unit)
13271	13420	{
13272	13421	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13273	13422	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13274	13423	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13424	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13425	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13275	13426	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13276		- "SLT " + src + ".z, " + src + ".x, one.x;" +
13277		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13278		- "SLT " + src + ".z, " + src + ".y, one.x;" +
13279		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13427	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13428	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13280	13429	//"SWZ buffer, temp, w,w,w,w;";
13281		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13430	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13282	13431	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13283	13432	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13284	13433	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13285		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13434	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13286	13435
13287		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13288		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13436	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13437	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13289	13438	}
13290	13439
13291	13440	String Shadow(String depth, String shadow)
..	..	@@ -13332,7 +13481,7 @@
13332	13481	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13333	13482	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13334	13483
13335		- // No shadow when out of frustrum
	13484	+ // No shadow when out of frustum
13336	13485	"SGE temp.x, " + depth + ".z, one.z;" +
13337	13486	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13338	13487	"";
..	..	@@ -14065,7 +14214,7 @@
14065	14214
14066	14215	// fev 2014???
14067	14216	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
14068		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14217	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
14069	14218	pingthread.StepToTarget(true); // true);
14070	14219	}
14071	14220	// if (!LIVE)
..	..	@@ -14130,14 +14279,15 @@
14130	14279	drag = false;
14131	14280	//System.out.println("Mouse DOWN");
14132	14281	editObj = false;
14133		- ClickInfo info = new ClickInfo();
14134		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14135		- info.pane = this;
14136		- info.camera = renderCamera;
14137		- info.x = x;
14138		- info.y = y;
14139		- info.modifiers = modifiersex;
14140		- editObj = object.doEditClick(info, 0);
	14282	+ //ClickInfo info = new ClickInfo();
	14283	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14284	+ object.clickInfo.pane = this;
	14285	+ object.clickInfo.camera = renderCamera;
	14286	+ object.clickInfo.x = x;
	14287	+ object.clickInfo.y = y;
	14288	+ object.clickInfo.modifiers = modifiersex;
	14289	+ editObj = object.doEditClick(//info,
	14290	+ 0);
14141	14291	if (!editObj)
14142	14292	{
14143	14293	hasMarquee = true;
..	..	@@ -14419,12 +14569,12 @@
14419	14569	void GoDown(int mod)
14420	14570	{
14421	14571	MODIFIERS \|= COMMAND;
14422		- /*
	14572	+ /**/
14423	14573	if((mod&SHIFT) == SHIFT)
14424	14574	manipCamera.RotatePosition(0, -speed);
14425	14575	else
14426		- manipCamera.BackForth(0, -speed*delta, getWidth());
14427		- */
	14576	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14577	+ /**/
14428	14578	if ((mod & SHIFT) == SHIFT)
14429	14579	{
14430	14580	mouseMode = mouseMode; // VR??
..	..	@@ -14440,12 +14590,12 @@
14440	14590	void GoUp(int mod)
14441	14591	{
14442	14592	MODIFIERS \|= COMMAND;
14443		- /*
	14593	+ /**/
14444	14594	if((mod&SHIFT) == SHIFT)
14445	14595	manipCamera.RotatePosition(0, speed);
14446	14596	else
14447		- manipCamera.BackForth(0, speed*delta, getWidth());
14448		- */
	14597	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14598	+ /**/
14449	14599	if ((mod & SHIFT) == SHIFT)
14450	14600	{
14451	14601	mouseMode = mouseMode;
..	..	@@ -14461,12 +14611,12 @@
14461	14611	void GoLeft(int mod)
14462	14612	{
14463	14613	MODIFIERS \|= COMMAND;
14464		- /*
	14614	+ /**/
14465	14615	if((mod&SHIFT) == SHIFT)
14466		- manipCamera.RotatePosition(speed, 0);
14467		- else
14468	14616	manipCamera.Translate(speed*delta, 0, getWidth());
14469		- */
	14617	+ else
	14618	+ manipCamera.RotatePosition(speed, 0);
	14619	+ /**/
14470	14620	if ((mod & SHIFT) == SHIFT)
14471	14621	{
14472	14622	mouseMode = mouseMode;
..	..	@@ -14482,12 +14632,12 @@
14482	14632	void GoRight(int mod)
14483	14633	{
14484	14634	MODIFIERS \|= COMMAND;
14485		- /*
	14635	+ /**/
14486	14636	if((mod&SHIFT) == SHIFT)
14487		- manipCamera.RotatePosition(-speed, 0);
14488		- else
14489	14637	manipCamera.Translate(-speed*delta, 0, getWidth());
14490		- */
	14638	+ else
	14639	+ manipCamera.RotatePosition(-speed, 0);
	14640	+ /**/
14491	14641	if ((mod & SHIFT) == SHIFT)
14492	14642	{
14493	14643	mouseMode = mouseMode;
..	..	@@ -14537,15 +14687,16 @@
14537	14687	if (editObj)
14538	14688	{
14539	14689	drag = true;
14540		- ClickInfo info = new ClickInfo();
14541		- info.bounds.setBounds(0, 0,
	14690	+ //ClickInfo info = new ClickInfo();
	14691	+ object.clickInfo.bounds.setBounds(0, 0,
14542	14692	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14543		- info.pane = this;
14544		- info.camera = renderCamera;
14545		- info.x = x;
14546		- info.y = y;
14547		- object.GetWindow().copy
14548		- .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	14693	+ object.clickInfo.pane = this;
	14694	+ object.clickInfo.camera = renderCamera;
	14695	+ object.clickInfo.x = x;
	14696	+ object.clickInfo.y = y;
	14697	+ object //.GetWindow().copy
	14698	+ .doEditDrag(//info,
	14699	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14549	14700	} else
14550	14701	{
14551	14702	if (x < startX)
..	..	@@ -14694,24 +14845,27 @@
14694	14845	}
14695	14846	}
14696	14847
	14848	+// ClickInfo clickInfo = new ClickInfo();
	14849	+
14697	14850	public void mouseMoved(MouseEvent e)
14698	14851	{
14699	14852	//System.out.println("mouseMoved: " + e);
14700	14853	if (isRenderer)
14701	14854	return;
14702	14855
14703		- ClickInfo ci = new ClickInfo();
14704		- ci.x = e.getX();
14705		- ci.y = e.getY();
14706		- ci.modifiers = e.getModifiersEx();
14707		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14708		- ci.pane = this;
14709		- ci.camera = renderCamera;
	14856	+ // Mouse cursor feedback
	14857	+ object.clickInfo.x = e.getX();
	14858	+ object.clickInfo.y = e.getY();
	14859	+ object.clickInfo.modifiers = e.getModifiersEx();
	14860	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14861	+ object.clickInfo.pane = this;
	14862	+ object.clickInfo.camera = renderCamera;
14710	14863	if (!isRenderer)
14711	14864	{
14712	14865	//ObjEditor editWindow = object.editWindow;
14713	14866	//Object3D copy = editWindow.copy;
14714		- if (object.doEditClick(ci, 0))
	14867	+ if (object.doEditClick(//clickInfo,
	14868	+ 0))
14715	14869	{
14716	14870	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14717	14871	} else
..	..	@@ -14726,7 +14880,8 @@
14726	14880	Globals.MOUSEDRAGGED = false;
14727	14881
14728	14882	movingcamera = false;
14729		- X = Y = 0;
	14883	+ X = 0; // getBounds().width/2;
	14884	+ Y = 0; // getBounds().height/2;
14730	14885	//System.out.println("mouseReleased: " + e);
14731	14886	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14732	14887	}
..	..	@@ -14982,7 +15137,8 @@
14982	15137	// break;
14983	15138	case 'T':
14984	15139	CACHETEXTURE ^= true;
14985		- textures.clear();
	15140	+ texturepigment.clear();
	15141	+ texturebump.clear();
14986	15142	// repaint();
14987	15143	break;
14988	15144	case 'Y':
..	..	@@ -15067,7 +15223,9 @@
15067	15223	case 'E' : COMPACT ^= true;
15068	15224	repaint();
15069	15225	break;
15070		- case 'W' : DEBUGHSB ^= true;
	15226	+ case 'W' : // Wide Window (fullscreen)
	15227	+ //DEBUGHSB ^= true;
	15228	+ ObjEditor.theFrame.ToggleFullScreen();
15071	15229	repaint();
15072	15230	break;
15073	15231	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -15093,13 +15251,7 @@
15093	15251	repaint();
15094	15252	break;
15095	15253	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':
	15254	+ //case 'L':
15103	15255	if (lightMode)
15104	15256	{
15105	15257	lightMode = false;
..	..	@@ -15246,7 +15398,10 @@
15246	15398	// kompactbit = 6;
15247	15399	// break;
15248	15400	case ' ':
15249		- ObjEditor.theFrame.ToggleFullScreen();
	15401	+ lightMode ^= true;
	15402	+ Globals.lighttouched = true;
	15403	+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
	15404	+ targetLookAt.set(manipCamera.lookAt);
15250	15405	repaint();
15251	15406	break;
15252	15407	//case '`' :
..	..	@@ -15295,12 +15450,6 @@
15295	15450	break;
15296	15451	case '+':
15297	15452
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	15453	/*
15305	15454	//fontsize += 1;
15306	15455	bbzoom *= 2;
..	..	@@ -15318,17 +15467,17 @@
15318	15467	case '=':
15319	15468	IncDepth();
15320	15469	//fontsize += 1;
15321		- object.editWindow.refreshContents(true);
	15470	+ object.GetWindow().refreshContents(true);
15322	15471	maskbit = 6;
15323	15472	break;
15324	15473	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
15325	15474	DecDepth();
15326	15475	maskbit = 5;
15327	15476	//if(fontsize > 1) fontsize -= 1;
15328		- if (object.editWindow == null)
15329		- new Exception().printStackTrace();
15330		- else
15331		- object.editWindow.refreshContents(true);
	15477	+// if (object.editWindow == null)
	15478	+// new Exception().printStackTrace();
	15479	+// else
	15480	+ object.GetWindow().refreshContents(true);
15332	15481	break;
15333	15482	case '{':
15334	15483	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15552,7 +15701,7 @@
15552	15701	}
15553	15702	*/
15554	15703
15555		- object.editWindow.EditSelection(false);
	15704	+ object.GetWindow().EditSelection(false);
15556	15705	}
15557	15706
15558	15707	void SelectParent()
..	..	@@ -15569,10 +15718,10 @@
15569	15718	{
15570	15719	//selectees.remove(i);
15571	15720	System.out.println("select parent of " + elem);
15572		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15721	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15573	15722	} else
15574	15723	{
15575		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15724	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15576	15725	}
15577	15726
15578	15727	first = false;
..	..	@@ -15614,12 +15763,12 @@
15614	15763	for (int j = 0; j < group.children.size(); j++)
15615	15764	{
15616	15765	elem = (Object3D) group.children.elementAt(j);
15617		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15766	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15618	15767	first = false;
15619	15768	}
15620	15769	} else
15621	15770	{
15622		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15771	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15623	15772	}
15624	15773
15625	15774	first = false;
..	..	@@ -15630,21 +15779,21 @@
15630	15779	{
15631	15780	//Composite group = (Composite) object;
15632	15781	Object3D group = object;
15633		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15782	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15634	15783	}
15635	15784
15636	15785	void ResetTransform(int mask)
15637	15786	{
15638	15787	//Composite group = (Composite) object;
15639	15788	Object3D group = object;
15640		- group.editWindow.ResetTransform(mask);
	15789	+ group.GetWindow().ResetTransform(mask);
15641	15790	}
15642	15791
15643	15792	void FlipTransform()
15644	15793	{
15645	15794	//Composite group = (Composite) object;
15646	15795	Object3D group = object;
15647		- group.editWindow.FlipTransform();
	15796	+ group.GetWindow().FlipTransform();
15648	15797	// group.editWindow.ReduceMesh(true);
15649	15798	}
15650	15799
..	..	@@ -15652,7 +15801,7 @@
15652	15801	{
15653	15802	//Composite group = (Composite) object;
15654	15803	Object3D group = object;
15655		- group.editWindow.PrintMemory();
	15804	+ group.GetWindow().PrintMemory();
15656	15805	// group.editWindow.ReduceMesh(true);
15657	15806	}
15658	15807
..	..	@@ -15660,7 +15809,7 @@
15660	15809	{
15661	15810	//Composite group = (Composite) object;
15662	15811	Object3D group = object;
15663		- group.editWindow.ResetCentroid();
	15812	+ group.GetWindow().ResetCentroid();
15664	15813	}
15665	15814
15666	15815	void IncDepth()
..	..	@@ -15742,8 +15891,6 @@
15742	15891
15743	15892	int width = getBounds().width;
15744	15893	int height = getBounds().height;
15745		- ClickInfo info = new ClickInfo();
15746		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15747	15894	//Image img = CreateImage(width, height);
15748	15895	//System.out.println("width = " + width + "; height = " + height + "\n");
15749	15896
..	..	@@ -15820,48 +15967,77 @@
15820	15967	}
15821	15968	if (object != null && !hasMarquee)
15822	15969	{
	15970	+ if (object.clickInfo == null)
	15971	+ object.clickInfo = new ClickInfo();
	15972	+ ClickInfo info = object.clickInfo;
	15973	+ //ClickInfo info = new ClickInfo();
	15974	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	15975	+
15823	15976	if (isRenderer)
15824	15977	{
15825		- info.flags++;
	15978	+ object.clickInfo.flags++;
15826	15979	double frameAspect = (double) width / (double) height;
15827	15980	if (frameAspect > renderCamera.aspect)
15828	15981	{
15829	15982	int desired = (int) ((double) height * renderCamera.aspect);
15830		- info.bounds.width -= width - desired;
15831		- info.bounds.x += (width - desired) / 2;
	15983	+ object.clickInfo.bounds.width -= width - desired;
	15984	+ object.clickInfo.bounds.x += (width - desired) / 2;
15832	15985	} else
15833	15986	{
15834	15987	int desired = (int) ((double) width / renderCamera.aspect);
15835		- info.bounds.height -= height - desired;
15836		- info.bounds.y += (height - desired) / 2;
	15988	+ object.clickInfo.bounds.height -= height - desired;
	15989	+ object.clickInfo.bounds.y += (height - desired) / 2;
15837	15990	}
15838	15991	}
15839		- info.g = gr;
15840		- info.camera = renderCamera;
	15992	+
	15993	+ object.clickInfo.g = gr;
	15994	+ object.clickInfo.camera = renderCamera;
15841	15995	/*
15842	15996	// Memory intensive (brep.verticescopy)
15843	15997	if (!(object instanceof Composite))
15844	15998	object.draw(info, 0, false); // SLOW :
15845	15999	*/
15846		- if (!isRenderer)
	16000	+ if (!isRenderer) // && drag)
15847	16001	{
15848		- object.drawEditHandles(info, 0);
15849		-
15850		- if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	16002	+ Grafreed.Assert(object != null);
	16003	+ Grafreed.Assert(object.selection != null);
	16004	+ if (object.selection.Size() > 0)
15851	16005	{
15852		- switch (object.selection.get(0).hitSomething)
	16006	+ int hitSomething = object.selection.get(0).hitSomething;
	16007	+
	16008	+ object.clickInfo.DX = 0;
	16009	+ object.clickInfo.DY = 0;
	16010	+ object.clickInfo.W = 1;
	16011	+ if (hitSomething == Object3D.hitCenter)
15853	16012	{
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;
	16013	+ info.DX = X;
	16014	+ if (X != 0)
	16015	+ info.DX -= info.bounds.width/2;
	16016	+
	16017	+ info.DY = Y;
	16018	+ if (Y != 0)
	16019	+ info.DY -= info.bounds.height/2;
15863	16020	}
15864		-
	16021	+
	16022	+ object.drawEditHandles(//info,
	16023	+ 0);
	16024	+
	16025	+ if (drag && (X != 0 \|\| Y != 0))
	16026	+ {
	16027	+ switch (hitSomething)
	16028	+ {
	16029	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16030	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16031	+ break;
	16032	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16033	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16034	+ break;
	16035	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16036	+ gr.drawLine(X, Y, 0, 0);
	16037	+ break;
	16038	+ }
	16039	+
	16040	+ }
15865	16041	}
15866	16042	}
15867	16043	}
..	..	@@ -16659,6 +16835,14 @@
16659	16835	}
16660	16836	}
16661	16837
	16838	+ private Object3D GetFolder()
	16839	+ {
	16840	+ Object3D folder = object.GetWindow().copy;
	16841	+ if (object.GetWindow().copy.selection.Size() > 0)
	16842	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16843	+ return folder;
	16844	+ }
	16845	+
16662	16846	class SelectBuffer implements GLEventListener
16663	16847	{
16664	16848
..	..	@@ -16738,6 +16922,17 @@
16738	16922
16739	16923	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16740	16924
	16925	+ if (PAINTMODE)
	16926	+ {
	16927	+ if (object.GetWindow().copy.selection.Size() > 0)
	16928	+ {
	16929	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16930	+
	16931	+ // Make what you paint not selectable.
	16932	+ paintobj.ResetSelectable();
	16933	+ }
	16934	+ }
	16935	+
16741	16936	//int tmp = selection_view;
16742	16937	//selection_view = -1;
16743	16938	int temp = DrawMode();
..	..	@@ -16749,6 +16944,17 @@
16749	16944	// temp = DEFAULT; // patch for selection debug
16750	16945	Globals.drawMode = temp; // WARNING
16751	16946
	16947	+ if (PAINTMODE)
	16948	+ {
	16949	+ if (object.GetWindow().copy.selection.Size() > 0)
	16950	+ {
	16951	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16952	+
	16953	+ // Revert.
	16954	+ paintobj.RestoreSelectable();
	16955	+ }
	16956	+ }
	16957	+
16752	16958	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16753	16959
16754	16960	// trying different ways of getting the depth info over
..	..	@@ -16852,29 +17058,31 @@
16852	17058	}
16853	17059
16854	17060	if (!movingcamera && !PAINTMODE)
16855		- object.editWindow.ScreenFitPoint(); // fev 2014
	17061	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16856	17062
16857		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17063	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16858	17064	{
16859		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17065	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16860	17066
16861		- Object3D group = new Object3D("inst" + paintcount++);
	17067	+ if (object.GetWindow().copy.selection.Size() > 0)
	17068	+ {
	17069	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16862	17070
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();
	17071	+ Object3D inst = new Object3D("inst" + paintcount++);
	17072	+
	17073	+ inst.CreateMaterial(); // use a void leaf to select instances
	17074	+
	17075	+ inst.add(paintobj); // link
	17076	+
	17077	+ object.GetWindow().SnapObject(inst);
	17078	+
	17079	+ Object3D folder = paintFolder; // GetFolder();
	17080	+
	17081	+ folder.add(inst);
	17082	+
	17083	+ object.GetWindow().ResetModel();
	17084	+ object.GetWindow().refreshContents();
	17085	+ }
16878	17086	}
16879	17087	else
16880	17088	paintcount = 0;