~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,11 @@
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;
	116	+ boolean transformMode;
	117	+
77	118	boolean reverseUP = false;
78	119	static boolean frozen = false;
79	120	boolean enablebackspace = false; // patch for back buffer refresh
..	..	@@ -127,7 +168,7 @@
127	168
128	169
129	170	// OPTIONS
130		- boolean Skinshader = true;
	171	+ boolean Skinshader = false; // true;
131	172	boolean cameraLight = false;
132	173	boolean UVdebug = false;
133	174	boolean Udebug = false;
..	..	@@ -136,7 +177,7 @@
136	177	static boolean doublesided = false; // true; // reversed normals are awful for conformance
137	178	boolean anisotropy = true;
138	179	boolean softshadow = true; // slower but better false;
139		- boolean opacityhalo = false;
	180	+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
140	181
141	182	boolean macromode = false;
142	183
..	..	@@ -150,6 +191,19 @@
150	191	}
151	192
152	193	private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	194	+
	195	+ public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	196	+ {
	197	+ try
	198	+ {
	199	+ return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	200	+ } catch (IOException e)
	201	+ {
	202	+ System.out.println("NAME = " + name);
	203	+ e.printStackTrace(); // throw new RuntimeException(e);
	204	+ return null;
	205	+ }
	206	+ }
153	207
154	208	void SetAsGLRenderer(boolean b)
155	209	{
..	..	@@ -169,7 +223,8 @@
169	223
170	224	SetCamera(cam);
171	225
172		- SetLight(new Camera(new cVector(10, 10, -20)));
	226	+ // Warning: not used.
	227	+ SetLight(new Camera(new cVector(15, 10, -20)));
173	228
174	229	object = o;
175	230
..	..	@@ -1447,6 +1502,8 @@
1447	1502	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1448	1503	}
1449	1504
	1505	+ float[] colorV = new float[4];
	1506	+
1450	1507	void SetColor(Object3D obj, Vertex p0)
1451	1508	{
1452	1509	CameraPane display = this;
..	..	@@ -1514,8 +1571,6 @@
1514	1571	{
1515	1572	return;
1516	1573	}
1517		-
1518		- float[] colorV = new float[3];
1519	1574
1520	1575	if (false) // marked)
1521	1576	{
..	..	@@ -2065,7 +2120,7 @@
2065	2120	//System.err.println("Oeil on");
2066	2121	OEIL = true;
2067	2122	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2068		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2123	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2069	2124	//pingthread.StepToTarget(true);
2070	2125	}
2071	2126
..	..	@@ -2298,10 +2353,17 @@
2298	2353	HANDLES ^= true;
2299	2354	}
2300	2355
	2356	+ Object3D paintFolder;
	2357	+
2301	2358	void TogglePaint()
2302	2359	{
2303	2360	PAINTMODE ^= true;
2304	2361	paintcount = 0;
	2362	+
	2363	+ if (PAINTMODE)
	2364	+ {
	2365	+ paintFolder = GetFolder();
	2366	+ }
2305	2367	}
2306	2368
2307	2369	void SwapCamera(int a, int b)
..	..	@@ -2398,126 +2460,19 @@
2398	2460	return currentGL;
2399	2461	}
2400	2462
2401		- private void GetRemoteZip(String url, String name, boolean unzip, boolean save)
	2463	+ static private BufferedImage CreateBim(TextureData texturedata)
2402	2464	{
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		-
	2465	+ Grafreed.Assert(texturedata != null);
	2466	+
	2467	+ int width = texturedata.getWidth();
	2468	+ int height = texturedata.getHeight();
	2469	+
	2470	+ Buffer buffer = texturedata.getBuffer();
	2471	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2472	+
	2473	+ byte[] bytes = bytebuf.array();
	2474	+
	2475	+ return CreateBim(bytes, width, height);
2521	2476	}
2522	2477
2523	2478	/**/
..	..	@@ -2528,28 +2483,31 @@
2528	2483
2529	2484	int resolution;
2530	2485
2531		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2486	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2532	2487	{
2533		- texture = tex;
	2488	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2489	+ texturedata = texdata;
2534	2490	resolution = res;
2535	2491	}
2536	2492	}
2537	2493	/**/
2538	2494
2539	2495	// 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>();
	2496	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2497	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2498	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2499	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2500	+
2543	2501	int pigmentdepth = 0;
2544	2502	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2545	2503	int bumpdepth = 0;
2546	2504	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2547	2505	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2548	2506	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2549		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2507	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2550	2508	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2551	2509
2552		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2510	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2553	2511	{
2554	2512	TextureData texturedata = null;
2555	2513
..	..	@@ -2559,7 +2517,7 @@
2559	2517	com.sun.opengl.util.texture.TextureIO.newTextureData(
2560	2518	getClass().getClassLoader().getResourceAsStream(name),
2561	2519	true,
2562		- com.sun.opengl.util.texture.TextureIO.PNG);
	2520	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
2563	2521	} catch (java.io.IOException e)
2564	2522	{
2565	2523	throw new javax.media.opengl.GLException(e);
..	..	@@ -2568,13 +2526,34 @@
2568	2526	if (bump)
2569	2527	texturedata = ConvertBump(texturedata, false);
2570	2528
2571		- com.sun.opengl.util.texture.Texture texture =
2572		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2529	+// com.sun.opengl.util.texture.Texture texture =
	2530	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2573	2531
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);
	2532	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2533	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2576	2534
2577		- return texture;
	2535	+ return texturedata;
	2536	+ }
	2537	+
	2538	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2539	+ {
	2540	+ TextureData texturedata = null;
	2541	+
	2542	+ try
	2543	+ {
	2544	+ texturedata =
	2545	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2546	+ bim,
	2547	+ true);
	2548	+ } catch (Exception e)
	2549	+ {
	2550	+ throw new javax.media.opengl.GLException(e);
	2551	+ }
	2552	+
	2553	+ if (bump)
	2554	+ texturedata = ConvertBump(texturedata, false);
	2555	+
	2556	+ return texturedata;
2578	2557	}
2579	2558
2580	2559	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3647,6 +3626,8 @@
3647	3626
3648	3627	System.out.println("LOADING TEXTURE : " + name);
3649	3628
	3629	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3630	+
3650	3631	//
3651	3632	if (false) // compressbit > 0)
3652	3633	{
..	..	@@ -8045,7 +8026,7 @@
8045	8026	String pigment = Object3D.GetPigment(tex);
8046	8027	String bump = Object3D.GetBump(tex);
8047	8028
8048		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8029	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8049	8030	{
8050	8031	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
8051	8032	// System.out.println("; bump = " + bump);
..	..	@@ -8060,8 +8041,8 @@
8060	8041	pigment = null;
8061	8042	}
8062	8043
8063		- ReleaseTexture(bump, true);
8064		- ReleaseTexture(pigment, false);
	8044	+ ReleaseTexture(tex, true);
	8045	+ ReleaseTexture(tex, false);
8065	8046	}
8066	8047
8067	8048	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -8079,7 +8060,7 @@
8079	8060
8080	8061	String pigment = Object3D.GetPigment(tex);
8081	8062
8082		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8063	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8083	8064	{
8084	8065	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
8085	8066	// System.out.println("; bump = " + bump);
..	..	@@ -8090,7 +8071,7 @@
8090	8071	pigment = null;
8091	8072	}
8092	8073
8093		- ReleaseTexture(pigment, false);
	8074	+ ReleaseTexture(tex, false);
8094	8075	}
8095	8076
8096	8077	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -8108,7 +8089,7 @@
8108	8089
8109	8090	String bump = Object3D.GetBump(tex);
8110	8091
8111		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8092	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8112	8093	{
8113	8094	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
8114	8095	// System.out.println("; bump = " + bump);
..	..	@@ -8119,10 +8100,10 @@
8119	8100	bump = null;
8120	8101	}
8121	8102
8122		- ReleaseTexture(bump, true);
	8103	+ ReleaseTexture(tex, true);
8123	8104	}
8124	8105
8125		- void ReleaseTexture(String tex, boolean bump)
	8106	+ void ReleaseTexture(cTexture tex, boolean bump)
8126	8107	{
8127	8108	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8128	8109	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8133,7 +8114,7 @@
8133	8114	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
8134	8115
8135	8116	if (tex != null)
8136		- texture = textures.get(tex);
	8117	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
8137	8118
8138	8119	// //assert( texture != null );
8139	8120	// if (texture == null)
..	..	@@ -8227,47 +8208,50 @@
8227	8208
8228	8209	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8229	8210	{
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		- }
	8211	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8212	+// ambientOcclusion ) // \|\| !textureon)
	8213	+// {
	8214	+// return; // false;
	8215	+// }
	8216	+//
	8217	+// if (tex == null)
	8218	+// {
	8219	+// BindTexture(null,false,resolution);
	8220	+// BindTexture(null,true,resolution);
	8221	+// return;
	8222	+// }
	8223	+//
	8224	+// String pigment = Object3D.GetPigment(tex);
	8225	+// String bump = Object3D.GetBump(tex);
	8226	+//
	8227	+// usedtextures.add(pigment);
	8228	+// usedtextures.add(bump);
	8229	+//
	8230	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8231	+// {
	8232	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8233	+// // System.out.println("; bump = " + bump);
	8234	+// }
	8235	+//
	8236	+// if (bump.equals(""))
	8237	+// {
	8238	+// bump = null;
	8239	+// }
	8240	+// if (pigment.equals(""))
	8241	+// {
	8242	+// pigment = null;
	8243	+// }
	8244	+//
	8245	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8246	+// BindTexture(pigment, false, resolution);
	8247	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8248	+// BindTexture(bump, true, resolution);
	8249	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8250	+//
	8251	+// return; // true;
8242	8252
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;
	8253	+ BindPigmentTexture(tex, resolution);
	8254	+ BindBumpTexture(tex, resolution);
8271	8255	}
8272	8256
8273	8257	/boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8286,9 +8270,9 @@
8286	8270
8287	8271	String pigment = Object3D.GetPigment(tex);
8288	8272
8289		- usedtextures.put(pigment, pigment);
	8273	+ usedtextures.add(tex);
8290	8274
8291		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8275	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8292	8276	{
8293	8277	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8294	8278	// System.out.println("; bump = " + bump);
..	..	@@ -8300,7 +8284,7 @@
8300	8284	}
8301	8285
8302	8286	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8303		- BindTexture(pigment, false, resolution);
	8287	+ BindTexture(tex, false, resolution);
8304	8288	}
8305	8289
8306	8290	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8319,9 +8303,9 @@
8319	8303
8320	8304	String bump = Object3D.GetBump(tex);
8321	8305
8322		- usedtextures.put(bump, bump);
	8306	+ usedtextures.add(tex);
8323	8307
8324		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8308	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8325	8309	{
8326	8310	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8327	8311	// System.out.println("; bump = " + bump);
..	..	@@ -8333,7 +8317,7 @@
8333	8317	}
8334	8318
8335	8319	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8336		- BindTexture(bump, true, resolution);
	8320	+ BindTexture(tex, true, resolution);
8337	8321	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8338	8322	}
8339	8323
..	..	@@ -8357,13 +8341,19 @@
8357	8341	return fileExists;
8358	8342	}
8359	8343
8360		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8344	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8361	8345	{
8362		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8346	+ CacheTexture texturecache = null;
8363	8347
8364	8348	if (tex != null)
8365	8349	{
8366		- String texname = tex;
	8350	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8351	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
	8352	+
	8353	+ if (texname.equals("") && texdata == null)
	8354	+ {
	8355	+ return null;
	8356	+ }
8367	8357
8368	8358	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8369	8359
..	..	@@ -8373,19 +8363,46 @@
8373	8363	// else
8374	8364	// if (!texname.startsWith("/"))
8375	8365	// texname = "/Users/nbriere/Textures/" + texname;
8376		- if (!FileExists(tex))
	8366	+ if (!FileExists(texname) && !texname.startsWith("@"))
8377	8367	{
8378	8368	texname = fallbackTextureName;
8379	8369	}
8380	8370
8381	8371	if (CACHETEXTURE)
8382		- texture = textures.get(texname); // TEXTURE CACHE
8383		-
8384		- TextureData texturedata = null;
8385		-
8386		- if (texture == null \|\| texture.resolution < resolution)
8387	8372	{
8388		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8373	+ if (texdata == null)
	8374	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8375	+ else
	8376	+ texturecache = bimtextures.get(texdata);
	8377	+ }
	8378	+
	8379	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8380	+ {
	8381	+ TextureData texturedata = null;
	8382	+
	8383	+ if (texdata != null && textureon)
	8384	+ {
	8385	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8386	+
	8387	+ try
	8388	+ {
	8389	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8390	+ }
	8391	+ catch (Exception e)
	8392	+ {
	8393	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8394	+ }
	8395	+
	8396	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8397	+ bimtextures.put(texdata, texturecache);
	8398	+
	8399	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8400	+
	8401	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8402	+ //bim2 = bim;
	8403	+ }
	8404	+ else
	8405	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8389	8406	{
8390	8407	assert(!bump);
8391	8408	// if (bump)
..	..	@@ -8396,19 +8413,23 @@
8396	8413	// }
8397	8414	// else
8398	8415	// {
8399		- texture = textures.get(tex);
8400		- if (texture == null)
	8416	+ // texturecache = textures.get(texname); // suspicious
	8417	+ if (texturecache == null)
8401	8418	{
8402		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8419	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8403	8420	}
	8421	+ else
	8422	+ new Exception().printStackTrace();
8404	8423	// }
8405	8424	} else
8406		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8425	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8407	8426	{
8408	8427	assert(bump);
8409		- texture = textures.get(tex);
8410		- if (texture == null)
8411		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8428	+ // texturecache = textures.get(texname); // suspicious
	8429	+ if (texturecache == null)
	8430	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8431	+ else
	8432	+ new Exception().printStackTrace();
8412	8433	} else
8413	8434	{
8414	8435	//if (tex.equals("IMMORTAL"))
..	..	@@ -8416,11 +8437,22 @@
8416	8437	// texture = GetResourceTexture("default.png");
8417	8438	//} else
8418	8439	//{
8419		- if (tex.equals("WHITE_NOISE"))
	8440	+ if (texname.endsWith("WHITE_NOISE"))
8420	8441	{
8421		- texture = textures.get(tex);
8422		- if (texture == null)
8423		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8442	+ // texturecache = textures.get(texname); // suspicious
	8443	+ if (texturecache == null)
	8444	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8445	+ else
	8446	+ new Exception().printStackTrace();
	8447	+ } else
	8448	+ {
	8449	+ if (texname.startsWith("@"))
	8450	+ {
	8451	+ // texturecache = textures.get(texname); // suspicious
	8452	+ if (texturecache == null)
	8453	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
	8454	+ else
	8455	+ new Exception().printStackTrace();
8424	8456	} else
8425	8457	{
8426	8458	if (textureon)
..	..	@@ -8479,19 +8511,20 @@
8479	8511	if (texturedata == null)
8480	8512	throw new Exception();
8481	8513
8482		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8514	+ texturecache = new CacheTexture(texturedata,resolution);
8483	8515	//texture = GetTexture(tex, bump);
8484	8516	}
	8517	+ }
8485	8518	}
8486	8519	//}
8487	8520	}
8488	8521
8489		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8522	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8490	8523	{
8491	8524	//return false;
8492	8525
8493	8526	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8494		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8527	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8495	8528	{
8496	8529	// String ext = "_highres";
8497	8530	// if (REDUCETEXTURE)
..	..	@@ -8508,52 +8541,17 @@
8508	8541	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8509	8542	if (!cachefile.exists())
8510	8543	{
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))
	8544	+ //if (texturedata.getWidth() == texturedata.getHeight())
8520	8545	{
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);
	8546	+ BufferedImage rendImage = CreateBim(texturedata);
	8547	+
8551	8548	ImageWriter writer = null;
8552	8549	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8553	8550	if (iter.hasNext()) {
8554	8551	writer = (ImageWriter)iter.next();
8555	8552	}
8556		- float compressionQuality = 0.9f;
	8553	+
	8554	+ float compressionQuality = 0.85f;
8557	8555	try
8558	8556	{
8559	8557	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8570,18 +8568,20 @@
8570	8568	}
8571	8569	}
8572	8570	}
8573		-
	8571	+
	8572	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8573	+
8574	8574	//System.out.println("Texture = " + tex);
8575		- if (textures.containsKey(texname))
	8575	+ if (textures.containsKey(tex))
8576	8576	{
8577		- CacheTexture thetex = textures.get(texname);
	8577	+ CacheTexture thetex = textures.get(tex);
8578	8578	thetex.texture.disable();
8579	8579	thetex.texture.dispose();
8580		- textures.remove(texname);
	8580	+ textures.remove(tex);
8581	8581	}
8582	8582
8583		- texture.texturedata = texturedata;
8584		- textures.put(texname, texture);
	8583	+ //texture.texturedata = texturedata;
	8584	+ textures.put(tex, texturecache);
8585	8585
8586	8586	// newtex = true;
8587	8587	}
..	..	@@ -8597,10 +8597,44 @@
8597	8597	}
8598	8598	}
8599	8599
8600		- return texture;
	8600	+ return texturecache;
8601	8601	}
8602	8602
8603		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	8603	+ static void EmbedTextures(cTexture tex)
	8604	+ {
	8605	+ if (tex.pigmentdata == null)
	8606	+ {
	8607	+ //String texname = Object3D.GetPigment(tex);
	8608	+
	8609	+ CacheTexture texturecache = texturepigment.get(tex);
	8610	+
	8611	+ if (texturecache != null)
	8612	+ {
	8613	+ tex.pw = texturecache.texturedata.getWidth();
	8614	+ tex.ph = texturecache.texturedata.getHeight();
	8615	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8616	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8617	+ ;
	8618	+ //, tex.pw, tex.ph), 0.5f);
	8619	+ }
	8620	+ }
	8621	+
	8622	+ if (tex.bumpdata == null)
	8623	+ {
	8624	+ //String texname = Object3D.GetBump(tex);
	8625	+
	8626	+ CacheTexture texturecache = texturebump.get(tex);
	8627	+
	8628	+ if (texturecache != null)
	8629	+ {
	8630	+ tex.bw = texturecache.texturedata.getWidth();
	8631	+ tex.bh = texturecache.texturedata.getHeight();
	8632	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8633	+ }
	8634	+ }
	8635	+ }
	8636	+
	8637	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8604	8638	{
8605	8639	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8606	8640
..	..	@@ -8618,21 +8652,21 @@
8618	8652	return texture!=null?texture.texture:null;
8619	8653	}
8620	8654
8621		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
	8655	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8622	8656	{
8623	8657	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8624	8658
8625	8659	return texture!=null?texture.texturedata:null;
8626	8660	}
8627	8661
8628		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8662	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8629	8663	{
8630	8664	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8631	8665	{
8632	8666	return false;
8633	8667	}
8634	8668
8635		- boolean newtex = false;
	8669	+ //boolean newtex = false;
8636	8670
8637	8671	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8638	8672
..	..	@@ -8664,9 +8698,75 @@
8664	8698	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8665	8699	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8666	8700
8667		- return newtex;
	8701	+ return true; // Warning: not used.
8668	8702	}
8669	8703
	8704	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8705	+ {
	8706	+ try
	8707	+ {
	8708	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8709	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8710	+ ImageWriter writer = writers.next();
	8711	+
	8712	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8713	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8714	+ param.setCompressionQuality(quality);
	8715	+
	8716	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8717	+ writer.setOutput(ios);
	8718	+ writer.write(null, new IIOImage(image, null, null), param);
	8719	+
	8720	+ byte[] data = baos.toByteArray();
	8721	+ writer.dispose();
	8722	+ return data;
	8723	+ }
	8724	+ catch (Exception e)
	8725	+ {
	8726	+ e.printStackTrace();
	8727	+ return null;
	8728	+ }
	8729	+ }
	8730	+
	8731	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8732	+ {
	8733	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8734	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8735	+ ImageReader reader = writers.next();
	8736	+
	8737	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8738	+
	8739	+ ImageReadParam param = reader.getDefaultReadParam();
	8740	+ param.setDestination(bim);
	8741	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8742	+
	8743	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8744	+ reader.setInput(ios);
	8745	+ BufferedImage bim2 = reader.read(0, param);
	8746	+ reader.dispose();
	8747	+
	8748	+// WritableRaster raster = bim2.getRaster();
	8749	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8750	+// byte[] bytes = data.getData();
	8751	+//
	8752	+// int[] pixels = new int[bytes.length/3];
	8753	+// for (int i=pixels.length; --i>=0;)
	8754	+// {
	8755	+// int i3 = i*3;
	8756	+// pixels[i] = 0xFF;
	8757	+// pixels[i] <<= 8;
	8758	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8759	+// pixels[i] <<= 8;
	8760	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8761	+// pixels[i] <<= 8;
	8762	+// pixels[i] \|= bytes[i3] & 0xFF;
	8763	+// }
	8764	+//
	8765	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8766	+
	8767	+ return bim;
	8768	+ }
	8769	+
8670	8770	ShadowBuffer shadowPBuf;
8671	8771	AntialiasBuffer antialiasPBuf;
8672	8772	int MAXSTACK;
..	..	@@ -8683,10 +8783,12 @@
8683	8783
8684	8784	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8685	8785	MAXSTACK = temp[0];
8686		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8786	+ if (Globals.DEBUG)
	8787	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8687	8788	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8688	8789	MAXSTACK = temp[0];
8689		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8790	+ if (Globals.DEBUG)
	8791	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8690	8792
8691	8793	// Use debug pipeline
8692	8794	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8694,7 +8796,8 @@
8694	8796	gl = drawable.getGL(); //
8695	8797
8696	8798	GL gl3 = getGL();
8697		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8698	8801
8699	8802
8700	8803	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8859,7 +8962,7 @@
8859	8962
8860	8963	if (cubemap == null)
8861	8964	{
8862		- LoadEnvy(5);
	8965	+ //LoadEnvy(1);
8863	8966	}
8864	8967
8865	8968	//cubemap.enable();
..	..	@@ -9135,6 +9238,8 @@
9135	9238
9136	9239	void LoadEnvy(int which)
9137	9240	{
	9241	+ assert(false);
	9242	+
9138	9243	String name;
9139	9244	String ext;
9140	9245
..	..	@@ -9146,37 +9251,58 @@
9146	9251	cubemap = null;
9147	9252	return;
9148	9253	case 1:
9149		- name = "cubemaps/box_";
9150		- ext = "png";
	9254	+ name = "cubemaps/rgb/";
	9255	+ ext = "jpg";
9151	9256	reverseUP = false;
9152	9257	break;
9153	9258	case 2:
9154		- name = "cubemaps/uffizi_";
9155		- ext = "png";
9156		- break; // reverseUP = true; break;
	9259	+ name = "cubemaps/uffizi/";
	9260	+ ext = "jpg";
	9261	+ reverseUP = false;
	9262	+ break;
9157	9263	case 3:
9158		- name = "cubemaps/CloudyHills_";
9159		- ext = "tga";
	9264	+ name = "cubemaps/CloudyHills/";
	9265	+ ext = "jpg";
9160	9266	reverseUP = false;
9161	9267	break;
9162	9268	case 4:
9163		- name = "cubemaps/cornell_";
	9269	+ name = "cubemaps/cornell/";
9164	9270	ext = "png";
9165	9271	reverseUP = false;
9166	9272	break;
	9273	+ case 5:
	9274	+ name = "cubemaps/skycube/";
	9275	+ ext = "jpg";
	9276	+ reverseUP = false;
	9277	+ break;
	9278	+ case 6:
	9279	+ name = "cubemaps/SaintLazarusChurch3/";
	9280	+ ext = "jpg";
	9281	+ reverseUP = false;
	9282	+ break;
	9283	+ case 7:
	9284	+ name = "cubemaps/Sodermalmsallen/";
	9285	+ ext = "jpg";
	9286	+ reverseUP = false;
	9287	+ break;
	9288	+ case 8:
	9289	+ name = "cubemaps/Sodermalmsallen2/";
	9290	+ ext = "jpg";
	9291	+ reverseUP = false;
	9292	+ break;
	9293	+ case 9:
	9294	+ name = "cubemaps/UnionSquare/";
	9295	+ ext = "jpg";
	9296	+ reverseUP = false;
	9297	+ break;
9167	9298	default:
9168		- name = "cubemaps/rgb_";
9169		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9299	+ name = "cubemaps/box/";
	9300	+ ext = "png"; /mipmap = true;/
	9301	+ reverseUP = false;
9170	9302	break;
9171	9303	}
9172		-
9173		- try
9174		- {
9175		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9176		- } catch (IOException e)
9177		- {
9178		- throw new RuntimeException(e);
9179		- }
	9304	+
	9305	+ LoadSkybox(name, ext, mipmap);
9180	9306	}
9181	9307
9182	9308	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -9208,8 +9334,12 @@
9208	9334	static double[] model = new double[16];
9209	9335	double[] camera2light = new double[16];
9210	9336	double[] light2camera = new double[16];
9211		- int newenvy = -1;
9212		- boolean envyoff = true; // false;
	9337	+
	9338	+ //int newenvy = -1;
	9339	+ //boolean envyoff = false;
	9340	+
	9341	+ String loadedskyboxname;
	9342	+
9213	9343	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9214	9344	//float[] light0 = { 0,0,0 };
9215	9345	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9627,7 +9757,7 @@
9627	9757
9628	9758	if (renderCamera != lightCamera)
9629	9759	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9630		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9760	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9631	9761
9632	9762	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9633	9763
..	..	@@ -9643,7 +9773,7 @@
9643	9773
9644	9774	if (renderCamera != lightCamera)
9645	9775	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9646		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9776	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9647	9777
9648	9778	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9649	9779
..	..	@@ -9689,10 +9819,12 @@
9689	9819	rati = 1 / rati;
9690	9820	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9691	9821	}
9692		- assert (newenvy == -1);
	9822	+
	9823	+ //assert (newenvy == -1);
	9824	+
9693	9825	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9694	9826	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9695		- DrawSkyBox(gl);
	9827	+ DrawSkyBox(gl, (float)rati);
9696	9828	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9697	9829	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9698	9830	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -10558,9 +10690,18 @@
10558	10690	static boolean init = false;
10559	10691
10560	10692	double[][] matrix = LA.newMatrix();
	10693	+
	10694	+ // This is to refresh the UI of the material panel.
	10695	+ ObjEditor patchMaterial;
10561	10696
10562	10697	public void display(GLAutoDrawable drawable)
10563	10698	{
	10699	+ if (patchMaterial.patchMaterial)
	10700	+ {
	10701	+ patchMaterial.patchMaterial = false;
	10702	+ patchMaterial.objectPanel.setSelectedIndex(0);
	10703	+ }
	10704	+
10564	10705	if (Grafreed.savesound && Grafreed.hassound)
10565	10706	{
10566	10707	Grafreed.wav.save();
..	..	@@ -10729,7 +10870,7 @@
10729	10870
10730	10871	if (wait)
10731	10872	{
10732		- Sleep(500);
	10873	+ Sleep(200); // blocks everything
10733	10874
10734	10875	wait = false;
10735	10876	}
..	..	@@ -10844,7 +10985,7 @@
10844	10985	// if (parentcam != renderCamera) // not a light
10845	10986	if (cam != lightCamera)
10846	10987	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10847		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10988	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10848	10989
10849	10990	for (int j = 0; j < 4; j++)
10850	10991	{
..	..	@@ -10859,7 +11000,7 @@
10859	11000	// if (parentcam != renderCamera) // not a light
10860	11001	if (cam != lightCamera)
10861	11002	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10862		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	11003	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10863	11004
10864	11005	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10865	11006
..	..	@@ -10945,13 +11086,43 @@
10945	11086	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10946	11087	}
10947	11088
10948		- if (newenvy > -1)
	11089	+// if (newenvy > -1)
	11090	+// {
	11091	+// LoadEnvy(newenvy);
	11092	+// }
	11093	+//
	11094	+// newenvy = -1;
	11095	+
	11096	+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
10949	11097	{
10950		- LoadEnvy(newenvy);
	11098	+ if (cubemaprgb == null)
	11099	+ {
	11100	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11101	+ }
	11102	+
	11103	+ cubemap = cubemaprgb;
10951	11104	}
10952		-
10953		- newenvy = -1;
10954		-
	11105	+ else
	11106	+ {
	11107	+ if (object.skyboxname != null)
	11108	+ {
	11109	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11110	+ {
	11111	+ if (cubemap != null && cubemap != cubemaprgb)
	11112	+ cubemap.dispose();
	11113	+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11114	+ loadedskyboxname = object.skyboxname;
	11115	+ }
	11116	+ }
	11117	+ else
	11118	+ {
	11119	+ cubemapcustom = null;
	11120	+ loadedskyboxname = null;
	11121	+ }
	11122	+
	11123	+ cubemap = cubemapcustom;
	11124	+ }
	11125	+
10955	11126	ratio = ((double) getWidth()) / getHeight();
10956	11127	//System.out.println("ratio = " + ratio);
10957	11128
..	..	@@ -10967,7 +11138,7 @@
10967	11138
10968	11139	if (!IsFrozen() && !ambientOcclusion)
10969	11140	{
10970		- DrawSkyBox(gl);
	11141	+ DrawSkyBox(gl, (float)ratio);
10971	11142	}
10972	11143
10973	11144	//if (selection_view == -1)
..	..	@@ -11150,9 +11321,9 @@
11150	11321
11151	11322	gl.glMatrixMode(GL.GL_MODELVIEW);
11152	11323
11153		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11154		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
11155		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11324	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11325	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11326	+gl.glEnable(gl.GL_MULTISAMPLE);
11156	11327	} else
11157	11328	{
11158	11329	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -11163,7 +11334,7 @@
11163	11334	//System.out.println("BLENDING ON");
11164	11335	gl.glEnable(GL.GL_BLEND);
11165	11336	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
11166		-
	11337	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
11167	11338	gl.glMatrixMode(gl.GL_PROJECTION);
11168	11339	gl.glLoadIdentity();
11169	11340
..	..	@@ -11253,7 +11424,7 @@
11253	11424
11254	11425	// if (cam != lightCamera)
11255	11426	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11256		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11427	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11257	11428	}
11258	11429
11259	11430	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -11412,7 +11583,7 @@
11412	11583	}
11413	11584	}
11414	11585
11415		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11586	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11416	11587	{
11417	11588	//gl.glDepthFunc(GL.GL_LEQUAL);
11418	11589	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11420,24 +11591,21 @@
11420	11591
11421	11592	boolean texon = textureon;
11422	11593
11423		- if (RENDERPROGRAM > 0)
11424		- {
11425		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11426		- textureon = false;
11427		- }
	11594	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11595	+ textureon = false;
	11596	+
11428	11597	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11429	11598	//System.out.println("ALLO");
11430	11599	gl.glColorMask(false, false, false, false);
11431	11600	DrawObject(gl);
11432		- if (RENDERPROGRAM > 0)
11433		- {
11434		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11435		- textureon = texon;
11436		- }
	11601	+
	11602	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11603	+ textureon = texon;
	11604	+
11437	11605	gl.glColorMask(true, true, true, true);
11438	11606
11439	11607	gl.glDepthFunc(GL.GL_EQUAL);
11440		- //gl.glDepthMask(false);
	11608	+ gl.glDepthMask(false);
11441	11609	}
11442	11610
11443	11611	if (false) // DrawMode() == SHADOW)
..	..	@@ -11649,7 +11817,7 @@
11649	11817	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11650	11818	{
11651	11819	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11652		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11820	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11653	11821	pingthread.StepToTarget(true); // true);
11654	11822	// zoomonce = false;
11655	11823	}
..	..	@@ -11777,20 +11945,32 @@
11777	11945	ReleaseTextures(DEFAULT_TEXTURES);
11778	11946
11779	11947	if (CLEANCACHE)
11780		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11948	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11781	11949	{
11782		- String tex = e.nextElement();
	11950	+ cTexture tex = e.nextElement();
11783	11951
11784	11952	// System.out.println("Texture --------- " + tex);
11785	11953
11786		- if (tex.equals("WHITE_NOISE"))
	11954	+ if (tex.equals("WHITE_NOISE:"))
11787	11955	continue;
11788	11956
11789		- if (!usedtextures.containsKey(tex))
	11957	+ if (!usedtextures.contains(tex))
11790	11958	{
	11959	+ CacheTexture gettex = texturepigment.get(tex);
11791	11960	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11792		- textures.get(tex).texture.dispose();
11793		- textures.remove(tex);
	11961	+ if (gettex != null)
	11962	+ {
	11963	+ gettex.texture.dispose();
	11964	+ texturepigment.remove(tex);
	11965	+ }
	11966	+
	11967	+ gettex = texturebump.get(tex);
	11968	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11969	+ if (gettex != null)
	11970	+ {
	11971	+ gettex.texture.dispose();
	11972	+ texturebump.remove(tex);
	11973	+ }
11794	11974	}
11795	11975	}
11796	11976	}
..	..	@@ -12318,8 +12498,76 @@
12318	12498
12319	12499	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12320	12500
12321		- String program =
	12501	+ String programmin =
	12502	+ // Min shader
12322	12503	"!!ARBfp1.0\n" +
	12504	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12505	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12506	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12507	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12508	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12509	+ "PARAM light2cam0 = program.env[10];" +
	12510	+ "PARAM light2cam1 = program.env[11];" +
	12511	+ "PARAM light2cam2 = program.env[12];" +
	12512	+ "TEMP temp;" +
	12513	+ "TEMP light;" +
	12514	+ "TEMP ndotl;" +
	12515	+ "TEMP normal;" +
	12516	+ "TEMP depth;" +
	12517	+ "TEMP eye;" +
	12518	+ "TEMP pos;" +
	12519	+
	12520	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12521	+ Normalize("normal") +
	12522	+ "MOV light, state.light[0].position;" +
	12523	+ "DP3 ndotl.x, light, normal;" +
	12524	+
	12525	+ // shadow
	12526	+ "MOV pos, fragment.texcoord[1];" +
	12527	+ "MOV temp, pos;" +
	12528	+ ShadowTextureFetch("depth", "temp", "1") +
	12529	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12530	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12531	+
	12532	+ // No shadow when out of frustum
	12533	+ //"SGE temp.y, depth.z, zero123.y;" +
	12534	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12535	+
	12536	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12537	+
	12538	+ // Backlit
	12539	+ "MOV pos.w, zero123.y;" +
	12540	+ "DP4 eye.x, pos, light2cam0;" +
	12541	+ "DP4 eye.y, pos, light2cam1;" +
	12542	+ "DP4 eye.z, pos, light2cam2;" +
	12543	+ Normalize("eye") +
	12544	+
	12545	+ "DP3 ndotl.y, -eye, normal;" +
	12546	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12547	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12548	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12549	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12550	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12551	+
	12552	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12553	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12554	+
	12555	+ // Pigment
	12556	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12557	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12558	+ "MUL temp, temp, ndotl.x;" +
	12559	+
	12560	+ "MUL temp, temp, zero123.z;" +
	12561	+
	12562	+ //"MUL temp, temp, ndotl.y;" +
	12563	+
	12564	+ "MOV temp.w, zero123.y;" + // reset alpha
	12565	+ "MOV result.color, temp;" +
	12566	+ "END";
	12567	+
	12568	+ String programmax =
	12569	+ "!!ARBfp1.0\n" +
	12570	+
12323	12571	//"OPTION ARB_fragment_program_shadow;" +
12324	12572	"PARAM light2cam0 = program.env[10];" +
12325	12573	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12434,8 +12682,7 @@
12434	12682	"TEMP shininess;" +
12435	12683	"\n" +
12436	12684	"MOV texSamp, one;" +
12437		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12438		-
	12685	+
12439	12686	"MOV mapgrid.x, one2048th.x;" +
12440	12687	"MOV temp, fragment.texcoord[1];" +
12441	12688	/*
..	..	@@ -12456,20 +12703,20 @@
12456	12703	"MUL temp, floor, mapgrid.x;" +
12457	12704	//"TEX depth0, temp, texture[1], 2D;" +
12458	12705	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12459		- TextureFetch("depth0", "temp", "1") +
	12706	+ ShadowTextureFetch("depth0", "temp", "1") +
12460	12707	"") +
12461	12708	"ADD temp.x, temp.x, mapgrid.x;" +
12462	12709	//"TEX depth1, temp, texture[1], 2D;" +
12463	12710	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12464		- TextureFetch("depth1", "temp", "1") +
	12711	+ ShadowTextureFetch("depth1", "temp", "1") +
12465	12712	"") +
12466	12713	"ADD temp.y, temp.y, mapgrid.x;" +
12467	12714	//"TEX depth2, temp, texture[1], 2D;" +
12468		- TextureFetch("depth2", "temp", "1") +
	12715	+ ShadowTextureFetch("depth2", "temp", "1") +
12469	12716	"SUB temp.x, temp.x, mapgrid.x;" +
12470	12717	//"TEX depth3, temp, texture[1], 2D;" +
12471	12718	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12472		- TextureFetch("depth3", "temp", "1") +
	12719	+ ShadowTextureFetch("depth3", "temp", "1") +
12473	12720	"") +
12474	12721	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12475	12722	//"MOV params, material;" +
..	..	@@ -12840,10 +13087,10 @@
12840	13087	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12841	13088	"") +
12842	13089
12843		- // display shadow only (bump == 0)
	13090	+ // display shadow only (fakedepth == 0)
12844	13091	"SUB temp.x, half.x, shadow.x;" +
12845	13092	"MOV temp.y, -params5.z;" + // params6.x;" +
12846		- "SLT temp.z, temp.y, -one2048th.x;" +
	13093	+ "SLT temp.z, temp.y, -c256i.x;" +
12847	13094	"SUB temp.y, one.x, temp.z;" +
12848	13095	"MUL temp.x, temp.x, temp.y;" +
12849	13096	"KIL temp.x;" +
..	..	@@ -13174,8 +13421,19 @@
13174	13421	//once = true;
13175	13422	}
13176	13423
13177		- System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13178		- System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13424	+ String program = programmax;
	13425	+
	13426	+ if (Globals.MINSHADER)
	13427	+ {
	13428	+ program = programmin;
	13429	+ }
	13430	+
	13431	+ if (Globals.DEBUG)
	13432	+ {
	13433	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
	13434	+ System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13435	+ }
	13436	+
13179	13437	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13180	13438
13181	13439	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13222,7 +13480,8 @@
13222	13480	"\n" +
13223	13481	"END\n";
13224	13482
13225		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13483	+ if (Globals.DEBUG)
	13484	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13226	13485	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13227	13486
13228	13487	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13267,25 +13526,26 @@
13267	13526	return out;
13268	13527	}
13269	13528
13270		- String TextureFetch(String dest, String src, String unit)
	13529	+ // Also does frustum culling
	13530	+ String ShadowTextureFetch(String dest, String src, String unit)
13271	13531	{
13272	13532	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13273	13533	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13274	13534	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13535	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13536	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13275	13537	"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;" +
	13538	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13539	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13280	13540	//"SWZ buffer, temp, w,w,w,w;";
13281		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13541	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13282	13542	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13283	13543	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13284	13544	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13285		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13545	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13286	13546
13287		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13288		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13547	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13548	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13289	13549	}
13290	13550
13291	13551	String Shadow(String depth, String shadow)
..	..	@@ -13332,7 +13592,7 @@
13332	13592	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13333	13593	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13334	13594
13335		- // No shadow when out of frustrum
	13595	+ // No shadow when out of frustum
13336	13596	"SGE temp.x, " + depth + ".z, one.z;" +
13337	13597	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13338	13598	"";
..	..	@@ -14065,7 +14325,7 @@
14065	14325
14066	14326	// fev 2014???
14067	14327	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
14068		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14328	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
14069	14329	pingthread.StepToTarget(true); // true);
14070	14330	}
14071	14331	// if (!LIVE)
..	..	@@ -14130,14 +14390,15 @@
14130	14390	drag = false;
14131	14391	//System.out.println("Mouse DOWN");
14132	14392	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);
	14393	+ //ClickInfo info = new ClickInfo();
	14394	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14395	+ object.clickInfo.pane = this;
	14396	+ object.clickInfo.camera = renderCamera;
	14397	+ object.clickInfo.x = x;
	14398	+ object.clickInfo.y = y;
	14399	+ object.clickInfo.modifiers = modifiersex;
	14400	+ editObj = object.doEditClick(//info,
	14401	+ 0);
14141	14402	if (!editObj)
14142	14403	{
14143	14404	hasMarquee = true;
..	..	@@ -14419,12 +14680,18 @@
14419	14680	void GoDown(int mod)
14420	14681	{
14421	14682	MODIFIERS \|= COMMAND;
14422		- /*
	14683	+ boolean isVR = (mouseMode&VR)!=0;
	14684	+ /**/
14423	14685	if((mod&SHIFT) == SHIFT)
14424		- manipCamera.RotatePosition(0, -speed);
	14686	+ {
	14687	+ if (isVR)
	14688	+ manipCamera.RotateInterest(0, -speed);
	14689	+ else
	14690	+ manipCamera.RotatePosition(0, -speed);
	14691	+ }
14425	14692	else
14426		- manipCamera.BackForth(0, -speed*delta, getWidth());
14427		- */
	14693	+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
	14694	+ /**/
14428	14695	if ((mod & SHIFT) == SHIFT)
14429	14696	{
14430	14697	mouseMode = mouseMode; // VR??
..	..	@@ -14433,6 +14700,8 @@
14433	14700	mouseMode \|= BACKFORTH;
14434	14701	}
14435	14702
	14703	+ targetLookAt.set(manipCamera.lookAt);
	14704	+
14436	14705	//prevX = X = anchorX;
14437	14706	prevY = Y = anchorY - (int) (renderCamera.Distance());
14438	14707	}
..	..	@@ -14440,12 +14709,19 @@
14440	14709	void GoUp(int mod)
14441	14710	{
14442	14711	MODIFIERS \|= COMMAND;
14443		- /*
	14712	+ /**/
	14713	+ boolean isVR = (mouseMode&VR)!=0;
	14714	+
14444	14715	if((mod&SHIFT) == SHIFT)
14445		- manipCamera.RotatePosition(0, speed);
	14716	+ {
	14717	+ if (isVR)
	14718	+ manipCamera.RotateInterest(0, speed);
	14719	+ else
	14720	+ manipCamera.RotatePosition(0, speed);
	14721	+ }
14446	14722	else
14447		- manipCamera.BackForth(0, speed*delta, getWidth());
14448		- */
	14723	+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
	14724	+ /**/
14449	14725	if ((mod & SHIFT) == SHIFT)
14450	14726	{
14451	14727	mouseMode = mouseMode;
..	..	@@ -14454,6 +14730,8 @@
14454	14730	mouseMode \|= BACKFORTH;
14455	14731	}
14456	14732
	14733	+ targetLookAt.set(manipCamera.lookAt);
	14734	+
14457	14735	//prevX = X = anchorX;
14458	14736	prevY = Y = anchorY + (int) (renderCamera.Distance());
14459	14737	}
..	..	@@ -14461,12 +14739,17 @@
14461	14739	void GoLeft(int mod)
14462	14740	{
14463	14741	MODIFIERS \|= COMMAND;
14464		- /*
	14742	+ /**/
14465	14743	if((mod&SHIFT) == SHIFT)
14466		- manipCamera.RotatePosition(speed, 0);
	14744	+ manipCamera.Translate(speed*delta, 0, getWidth());
14467	14745	else
14468		- manipCamera.Translate(speed*delta, 0, getWidth());
14469		- */
	14746	+ {
	14747	+ if ((mouseMode&VR)!=0)
	14748	+ manipCamera.RotateInterest(-speed, 0);
	14749	+ else
	14750	+ manipCamera.RotatePosition(speed, 0);
	14751	+ }
	14752	+ /**/
14470	14753	if ((mod & SHIFT) == SHIFT)
14471	14754	{
14472	14755	mouseMode = mouseMode;
..	..	@@ -14475,6 +14758,8 @@
14475	14758	mouseMode \|= ROTATE;
14476	14759	} // TRANSLATE;
14477	14760
	14761	+ targetLookAt.set(manipCamera.lookAt);
	14762	+
14478	14763	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
14479	14764	prevY = Y = anchorY;
14480	14765	}
..	..	@@ -14482,12 +14767,18 @@
14482	14767	void GoRight(int mod)
14483	14768	{
14484	14769	MODIFIERS \|= COMMAND;
14485		- /*
	14770	+ /**/
14486	14771	if((mod&SHIFT) == SHIFT)
14487		- manipCamera.RotatePosition(-speed, 0);
	14772	+ manipCamera.Translate(-speed*delta, 0, getWidth());
14488	14773	else
14489		- manipCamera.Translate(-speed*delta, 0, getWidth());
14490		- */
	14774	+ {
	14775	+ if ((mouseMode&VR)!=0)
	14776	+ manipCamera.RotateInterest(speed, 0);
	14777	+ else
	14778	+ manipCamera.RotatePosition(-speed, 0);
	14779	+ }
	14780	+
	14781	+ /**/
14491	14782	if ((mod & SHIFT) == SHIFT)
14492	14783	{
14493	14784	mouseMode = mouseMode;
..	..	@@ -14496,6 +14787,8 @@
14496	14787	mouseMode \|= ROTATE;
14497	14788	} // TRANSLATE;
14498	14789
	14790	+ targetLookAt.set(manipCamera.lookAt);
	14791	+
14499	14792	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
14500	14793	prevY = Y = anchorY;
14501	14794	}
..	..	@@ -14537,15 +14830,16 @@
14537	14830	if (editObj)
14538	14831	{
14539	14832	drag = true;
14540		- ClickInfo info = new ClickInfo();
14541		- info.bounds.setBounds(0, 0,
	14833	+ //ClickInfo info = new ClickInfo();
	14834	+ object.clickInfo.bounds.setBounds(0, 0,
14542	14835	(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);
	14836	+ object.clickInfo.pane = this;
	14837	+ object.clickInfo.camera = renderCamera;
	14838	+ object.clickInfo.x = x;
	14839	+ object.clickInfo.y = y;
	14840	+ object //.GetWindow().copy
	14841	+ .doEditDrag(//info,
	14842	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14549	14843	} else
14550	14844	{
14551	14845	if (x < startX)
..	..	@@ -14694,24 +14988,27 @@
14694	14988	}
14695	14989	}
14696	14990
	14991	+// ClickInfo clickInfo = new ClickInfo();
	14992	+
14697	14993	public void mouseMoved(MouseEvent e)
14698	14994	{
14699	14995	//System.out.println("mouseMoved: " + e);
14700	14996	if (isRenderer)
14701	14997	return;
14702	14998
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;
	14999	+ // Mouse cursor feedback
	15000	+ object.clickInfo.x = e.getX();
	15001	+ object.clickInfo.y = e.getY();
	15002	+ object.clickInfo.modifiers = e.getModifiersEx();
	15003	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	15004	+ object.clickInfo.pane = this;
	15005	+ object.clickInfo.camera = renderCamera;
14710	15006	if (!isRenderer)
14711	15007	{
14712	15008	//ObjEditor editWindow = object.editWindow;
14713	15009	//Object3D copy = editWindow.copy;
14714		- if (object.doEditClick(ci, 0))
	15010	+ if (object.doEditClick(//clickInfo,
	15011	+ 0))
14715	15012	{
14716	15013	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14717	15014	} else
..	..	@@ -14726,7 +15023,8 @@
14726	15023	Globals.MOUSEDRAGGED = false;
14727	15024
14728	15025	movingcamera = false;
14729		- X = Y = 0;
	15026	+ X = 0; // getBounds().width/2;
	15027	+ Y = 0; // getBounds().height/2;
14730	15028	//System.out.println("mouseReleased: " + e);
14731	15029	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14732	15030	}
..	..	@@ -14982,7 +15280,8 @@
14982	15280	// break;
14983	15281	case 'T':
14984	15282	CACHETEXTURE ^= true;
14985		- textures.clear();
	15283	+ texturepigment.clear();
	15284	+ texturebump.clear();
14986	15285	// repaint();
14987	15286	break;
14988	15287	case 'Y':
..	..	@@ -14992,8 +15291,8 @@
14992	15291	case 'K':
14993	15292	KOMPACTTEXTURE ^= true;
14994	15293	//textures.clear();
14995		- break;
14996		- case 'P': // Texture Projection macros
	15294	+ // break;
	15295	+ //case 'P': // Texture Projection macros
14997	15296	// SAVETEXTURE ^= true;
14998	15297	macromode = true;
14999	15298	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -15067,7 +15366,9 @@
15067	15366	case 'E' : COMPACT ^= true;
15068	15367	repaint();
15069	15368	break;
15070		- case 'W' : DEBUGHSB ^= true;
	15369	+ case 'W' : // Wide Window (fullscreen)
	15370	+ //DEBUGHSB ^= true;
	15371	+ ObjEditor.theFrame.ToggleFullScreen();
15071	15372	repaint();
15072	15373	break;
15073	15374	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -15093,13 +15394,7 @@
15093	15394	repaint();
15094	15395	break;
15095	15396	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':
	15397	+ //case 'L':
15103	15398	if (lightMode)
15104	15399	{
15105	15400	lightMode = false;
..	..	@@ -15118,7 +15413,7 @@
15118	15413	targetLookAt.set(manipCamera.lookAt);
15119	15414	repaint();
15120	15415	break;
15121		- case 'p':
	15416	+ case 'P': // p':
15122	15417	// c'est quoi ca au juste? spherical ^= true;
15123	15418	Skinshader ^= true; programInitialized = false;
15124	15419	repaint();
..	..	@@ -15163,20 +15458,24 @@
15163	15458	OCCLUSION_CULLING ^= true;
15164	15459	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
15165	15460	break;
15166		- case '0': envyoff ^= true; repaint(); break;
	15461	+ //case '0': envyoff ^= true; repaint(); break;
15167	15462	case '1':
15168	15463	case '2':
15169	15464	case '3':
15170	15465	case '4':
15171	15466	case '5':
15172		- newenvy = Character.getNumericValue(key);
15173		- repaint();
15174		- break;
15175	15467	case '6':
15176	15468	case '7':
15177	15469	case '8':
15178	15470	case '9':
15179		- BGcolor = (key - '6')/3.f;
	15471	+ if (true) // envyoff)
	15472	+ {
	15473	+ BGcolor = (key - '1')/8.f;
	15474	+ }
	15475	+ else
	15476	+ {
	15477	+ //newenvy = Character.getNumericValue(key);
	15478	+ }
15180	15479	repaint();
15181	15480	break;
15182	15481	case '!':
..	..	@@ -15246,7 +15545,10 @@
15246	15545	// kompactbit = 6;
15247	15546	// break;
15248	15547	case ' ':
15249		- ObjEditor.theFrame.ToggleFullScreen();
	15548	+ lightMode ^= true;
	15549	+ Globals.lighttouched = true;
	15550	+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
	15551	+ targetLookAt.set(manipCamera.lookAt);
15250	15552	repaint();
15251	15553	break;
15252	15554	//case '`' :
..	..	@@ -15295,12 +15597,6 @@
15295	15597	break;
15296	15598	case '+':
15297	15599
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	15600	/*
15305	15601	//fontsize += 1;
15306	15602	bbzoom *= 2;
..	..	@@ -15318,17 +15614,17 @@
15318	15614	case '=':
15319	15615	IncDepth();
15320	15616	//fontsize += 1;
15321		- object.editWindow.refreshContents(true);
	15617	+ object.GetWindow().refreshContents(true);
15322	15618	maskbit = 6;
15323	15619	break;
15324	15620	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
15325	15621	DecDepth();
15326	15622	maskbit = 5;
15327	15623	//if(fontsize > 1) fontsize -= 1;
15328		- if (object.editWindow == null)
15329		- new Exception().printStackTrace();
15330		- else
15331		- object.editWindow.refreshContents(true);
	15624	+// if (object.editWindow == null)
	15625	+// new Exception().printStackTrace();
	15626	+// else
	15627	+ object.GetWindow().refreshContents(true);
15332	15628	break;
15333	15629	case '{':
15334	15630	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15552,7 +15848,7 @@
15552	15848	}
15553	15849	*/
15554	15850
15555		- object.editWindow.EditSelection(false);
	15851	+ object.GetWindow().EditSelection(false);
15556	15852	}
15557	15853
15558	15854	void SelectParent()
..	..	@@ -15569,10 +15865,10 @@
15569	15865	{
15570	15866	//selectees.remove(i);
15571	15867	System.out.println("select parent of " + elem);
15572		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15868	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15573	15869	} else
15574	15870	{
15575		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15871	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15576	15872	}
15577	15873
15578	15874	first = false;
..	..	@@ -15614,12 +15910,12 @@
15614	15910	for (int j = 0; j < group.children.size(); j++)
15615	15911	{
15616	15912	elem = (Object3D) group.children.elementAt(j);
15617		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15913	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15618	15914	first = false;
15619	15915	}
15620	15916	} else
15621	15917	{
15622		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15918	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15623	15919	}
15624	15920
15625	15921	first = false;
..	..	@@ -15630,21 +15926,21 @@
15630	15926	{
15631	15927	//Composite group = (Composite) object;
15632	15928	Object3D group = object;
15633		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15929	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15634	15930	}
15635	15931
15636	15932	void ResetTransform(int mask)
15637	15933	{
15638	15934	//Composite group = (Composite) object;
15639	15935	Object3D group = object;
15640		- group.editWindow.ResetTransform(mask);
	15936	+ group.GetWindow().ResetTransform(mask);
15641	15937	}
15642	15938
15643	15939	void FlipTransform()
15644	15940	{
15645	15941	//Composite group = (Composite) object;
15646	15942	Object3D group = object;
15647		- group.editWindow.FlipTransform();
	15943	+ group.GetWindow().FlipTransform();
15648	15944	// group.editWindow.ReduceMesh(true);
15649	15945	}
15650	15946
..	..	@@ -15652,7 +15948,7 @@
15652	15948	{
15653	15949	//Composite group = (Composite) object;
15654	15950	Object3D group = object;
15655		- group.editWindow.PrintMemory();
	15951	+ group.GetWindow().PrintMemory();
15656	15952	// group.editWindow.ReduceMesh(true);
15657	15953	}
15658	15954
..	..	@@ -15660,7 +15956,7 @@
15660	15956	{
15661	15957	//Composite group = (Composite) object;
15662	15958	Object3D group = object;
15663		- group.editWindow.ResetCentroid();
	15959	+ group.GetWindow().ResetCentroid();
15664	15960	}
15665	15961
15666	15962	void IncDepth()
..	..	@@ -15742,8 +16038,6 @@
15742	16038
15743	16039	int width = getBounds().width;
15744	16040	int height = getBounds().height;
15745		- ClickInfo info = new ClickInfo();
15746		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15747	16041	//Image img = CreateImage(width, height);
15748	16042	//System.out.println("width = " + width + "; height = " + height + "\n");
15749	16043
..	..	@@ -15820,48 +16114,77 @@
15820	16114	}
15821	16115	if (object != null && !hasMarquee)
15822	16116	{
	16117	+ if (object.clickInfo == null)
	16118	+ object.clickInfo = new ClickInfo();
	16119	+ ClickInfo info = object.clickInfo;
	16120	+ //ClickInfo info = new ClickInfo();
	16121	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16122	+
15823	16123	if (isRenderer)
15824	16124	{
15825		- info.flags++;
	16125	+ object.clickInfo.flags++;
15826	16126	double frameAspect = (double) width / (double) height;
15827	16127	if (frameAspect > renderCamera.aspect)
15828	16128	{
15829	16129	int desired = (int) ((double) height * renderCamera.aspect);
15830		- info.bounds.width -= width - desired;
15831		- info.bounds.x += (width - desired) / 2;
	16130	+ object.clickInfo.bounds.width -= width - desired;
	16131	+ object.clickInfo.bounds.x += (width - desired) / 2;
15832	16132	} else
15833	16133	{
15834	16134	int desired = (int) ((double) width / renderCamera.aspect);
15835		- info.bounds.height -= height - desired;
15836		- info.bounds.y += (height - desired) / 2;
	16135	+ object.clickInfo.bounds.height -= height - desired;
	16136	+ object.clickInfo.bounds.y += (height - desired) / 2;
15837	16137	}
15838	16138	}
15839		- info.g = gr;
15840		- info.camera = renderCamera;
	16139	+
	16140	+ object.clickInfo.g = gr;
	16141	+ object.clickInfo.camera = renderCamera;
15841	16142	/*
15842	16143	// Memory intensive (brep.verticescopy)
15843	16144	if (!(object instanceof Composite))
15844	16145	object.draw(info, 0, false); // SLOW :
15845	16146	*/
15846		- if (!isRenderer)
	16147	+ if (!isRenderer) // && drag)
15847	16148	{
15848		- object.drawEditHandles(info, 0);
15849		-
15850		- if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	16149	+ Grafreed.Assert(object != null);
	16150	+ Grafreed.Assert(object.selection != null);
	16151	+ if (object.selection.Size() > 0)
15851	16152	{
15852		- switch (object.selection.get(0).hitSomething)
	16153	+ int hitSomething = object.selection.get(0).hitSomething;
	16154	+
	16155	+ object.clickInfo.DX = 0;
	16156	+ object.clickInfo.DY = 0;
	16157	+ object.clickInfo.W = 1;
	16158	+ if (hitSomething == Object3D.hitCenter)
15853	16159	{
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;
	16160	+ info.DX = X;
	16161	+ if (X != 0)
	16162	+ info.DX -= info.bounds.width/2;
	16163	+
	16164	+ info.DY = Y;
	16165	+ if (Y != 0)
	16166	+ info.DY -= info.bounds.height/2;
15863	16167	}
15864		-
	16168	+
	16169	+ object.drawEditHandles(//info,
	16170	+ 0);
	16171	+
	16172	+ if (drag && (X != 0 \|\| Y != 0))
	16173	+ {
	16174	+ switch (hitSomething)
	16175	+ {
	16176	+ case Object3D.hitCenter: gr.setColor(Color.white);
	16177	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16178	+ break;
	16179	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16180	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16181	+ break;
	16182	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16183	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16184	+ break;
	16185	+ }
	16186	+
	16187	+ }
15865	16188	}
15866	16189	}
15867	16190	}
..	..	@@ -15876,7 +16199,7 @@
15876	16199	if (hasMarquee)
15877	16200	{
15878	16201	gr.setXORMode(Color.white);
15879		- gr.setColor(Color.red);
	16202	+ gr.setColor(Color.white);
15880	16203	if (!firstime)
15881	16204	{
15882	16205	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -16343,6 +16666,8 @@
16343	16666	private /static/ boolean firstime;
16344	16667	private /static/ cVector newView = new cVector();
16345	16668	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16669	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16670	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
16346	16671	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16347	16672	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16348	16673	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16355,29 +16680,67 @@
16355	16680	{
16356	16681	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16357	16682
	16683	+ int usedsuf = 0;
	16684	+
16358	16685	for (int i = 0; i < suffixes.length; i++)
16359	16686	{
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)
	16687	+ String[] suffixe = suffixes;
	16688	+ String[] fallback = suffixes2;
	16689	+ String[] fallfallback = suffixes3;
	16690	+
	16691	+ for (int c=usedsuf; --c>=0;)
16365	16692	{
16366		- throw new IOException("Unable to load texture " + resourceName);
	16693	+// String[] temp = suffixe;
	16694	+// suffixe = fallback;
	16695	+// fallback = fallfallback;
	16696	+// fallfallback = temp;
16367	16697	}
	16698	+
	16699	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16700	+ TextureData data;
	16701	+
	16702	+ try
	16703	+ {
	16704	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16705	+ mipmapped,
	16706	+ FileUtil.getFileSuffix(resourceName));
	16707	+ }
	16708	+ catch (Exception e)
	16709	+ {
	16710	+ try
	16711	+ {
	16712	+ resourceName = basename + fallback[i] + "." + suffix;
	16713	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16714	+ mipmapped,
	16715	+ FileUtil.getFileSuffix(resourceName));
	16716	+ }
	16717	+ catch (Exception e2)
	16718	+ {
	16719	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16720	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16721	+ mipmapped,
	16722	+ FileUtil.getFileSuffix(resourceName));
	16723	+ }
	16724	+ }
	16725	+
16368	16726	//System.out.println("Target = " + targets[i]);
16369	16727	cubemap.updateImage(data, targets[i]);
16370	16728	}
16371	16729
16372	16730	return cubemap;
16373	16731	}
	16732	+
16374	16733	int bigsphere = -1;
16375	16734
16376	16735	float BGcolor = 0.5f;
16377	16736
16378		- private void DrawSkyBox(GL gl)
	16737	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16738	+
	16739	+ private void DrawSkyBox(GL gl, float ratio)
16379	16740	{
16380		- if (envyoff \|\| cubemap == null)
	16741	+ if (//envyoff \|\|
	16742	+ WIREFRAME \|\|
	16743	+ cubemap == null)
16381	16744	{
16382	16745	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16383	16746	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16392,7 +16755,17 @@
16392	16755	// Compensates for ExaminerViewer's modification of modelview matrix
16393	16756	gl.glMatrixMode(GL.GL_MODELVIEW);
16394	16757	gl.glLoadIdentity();
	16758	+ gl.glScalef(1,ratio,1);
16395	16759
	16760	+// colorV[0] = 2;
	16761	+// colorV[1] = 2;
	16762	+// colorV[2] = 2;
	16763	+// colorV[3] = 1;
	16764	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16765	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16766	+//
	16767	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16768	+
16396	16769	//gl.glActiveTexture(GL.GL_TEXTURE1);
16397	16770	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16398	16771
..	..	@@ -16424,6 +16797,7 @@
16424	16797	{
16425	16798	gl.glScalef(1.0f, -1.0f, 1.0f);
16426	16799	}
	16800	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16427	16801	gl.glMultMatrixd(viewrot_1, 0);
16428	16802	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16429	16803	//viewer.updateInverseRotation(gl);
..	..	@@ -16464,7 +16838,8 @@
16464	16838	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16465	16839
16466	16840	cubemap.disable();
16467		- ////cubemap.unbind();
	16841	+ //cubemap.dispose();
	16842	+
16468	16843	if (CULLFACE)
16469	16844	{
16470	16845	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16659,6 +17034,14 @@
16659	17034	}
16660	17035	}
16661	17036
	17037	+ private Object3D GetFolder()
	17038	+ {
	17039	+ Object3D folder = object.GetWindow().copy;
	17040	+ if (object.GetWindow().copy.selection.Size() > 0)
	17041	+ folder = object.GetWindow().copy.selection.elementAt(0);
	17042	+ return folder;
	17043	+ }
	17044	+
16662	17045	class SelectBuffer implements GLEventListener
16663	17046	{
16664	17047
..	..	@@ -16674,7 +17057,7 @@
16674	17057	//new Exception().printStackTrace();
16675	17058	System.out.println("select buffer init");
16676	17059	// Use debug pipeline
16677		- drawable.setGL(new DebugGL(drawable.getGL()));
	17060	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16678	17061
16679	17062	GL gl = drawable.getGL();
16680	17063
..	..	@@ -16738,6 +17121,17 @@
16738	17121
16739	17122	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16740	17123
	17124	+ if (PAINTMODE)
	17125	+ {
	17126	+ if (object.GetWindow().copy.selection.Size() > 0)
	17127	+ {
	17128	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17129	+
	17130	+ // Make what you paint not selectable.
	17131	+ paintobj.ResetSelectable();
	17132	+ }
	17133	+ }
	17134	+
16741	17135	//int tmp = selection_view;
16742	17136	//selection_view = -1;
16743	17137	int temp = DrawMode();
..	..	@@ -16749,6 +17143,17 @@
16749	17143	// temp = DEFAULT; // patch for selection debug
16750	17144	Globals.drawMode = temp; // WARNING
16751	17145
	17146	+ if (PAINTMODE)
	17147	+ {
	17148	+ if (object.GetWindow().copy.selection.Size() > 0)
	17149	+ {
	17150	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17151	+
	17152	+ // Revert.
	17153	+ paintobj.RestoreSelectable();
	17154	+ }
	17155	+ }
	17156	+
16752	17157	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16753	17158
16754	17159	// trying different ways of getting the depth info over
..	..	@@ -16852,29 +17257,31 @@
16852	17257	}
16853	17258
16854	17259	if (!movingcamera && !PAINTMODE)
16855		- object.editWindow.ScreenFitPoint(); // fev 2014
	17260	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16856	17261
16857		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17262	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16858	17263	{
16859		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17264	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16860	17265
16861		- Object3D group = new Object3D("inst" + paintcount++);
	17266	+ if (object.GetWindow().copy.selection.Size() > 0)
	17267	+ {
	17268	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16862	17269
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();
	17270	+ Object3D inst = new Object3D("inst" + paintcount++);
	17271	+
	17272	+ inst.CreateMaterial(); // use a void leaf to select instances
	17273	+
	17274	+ inst.add(paintobj); // link
	17275	+
	17276	+ object.GetWindow().SnapObject(inst);
	17277	+
	17278	+ Object3D folder = paintFolder; // GetFolder();
	17279	+
	17280	+ folder.add(inst);
	17281	+
	17282	+ object.GetWindow().ResetModel();
	17283	+ object.GetWindow().refreshContents();
	17284	+ }
16878	17285	}
16879	17286	else
16880	17287	paintcount = 0;
..	..	@@ -16968,6 +17375,7 @@
16968	17375
16969	17376	public void init(GLAutoDrawable drawable)
16970	17377	{
	17378	+ if (Globals.DEBUG)
16971	17379	System.out.println("shadow buffer init");
16972	17380
16973	17381	GL gl = drawable.getGL();
..	..	@@ -17196,10 +17604,14 @@
17196	17604	gl.glFlush();
17197	17605
17198	17606	/**/
17199		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	17607	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
17200	17608
17201		- float[] pixels = occlusionsizebuffer.array();
	17609	+ float[] depths = occlusiondepthbuffer.array();
17202	17610
	17611	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	17612	+
	17613	+ int[] pixels = selectsizebuffer.array();
	17614	+
17203	17615	double r = 0, g = 0, b = 0;
17204	17616
17205	17617	double count = 0;
..	..	@@ -17210,7 +17622,7 @@
17210	17622
17211	17623	double FACTOR = 1;
17212	17624
17213		- for (int i = 0; i < pixels.length; i++)
	17625	+ for (int i = 0; i < depths.length; i++)
17214	17626	{
17215	17627	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
17216	17628	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -17293,7 +17705,7 @@
17293	17705
17294	17706	double scale = ray.z; // 1; // cos
17295	17707
17296		- float depth = pixels[newindex];
	17708	+ float depth = depths[newindex];
17297	17709
17298	17710	/*
17299	17711	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17490,11 +17902,14 @@
17490	17902	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17491	17903	static IntBuffer bigAAbuffer;
17492	17904	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17493		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	17905	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17494	17906	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17495	17907	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17496	17908	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17497		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17909	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17910	+
	17911	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17912	+
17498	17913	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17499	17914	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17500	17915	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();