~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -45,6 +45,39 @@
45	45
46	46	static int STEP = 1;
47	47
	48	+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
	49	+ {
	50	+ int[] pixels = new int[bytes.length/3];
	51	+ for (int i=pixels.length; --i>=0;)
	52	+ {
	53	+ int i3 = i*3;
	54	+ pixels[i] = 0xFF;
	55	+ pixels[i] <<= 8;
	56	+ pixels[i] \|= bytes[i3+2] & 0xFF;
	57	+ pixels[i] <<= 8;
	58	+ pixels[i] \|= bytes[i3+1] & 0xFF;
	59	+ pixels[i] <<= 8;
	60	+ pixels[i] \|= bytes[i3] & 0xFF;
	61	+ }
	62	+ /*
	63	+ int r=0,g=0,b=0,a=0;
	64	+ for (int i=0; i<width; i++)
	65	+ for (int j=0; j<height; j++)
	66	+ {
	67	+ int index = j*width+i;
	68	+ int p = pixels[index];
	69	+ a = ((p>>24) & 0xFF);
	70	+ r = ((p>>16) & 0xFF);
	71	+ g = ((p>>8) & 0xFF);
	72	+ b = (p & 0xFF);
	73	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	74	+ }
	75	+ /**/
	76	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	77	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	78	+ return rendImage;
	79	+ }
	80	+
48	81	/static/ private boolean CULLFACE = false; // true;
49	82	/static/ boolean NEAREST = false; // true;
50	83	/static/ boolean WIREFRAME = false; // true;
..	..	@@ -60,7 +93,7 @@
60	93	//boolean REDUCETEXTURE = true;
61	94	boolean CACHETEXTURE = true;
62	95	boolean CLEANCACHE = false; // true;
63		- boolean MIPMAP = false; // true;
	96	+ boolean MIPMAP = true; // false; // true;
64	97	boolean COMPRESSTEXTURE = false;
65	98	boolean KOMPACTTEXTURE = false; // true;
66	99	boolean RESIZETEXTURE = false;
..	..	@@ -2065,7 +2098,7 @@
2065	2098	//System.err.println("Oeil on");
2066	2099	OEIL = true;
2067	2100	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2068		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2101	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2069	2102	//pingthread.StepToTarget(true);
2070	2103	}
2071	2104
..	..	@@ -2298,10 +2331,17 @@
2298	2331	HANDLES ^= true;
2299	2332	}
2300	2333
	2334	+ Object3D paintFolder;
	2335	+
2301	2336	void TogglePaint()
2302	2337	{
2303	2338	PAINTMODE ^= true;
2304	2339	paintcount = 0;
	2340	+
	2341	+ if (PAINTMODE)
	2342	+ {
	2343	+ paintFolder = GetFolder();
	2344	+ }
2305	2345	}
2306	2346
2307	2347	void SwapCamera(int a, int b)
..	..	@@ -2398,126 +2438,19 @@
2398	2438	return currentGL;
2399	2439	}
2400	2440
2401		- private void GetRemoteZip(String url, String name, boolean unzip, boolean save)
	2441	+ static private BufferedImage CreateBim(TextureData texturedata)
2402	2442	{
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		-
	2443	+ Grafreed.Assert(texturedata != null);
	2444	+
	2445	+ int width = texturedata.getWidth();
	2446	+ int height = texturedata.getHeight();
	2447	+
	2448	+ Buffer buffer = texturedata.getBuffer();
	2449	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2450	+
	2451	+ byte[] bytes = bytebuf.array();
	2452	+
	2453	+ return CreateBim(bytes, width, height);
2521	2454	}
2522	2455
2523	2456	/**/
..	..	@@ -2528,28 +2461,31 @@
2528	2461
2529	2462	int resolution;
2530	2463
2531		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2464	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2532	2465	{
2533		- texture = tex;
	2466	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2467	+ texturedata = texdata;
2534	2468	resolution = res;
2535	2469	}
2536	2470	}
2537	2471	/**/
2538	2472
2539	2473	// 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>();
	2474	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2475	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2476	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2477	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2478	+
2543	2479	int pigmentdepth = 0;
2544	2480	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2545	2481	int bumpdepth = 0;
2546	2482	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2547	2483	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2548	2484	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2549		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2485	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2550	2486	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2551	2487
2552		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2488	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2553	2489	{
2554	2490	TextureData texturedata = null;
2555	2491
..	..	@@ -2568,13 +2504,34 @@
2568	2504	if (bump)
2569	2505	texturedata = ConvertBump(texturedata, false);
2570	2506
2571		- com.sun.opengl.util.texture.Texture texture =
2572		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2507	+// com.sun.opengl.util.texture.Texture texture =
	2508	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2573	2509
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);
	2510	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2511	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2576	2512
2577		- return texture;
	2513	+ return texturedata;
	2514	+ }
	2515	+
	2516	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2517	+ {
	2518	+ TextureData texturedata = null;
	2519	+
	2520	+ try
	2521	+ {
	2522	+ texturedata =
	2523	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2524	+ bim,
	2525	+ true);
	2526	+ } catch (Exception e)
	2527	+ {
	2528	+ throw new javax.media.opengl.GLException(e);
	2529	+ }
	2530	+
	2531	+ if (bump)
	2532	+ texturedata = ConvertBump(texturedata, false);
	2533	+
	2534	+ return texturedata;
2578	2535	}
2579	2536
2580	2537	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3647,6 +3604,8 @@
3647	3604
3648	3605	System.out.println("LOADING TEXTURE : " + name);
3649	3606
	3607	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3608	+
3650	3609	//
3651	3610	if (false) // compressbit > 0)
3652	3611	{
..	..	@@ -8045,7 +8004,7 @@
8045	8004	String pigment = Object3D.GetPigment(tex);
8046	8005	String bump = Object3D.GetBump(tex);
8047	8006
8048		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8007	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8049	8008	{
8050	8009	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
8051	8010	// System.out.println("; bump = " + bump);
..	..	@@ -8060,8 +8019,8 @@
8060	8019	pigment = null;
8061	8020	}
8062	8021
8063		- ReleaseTexture(bump, true);
8064		- ReleaseTexture(pigment, false);
	8022	+ ReleaseTexture(tex, true);
	8023	+ ReleaseTexture(tex, false);
8065	8024	}
8066	8025
8067	8026	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -8079,7 +8038,7 @@
8079	8038
8080	8039	String pigment = Object3D.GetPigment(tex);
8081	8040
8082		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8041	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8083	8042	{
8084	8043	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
8085	8044	// System.out.println("; bump = " + bump);
..	..	@@ -8090,7 +8049,7 @@
8090	8049	pigment = null;
8091	8050	}
8092	8051
8093		- ReleaseTexture(pigment, false);
	8052	+ ReleaseTexture(tex, false);
8094	8053	}
8095	8054
8096	8055	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -8108,7 +8067,7 @@
8108	8067
8109	8068	String bump = Object3D.GetBump(tex);
8110	8069
8111		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8070	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8112	8071	{
8113	8072	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
8114	8073	// System.out.println("; bump = " + bump);
..	..	@@ -8119,10 +8078,10 @@
8119	8078	bump = null;
8120	8079	}
8121	8080
8122		- ReleaseTexture(bump, true);
	8081	+ ReleaseTexture(tex, true);
8123	8082	}
8124	8083
8125		- void ReleaseTexture(String tex, boolean bump)
	8084	+ void ReleaseTexture(cTexture tex, boolean bump)
8126	8085	{
8127	8086	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8128	8087	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8133,7 +8092,7 @@
8133	8092	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
8134	8093
8135	8094	if (tex != null)
8136		- texture = textures.get(tex);
	8095	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
8137	8096
8138	8097	// //assert( texture != null );
8139	8098	// if (texture == null)
..	..	@@ -8227,47 +8186,50 @@
8227	8186
8228	8187	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8229	8188	{
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		- }
	8189	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8190	+// ambientOcclusion ) // \|\| !textureon)
	8191	+// {
	8192	+// return; // false;
	8193	+// }
	8194	+//
	8195	+// if (tex == null)
	8196	+// {
	8197	+// BindTexture(null,false,resolution);
	8198	+// BindTexture(null,true,resolution);
	8199	+// return;
	8200	+// }
	8201	+//
	8202	+// String pigment = Object3D.GetPigment(tex);
	8203	+// String bump = Object3D.GetBump(tex);
	8204	+//
	8205	+// usedtextures.add(pigment);
	8206	+// usedtextures.add(bump);
	8207	+//
	8208	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8209	+// {
	8210	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8211	+// // System.out.println("; bump = " + bump);
	8212	+// }
	8213	+//
	8214	+// if (bump.equals(""))
	8215	+// {
	8216	+// bump = null;
	8217	+// }
	8218	+// if (pigment.equals(""))
	8219	+// {
	8220	+// pigment = null;
	8221	+// }
	8222	+//
	8223	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8224	+// BindTexture(pigment, false, resolution);
	8225	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8226	+// BindTexture(bump, true, resolution);
	8227	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8228	+//
	8229	+// return; // true;
8242	8230
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;
	8231	+ BindPigmentTexture(tex, resolution);
	8232	+ BindBumpTexture(tex, resolution);
8271	8233	}
8272	8234
8273	8235	/boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8286,9 +8248,9 @@
8286	8248
8287	8249	String pigment = Object3D.GetPigment(tex);
8288	8250
8289		- usedtextures.put(pigment, pigment);
	8251	+ usedtextures.add(tex);
8290	8252
8291		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8253	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8292	8254	{
8293	8255	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8294	8256	// System.out.println("; bump = " + bump);
..	..	@@ -8300,7 +8262,7 @@
8300	8262	}
8301	8263
8302	8264	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8303		- BindTexture(pigment, false, resolution);
	8265	+ BindTexture(tex, false, resolution);
8304	8266	}
8305	8267
8306	8268	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8319,9 +8281,9 @@
8319	8281
8320	8282	String bump = Object3D.GetBump(tex);
8321	8283
8322		- usedtextures.put(bump, bump);
	8284	+ usedtextures.add(tex);
8323	8285
8324		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8286	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8325	8287	{
8326	8288	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8327	8289	// System.out.println("; bump = " + bump);
..	..	@@ -8333,7 +8295,7 @@
8333	8295	}
8334	8296
8335	8297	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8336		- BindTexture(bump, true, resolution);
	8298	+ BindTexture(tex, true, resolution);
8337	8299	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8338	8300	}
8339	8301
..	..	@@ -8357,13 +8319,19 @@
8357	8319	return fileExists;
8358	8320	}
8359	8321
8360		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8322	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8361	8323	{
8362		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8324	+ CacheTexture texturecache = null;
8363	8325
8364	8326	if (tex != null)
8365	8327	{
8366		- String texname = tex;
	8328	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8329	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
	8330	+
	8331	+ if (texname.equals("") && texdata == null)
	8332	+ {
	8333	+ return null;
	8334	+ }
8367	8335
8368	8336	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8369	8337
..	..	@@ -8373,19 +8341,34 @@
8373	8341	// else
8374	8342	// if (!texname.startsWith("/"))
8375	8343	// texname = "/Users/nbriere/Textures/" + texname;
8376		- if (!FileExists(tex))
	8344	+ if (!FileExists(texname))
8377	8345	{
8378	8346	texname = fallbackTextureName;
8379	8347	}
8380	8348
8381	8349	if (CACHETEXTURE)
8382		- texture = textures.get(texname); // TEXTURE CACHE
8383		-
8384		- TextureData texturedata = null;
8385		-
8386		- if (texture == null \|\| texture.resolution < resolution)
8387	8350	{
8388		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8351	+ if (texdata == null)
	8352	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8353	+ else
	8354	+ texturecache = bimtextures.get(texdata);
	8355	+ }
	8356	+
	8357	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8358	+ {
	8359	+ TextureData texturedata = null;
	8360	+
	8361	+ if (texdata != null)
	8362	+ {
	8363	+ BufferedImage bim = //new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8364	+
	8365	+ CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8366	+
	8367	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8368	+ bimtextures.put(texdata, texturecache);
	8369	+ }
	8370	+ else
	8371	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8389	8372	{
8390	8373	assert(!bump);
8391	8374	// if (bump)
..	..	@@ -8396,19 +8379,23 @@
8396	8379	// }
8397	8380	// else
8398	8381	// {
8399		- texture = textures.get(tex);
8400		- if (texture == null)
	8382	+ // texturecache = textures.get(texname); // suspicious
	8383	+ if (texturecache == null)
8401	8384	{
8402		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8385	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8403	8386	}
	8387	+ else
	8388	+ new Exception().printStackTrace();
8404	8389	// }
8405	8390	} else
8406		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8391	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8407	8392	{
8408	8393	assert(bump);
8409		- texture = textures.get(tex);
8410		- if (texture == null)
8411		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8394	+ // texturecache = textures.get(texname); // suspicious
	8395	+ if (texturecache == null)
	8396	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8397	+ else
	8398	+ new Exception().printStackTrace();
8412	8399	} else
8413	8400	{
8414	8401	//if (tex.equals("IMMORTAL"))
..	..	@@ -8416,11 +8403,13 @@
8416	8403	// texture = GetResourceTexture("default.png");
8417	8404	//} else
8418	8405	//{
8419		- if (tex.equals("WHITE_NOISE"))
	8406	+ if (texname.endsWith("WHITE_NOISE"))
8420	8407	{
8421		- texture = textures.get(tex);
8422		- if (texture == null)
8423		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8408	+ // texturecache = textures.get(texname); // suspicious
	8409	+ if (texturecache == null)
	8410	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8411	+ else
	8412	+ new Exception().printStackTrace();
8424	8413	} else
8425	8414	{
8426	8415	if (textureon)
..	..	@@ -8479,19 +8468,19 @@
8479	8468	if (texturedata == null)
8480	8469	throw new Exception();
8481	8470
8482		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8471	+ texturecache = new CacheTexture(texturedata,resolution);
8483	8472	//texture = GetTexture(tex, bump);
8484	8473	}
8485	8474	}
8486	8475	//}
8487	8476	}
8488	8477
8489		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8478	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8490	8479	{
8491	8480	//return false;
8492	8481
8493	8482	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8494		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8483	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8495	8484	{
8496	8485	// String ext = "_highres";
8497	8486	// if (REDUCETEXTURE)
..	..	@@ -8508,52 +8497,17 @@
8508	8497	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8509	8498	if (!cachefile.exists())
8510	8499	{
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))
	8500	+ //if (texturedata.getWidth() == texturedata.getHeight())
8520	8501	{
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);
	8502	+ BufferedImage rendImage = CreateBim(texturedata);
	8503	+
8551	8504	ImageWriter writer = null;
8552	8505	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8553	8506	if (iter.hasNext()) {
8554	8507	writer = (ImageWriter)iter.next();
8555	8508	}
8556		- float compressionQuality = 0.9f;
	8509	+
	8510	+ float compressionQuality = 0.85f;
8557	8511	try
8558	8512	{
8559	8513	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8570,18 +8524,20 @@
8570	8524	}
8571	8525	}
8572	8526	}
8573		-
	8527	+
	8528	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8529	+
8574	8530	//System.out.println("Texture = " + tex);
8575		- if (textures.containsKey(texname))
	8531	+ if (textures.containsKey(tex))
8576	8532	{
8577		- CacheTexture thetex = textures.get(texname);
	8533	+ CacheTexture thetex = textures.get(tex);
8578	8534	thetex.texture.disable();
8579	8535	thetex.texture.dispose();
8580		- textures.remove(texname);
	8536	+ textures.remove(tex);
8581	8537	}
8582	8538
8583		- texture.texturedata = texturedata;
8584		- textures.put(texname, texture);
	8539	+ //texture.texturedata = texturedata;
	8540	+ textures.put(tex, texturecache);
8585	8541
8586	8542	// newtex = true;
8587	8543	}
..	..	@@ -8597,10 +8553,41 @@
8597	8553	}
8598	8554	}
8599	8555
8600		- return texture;
	8556	+ return texturecache;
8601	8557	}
8602	8558
8603		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	8559	+ static void EmbedTextures(cTexture tex)
	8560	+ {
	8561	+ if (tex.pigmentdata == null)
	8562	+ {
	8563	+ String texname = Object3D.GetPigment(tex);
	8564	+
	8565	+ CacheTexture texturecache = texturepigment.get(tex);
	8566	+
	8567	+ if (texturecache != null)
	8568	+ {
	8569	+ tex.pigmentdata = ((ByteBuffer)texturecache.texturedata.getBuffer()).array();
	8570	+ tex.pw = texturecache.texturedata.getWidth();
	8571	+ tex.ph = texturecache.texturedata.getHeight();
	8572	+ }
	8573	+ }
	8574	+
	8575	+ if (tex.bumpdata == null)
	8576	+ {
	8577	+ String texname = Object3D.GetBump(tex);
	8578	+
	8579	+ CacheTexture texturecache = texturebump.get(tex);
	8580	+
	8581	+ if (texturecache != null)
	8582	+ {
	8583	+ tex.bumpdata = ((ByteBuffer)texturecache.texturedata.getBuffer()).array();
	8584	+ tex.bw = texturecache.texturedata.getWidth();
	8585	+ tex.bh = texturecache.texturedata.getHeight();
	8586	+ }
	8587	+ }
	8588	+ }
	8589	+
	8590	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8604	8591	{
8605	8592	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8606	8593
..	..	@@ -8618,21 +8605,21 @@
8618	8605	return texture!=null?texture.texture:null;
8619	8606	}
8620	8607
8621		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
	8608	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8622	8609	{
8623	8610	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8624	8611
8625	8612	return texture!=null?texture.texturedata:null;
8626	8613	}
8627	8614
8628		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8615	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8629	8616	{
8630	8617	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8631	8618	{
8632	8619	return false;
8633	8620	}
8634	8621
8635		- boolean newtex = false;
	8622	+ //boolean newtex = false;
8636	8623
8637	8624	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8638	8625
..	..	@@ -8664,7 +8651,7 @@
8664	8651	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8665	8652	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8666	8653
8667		- return newtex;
	8654	+ return true; // Warning: not used.
8668	8655	}
8669	8656
8670	8657	ShadowBuffer shadowPBuf;
..	..	@@ -11150,9 +11137,9 @@
11150	11137
11151	11138	gl.glMatrixMode(GL.GL_MODELVIEW);
11152	11139
11153		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11154		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
11155		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11140	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11141	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11142	+gl.glEnable(gl.GL_MULTISAMPLE);
11156	11143	} else
11157	11144	{
11158	11145	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -11163,7 +11150,7 @@
11163	11150	//System.out.println("BLENDING ON");
11164	11151	gl.glEnable(GL.GL_BLEND);
11165	11152	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
11166		-
	11153	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
11167	11154	gl.glMatrixMode(gl.GL_PROJECTION);
11168	11155	gl.glLoadIdentity();
11169	11156
..	..	@@ -11649,7 +11636,7 @@
11649	11636	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11650	11637	{
11651	11638	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11652		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11639	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11653	11640	pingthread.StepToTarget(true); // true);
11654	11641	// zoomonce = false;
11655	11642	}
..	..	@@ -11777,20 +11764,32 @@
11777	11764	ReleaseTextures(DEFAULT_TEXTURES);
11778	11765
11779	11766	if (CLEANCACHE)
11780		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11767	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11781	11768	{
11782		- String tex = e.nextElement();
	11769	+ cTexture tex = e.nextElement();
11783	11770
11784	11771	// System.out.println("Texture --------- " + tex);
11785	11772
11786		- if (tex.equals("WHITE_NOISE"))
	11773	+ if (tex.equals("WHITE_NOISE:"))
11787	11774	continue;
11788	11775
11789		- if (!usedtextures.containsKey(tex))
	11776	+ if (!usedtextures.contains(tex))
11790	11777	{
	11778	+ CacheTexture gettex = texturepigment.get(tex);
11791	11779	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11792		- textures.get(tex).texture.dispose();
11793		- textures.remove(tex);
	11780	+ if (gettex != null)
	11781	+ {
	11782	+ gettex.texture.dispose();
	11783	+ texturepigment.remove(tex);
	11784	+ }
	11785	+
	11786	+ gettex = texturebump.get(tex);
	11787	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11788	+ if (gettex != null)
	11789	+ {
	11790	+ gettex.texture.dispose();
	11791	+ texturebump.remove(tex);
	11792	+ }
11794	11793	}
11795	11794	}
11796	11795	}
..	..	@@ -14065,7 +14064,7 @@
14065	14064
14066	14065	// fev 2014???
14067	14066	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
14068		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14067	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
14069	14068	pingthread.StepToTarget(true); // true);
14070	14069	}
14071	14070	// if (!LIVE)
..	..	@@ -14419,12 +14418,12 @@
14419	14418	void GoDown(int mod)
14420	14419	{
14421	14420	MODIFIERS \|= COMMAND;
14422		- /*
	14421	+ /**/
14423	14422	if((mod&SHIFT) == SHIFT)
14424	14423	manipCamera.RotatePosition(0, -speed);
14425	14424	else
14426		- manipCamera.BackForth(0, -speed*delta, getWidth());
14427		- */
	14425	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14426	+ /**/
14428	14427	if ((mod & SHIFT) == SHIFT)
14429	14428	{
14430	14429	mouseMode = mouseMode; // VR??
..	..	@@ -14440,12 +14439,12 @@
14440	14439	void GoUp(int mod)
14441	14440	{
14442	14441	MODIFIERS \|= COMMAND;
14443		- /*
	14442	+ /**/
14444	14443	if((mod&SHIFT) == SHIFT)
14445	14444	manipCamera.RotatePosition(0, speed);
14446	14445	else
14447		- manipCamera.BackForth(0, speed*delta, getWidth());
14448		- */
	14446	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14447	+ /**/
14449	14448	if ((mod & SHIFT) == SHIFT)
14450	14449	{
14451	14450	mouseMode = mouseMode;
..	..	@@ -14461,12 +14460,12 @@
14461	14460	void GoLeft(int mod)
14462	14461	{
14463	14462	MODIFIERS \|= COMMAND;
14464		- /*
	14463	+ /**/
14465	14464	if((mod&SHIFT) == SHIFT)
14466		- manipCamera.RotatePosition(speed, 0);
14467		- else
14468	14465	manipCamera.Translate(speed*delta, 0, getWidth());
14469		- */
	14466	+ else
	14467	+ manipCamera.RotatePosition(speed, 0);
	14468	+ /**/
14470	14469	if ((mod & SHIFT) == SHIFT)
14471	14470	{
14472	14471	mouseMode = mouseMode;
..	..	@@ -14482,12 +14481,12 @@
14482	14481	void GoRight(int mod)
14483	14482	{
14484	14483	MODIFIERS \|= COMMAND;
14485		- /*
	14484	+ /**/
14486	14485	if((mod&SHIFT) == SHIFT)
14487		- manipCamera.RotatePosition(-speed, 0);
14488		- else
14489	14486	manipCamera.Translate(-speed*delta, 0, getWidth());
14490		- */
	14487	+ else
	14488	+ manipCamera.RotatePosition(-speed, 0);
	14489	+ /**/
14491	14490	if ((mod & SHIFT) == SHIFT)
14492	14491	{
14493	14492	mouseMode = mouseMode;
..	..	@@ -14726,7 +14725,8 @@
14726	14725	Globals.MOUSEDRAGGED = false;
14727	14726
14728	14727	movingcamera = false;
14729		- X = Y = 0;
	14728	+ X = 0; // getBounds().width/2;
	14729	+ Y = 0; // getBounds().height/2;
14730	14730	//System.out.println("mouseReleased: " + e);
14731	14731	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14732	14732	}
..	..	@@ -14982,7 +14982,8 @@
14982	14982	// break;
14983	14983	case 'T':
14984	14984	CACHETEXTURE ^= true;
14985		- textures.clear();
	14985	+ texturepigment.clear();
	14986	+ texturebump.clear();
14986	14987	// repaint();
14987	14988	break;
14988	14989	case 'Y':
..	..	@@ -15067,7 +15068,9 @@
15067	15068	case 'E' : COMPACT ^= true;
15068	15069	repaint();
15069	15070	break;
15070		- case 'W' : DEBUGHSB ^= true;
	15071	+ case 'W' : // Wide Window (fullscreen)
	15072	+ //DEBUGHSB ^= true;
	15073	+ ObjEditor.theFrame.ToggleFullScreen();
15071	15074	repaint();
15072	15075	break;
15073	15076	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -15093,13 +15096,7 @@
15093	15096	repaint();
15094	15097	break;
15095	15098	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':
	15099	+ //case 'L':
15103	15100	if (lightMode)
15104	15101	{
15105	15102	lightMode = false;
..	..	@@ -15246,7 +15243,10 @@
15246	15243	// kompactbit = 6;
15247	15244	// break;
15248	15245	case ' ':
15249		- ObjEditor.theFrame.ToggleFullScreen();
	15246	+ lightMode ^= true;
	15247	+ Globals.lighttouched = true;
	15248	+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
	15249	+ targetLookAt.set(manipCamera.lookAt);
15250	15250	repaint();
15251	15251	break;
15252	15252	//case '`' :
..	..	@@ -15295,12 +15295,6 @@
15295	15295	break;
15296	15296	case '+':
15297	15297
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	15298	/*
15305	15299	//fontsize += 1;
15306	15300	bbzoom *= 2;
..	..	@@ -15318,17 +15312,17 @@
15318	15312	case '=':
15319	15313	IncDepth();
15320	15314	//fontsize += 1;
15321		- object.editWindow.refreshContents(true);
	15315	+ object.GetWindow().refreshContents(true);
15322	15316	maskbit = 6;
15323	15317	break;
15324	15318	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
15325	15319	DecDepth();
15326	15320	maskbit = 5;
15327	15321	//if(fontsize > 1) fontsize -= 1;
15328		- if (object.editWindow == null)
15329		- new Exception().printStackTrace();
15330		- else
15331		- object.editWindow.refreshContents(true);
	15322	+// if (object.editWindow == null)
	15323	+// new Exception().printStackTrace();
	15324	+// else
	15325	+ object.GetWindow().refreshContents(true);
15332	15326	break;
15333	15327	case '{':
15334	15328	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15552,7 +15546,7 @@
15552	15546	}
15553	15547	*/
15554	15548
15555		- object.editWindow.EditSelection(false);
	15549	+ object.GetWindow().EditSelection(false);
15556	15550	}
15557	15551
15558	15552	void SelectParent()
..	..	@@ -15569,10 +15563,10 @@
15569	15563	{
15570	15564	//selectees.remove(i);
15571	15565	System.out.println("select parent of " + elem);
15572		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15566	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15573	15567	} else
15574	15568	{
15575		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15569	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15576	15570	}
15577	15571
15578	15572	first = false;
..	..	@@ -15614,12 +15608,12 @@
15614	15608	for (int j = 0; j < group.children.size(); j++)
15615	15609	{
15616	15610	elem = (Object3D) group.children.elementAt(j);
15617		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15611	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15618	15612	first = false;
15619	15613	}
15620	15614	} else
15621	15615	{
15622		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15616	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15623	15617	}
15624	15618
15625	15619	first = false;
..	..	@@ -15630,21 +15624,21 @@
15630	15624	{
15631	15625	//Composite group = (Composite) object;
15632	15626	Object3D group = object;
15633		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15627	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15634	15628	}
15635	15629
15636	15630	void ResetTransform(int mask)
15637	15631	{
15638	15632	//Composite group = (Composite) object;
15639	15633	Object3D group = object;
15640		- group.editWindow.ResetTransform(mask);
	15634	+ group.GetWindow().ResetTransform(mask);
15641	15635	}
15642	15636
15643	15637	void FlipTransform()
15644	15638	{
15645	15639	//Composite group = (Composite) object;
15646	15640	Object3D group = object;
15647		- group.editWindow.FlipTransform();
	15641	+ group.GetWindow().FlipTransform();
15648	15642	// group.editWindow.ReduceMesh(true);
15649	15643	}
15650	15644
..	..	@@ -15652,7 +15646,7 @@
15652	15646	{
15653	15647	//Composite group = (Composite) object;
15654	15648	Object3D group = object;
15655		- group.editWindow.PrintMemory();
	15649	+ group.GetWindow().PrintMemory();
15656	15650	// group.editWindow.ReduceMesh(true);
15657	15651	}
15658	15652
..	..	@@ -15660,7 +15654,7 @@
15660	15654	{
15661	15655	//Composite group = (Composite) object;
15662	15656	Object3D group = object;
15663		- group.editWindow.ResetCentroid();
	15657	+ group.GetWindow().ResetCentroid();
15664	15658	}
15665	15659
15666	15660	void IncDepth()
..	..	@@ -15836,6 +15830,7 @@
15836	15830	info.bounds.y += (height - desired) / 2;
15837	15831	}
15838	15832	}
	15833	+
15839	15834	info.g = gr;
15840	15835	info.camera = renderCamera;
15841	15836	/*
..	..	@@ -15845,23 +15840,44 @@
15845	15840	*/
15846	15841	if (!isRenderer)
15847	15842	{
15848		- object.drawEditHandles(info, 0);
15849		-
15850		- if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	15843	+ Grafreed.Assert(object != null);
	15844	+ Grafreed.Assert(object.selection != null);
	15845	+ if (object.selection.Size() > 0)
15851	15846	{
15852		- switch (object.selection.get(0).hitSomething)
	15847	+ int hitSomething = object.selection.get(0).hitSomething;
	15848	+
	15849	+ info.DX = 0;
	15850	+ info.DY = 0;
	15851	+ info.W = 1;
	15852	+ if (hitSomething == Object3D.hitCenter)
15853	15853	{
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;
	15854	+ info.DX = X;
	15855	+ if (X != 0)
	15856	+ info.DX -= info.bounds.width/2;
	15857	+
	15858	+ info.DY = Y;
	15859	+ if (Y != 0)
	15860	+ info.DY -= info.bounds.height/2;
15863	15861	}
15864		-
	15862	+
	15863	+ object.drawEditHandles(info, 0);
	15864	+
	15865	+ if (drag && (X != 0 \|\| Y != 0))
	15866	+ {
	15867	+ switch (hitSomething)
	15868	+ {
	15869	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15870	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15871	+ break;
	15872	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15873	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15874	+ break;
	15875	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15876	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15877	+ break;
	15878	+ }
	15879	+
	15880	+ }
15865	15881	}
15866	15882	}
15867	15883	}
..	..	@@ -16659,6 +16675,14 @@
16659	16675	}
16660	16676	}
16661	16677
	16678	+ private Object3D GetFolder()
	16679	+ {
	16680	+ Object3D folder = object.GetWindow().copy;
	16681	+ if (object.GetWindow().copy.selection.Size() > 0)
	16682	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16683	+ return folder;
	16684	+ }
	16685	+
16662	16686	class SelectBuffer implements GLEventListener
16663	16687	{
16664	16688
..	..	@@ -16738,6 +16762,17 @@
16738	16762
16739	16763	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16740	16764
	16765	+ if (PAINTMODE)
	16766	+ {
	16767	+ if (object.GetWindow().copy.selection.Size() > 0)
	16768	+ {
	16769	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16770	+
	16771	+ // Make what you paint not selectable.
	16772	+ paintobj.ResetSelectable();
	16773	+ }
	16774	+ }
	16775	+
16741	16776	//int tmp = selection_view;
16742	16777	//selection_view = -1;
16743	16778	int temp = DrawMode();
..	..	@@ -16749,6 +16784,17 @@
16749	16784	// temp = DEFAULT; // patch for selection debug
16750	16785	Globals.drawMode = temp; // WARNING
16751	16786
	16787	+ if (PAINTMODE)
	16788	+ {
	16789	+ if (object.GetWindow().copy.selection.Size() > 0)
	16790	+ {
	16791	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16792	+
	16793	+ // Revert.
	16794	+ paintobj.RestoreSelectable();
	16795	+ }
	16796	+ }
	16797	+
16752	16798	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16753	16799
16754	16800	// trying different ways of getting the depth info over
..	..	@@ -16852,29 +16898,31 @@
16852	16898	}
16853	16899
16854	16900	if (!movingcamera && !PAINTMODE)
16855		- object.editWindow.ScreenFitPoint(); // fev 2014
	16901	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16856	16902
16857		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16903	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16858	16904	{
16859		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16905	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16860	16906
16861		- Object3D group = new Object3D("inst" + paintcount++);
	16907	+ if (object.GetWindow().copy.selection.Size() > 0)
	16908	+ {
	16909	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16862	16910
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();
	16911	+ Object3D inst = new Object3D("inst" + paintcount++);
	16912	+
	16913	+ inst.CreateMaterial(); // use a void leaf to select instances
	16914	+
	16915	+ inst.add(paintobj); // link
	16916	+
	16917	+ object.GetWindow().SnapObject(inst);
	16918	+
	16919	+ Object3D folder = paintFolder; // GetFolder();
	16920	+
	16921	+ folder.add(inst);
	16922	+
	16923	+ object.GetWindow().ResetModel();
	16924	+ object.GetWindow().refreshContents();
	16925	+ }
16878	16926	}
16879	16927	else
16880	16928	paintcount = 0;