~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;
..	..	@@ -73,7 +110,9 @@
73	110	//private Mat4f spotlightTransform = new Mat4f();
74	111	//private Mat4f spotlightInverseTransform = new Mat4f();
75	112	static GLContext glcontext = null;
76		- /static/ com.sun.opengl.util.texture.Texture cubemap;
	113	+ /static/ com.sun.opengl.util.texture.Texture cubemap; // Either custom or rgb
	114	+ /static/ com.sun.opengl.util.texture.Texture cubemapcustom;
	115	+ /static/ com.sun.opengl.util.texture.Texture cubemaprgb;
77	116	boolean reverseUP = false;
78	117	static boolean frozen = false;
79	118	boolean enablebackspace = false; // patch for back buffer refresh
..	..	@@ -136,7 +175,7 @@
136	175	static boolean doublesided = false; // true; // reversed normals are awful for conformance
137	176	boolean anisotropy = true;
138	177	boolean softshadow = true; // slower but better false;
139		- boolean opacityhalo = false;
	178	+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
140	179
141	180	boolean macromode = false;
142	181
..	..	@@ -150,6 +189,19 @@
150	189	}
151	190
152	191	private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	192	+
	193	+ public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	194	+ {
	195	+ try
	196	+ {
	197	+ return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	198	+ } catch (IOException e)
	199	+ {
	200	+ System.out.println("NAME = " + name);
	201	+ e.printStackTrace(); // throw new RuntimeException(e);
	202	+ return null;
	203	+ }
	204	+ }
153	205
154	206	void SetAsGLRenderer(boolean b)
155	207	{
..	..	@@ -169,7 +221,8 @@
169	221
170	222	SetCamera(cam);
171	223
172		- SetLight(new Camera(new cVector(10, 10, -20)));
	224	+ // Warning: not used.
	225	+ SetLight(new Camera(new cVector(15, 10, -20)));
173	226
174	227	object = o;
175	228
..	..	@@ -1447,6 +1500,8 @@
1447	1500	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1448	1501	}
1449	1502
	1503	+ float[] colorV = new float[4];
	1504	+
1450	1505	void SetColor(Object3D obj, Vertex p0)
1451	1506	{
1452	1507	CameraPane display = this;
..	..	@@ -1514,8 +1569,6 @@
1514	1569	{
1515	1570	return;
1516	1571	}
1517		-
1518		- float[] colorV = new float[3];
1519	1572
1520	1573	if (false) // marked)
1521	1574	{
..	..	@@ -2065,7 +2118,7 @@
2065	2118	//System.err.println("Oeil on");
2066	2119	OEIL = true;
2067	2120	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2068		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2121	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2069	2122	//pingthread.StepToTarget(true);
2070	2123	}
2071	2124
..	..	@@ -2298,10 +2351,17 @@
2298	2351	HANDLES ^= true;
2299	2352	}
2300	2353
	2354	+ Object3D paintFolder;
	2355	+
2301	2356	void TogglePaint()
2302	2357	{
2303	2358	PAINTMODE ^= true;
2304	2359	paintcount = 0;
	2360	+
	2361	+ if (PAINTMODE)
	2362	+ {
	2363	+ paintFolder = GetFolder();
	2364	+ }
2305	2365	}
2306	2366
2307	2367	void SwapCamera(int a, int b)
..	..	@@ -2398,126 +2458,19 @@
2398	2458	return currentGL;
2399	2459	}
2400	2460
2401		- private void GetRemoteZip(String url, String name, boolean unzip, boolean save)
	2461	+ static private BufferedImage CreateBim(TextureData texturedata)
2402	2462	{
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		-
	2463	+ Grafreed.Assert(texturedata != null);
	2464	+
	2465	+ int width = texturedata.getWidth();
	2466	+ int height = texturedata.getHeight();
	2467	+
	2468	+ Buffer buffer = texturedata.getBuffer();
	2469	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2470	+
	2471	+ byte[] bytes = bytebuf.array();
	2472	+
	2473	+ return CreateBim(bytes, width, height);
2521	2474	}
2522	2475
2523	2476	/**/
..	..	@@ -2528,28 +2481,31 @@
2528	2481
2529	2482	int resolution;
2530	2483
2531		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2484	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2532	2485	{
2533		- texture = tex;
	2486	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2487	+ texturedata = texdata;
2534	2488	resolution = res;
2535	2489	}
2536	2490	}
2537	2491	/**/
2538	2492
2539	2493	// 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>();
	2494	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2495	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2496	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2497	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2498	+
2543	2499	int pigmentdepth = 0;
2544	2500	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2545	2501	int bumpdepth = 0;
2546	2502	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2547	2503	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2548	2504	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2549		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2505	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2550	2506	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2551	2507
2552		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2508	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2553	2509	{
2554	2510	TextureData texturedata = null;
2555	2511
..	..	@@ -2568,13 +2524,34 @@
2568	2524	if (bump)
2569	2525	texturedata = ConvertBump(texturedata, false);
2570	2526
2571		- com.sun.opengl.util.texture.Texture texture =
2572		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2527	+// com.sun.opengl.util.texture.Texture texture =
	2528	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2573	2529
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);
	2530	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2531	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2576	2532
2577		- return texture;
	2533	+ return texturedata;
	2534	+ }
	2535	+
	2536	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2537	+ {
	2538	+ TextureData texturedata = null;
	2539	+
	2540	+ try
	2541	+ {
	2542	+ texturedata =
	2543	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2544	+ bim,
	2545	+ true);
	2546	+ } catch (Exception e)
	2547	+ {
	2548	+ throw new javax.media.opengl.GLException(e);
	2549	+ }
	2550	+
	2551	+ if (bump)
	2552	+ texturedata = ConvertBump(texturedata, false);
	2553	+
	2554	+ return texturedata;
2578	2555	}
2579	2556
2580	2557	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3647,6 +3624,8 @@
3647	3624
3648	3625	System.out.println("LOADING TEXTURE : " + name);
3649	3626
	3627	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3628	+
3650	3629	//
3651	3630	if (false) // compressbit > 0)
3652	3631	{
..	..	@@ -8045,7 +8024,7 @@
8045	8024	String pigment = Object3D.GetPigment(tex);
8046	8025	String bump = Object3D.GetBump(tex);
8047	8026
8048		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8027	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8049	8028	{
8050	8029	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
8051	8030	// System.out.println("; bump = " + bump);
..	..	@@ -8060,8 +8039,8 @@
8060	8039	pigment = null;
8061	8040	}
8062	8041
8063		- ReleaseTexture(bump, true);
8064		- ReleaseTexture(pigment, false);
	8042	+ ReleaseTexture(tex, true);
	8043	+ ReleaseTexture(tex, false);
8065	8044	}
8066	8045
8067	8046	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -8079,7 +8058,7 @@
8079	8058
8080	8059	String pigment = Object3D.GetPigment(tex);
8081	8060
8082		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8061	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8083	8062	{
8084	8063	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
8085	8064	// System.out.println("; bump = " + bump);
..	..	@@ -8090,7 +8069,7 @@
8090	8069	pigment = null;
8091	8070	}
8092	8071
8093		- ReleaseTexture(pigment, false);
	8072	+ ReleaseTexture(tex, false);
8094	8073	}
8095	8074
8096	8075	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -8108,7 +8087,7 @@
8108	8087
8109	8088	String bump = Object3D.GetBump(tex);
8110	8089
8111		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8090	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8112	8091	{
8113	8092	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
8114	8093	// System.out.println("; bump = " + bump);
..	..	@@ -8119,10 +8098,10 @@
8119	8098	bump = null;
8120	8099	}
8121	8100
8122		- ReleaseTexture(bump, true);
	8101	+ ReleaseTexture(tex, true);
8123	8102	}
8124	8103
8125		- void ReleaseTexture(String tex, boolean bump)
	8104	+ void ReleaseTexture(cTexture tex, boolean bump)
8126	8105	{
8127	8106	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8128	8107	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8133,7 +8112,7 @@
8133	8112	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
8134	8113
8135	8114	if (tex != null)
8136		- texture = textures.get(tex);
	8115	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
8137	8116
8138	8117	// //assert( texture != null );
8139	8118	// if (texture == null)
..	..	@@ -8227,47 +8206,50 @@
8227	8206
8228	8207	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8229	8208	{
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		- }
	8209	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8210	+// ambientOcclusion ) // \|\| !textureon)
	8211	+// {
	8212	+// return; // false;
	8213	+// }
	8214	+//
	8215	+// if (tex == null)
	8216	+// {
	8217	+// BindTexture(null,false,resolution);
	8218	+// BindTexture(null,true,resolution);
	8219	+// return;
	8220	+// }
	8221	+//
	8222	+// String pigment = Object3D.GetPigment(tex);
	8223	+// String bump = Object3D.GetBump(tex);
	8224	+//
	8225	+// usedtextures.add(pigment);
	8226	+// usedtextures.add(bump);
	8227	+//
	8228	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8229	+// {
	8230	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8231	+// // System.out.println("; bump = " + bump);
	8232	+// }
	8233	+//
	8234	+// if (bump.equals(""))
	8235	+// {
	8236	+// bump = null;
	8237	+// }
	8238	+// if (pigment.equals(""))
	8239	+// {
	8240	+// pigment = null;
	8241	+// }
	8242	+//
	8243	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8244	+// BindTexture(pigment, false, resolution);
	8245	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8246	+// BindTexture(bump, true, resolution);
	8247	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8248	+//
	8249	+// return; // true;
8242	8250
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;
	8251	+ BindPigmentTexture(tex, resolution);
	8252	+ BindBumpTexture(tex, resolution);
8271	8253	}
8272	8254
8273	8255	/boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8286,9 +8268,9 @@
8286	8268
8287	8269	String pigment = Object3D.GetPigment(tex);
8288	8270
8289		- usedtextures.put(pigment, pigment);
	8271	+ usedtextures.add(tex);
8290	8272
8291		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8273	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8292	8274	{
8293	8275	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8294	8276	// System.out.println("; bump = " + bump);
..	..	@@ -8300,7 +8282,7 @@
8300	8282	}
8301	8283
8302	8284	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8303		- BindTexture(pigment, false, resolution);
	8285	+ BindTexture(tex, false, resolution);
8304	8286	}
8305	8287
8306	8288	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8319,9 +8301,9 @@
8319	8301
8320	8302	String bump = Object3D.GetBump(tex);
8321	8303
8322		- usedtextures.put(bump, bump);
	8304	+ usedtextures.add(tex);
8323	8305
8324		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8306	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8325	8307	{
8326	8308	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8327	8309	// System.out.println("; bump = " + bump);
..	..	@@ -8333,7 +8315,7 @@
8333	8315	}
8334	8316
8335	8317	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8336		- BindTexture(bump, true, resolution);
	8318	+ BindTexture(tex, true, resolution);
8337	8319	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8338	8320	}
8339	8321
..	..	@@ -8357,13 +8339,19 @@
8357	8339	return fileExists;
8358	8340	}
8359	8341
8360		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8342	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8361	8343	{
8362		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8344	+ CacheTexture texturecache = null;
8363	8345
8364	8346	if (tex != null)
8365	8347	{
8366		- String texname = tex;
	8348	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8349	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
	8350	+
	8351	+ if (texname.equals("") && texdata == null)
	8352	+ {
	8353	+ return null;
	8354	+ }
8367	8355
8368	8356	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8369	8357
..	..	@@ -8373,19 +8361,46 @@
8373	8361	// else
8374	8362	// if (!texname.startsWith("/"))
8375	8363	// texname = "/Users/nbriere/Textures/" + texname;
8376		- if (!FileExists(tex))
	8364	+ if (!FileExists(texname) && !texname.startsWith("@"))
8377	8365	{
8378	8366	texname = fallbackTextureName;
8379	8367	}
8380	8368
8381	8369	if (CACHETEXTURE)
8382		- texture = textures.get(texname); // TEXTURE CACHE
8383		-
8384		- TextureData texturedata = null;
8385		-
8386		- if (texture == null \|\| texture.resolution < resolution)
8387	8370	{
8388		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8371	+ if (texdata == null)
	8372	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8373	+ else
	8374	+ texturecache = bimtextures.get(texdata);
	8375	+ }
	8376	+
	8377	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8378	+ {
	8379	+ TextureData texturedata = null;
	8380	+
	8381	+ if (texdata != null && textureon)
	8382	+ {
	8383	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8384	+
	8385	+ try
	8386	+ {
	8387	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8388	+ }
	8389	+ catch (Exception e)
	8390	+ {
	8391	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8392	+ }
	8393	+
	8394	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8395	+ bimtextures.put(texdata, texturecache);
	8396	+
	8397	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8398	+
	8399	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8400	+ //bim2 = bim;
	8401	+ }
	8402	+ else
	8403	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8389	8404	{
8390	8405	assert(!bump);
8391	8406	// if (bump)
..	..	@@ -8396,19 +8411,23 @@
8396	8411	// }
8397	8412	// else
8398	8413	// {
8399		- texture = textures.get(tex);
8400		- if (texture == null)
	8414	+ // texturecache = textures.get(texname); // suspicious
	8415	+ if (texturecache == null)
8401	8416	{
8402		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8417	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8403	8418	}
	8419	+ else
	8420	+ new Exception().printStackTrace();
8404	8421	// }
8405	8422	} else
8406		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8423	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8407	8424	{
8408	8425	assert(bump);
8409		- texture = textures.get(tex);
8410		- if (texture == null)
8411		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8426	+ // texturecache = textures.get(texname); // suspicious
	8427	+ if (texturecache == null)
	8428	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8429	+ else
	8430	+ new Exception().printStackTrace();
8412	8431	} else
8413	8432	{
8414	8433	//if (tex.equals("IMMORTAL"))
..	..	@@ -8416,11 +8435,22 @@
8416	8435	// texture = GetResourceTexture("default.png");
8417	8436	//} else
8418	8437	//{
8419		- if (tex.equals("WHITE_NOISE"))
	8438	+ if (texname.endsWith("WHITE_NOISE"))
8420	8439	{
8421		- texture = textures.get(tex);
8422		- if (texture == null)
8423		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8440	+ // texturecache = textures.get(texname); // suspicious
	8441	+ if (texturecache == null)
	8442	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8443	+ else
	8444	+ new Exception().printStackTrace();
	8445	+ } else
	8446	+ {
	8447	+ if (texname.startsWith("@"))
	8448	+ {
	8449	+ // texturecache = textures.get(texname); // suspicious
	8450	+ if (texturecache == null)
	8451	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
	8452	+ else
	8453	+ new Exception().printStackTrace();
8424	8454	} else
8425	8455	{
8426	8456	if (textureon)
..	..	@@ -8479,19 +8509,20 @@
8479	8509	if (texturedata == null)
8480	8510	throw new Exception();
8481	8511
8482		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8512	+ texturecache = new CacheTexture(texturedata,resolution);
8483	8513	//texture = GetTexture(tex, bump);
8484	8514	}
	8515	+ }
8485	8516	}
8486	8517	//}
8487	8518	}
8488	8519
8489		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8520	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8490	8521	{
8491	8522	//return false;
8492	8523
8493	8524	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8494		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8525	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8495	8526	{
8496	8527	// String ext = "_highres";
8497	8528	// if (REDUCETEXTURE)
..	..	@@ -8508,52 +8539,17 @@
8508	8539	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8509	8540	if (!cachefile.exists())
8510	8541	{
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))
	8542	+ //if (texturedata.getWidth() == texturedata.getHeight())
8520	8543	{
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);
	8544	+ BufferedImage rendImage = CreateBim(texturedata);
	8545	+
8551	8546	ImageWriter writer = null;
8552	8547	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8553	8548	if (iter.hasNext()) {
8554	8549	writer = (ImageWriter)iter.next();
8555	8550	}
8556		- float compressionQuality = 0.9f;
	8551	+
	8552	+ float compressionQuality = 0.85f;
8557	8553	try
8558	8554	{
8559	8555	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8570,18 +8566,20 @@
8570	8566	}
8571	8567	}
8572	8568	}
8573		-
	8569	+
	8570	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8571	+
8574	8572	//System.out.println("Texture = " + tex);
8575		- if (textures.containsKey(texname))
	8573	+ if (textures.containsKey(tex))
8576	8574	{
8577		- CacheTexture thetex = textures.get(texname);
	8575	+ CacheTexture thetex = textures.get(tex);
8578	8576	thetex.texture.disable();
8579	8577	thetex.texture.dispose();
8580		- textures.remove(texname);
	8578	+ textures.remove(tex);
8581	8579	}
8582	8580
8583		- texture.texturedata = texturedata;
8584		- textures.put(texname, texture);
	8581	+ //texture.texturedata = texturedata;
	8582	+ textures.put(tex, texturecache);
8585	8583
8586	8584	// newtex = true;
8587	8585	}
..	..	@@ -8597,10 +8595,44 @@
8597	8595	}
8598	8596	}
8599	8597
8600		- return texture;
	8598	+ return texturecache;
8601	8599	}
8602	8600
8603		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	8601	+ static void EmbedTextures(cTexture tex)
	8602	+ {
	8603	+ if (tex.pigmentdata == null)
	8604	+ {
	8605	+ //String texname = Object3D.GetPigment(tex);
	8606	+
	8607	+ CacheTexture texturecache = texturepigment.get(tex);
	8608	+
	8609	+ if (texturecache != null)
	8610	+ {
	8611	+ tex.pw = texturecache.texturedata.getWidth();
	8612	+ tex.ph = texturecache.texturedata.getHeight();
	8613	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8614	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8615	+ ;
	8616	+ //, tex.pw, tex.ph), 0.5f);
	8617	+ }
	8618	+ }
	8619	+
	8620	+ if (tex.bumpdata == null)
	8621	+ {
	8622	+ //String texname = Object3D.GetBump(tex);
	8623	+
	8624	+ CacheTexture texturecache = texturebump.get(tex);
	8625	+
	8626	+ if (texturecache != null)
	8627	+ {
	8628	+ tex.bw = texturecache.texturedata.getWidth();
	8629	+ tex.bh = texturecache.texturedata.getHeight();
	8630	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8631	+ }
	8632	+ }
	8633	+ }
	8634	+
	8635	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8604	8636	{
8605	8637	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8606	8638
..	..	@@ -8618,21 +8650,21 @@
8618	8650	return texture!=null?texture.texture:null;
8619	8651	}
8620	8652
8621		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
	8653	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8622	8654	{
8623	8655	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8624	8656
8625	8657	return texture!=null?texture.texturedata:null;
8626	8658	}
8627	8659
8628		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8660	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8629	8661	{
8630	8662	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8631	8663	{
8632	8664	return false;
8633	8665	}
8634	8666
8635		- boolean newtex = false;
	8667	+ //boolean newtex = false;
8636	8668
8637	8669	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8638	8670
..	..	@@ -8664,9 +8696,75 @@
8664	8696	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8665	8697	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8666	8698
8667		- return newtex;
	8699	+ return true; // Warning: not used.
8668	8700	}
8669	8701
	8702	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8703	+ {
	8704	+ try
	8705	+ {
	8706	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8707	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8708	+ ImageWriter writer = writers.next();
	8709	+
	8710	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8711	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8712	+ param.setCompressionQuality(quality);
	8713	+
	8714	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8715	+ writer.setOutput(ios);
	8716	+ writer.write(null, new IIOImage(image, null, null), param);
	8717	+
	8718	+ byte[] data = baos.toByteArray();
	8719	+ writer.dispose();
	8720	+ return data;
	8721	+ }
	8722	+ catch (Exception e)
	8723	+ {
	8724	+ e.printStackTrace();
	8725	+ return null;
	8726	+ }
	8727	+ }
	8728	+
	8729	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8730	+ {
	8731	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8732	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8733	+ ImageReader reader = writers.next();
	8734	+
	8735	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8736	+
	8737	+ ImageReadParam param = reader.getDefaultReadParam();
	8738	+ param.setDestination(bim);
	8739	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8740	+
	8741	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8742	+ reader.setInput(ios);
	8743	+ BufferedImage bim2 = reader.read(0, param);
	8744	+ reader.dispose();
	8745	+
	8746	+// WritableRaster raster = bim2.getRaster();
	8747	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8748	+// byte[] bytes = data.getData();
	8749	+//
	8750	+// int[] pixels = new int[bytes.length/3];
	8751	+// for (int i=pixels.length; --i>=0;)
	8752	+// {
	8753	+// int i3 = i*3;
	8754	+// pixels[i] = 0xFF;
	8755	+// pixels[i] <<= 8;
	8756	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8757	+// pixels[i] <<= 8;
	8758	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8759	+// pixels[i] <<= 8;
	8760	+// pixels[i] \|= bytes[i3] & 0xFF;
	8761	+// }
	8762	+//
	8763	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8764	+
	8765	+ return bim;
	8766	+ }
	8767	+
8670	8768	ShadowBuffer shadowPBuf;
8671	8769	AntialiasBuffer antialiasPBuf;
8672	8770	int MAXSTACK;
..	..	@@ -8683,10 +8781,12 @@
8683	8781
8684	8782	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8685	8783	MAXSTACK = temp[0];
8686		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8784	+ if (Globals.DEBUG)
	8785	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8687	8786	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8688	8787	MAXSTACK = temp[0];
8689		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8788	+ if (Globals.DEBUG)
	8789	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8690	8790
8691	8791	// Use debug pipeline
8692	8792	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8694,7 +8794,8 @@
8694	8794	gl = drawable.getGL(); //
8695	8795
8696	8796	GL gl3 = getGL();
8697		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8797	+ if (Globals.DEBUG)
	8798	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8698	8799
8699	8800
8700	8801	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8859,7 +8960,7 @@
8859	8960
8860	8961	if (cubemap == null)
8861	8962	{
8862		- LoadEnvy(5);
	8963	+ //LoadEnvy(1);
8863	8964	}
8864	8965
8865	8966	//cubemap.enable();
..	..	@@ -9135,6 +9236,8 @@
9135	9236
9136	9237	void LoadEnvy(int which)
9137	9238	{
	9239	+ assert(false);
	9240	+
9138	9241	String name;
9139	9242	String ext;
9140	9243
..	..	@@ -9146,37 +9249,58 @@
9146	9249	cubemap = null;
9147	9250	return;
9148	9251	case 1:
9149		- name = "cubemaps/box_";
9150		- ext = "png";
	9252	+ name = "cubemaps/rgb/";
	9253	+ ext = "jpg";
9151	9254	reverseUP = false;
9152	9255	break;
9153	9256	case 2:
9154		- name = "cubemaps/uffizi_";
9155		- ext = "png";
9156		- break; // reverseUP = true; break;
	9257	+ name = "cubemaps/uffizi/";
	9258	+ ext = "jpg";
	9259	+ reverseUP = false;
	9260	+ break;
9157	9261	case 3:
9158		- name = "cubemaps/CloudyHills_";
9159		- ext = "tga";
	9262	+ name = "cubemaps/CloudyHills/";
	9263	+ ext = "jpg";
9160	9264	reverseUP = false;
9161	9265	break;
9162	9266	case 4:
9163		- name = "cubemaps/cornell_";
	9267	+ name = "cubemaps/cornell/";
9164	9268	ext = "png";
9165	9269	reverseUP = false;
9166	9270	break;
	9271	+ case 5:
	9272	+ name = "cubemaps/skycube/";
	9273	+ ext = "jpg";
	9274	+ reverseUP = false;
	9275	+ break;
	9276	+ case 6:
	9277	+ name = "cubemaps/SaintLazarusChurch3/";
	9278	+ ext = "jpg";
	9279	+ reverseUP = false;
	9280	+ break;
	9281	+ case 7:
	9282	+ name = "cubemaps/Sodermalmsallen/";
	9283	+ ext = "jpg";
	9284	+ reverseUP = false;
	9285	+ break;
	9286	+ case 8:
	9287	+ name = "cubemaps/Sodermalmsallen2/";
	9288	+ ext = "jpg";
	9289	+ reverseUP = false;
	9290	+ break;
	9291	+ case 9:
	9292	+ name = "cubemaps/UnionSquare/";
	9293	+ ext = "jpg";
	9294	+ reverseUP = false;
	9295	+ break;
9167	9296	default:
9168		- name = "cubemaps/rgb_";
9169		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9297	+ name = "cubemaps/box/";
	9298	+ ext = "png"; /mipmap = true;/
	9299	+ reverseUP = false;
9170	9300	break;
9171	9301	}
9172		-
9173		- try
9174		- {
9175		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9176		- } catch (IOException e)
9177		- {
9178		- throw new RuntimeException(e);
9179		- }
	9302	+
	9303	+ LoadSkybox(name, ext, mipmap);
9180	9304	}
9181	9305
9182	9306	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -9208,8 +9332,12 @@
9208	9332	static double[] model = new double[16];
9209	9333	double[] camera2light = new double[16];
9210	9334	double[] light2camera = new double[16];
9211		- int newenvy = -1;
9212		- boolean envyoff = true; // false;
	9335	+
	9336	+ //int newenvy = -1;
	9337	+ //boolean envyoff = false;
	9338	+
	9339	+ String loadedskyboxname;
	9340	+
9213	9341	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9214	9342	//float[] light0 = { 0,0,0 };
9215	9343	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9627,7 +9755,7 @@
9627	9755
9628	9756	if (renderCamera != lightCamera)
9629	9757	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9630		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9758	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9631	9759
9632	9760	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9633	9761
..	..	@@ -9643,7 +9771,7 @@
9643	9771
9644	9772	if (renderCamera != lightCamera)
9645	9773	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9646		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9774	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9647	9775
9648	9776	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9649	9777
..	..	@@ -9689,10 +9817,12 @@
9689	9817	rati = 1 / rati;
9690	9818	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9691	9819	}
9692		- assert (newenvy == -1);
	9820	+
	9821	+ //assert (newenvy == -1);
	9822	+
9693	9823	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9694	9824	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9695		- DrawSkyBox(gl);
	9825	+ DrawSkyBox(gl, (float)rati);
9696	9826	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9697	9827	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9698	9828	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -10729,7 +10859,7 @@
10729	10859
10730	10860	if (wait)
10731	10861	{
10732		- Sleep(500);
	10862	+ Sleep(200); // blocks everything
10733	10863
10734	10864	wait = false;
10735	10865	}
..	..	@@ -10844,7 +10974,7 @@
10844	10974	// if (parentcam != renderCamera) // not a light
10845	10975	if (cam != lightCamera)
10846	10976	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10847		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10977	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10848	10978
10849	10979	for (int j = 0; j < 4; j++)
10850	10980	{
..	..	@@ -10859,7 +10989,7 @@
10859	10989	// if (parentcam != renderCamera) // not a light
10860	10990	if (cam != lightCamera)
10861	10991	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10862		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	10992	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10863	10993
10864	10994	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10865	10995
..	..	@@ -10945,13 +11075,41 @@
10945	11075	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10946	11076	}
10947	11077
10948		- if (newenvy > -1)
	11078	+// if (newenvy > -1)
	11079	+// {
	11080	+// LoadEnvy(newenvy);
	11081	+// }
	11082	+//
	11083	+// newenvy = -1;
	11084	+
	11085	+ if (object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
10949	11086	{
10950		- LoadEnvy(newenvy);
	11087	+ if (cubemaprgb == null)
	11088	+ {
	11089	+ cubemaprgb = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11090	+ }
	11091	+
	11092	+ cubemap = cubemaprgb;
10951	11093	}
10952		-
10953		- newenvy = -1;
10954		-
	11094	+ else
	11095	+ {
	11096	+ if (object.skyboxname != null)
	11097	+ {
	11098	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11099	+ {
	11100	+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11101	+ loadedskyboxname = object.skyboxname;
	11102	+ }
	11103	+ }
	11104	+ else
	11105	+ {
	11106	+ cubemapcustom = null;
	11107	+ loadedskyboxname = null;
	11108	+ }
	11109	+
	11110	+ cubemap = cubemapcustom;
	11111	+ }
	11112	+
10955	11113	ratio = ((double) getWidth()) / getHeight();
10956	11114	//System.out.println("ratio = " + ratio);
10957	11115
..	..	@@ -10967,7 +11125,7 @@
10967	11125
10968	11126	if (!IsFrozen() && !ambientOcclusion)
10969	11127	{
10970		- DrawSkyBox(gl);
	11128	+ DrawSkyBox(gl, (float)ratio);
10971	11129	}
10972	11130
10973	11131	//if (selection_view == -1)
..	..	@@ -11150,9 +11308,9 @@
11150	11308
11151	11309	gl.glMatrixMode(GL.GL_MODELVIEW);
11152	11310
11153		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11154		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
11155		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11311	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11312	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11313	+gl.glEnable(gl.GL_MULTISAMPLE);
11156	11314	} else
11157	11315	{
11158	11316	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -11163,7 +11321,7 @@
11163	11321	//System.out.println("BLENDING ON");
11164	11322	gl.glEnable(GL.GL_BLEND);
11165	11323	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
11166		-
	11324	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
11167	11325	gl.glMatrixMode(gl.GL_PROJECTION);
11168	11326	gl.glLoadIdentity();
11169	11327
..	..	@@ -11253,7 +11411,7 @@
11253	11411
11254	11412	// if (cam != lightCamera)
11255	11413	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11256		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11414	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11257	11415	}
11258	11416
11259	11417	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -11412,7 +11570,7 @@
11412	11570	}
11413	11571	}
11414	11572
11415		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11573	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11416	11574	{
11417	11575	//gl.glDepthFunc(GL.GL_LEQUAL);
11418	11576	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11420,24 +11578,21 @@
11420	11578
11421	11579	boolean texon = textureon;
11422	11580
11423		- if (RENDERPROGRAM > 0)
11424		- {
11425		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11426		- textureon = false;
11427		- }
	11581	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11582	+ textureon = false;
	11583	+
11428	11584	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11429	11585	//System.out.println("ALLO");
11430	11586	gl.glColorMask(false, false, false, false);
11431	11587	DrawObject(gl);
11432		- if (RENDERPROGRAM > 0)
11433		- {
11434		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11435		- textureon = texon;
11436		- }
	11588	+
	11589	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11590	+ textureon = texon;
	11591	+
11437	11592	gl.glColorMask(true, true, true, true);
11438	11593
11439	11594	gl.glDepthFunc(GL.GL_EQUAL);
11440		- //gl.glDepthMask(false);
	11595	+ gl.glDepthMask(false);
11441	11596	}
11442	11597
11443	11598	if (false) // DrawMode() == SHADOW)
..	..	@@ -11649,7 +11804,7 @@
11649	11804	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11650	11805	{
11651	11806	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11652		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11807	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11653	11808	pingthread.StepToTarget(true); // true);
11654	11809	// zoomonce = false;
11655	11810	}
..	..	@@ -11777,20 +11932,32 @@
11777	11932	ReleaseTextures(DEFAULT_TEXTURES);
11778	11933
11779	11934	if (CLEANCACHE)
11780		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11935	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11781	11936	{
11782		- String tex = e.nextElement();
	11937	+ cTexture tex = e.nextElement();
11783	11938
11784	11939	// System.out.println("Texture --------- " + tex);
11785	11940
11786		- if (tex.equals("WHITE_NOISE"))
	11941	+ if (tex.equals("WHITE_NOISE:"))
11787	11942	continue;
11788	11943
11789		- if (!usedtextures.containsKey(tex))
	11944	+ if (!usedtextures.contains(tex))
11790	11945	{
	11946	+ CacheTexture gettex = texturepigment.get(tex);
11791	11947	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11792		- textures.get(tex).texture.dispose();
11793		- textures.remove(tex);
	11948	+ if (gettex != null)
	11949	+ {
	11950	+ gettex.texture.dispose();
	11951	+ texturepigment.remove(tex);
	11952	+ }
	11953	+
	11954	+ gettex = texturebump.get(tex);
	11955	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11956	+ if (gettex != null)
	11957	+ {
	11958	+ gettex.texture.dispose();
	11959	+ texturebump.remove(tex);
	11960	+ }
11794	11961	}
11795	11962	}
11796	11963	}
..	..	@@ -12318,8 +12485,76 @@
12318	12485
12319	12486	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12320	12487
12321		- String program =
	12488	+ String programmin =
	12489	+ // Min shader
12322	12490	"!!ARBfp1.0\n" +
	12491	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12492	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12493	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12494	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12495	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12496	+ "PARAM light2cam0 = program.env[10];" +
	12497	+ "PARAM light2cam1 = program.env[11];" +
	12498	+ "PARAM light2cam2 = program.env[12];" +
	12499	+ "TEMP temp;" +
	12500	+ "TEMP light;" +
	12501	+ "TEMP ndotl;" +
	12502	+ "TEMP normal;" +
	12503	+ "TEMP depth;" +
	12504	+ "TEMP eye;" +
	12505	+ "TEMP pos;" +
	12506	+
	12507	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12508	+ Normalize("normal") +
	12509	+ "MOV light, state.light[0].position;" +
	12510	+ "DP3 ndotl.x, light, normal;" +
	12511	+
	12512	+ // shadow
	12513	+ "MOV pos, fragment.texcoord[1];" +
	12514	+ "MOV temp, pos;" +
	12515	+ ShadowTextureFetch("depth", "temp", "1") +
	12516	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12517	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12518	+
	12519	+ // No shadow when out of frustum
	12520	+ //"SGE temp.y, depth.z, zero123.y;" +
	12521	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12522	+
	12523	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12524	+
	12525	+ // Backlit
	12526	+ "MOV pos.w, zero123.y;" +
	12527	+ "DP4 eye.x, pos, light2cam0;" +
	12528	+ "DP4 eye.y, pos, light2cam1;" +
	12529	+ "DP4 eye.z, pos, light2cam2;" +
	12530	+ Normalize("eye") +
	12531	+
	12532	+ "DP3 ndotl.y, -eye, normal;" +
	12533	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12534	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12535	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12536	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12537	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12538	+
	12539	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12540	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12541	+
	12542	+ // Pigment
	12543	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12544	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12545	+ "MUL temp, temp, ndotl.x;" +
	12546	+
	12547	+ "MUL temp, temp, zero123.z;" +
	12548	+
	12549	+ //"MUL temp, temp, ndotl.y;" +
	12550	+
	12551	+ "MOV temp.w, zero123.y;" + // reset alpha
	12552	+ "MOV result.color, temp;" +
	12553	+ "END";
	12554	+
	12555	+ String programmax =
	12556	+ "!!ARBfp1.0\n" +
	12557	+
12323	12558	//"OPTION ARB_fragment_program_shadow;" +
12324	12559	"PARAM light2cam0 = program.env[10];" +
12325	12560	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12434,8 +12669,7 @@
12434	12669	"TEMP shininess;" +
12435	12670	"\n" +
12436	12671	"MOV texSamp, one;" +
12437		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12438		-
	12672	+
12439	12673	"MOV mapgrid.x, one2048th.x;" +
12440	12674	"MOV temp, fragment.texcoord[1];" +
12441	12675	/*
..	..	@@ -12456,20 +12690,20 @@
12456	12690	"MUL temp, floor, mapgrid.x;" +
12457	12691	//"TEX depth0, temp, texture[1], 2D;" +
12458	12692	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12459		- TextureFetch("depth0", "temp", "1") +
	12693	+ ShadowTextureFetch("depth0", "temp", "1") +
12460	12694	"") +
12461	12695	"ADD temp.x, temp.x, mapgrid.x;" +
12462	12696	//"TEX depth1, temp, texture[1], 2D;" +
12463	12697	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12464		- TextureFetch("depth1", "temp", "1") +
	12698	+ ShadowTextureFetch("depth1", "temp", "1") +
12465	12699	"") +
12466	12700	"ADD temp.y, temp.y, mapgrid.x;" +
12467	12701	//"TEX depth2, temp, texture[1], 2D;" +
12468		- TextureFetch("depth2", "temp", "1") +
	12702	+ ShadowTextureFetch("depth2", "temp", "1") +
12469	12703	"SUB temp.x, temp.x, mapgrid.x;" +
12470	12704	//"TEX depth3, temp, texture[1], 2D;" +
12471	12705	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12472		- TextureFetch("depth3", "temp", "1") +
	12706	+ ShadowTextureFetch("depth3", "temp", "1") +
12473	12707	"") +
12474	12708	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12475	12709	//"MOV params, material;" +
..	..	@@ -12840,10 +13074,10 @@
12840	13074	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12841	13075	"") +
12842	13076
12843		- // display shadow only (bump == 0)
	13077	+ // display shadow only (fakedepth == 0)
12844	13078	"SUB temp.x, half.x, shadow.x;" +
12845	13079	"MOV temp.y, -params5.z;" + // params6.x;" +
12846		- "SLT temp.z, temp.y, -one2048th.x;" +
	13080	+ "SLT temp.z, temp.y, -c256i.x;" +
12847	13081	"SUB temp.y, one.x, temp.z;" +
12848	13082	"MUL temp.x, temp.x, temp.y;" +
12849	13083	"KIL temp.x;" +
..	..	@@ -13174,6 +13408,13 @@
13174	13408	//once = true;
13175	13409	}
13176	13410
	13411	+ String program = programmax;
	13412	+
	13413	+ if (Globals.MINSHADER)
	13414	+ {
	13415	+ program = programmin;
	13416	+ }
	13417	+
13177	13418	System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13178	13419	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13179	13420	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
..	..	@@ -13267,25 +13508,26 @@
13267	13508	return out;
13268	13509	}
13269	13510
13270		- String TextureFetch(String dest, String src, String unit)
	13511	+ // Also does frustum culling
	13512	+ String ShadowTextureFetch(String dest, String src, String unit)
13271	13513	{
13272	13514	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13273	13515	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13274	13516	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13517	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13518	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13275	13519	"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;" +
	13520	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13521	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13280	13522	//"SWZ buffer, temp, w,w,w,w;";
13281		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13523	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13282	13524	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13283	13525	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13284	13526	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13285		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13527	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13286	13528
13287		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13288		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13529	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13530	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13289	13531	}
13290	13532
13291	13533	String Shadow(String depth, String shadow)
..	..	@@ -13332,7 +13574,7 @@
13332	13574	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13333	13575	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13334	13576
13335		- // No shadow when out of frustrum
	13577	+ // No shadow when out of frustum
13336	13578	"SGE temp.x, " + depth + ".z, one.z;" +
13337	13579	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13338	13580	"";
..	..	@@ -14065,7 +14307,7 @@
14065	14307
14066	14308	// fev 2014???
14067	14309	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
14068		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14310	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
14069	14311	pingthread.StepToTarget(true); // true);
14070	14312	}
14071	14313	// if (!LIVE)
..	..	@@ -14130,14 +14372,15 @@
14130	14372	drag = false;
14131	14373	//System.out.println("Mouse DOWN");
14132	14374	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);
	14375	+ //ClickInfo info = new ClickInfo();
	14376	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14377	+ object.clickInfo.pane = this;
	14378	+ object.clickInfo.camera = renderCamera;
	14379	+ object.clickInfo.x = x;
	14380	+ object.clickInfo.y = y;
	14381	+ object.clickInfo.modifiers = modifiersex;
	14382	+ editObj = object.doEditClick(//info,
	14383	+ 0);
14141	14384	if (!editObj)
14142	14385	{
14143	14386	hasMarquee = true;
..	..	@@ -14419,12 +14662,12 @@
14419	14662	void GoDown(int mod)
14420	14663	{
14421	14664	MODIFIERS \|= COMMAND;
14422		- /*
	14665	+ /**/
14423	14666	if((mod&SHIFT) == SHIFT)
14424		- manipCamera.RotatePosition(0, -speed);
	14667	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14425	14668	else
14426		- manipCamera.BackForth(0, -speed*delta, getWidth());
14427		- */
	14669	+ manipCamera.RotatePosition(0, -speed);
	14670	+ /**/
14428	14671	if ((mod & SHIFT) == SHIFT)
14429	14672	{
14430	14673	mouseMode = mouseMode; // VR??
..	..	@@ -14440,12 +14683,12 @@
14440	14683	void GoUp(int mod)
14441	14684	{
14442	14685	MODIFIERS \|= COMMAND;
14443		- /*
	14686	+ /**/
14444	14687	if((mod&SHIFT) == SHIFT)
14445		- manipCamera.RotatePosition(0, speed);
	14688	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14446	14689	else
14447		- manipCamera.BackForth(0, speed*delta, getWidth());
14448		- */
	14690	+ manipCamera.RotatePosition(0, speed);
	14691	+ /**/
14449	14692	if ((mod & SHIFT) == SHIFT)
14450	14693	{
14451	14694	mouseMode = mouseMode;
..	..	@@ -14461,12 +14704,12 @@
14461	14704	void GoLeft(int mod)
14462	14705	{
14463	14706	MODIFIERS \|= COMMAND;
14464		- /*
	14707	+ /**/
14465	14708	if((mod&SHIFT) == SHIFT)
14466		- manipCamera.RotatePosition(speed, 0);
14467		- else
14468	14709	manipCamera.Translate(speed*delta, 0, getWidth());
14469		- */
	14710	+ else
	14711	+ manipCamera.RotatePosition(speed, 0);
	14712	+ /**/
14470	14713	if ((mod & SHIFT) == SHIFT)
14471	14714	{
14472	14715	mouseMode = mouseMode;
..	..	@@ -14482,12 +14725,12 @@
14482	14725	void GoRight(int mod)
14483	14726	{
14484	14727	MODIFIERS \|= COMMAND;
14485		- /*
	14728	+ /**/
14486	14729	if((mod&SHIFT) == SHIFT)
14487		- manipCamera.RotatePosition(-speed, 0);
14488		- else
14489	14730	manipCamera.Translate(-speed*delta, 0, getWidth());
14490		- */
	14731	+ else
	14732	+ manipCamera.RotatePosition(-speed, 0);
	14733	+ /**/
14491	14734	if ((mod & SHIFT) == SHIFT)
14492	14735	{
14493	14736	mouseMode = mouseMode;
..	..	@@ -14537,15 +14780,16 @@
14537	14780	if (editObj)
14538	14781	{
14539	14782	drag = true;
14540		- ClickInfo info = new ClickInfo();
14541		- info.bounds.setBounds(0, 0,
	14783	+ //ClickInfo info = new ClickInfo();
	14784	+ object.clickInfo.bounds.setBounds(0, 0,
14542	14785	(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);
	14786	+ object.clickInfo.pane = this;
	14787	+ object.clickInfo.camera = renderCamera;
	14788	+ object.clickInfo.x = x;
	14789	+ object.clickInfo.y = y;
	14790	+ object //.GetWindow().copy
	14791	+ .doEditDrag(//info,
	14792	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14549	14793	} else
14550	14794	{
14551	14795	if (x < startX)
..	..	@@ -14694,24 +14938,27 @@
14694	14938	}
14695	14939	}
14696	14940
	14941	+// ClickInfo clickInfo = new ClickInfo();
	14942	+
14697	14943	public void mouseMoved(MouseEvent e)
14698	14944	{
14699	14945	//System.out.println("mouseMoved: " + e);
14700	14946	if (isRenderer)
14701	14947	return;
14702	14948
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;
	14949	+ // Mouse cursor feedback
	14950	+ object.clickInfo.x = e.getX();
	14951	+ object.clickInfo.y = e.getY();
	14952	+ object.clickInfo.modifiers = e.getModifiersEx();
	14953	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14954	+ object.clickInfo.pane = this;
	14955	+ object.clickInfo.camera = renderCamera;
14710	14956	if (!isRenderer)
14711	14957	{
14712	14958	//ObjEditor editWindow = object.editWindow;
14713	14959	//Object3D copy = editWindow.copy;
14714		- if (object.doEditClick(ci, 0))
	14960	+ if (object.doEditClick(//clickInfo,
	14961	+ 0))
14715	14962	{
14716	14963	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14717	14964	} else
..	..	@@ -14726,7 +14973,8 @@
14726	14973	Globals.MOUSEDRAGGED = false;
14727	14974
14728	14975	movingcamera = false;
14729		- X = Y = 0;
	14976	+ X = 0; // getBounds().width/2;
	14977	+ Y = 0; // getBounds().height/2;
14730	14978	//System.out.println("mouseReleased: " + e);
14731	14979	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14732	14980	}
..	..	@@ -14982,7 +15230,8 @@
14982	15230	// break;
14983	15231	case 'T':
14984	15232	CACHETEXTURE ^= true;
14985		- textures.clear();
	15233	+ texturepigment.clear();
	15234	+ texturebump.clear();
14986	15235	// repaint();
14987	15236	break;
14988	15237	case 'Y':
..	..	@@ -15067,7 +15316,9 @@
15067	15316	case 'E' : COMPACT ^= true;
15068	15317	repaint();
15069	15318	break;
15070		- case 'W' : DEBUGHSB ^= true;
	15319	+ case 'W' : // Wide Window (fullscreen)
	15320	+ //DEBUGHSB ^= true;
	15321	+ ObjEditor.theFrame.ToggleFullScreen();
15071	15322	repaint();
15072	15323	break;
15073	15324	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -15093,13 +15344,7 @@
15093	15344	repaint();
15094	15345	break;
15095	15346	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':
	15347	+ //case 'L':
15103	15348	if (lightMode)
15104	15349	{
15105	15350	lightMode = false;
..	..	@@ -15163,20 +15408,24 @@
15163	15408	OCCLUSION_CULLING ^= true;
15164	15409	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
15165	15410	break;
15166		- case '0': envyoff ^= true; repaint(); break;
	15411	+ //case '0': envyoff ^= true; repaint(); break;
15167	15412	case '1':
15168	15413	case '2':
15169	15414	case '3':
15170	15415	case '4':
15171	15416	case '5':
15172		- newenvy = Character.getNumericValue(key);
15173		- repaint();
15174		- break;
15175	15417	case '6':
15176	15418	case '7':
15177	15419	case '8':
15178	15420	case '9':
15179		- BGcolor = (key - '6')/3.f;
	15421	+ if (true) // envyoff)
	15422	+ {
	15423	+ BGcolor = (key - '1')/8.f;
	15424	+ }
	15425	+ else
	15426	+ {
	15427	+ //newenvy = Character.getNumericValue(key);
	15428	+ }
15180	15429	repaint();
15181	15430	break;
15182	15431	case '!':
..	..	@@ -15246,7 +15495,10 @@
15246	15495	// kompactbit = 6;
15247	15496	// break;
15248	15497	case ' ':
15249		- ObjEditor.theFrame.ToggleFullScreen();
	15498	+ lightMode ^= true;
	15499	+ Globals.lighttouched = true;
	15500	+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
	15501	+ targetLookAt.set(manipCamera.lookAt);
15250	15502	repaint();
15251	15503	break;
15252	15504	//case '`' :
..	..	@@ -15295,12 +15547,6 @@
15295	15547	break;
15296	15548	case '+':
15297	15549
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	15550	/*
15305	15551	//fontsize += 1;
15306	15552	bbzoom *= 2;
..	..	@@ -15318,17 +15564,17 @@
15318	15564	case '=':
15319	15565	IncDepth();
15320	15566	//fontsize += 1;
15321		- object.editWindow.refreshContents(true);
	15567	+ object.GetWindow().refreshContents(true);
15322	15568	maskbit = 6;
15323	15569	break;
15324	15570	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
15325	15571	DecDepth();
15326	15572	maskbit = 5;
15327	15573	//if(fontsize > 1) fontsize -= 1;
15328		- if (object.editWindow == null)
15329		- new Exception().printStackTrace();
15330		- else
15331		- object.editWindow.refreshContents(true);
	15574	+// if (object.editWindow == null)
	15575	+// new Exception().printStackTrace();
	15576	+// else
	15577	+ object.GetWindow().refreshContents(true);
15332	15578	break;
15333	15579	case '{':
15334	15580	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15552,7 +15798,7 @@
15552	15798	}
15553	15799	*/
15554	15800
15555		- object.editWindow.EditSelection(false);
	15801	+ object.GetWindow().EditSelection(false);
15556	15802	}
15557	15803
15558	15804	void SelectParent()
..	..	@@ -15569,10 +15815,10 @@
15569	15815	{
15570	15816	//selectees.remove(i);
15571	15817	System.out.println("select parent of " + elem);
15572		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15818	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15573	15819	} else
15574	15820	{
15575		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15821	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15576	15822	}
15577	15823
15578	15824	first = false;
..	..	@@ -15614,12 +15860,12 @@
15614	15860	for (int j = 0; j < group.children.size(); j++)
15615	15861	{
15616	15862	elem = (Object3D) group.children.elementAt(j);
15617		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15863	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15618	15864	first = false;
15619	15865	}
15620	15866	} else
15621	15867	{
15622		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15868	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15623	15869	}
15624	15870
15625	15871	first = false;
..	..	@@ -15630,21 +15876,21 @@
15630	15876	{
15631	15877	//Composite group = (Composite) object;
15632	15878	Object3D group = object;
15633		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15879	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15634	15880	}
15635	15881
15636	15882	void ResetTransform(int mask)
15637	15883	{
15638	15884	//Composite group = (Composite) object;
15639	15885	Object3D group = object;
15640		- group.editWindow.ResetTransform(mask);
	15886	+ group.GetWindow().ResetTransform(mask);
15641	15887	}
15642	15888
15643	15889	void FlipTransform()
15644	15890	{
15645	15891	//Composite group = (Composite) object;
15646	15892	Object3D group = object;
15647		- group.editWindow.FlipTransform();
	15893	+ group.GetWindow().FlipTransform();
15648	15894	// group.editWindow.ReduceMesh(true);
15649	15895	}
15650	15896
..	..	@@ -15652,7 +15898,7 @@
15652	15898	{
15653	15899	//Composite group = (Composite) object;
15654	15900	Object3D group = object;
15655		- group.editWindow.PrintMemory();
	15901	+ group.GetWindow().PrintMemory();
15656	15902	// group.editWindow.ReduceMesh(true);
15657	15903	}
15658	15904
..	..	@@ -15660,7 +15906,7 @@
15660	15906	{
15661	15907	//Composite group = (Composite) object;
15662	15908	Object3D group = object;
15663		- group.editWindow.ResetCentroid();
	15909	+ group.GetWindow().ResetCentroid();
15664	15910	}
15665	15911
15666	15912	void IncDepth()
..	..	@@ -15742,8 +15988,6 @@
15742	15988
15743	15989	int width = getBounds().width;
15744	15990	int height = getBounds().height;
15745		- ClickInfo info = new ClickInfo();
15746		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15747	15991	//Image img = CreateImage(width, height);
15748	15992	//System.out.println("width = " + width + "; height = " + height + "\n");
15749	15993
..	..	@@ -15820,48 +16064,77 @@
15820	16064	}
15821	16065	if (object != null && !hasMarquee)
15822	16066	{
	16067	+ if (object.clickInfo == null)
	16068	+ object.clickInfo = new ClickInfo();
	16069	+ ClickInfo info = object.clickInfo;
	16070	+ //ClickInfo info = new ClickInfo();
	16071	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16072	+
15823	16073	if (isRenderer)
15824	16074	{
15825		- info.flags++;
	16075	+ object.clickInfo.flags++;
15826	16076	double frameAspect = (double) width / (double) height;
15827	16077	if (frameAspect > renderCamera.aspect)
15828	16078	{
15829	16079	int desired = (int) ((double) height * renderCamera.aspect);
15830		- info.bounds.width -= width - desired;
15831		- info.bounds.x += (width - desired) / 2;
	16080	+ object.clickInfo.bounds.width -= width - desired;
	16081	+ object.clickInfo.bounds.x += (width - desired) / 2;
15832	16082	} else
15833	16083	{
15834	16084	int desired = (int) ((double) width / renderCamera.aspect);
15835		- info.bounds.height -= height - desired;
15836		- info.bounds.y += (height - desired) / 2;
	16085	+ object.clickInfo.bounds.height -= height - desired;
	16086	+ object.clickInfo.bounds.y += (height - desired) / 2;
15837	16087	}
15838	16088	}
15839		- info.g = gr;
15840		- info.camera = renderCamera;
	16089	+
	16090	+ object.clickInfo.g = gr;
	16091	+ object.clickInfo.camera = renderCamera;
15841	16092	/*
15842	16093	// Memory intensive (brep.verticescopy)
15843	16094	if (!(object instanceof Composite))
15844	16095	object.draw(info, 0, false); // SLOW :
15845	16096	*/
15846		- if (!isRenderer)
	16097	+ if (!isRenderer) // && drag)
15847	16098	{
15848		- object.drawEditHandles(info, 0);
15849		-
15850		- if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	16099	+ Grafreed.Assert(object != null);
	16100	+ Grafreed.Assert(object.selection != null);
	16101	+ if (object.selection.Size() > 0)
15851	16102	{
15852		- switch (object.selection.get(0).hitSomething)
	16103	+ int hitSomething = object.selection.get(0).hitSomething;
	16104	+
	16105	+ object.clickInfo.DX = 0;
	16106	+ object.clickInfo.DY = 0;
	16107	+ object.clickInfo.W = 1;
	16108	+ if (hitSomething == Object3D.hitCenter)
15853	16109	{
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;
	16110	+ info.DX = X;
	16111	+ if (X != 0)
	16112	+ info.DX -= info.bounds.width/2;
	16113	+
	16114	+ info.DY = Y;
	16115	+ if (Y != 0)
	16116	+ info.DY -= info.bounds.height/2;
15863	16117	}
15864		-
	16118	+
	16119	+ object.drawEditHandles(//info,
	16120	+ 0);
	16121	+
	16122	+ if (drag && (X != 0 \|\| Y != 0))
	16123	+ {
	16124	+ switch (hitSomething)
	16125	+ {
	16126	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16127	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16128	+ break;
	16129	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16130	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16131	+ break;
	16132	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16133	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16134	+ break;
	16135	+ }
	16136	+
	16137	+ }
15865	16138	}
15866	16139	}
15867	16140	}
..	..	@@ -16343,6 +16616,8 @@
16343	16616	private /static/ boolean firstime;
16344	16617	private /static/ cVector newView = new cVector();
16345	16618	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16619	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16620	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
16346	16621	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16347	16622	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16348	16623	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16355,29 +16630,67 @@
16355	16630	{
16356	16631	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16357	16632
	16633	+ int usedsuf = 0;
	16634	+
16358	16635	for (int i = 0; i < suffixes.length; i++)
16359	16636	{
16360		- String resourceName = basename + suffixes[i] + "." + suffix;
16361		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16362		- mipmapped,
16363		- FileUtil.getFileSuffix(resourceName));
16364		- if (data == null)
	16637	+ String[] suffixe = suffixes;
	16638	+ String[] fallback = suffixes2;
	16639	+ String[] fallfallback = suffixes3;
	16640	+
	16641	+ for (int c=usedsuf; --c>=0;)
16365	16642	{
16366		- throw new IOException("Unable to load texture " + resourceName);
	16643	+// String[] temp = suffixe;
	16644	+// suffixe = fallback;
	16645	+// fallback = fallfallback;
	16646	+// fallfallback = temp;
16367	16647	}
	16648	+
	16649	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16650	+ TextureData data;
	16651	+
	16652	+ try
	16653	+ {
	16654	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16655	+ mipmapped,
	16656	+ FileUtil.getFileSuffix(resourceName));
	16657	+ }
	16658	+ catch (Exception e)
	16659	+ {
	16660	+ try
	16661	+ {
	16662	+ resourceName = basename + fallback[i] + "." + suffix;
	16663	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16664	+ mipmapped,
	16665	+ FileUtil.getFileSuffix(resourceName));
	16666	+ }
	16667	+ catch (Exception e2)
	16668	+ {
	16669	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16670	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16671	+ mipmapped,
	16672	+ FileUtil.getFileSuffix(resourceName));
	16673	+ }
	16674	+ }
	16675	+
16368	16676	//System.out.println("Target = " + targets[i]);
16369	16677	cubemap.updateImage(data, targets[i]);
16370	16678	}
16371	16679
16372	16680	return cubemap;
16373	16681	}
	16682	+
16374	16683	int bigsphere = -1;
16375	16684
16376	16685	float BGcolor = 0.5f;
16377	16686
16378		- private void DrawSkyBox(GL gl)
	16687	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16688	+
	16689	+ private void DrawSkyBox(GL gl, float ratio)
16379	16690	{
16380		- if (envyoff \|\| cubemap == null)
	16691	+ if (//envyoff \|\|
	16692	+ WIREFRAME \|\|
	16693	+ cubemap == null)
16381	16694	{
16382	16695	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16383	16696	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16392,7 +16705,17 @@
16392	16705	// Compensates for ExaminerViewer's modification of modelview matrix
16393	16706	gl.glMatrixMode(GL.GL_MODELVIEW);
16394	16707	gl.glLoadIdentity();
	16708	+ gl.glScalef(1,ratio,1);
16395	16709
	16710	+// colorV[0] = 2;
	16711	+// colorV[1] = 2;
	16712	+// colorV[2] = 2;
	16713	+// colorV[3] = 1;
	16714	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16715	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16716	+//
	16717	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16718	+
16396	16719	//gl.glActiveTexture(GL.GL_TEXTURE1);
16397	16720	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16398	16721
..	..	@@ -16424,6 +16747,7 @@
16424	16747	{
16425	16748	gl.glScalef(1.0f, -1.0f, 1.0f);
16426	16749	}
	16750	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16427	16751	gl.glMultMatrixd(viewrot_1, 0);
16428	16752	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16429	16753	//viewer.updateInverseRotation(gl);
..	..	@@ -16659,6 +16983,14 @@
16659	16983	}
16660	16984	}
16661	16985
	16986	+ private Object3D GetFolder()
	16987	+ {
	16988	+ Object3D folder = object.GetWindow().copy;
	16989	+ if (object.GetWindow().copy.selection.Size() > 0)
	16990	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16991	+ return folder;
	16992	+ }
	16993	+
16662	16994	class SelectBuffer implements GLEventListener
16663	16995	{
16664	16996
..	..	@@ -16674,7 +17006,7 @@
16674	17006	//new Exception().printStackTrace();
16675	17007	System.out.println("select buffer init");
16676	17008	// Use debug pipeline
16677		- drawable.setGL(new DebugGL(drawable.getGL()));
	17009	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16678	17010
16679	17011	GL gl = drawable.getGL();
16680	17012
..	..	@@ -16738,6 +17070,17 @@
16738	17070
16739	17071	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16740	17072
	17073	+ if (PAINTMODE)
	17074	+ {
	17075	+ if (object.GetWindow().copy.selection.Size() > 0)
	17076	+ {
	17077	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17078	+
	17079	+ // Make what you paint not selectable.
	17080	+ paintobj.ResetSelectable();
	17081	+ }
	17082	+ }
	17083	+
16741	17084	//int tmp = selection_view;
16742	17085	//selection_view = -1;
16743	17086	int temp = DrawMode();
..	..	@@ -16749,6 +17092,17 @@
16749	17092	// temp = DEFAULT; // patch for selection debug
16750	17093	Globals.drawMode = temp; // WARNING
16751	17094
	17095	+ if (PAINTMODE)
	17096	+ {
	17097	+ if (object.GetWindow().copy.selection.Size() > 0)
	17098	+ {
	17099	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17100	+
	17101	+ // Revert.
	17102	+ paintobj.RestoreSelectable();
	17103	+ }
	17104	+ }
	17105	+
16752	17106	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16753	17107
16754	17108	// trying different ways of getting the depth info over
..	..	@@ -16852,29 +17206,31 @@
16852	17206	}
16853	17207
16854	17208	if (!movingcamera && !PAINTMODE)
16855		- object.editWindow.ScreenFitPoint(); // fev 2014
	17209	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16856	17210
16857		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17211	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16858	17212	{
16859		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17213	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16860	17214
16861		- Object3D group = new Object3D("inst" + paintcount++);
	17215	+ if (object.GetWindow().copy.selection.Size() > 0)
	17216	+ {
	17217	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16862	17218
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();
	17219	+ Object3D inst = new Object3D("inst" + paintcount++);
	17220	+
	17221	+ inst.CreateMaterial(); // use a void leaf to select instances
	17222	+
	17223	+ inst.add(paintobj); // link
	17224	+
	17225	+ object.GetWindow().SnapObject(inst);
	17226	+
	17227	+ Object3D folder = paintFolder; // GetFolder();
	17228	+
	17229	+ folder.add(inst);
	17230	+
	17231	+ object.GetWindow().ResetModel();
	17232	+ object.GetWindow().refreshContents();
	17233	+ }
16878	17234	}
16879	17235	else
16880	17236	paintcount = 0;
..	..	@@ -17196,10 +17552,14 @@
17196	17552	gl.glFlush();
17197	17553
17198	17554	/**/
17199		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	17555	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
17200	17556
17201		- float[] pixels = occlusionsizebuffer.array();
	17557	+ float[] depths = occlusiondepthbuffer.array();
17202	17558
	17559	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	17560	+
	17561	+ int[] pixels = selectsizebuffer.array();
	17562	+
17203	17563	double r = 0, g = 0, b = 0;
17204	17564
17205	17565	double count = 0;
..	..	@@ -17210,7 +17570,7 @@
17210	17570
17211	17571	double FACTOR = 1;
17212	17572
17213		- for (int i = 0; i < pixels.length; i++)
	17573	+ for (int i = 0; i < depths.length; i++)
17214	17574	{
17215	17575	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
17216	17576	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -17293,7 +17653,7 @@
17293	17653
17294	17654	double scale = ray.z; // 1; // cos
17295	17655
17296		- float depth = pixels[newindex];
	17656	+ float depth = depths[newindex];
17297	17657
17298	17658	/*
17299	17659	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17490,11 +17850,14 @@
17490	17850	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17491	17851	static IntBuffer bigAAbuffer;
17492	17852	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17493		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	17853	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17494	17854	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17495	17855	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17496	17856	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17497		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17857	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17858	+
	17859	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17860	+
17498	17861	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17499	17862	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17500	17863	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();