~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;
..	..	@@ -150,6 +187,18 @@
150	187	}
151	188
152	189	private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	190	+
	191	+ public void LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	192	+ {
	193	+ try
	194	+ {
	195	+ cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	196	+ } catch (IOException e)
	197	+ {
	198	+ System.out.println("NAME = " + name);
	199	+ e.printStackTrace(); // throw new RuntimeException(e);
	200	+ }
	201	+ }
153	202
154	203	void SetAsGLRenderer(boolean b)
155	204	{
..	..	@@ -169,7 +218,8 @@
169	218
170	219	SetCamera(cam);
171	220
172		- SetLight(new Camera(new cVector(10, 10, -20)));
	221	+ // Warning: not used.
	222	+ SetLight(new Camera(new cVector(15, 10, -20)));
173	223
174	224	object = o;
175	225
..	..	@@ -1447,6 +1497,8 @@
1447	1497	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1448	1498	}
1449	1499
	1500	+ float[] colorV = new float[4];
	1501	+
1450	1502	void SetColor(Object3D obj, Vertex p0)
1451	1503	{
1452	1504	CameraPane display = this;
..	..	@@ -1514,8 +1566,6 @@
1514	1566	{
1515	1567	return;
1516	1568	}
1517		-
1518		- float[] colorV = new float[3];
1519	1569
1520	1570	if (false) // marked)
1521	1571	{
..	..	@@ -2065,7 +2115,7 @@
2065	2115	//System.err.println("Oeil on");
2066	2116	OEIL = true;
2067	2117	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2068		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2118	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2069	2119	//pingthread.StepToTarget(true);
2070	2120	}
2071	2121
..	..	@@ -2298,10 +2348,17 @@
2298	2348	HANDLES ^= true;
2299	2349	}
2300	2350
	2351	+ Object3D paintFolder;
	2352	+
2301	2353	void TogglePaint()
2302	2354	{
2303	2355	PAINTMODE ^= true;
2304	2356	paintcount = 0;
	2357	+
	2358	+ if (PAINTMODE)
	2359	+ {
	2360	+ paintFolder = GetFolder();
	2361	+ }
2305	2362	}
2306	2363
2307	2364	void SwapCamera(int a, int b)
..	..	@@ -2398,126 +2455,19 @@
2398	2455	return currentGL;
2399	2456	}
2400	2457
2401		- private void GetRemoteZip(String url, String name, boolean unzip, boolean save)
	2458	+ static private BufferedImage CreateBim(TextureData texturedata)
2402	2459	{
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		-
	2460	+ Grafreed.Assert(texturedata != null);
	2461	+
	2462	+ int width = texturedata.getWidth();
	2463	+ int height = texturedata.getHeight();
	2464	+
	2465	+ Buffer buffer = texturedata.getBuffer();
	2466	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2467	+
	2468	+ byte[] bytes = bytebuf.array();
	2469	+
	2470	+ return CreateBim(bytes, width, height);
2521	2471	}
2522	2472
2523	2473	/**/
..	..	@@ -2528,28 +2478,31 @@
2528	2478
2529	2479	int resolution;
2530	2480
2531		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2481	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2532	2482	{
2533		- texture = tex;
	2483	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2484	+ texturedata = texdata;
2534	2485	resolution = res;
2535	2486	}
2536	2487	}
2537	2488	/**/
2538	2489
2539	2490	// 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>();
	2491	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2492	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2493	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2494	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2495	+
2543	2496	int pigmentdepth = 0;
2544	2497	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2545	2498	int bumpdepth = 0;
2546	2499	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2547	2500	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2548	2501	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2549		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2502	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2550	2503	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2551	2504
2552		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2505	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2553	2506	{
2554	2507	TextureData texturedata = null;
2555	2508
..	..	@@ -2568,13 +2521,34 @@
2568	2521	if (bump)
2569	2522	texturedata = ConvertBump(texturedata, false);
2570	2523
2571		- com.sun.opengl.util.texture.Texture texture =
2572		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2524	+// com.sun.opengl.util.texture.Texture texture =
	2525	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2573	2526
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);
	2527	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2528	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2576	2529
2577		- return texture;
	2530	+ return texturedata;
	2531	+ }
	2532	+
	2533	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2534	+ {
	2535	+ TextureData texturedata = null;
	2536	+
	2537	+ try
	2538	+ {
	2539	+ texturedata =
	2540	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2541	+ bim,
	2542	+ true);
	2543	+ } catch (Exception e)
	2544	+ {
	2545	+ throw new javax.media.opengl.GLException(e);
	2546	+ }
	2547	+
	2548	+ if (bump)
	2549	+ texturedata = ConvertBump(texturedata, false);
	2550	+
	2551	+ return texturedata;
2578	2552	}
2579	2553
2580	2554	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3647,6 +3621,8 @@
3647	3621
3648	3622	System.out.println("LOADING TEXTURE : " + name);
3649	3623
	3624	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3625	+
3650	3626	//
3651	3627	if (false) // compressbit > 0)
3652	3628	{
..	..	@@ -8045,7 +8021,7 @@
8045	8021	String pigment = Object3D.GetPigment(tex);
8046	8022	String bump = Object3D.GetBump(tex);
8047	8023
8048		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8024	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8049	8025	{
8050	8026	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
8051	8027	// System.out.println("; bump = " + bump);
..	..	@@ -8060,8 +8036,8 @@
8060	8036	pigment = null;
8061	8037	}
8062	8038
8063		- ReleaseTexture(bump, true);
8064		- ReleaseTexture(pigment, false);
	8039	+ ReleaseTexture(tex, true);
	8040	+ ReleaseTexture(tex, false);
8065	8041	}
8066	8042
8067	8043	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -8079,7 +8055,7 @@
8079	8055
8080	8056	String pigment = Object3D.GetPigment(tex);
8081	8057
8082		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8058	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8083	8059	{
8084	8060	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
8085	8061	// System.out.println("; bump = " + bump);
..	..	@@ -8090,7 +8066,7 @@
8090	8066	pigment = null;
8091	8067	}
8092	8068
8093		- ReleaseTexture(pigment, false);
	8069	+ ReleaseTexture(tex, false);
8094	8070	}
8095	8071
8096	8072	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -8108,7 +8084,7 @@
8108	8084
8109	8085	String bump = Object3D.GetBump(tex);
8110	8086
8111		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8087	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8112	8088	{
8113	8089	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
8114	8090	// System.out.println("; bump = " + bump);
..	..	@@ -8119,10 +8095,10 @@
8119	8095	bump = null;
8120	8096	}
8121	8097
8122		- ReleaseTexture(bump, true);
	8098	+ ReleaseTexture(tex, true);
8123	8099	}
8124	8100
8125		- void ReleaseTexture(String tex, boolean bump)
	8101	+ void ReleaseTexture(cTexture tex, boolean bump)
8126	8102	{
8127	8103	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8128	8104	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8133,7 +8109,7 @@
8133	8109	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
8134	8110
8135	8111	if (tex != null)
8136		- texture = textures.get(tex);
	8112	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
8137	8113
8138	8114	// //assert( texture != null );
8139	8115	// if (texture == null)
..	..	@@ -8227,47 +8203,50 @@
8227	8203
8228	8204	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8229	8205	{
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		- }
	8206	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8207	+// ambientOcclusion ) // \|\| !textureon)
	8208	+// {
	8209	+// return; // false;
	8210	+// }
	8211	+//
	8212	+// if (tex == null)
	8213	+// {
	8214	+// BindTexture(null,false,resolution);
	8215	+// BindTexture(null,true,resolution);
	8216	+// return;
	8217	+// }
	8218	+//
	8219	+// String pigment = Object3D.GetPigment(tex);
	8220	+// String bump = Object3D.GetBump(tex);
	8221	+//
	8222	+// usedtextures.add(pigment);
	8223	+// usedtextures.add(bump);
	8224	+//
	8225	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8226	+// {
	8227	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8228	+// // System.out.println("; bump = " + bump);
	8229	+// }
	8230	+//
	8231	+// if (bump.equals(""))
	8232	+// {
	8233	+// bump = null;
	8234	+// }
	8235	+// if (pigment.equals(""))
	8236	+// {
	8237	+// pigment = null;
	8238	+// }
	8239	+//
	8240	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8241	+// BindTexture(pigment, false, resolution);
	8242	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8243	+// BindTexture(bump, true, resolution);
	8244	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8245	+//
	8246	+// return; // true;
8242	8247
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;
	8248	+ BindPigmentTexture(tex, resolution);
	8249	+ BindBumpTexture(tex, resolution);
8271	8250	}
8272	8251
8273	8252	/boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8286,9 +8265,9 @@
8286	8265
8287	8266	String pigment = Object3D.GetPigment(tex);
8288	8267
8289		- usedtextures.put(pigment, pigment);
	8268	+ usedtextures.add(tex);
8290	8269
8291		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8270	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8292	8271	{
8293	8272	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8294	8273	// System.out.println("; bump = " + bump);
..	..	@@ -8300,7 +8279,7 @@
8300	8279	}
8301	8280
8302	8281	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8303		- BindTexture(pigment, false, resolution);
	8282	+ BindTexture(tex, false, resolution);
8304	8283	}
8305	8284
8306	8285	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8319,9 +8298,9 @@
8319	8298
8320	8299	String bump = Object3D.GetBump(tex);
8321	8300
8322		- usedtextures.put(bump, bump);
	8301	+ usedtextures.add(tex);
8323	8302
8324		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8303	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8325	8304	{
8326	8305	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8327	8306	// System.out.println("; bump = " + bump);
..	..	@@ -8333,7 +8312,7 @@
8333	8312	}
8334	8313
8335	8314	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8336		- BindTexture(bump, true, resolution);
	8315	+ BindTexture(tex, true, resolution);
8337	8316	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8338	8317	}
8339	8318
..	..	@@ -8357,13 +8336,19 @@
8357	8336	return fileExists;
8358	8337	}
8359	8338
8360		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8339	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8361	8340	{
8362		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8341	+ CacheTexture texturecache = null;
8363	8342
8364	8343	if (tex != null)
8365	8344	{
8366		- String texname = tex;
	8345	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8346	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
	8347	+
	8348	+ if (texname.equals("") && texdata == null)
	8349	+ {
	8350	+ return null;
	8351	+ }
8367	8352
8368	8353	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8369	8354
..	..	@@ -8373,19 +8358,46 @@
8373	8358	// else
8374	8359	// if (!texname.startsWith("/"))
8375	8360	// texname = "/Users/nbriere/Textures/" + texname;
8376		- if (!FileExists(tex))
	8361	+ if (!FileExists(texname))
8377	8362	{
8378	8363	texname = fallbackTextureName;
8379	8364	}
8380	8365
8381	8366	if (CACHETEXTURE)
8382		- texture = textures.get(texname); // TEXTURE CACHE
8383		-
8384		- TextureData texturedata = null;
8385		-
8386		- if (texture == null \|\| texture.resolution < resolution)
8387	8367	{
8388		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8368	+ if (texdata == null)
	8369	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8370	+ else
	8371	+ texturecache = bimtextures.get(texdata);
	8372	+ }
	8373	+
	8374	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8375	+ {
	8376	+ TextureData texturedata = null;
	8377	+
	8378	+ if (texdata != null && textureon)
	8379	+ {
	8380	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8381	+
	8382	+ try
	8383	+ {
	8384	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8385	+ }
	8386	+ catch (Exception e)
	8387	+ {
	8388	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8389	+ }
	8390	+
	8391	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8392	+ bimtextures.put(texdata, texturecache);
	8393	+
	8394	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8395	+
	8396	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8397	+ //bim2 = bim;
	8398	+ }
	8399	+ else
	8400	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8389	8401	{
8390	8402	assert(!bump);
8391	8403	// if (bump)
..	..	@@ -8396,19 +8408,23 @@
8396	8408	// }
8397	8409	// else
8398	8410	// {
8399		- texture = textures.get(tex);
8400		- if (texture == null)
	8411	+ // texturecache = textures.get(texname); // suspicious
	8412	+ if (texturecache == null)
8401	8413	{
8402		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8414	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8403	8415	}
	8416	+ else
	8417	+ new Exception().printStackTrace();
8404	8418	// }
8405	8419	} else
8406		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8420	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8407	8421	{
8408	8422	assert(bump);
8409		- texture = textures.get(tex);
8410		- if (texture == null)
8411		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8423	+ // texturecache = textures.get(texname); // suspicious
	8424	+ if (texturecache == null)
	8425	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8426	+ else
	8427	+ new Exception().printStackTrace();
8412	8428	} else
8413	8429	{
8414	8430	//if (tex.equals("IMMORTAL"))
..	..	@@ -8416,11 +8432,13 @@
8416	8432	// texture = GetResourceTexture("default.png");
8417	8433	//} else
8418	8434	//{
8419		- if (tex.equals("WHITE_NOISE"))
	8435	+ if (texname.endsWith("WHITE_NOISE"))
8420	8436	{
8421		- texture = textures.get(tex);
8422		- if (texture == null)
8423		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8437	+ // texturecache = textures.get(texname); // suspicious
	8438	+ if (texturecache == null)
	8439	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8440	+ else
	8441	+ new Exception().printStackTrace();
8424	8442	} else
8425	8443	{
8426	8444	if (textureon)
..	..	@@ -8479,19 +8497,19 @@
8479	8497	if (texturedata == null)
8480	8498	throw new Exception();
8481	8499
8482		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8500	+ texturecache = new CacheTexture(texturedata,resolution);
8483	8501	//texture = GetTexture(tex, bump);
8484	8502	}
8485	8503	}
8486	8504	//}
8487	8505	}
8488	8506
8489		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8507	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8490	8508	{
8491	8509	//return false;
8492	8510
8493	8511	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8494		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8512	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8495	8513	{
8496	8514	// String ext = "_highres";
8497	8515	// if (REDUCETEXTURE)
..	..	@@ -8508,52 +8526,17 @@
8508	8526	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8509	8527	if (!cachefile.exists())
8510	8528	{
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))
	8529	+ //if (texturedata.getWidth() == texturedata.getHeight())
8520	8530	{
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);
	8531	+ BufferedImage rendImage = CreateBim(texturedata);
	8532	+
8551	8533	ImageWriter writer = null;
8552	8534	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8553	8535	if (iter.hasNext()) {
8554	8536	writer = (ImageWriter)iter.next();
8555	8537	}
8556		- float compressionQuality = 0.9f;
	8538	+
	8539	+ float compressionQuality = 0.85f;
8557	8540	try
8558	8541	{
8559	8542	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8570,18 +8553,20 @@
8570	8553	}
8571	8554	}
8572	8555	}
8573		-
	8556	+
	8557	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8558	+
8574	8559	//System.out.println("Texture = " + tex);
8575		- if (textures.containsKey(texname))
	8560	+ if (textures.containsKey(tex))
8576	8561	{
8577		- CacheTexture thetex = textures.get(texname);
	8562	+ CacheTexture thetex = textures.get(tex);
8578	8563	thetex.texture.disable();
8579	8564	thetex.texture.dispose();
8580		- textures.remove(texname);
	8565	+ textures.remove(tex);
8581	8566	}
8582	8567
8583		- texture.texturedata = texturedata;
8584		- textures.put(texname, texture);
	8568	+ //texture.texturedata = texturedata;
	8569	+ textures.put(tex, texturecache);
8585	8570
8586	8571	// newtex = true;
8587	8572	}
..	..	@@ -8597,10 +8582,44 @@
8597	8582	}
8598	8583	}
8599	8584
8600		- return texture;
	8585	+ return texturecache;
8601	8586	}
8602	8587
8603		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	8588	+ static void EmbedTextures(cTexture tex)
	8589	+ {
	8590	+ if (tex.pigmentdata == null)
	8591	+ {
	8592	+ //String texname = Object3D.GetPigment(tex);
	8593	+
	8594	+ CacheTexture texturecache = texturepigment.get(tex);
	8595	+
	8596	+ if (texturecache != null)
	8597	+ {
	8598	+ tex.pw = texturecache.texturedata.getWidth();
	8599	+ tex.ph = texturecache.texturedata.getHeight();
	8600	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8601	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8602	+ ;
	8603	+ //, tex.pw, tex.ph), 0.5f);
	8604	+ }
	8605	+ }
	8606	+
	8607	+ if (tex.bumpdata == null)
	8608	+ {
	8609	+ //String texname = Object3D.GetBump(tex);
	8610	+
	8611	+ CacheTexture texturecache = texturebump.get(tex);
	8612	+
	8613	+ if (texturecache != null)
	8614	+ {
	8615	+ tex.bw = texturecache.texturedata.getWidth();
	8616	+ tex.bh = texturecache.texturedata.getHeight();
	8617	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8618	+ }
	8619	+ }
	8620	+ }
	8621	+
	8622	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8604	8623	{
8605	8624	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8606	8625
..	..	@@ -8618,21 +8637,21 @@
8618	8637	return texture!=null?texture.texture:null;
8619	8638	}
8620	8639
8621		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
	8640	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8622	8641	{
8623	8642	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8624	8643
8625	8644	return texture!=null?texture.texturedata:null;
8626	8645	}
8627	8646
8628		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8647	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8629	8648	{
8630	8649	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8631	8650	{
8632	8651	return false;
8633	8652	}
8634	8653
8635		- boolean newtex = false;
	8654	+ //boolean newtex = false;
8636	8655
8637	8656	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8638	8657
..	..	@@ -8664,9 +8683,75 @@
8664	8683	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8665	8684	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8666	8685
8667		- return newtex;
	8686	+ return true; // Warning: not used.
8668	8687	}
8669	8688
	8689	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8690	+ {
	8691	+ try
	8692	+ {
	8693	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8694	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8695	+ ImageWriter writer = writers.next();
	8696	+
	8697	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8698	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8699	+ param.setCompressionQuality(quality);
	8700	+
	8701	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8702	+ writer.setOutput(ios);
	8703	+ writer.write(null, new IIOImage(image, null, null), param);
	8704	+
	8705	+ byte[] data = baos.toByteArray();
	8706	+ writer.dispose();
	8707	+ return data;
	8708	+ }
	8709	+ catch (Exception e)
	8710	+ {
	8711	+ e.printStackTrace();
	8712	+ return null;
	8713	+ }
	8714	+ }
	8715	+
	8716	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8717	+ {
	8718	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8719	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8720	+ ImageReader reader = writers.next();
	8721	+
	8722	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8723	+
	8724	+ ImageReadParam param = reader.getDefaultReadParam();
	8725	+ param.setDestination(bim);
	8726	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8727	+
	8728	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8729	+ reader.setInput(ios);
	8730	+ BufferedImage bim2 = reader.read(0, param);
	8731	+ reader.dispose();
	8732	+
	8733	+// WritableRaster raster = bim2.getRaster();
	8734	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8735	+// byte[] bytes = data.getData();
	8736	+//
	8737	+// int[] pixels = new int[bytes.length/3];
	8738	+// for (int i=pixels.length; --i>=0;)
	8739	+// {
	8740	+// int i3 = i*3;
	8741	+// pixels[i] = 0xFF;
	8742	+// pixels[i] <<= 8;
	8743	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8744	+// pixels[i] <<= 8;
	8745	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8746	+// pixels[i] <<= 8;
	8747	+// pixels[i] \|= bytes[i3] & 0xFF;
	8748	+// }
	8749	+//
	8750	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8751	+
	8752	+ return bim;
	8753	+ }
	8754	+
8670	8755	ShadowBuffer shadowPBuf;
8671	8756	AntialiasBuffer antialiasPBuf;
8672	8757	int MAXSTACK;
..	..	@@ -8859,7 +8944,7 @@
8859	8944
8860	8945	if (cubemap == null)
8861	8946	{
8862		- LoadEnvy(5);
	8947	+ //LoadEnvy(1);
8863	8948	}
8864	8949
8865	8950	//cubemap.enable();
..	..	@@ -9146,37 +9231,58 @@
9146	9231	cubemap = null;
9147	9232	return;
9148	9233	case 1:
9149		- name = "cubemaps/box_";
9150		- ext = "png";
	9234	+ name = "cubemaps/rgb/";
	9235	+ ext = "jpg";
9151	9236	reverseUP = false;
9152	9237	break;
9153	9238	case 2:
9154		- name = "cubemaps/uffizi_";
9155		- ext = "png";
9156		- break; // reverseUP = true; break;
	9239	+ name = "cubemaps/uffizi/";
	9240	+ ext = "jpg";
	9241	+ reverseUP = false;
	9242	+ break;
9157	9243	case 3:
9158		- name = "cubemaps/CloudyHills_";
9159		- ext = "tga";
	9244	+ name = "cubemaps/CloudyHills/";
	9245	+ ext = "jpg";
9160	9246	reverseUP = false;
9161	9247	break;
9162	9248	case 4:
9163		- name = "cubemaps/cornell_";
	9249	+ name = "cubemaps/cornell/";
9164	9250	ext = "png";
9165	9251	reverseUP = false;
9166	9252	break;
	9253	+ case 5:
	9254	+ name = "cubemaps/skycube/";
	9255	+ ext = "jpg";
	9256	+ reverseUP = false;
	9257	+ break;
	9258	+ case 6:
	9259	+ name = "cubemaps/SaintLazarusChurch3/";
	9260	+ ext = "jpg";
	9261	+ reverseUP = false;
	9262	+ break;
	9263	+ case 7:
	9264	+ name = "cubemaps/Sodermalmsallen/";
	9265	+ ext = "jpg";
	9266	+ reverseUP = false;
	9267	+ break;
	9268	+ case 8:
	9269	+ name = "cubemaps/Sodermalmsallen2/";
	9270	+ ext = "jpg";
	9271	+ reverseUP = false;
	9272	+ break;
	9273	+ case 9:
	9274	+ name = "cubemaps/UnionSquare/";
	9275	+ ext = "jpg";
	9276	+ reverseUP = false;
	9277	+ break;
9167	9278	default:
9168		- name = "cubemaps/rgb_";
9169		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9279	+ name = "cubemaps/box/";
	9280	+ ext = "png"; /mipmap = true;/
	9281	+ reverseUP = false;
9170	9282	break;
9171	9283	}
9172		-
9173		- try
9174		- {
9175		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9176		- } catch (IOException e)
9177		- {
9178		- throw new RuntimeException(e);
9179		- }
	9284	+
	9285	+ LoadSkybox(name, ext, mipmap);
9180	9286	}
9181	9287
9182	9288	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -9208,8 +9314,13 @@
9208	9314	static double[] model = new double[16];
9209	9315	double[] camera2light = new double[16];
9210	9316	double[] light2camera = new double[16];
9211		- int newenvy = -1;
	9317	+
	9318	+ //int newenvy = -1;
9212	9319	boolean envyoff = true; // false;
	9320	+ String skyboxname = "";
	9321	+ String skyboxext;
	9322	+ String loadedskyboxname = "";
	9323	+
9213	9324	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9214	9325	//float[] light0 = { 0,0,0 };
9215	9326	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9627,7 +9738,7 @@
9627	9738
9628	9739	if (renderCamera != lightCamera)
9629	9740	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9630		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9741	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9631	9742
9632	9743	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9633	9744
..	..	@@ -9643,7 +9754,7 @@
9643	9754
9644	9755	if (renderCamera != lightCamera)
9645	9756	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9646		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9757	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9647	9758
9648	9759	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9649	9760
..	..	@@ -9689,10 +9800,12 @@
9689	9800	rati = 1 / rati;
9690	9801	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9691	9802	}
9692		- assert (newenvy == -1);
	9803	+
	9804	+ //assert (newenvy == -1);
	9805	+
9693	9806	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9694	9807	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9695		- DrawSkyBox(gl);
	9808	+ DrawSkyBox(gl, (float)rati);
9696	9809	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9697	9810	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9698	9811	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -10844,7 +10957,7 @@
10844	10957	// if (parentcam != renderCamera) // not a light
10845	10958	if (cam != lightCamera)
10846	10959	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10847		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10960	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10848	10961
10849	10962	for (int j = 0; j < 4; j++)
10850	10963	{
..	..	@@ -10859,7 +10972,7 @@
10859	10972	// if (parentcam != renderCamera) // not a light
10860	10973	if (cam != lightCamera)
10861	10974	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10862		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	10975	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10863	10976
10864	10977	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10865	10978
..	..	@@ -10945,13 +11058,19 @@
10945	11058	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10946	11059	}
10947	11060
10948		- if (newenvy > -1)
	11061	+// if (newenvy > -1)
	11062	+// {
	11063	+// LoadEnvy(newenvy);
	11064	+// }
	11065	+//
	11066	+// newenvy = -1;
	11067	+
	11068	+ if (!skyboxname.equals(this.loadedskyboxname))
10949	11069	{
10950		- LoadEnvy(newenvy);
	11070	+ LoadSkybox(skyboxname + "/", skyboxext, false);
	11071	+ loadedskyboxname = skyboxname;
10951	11072	}
10952		-
10953		- newenvy = -1;
10954		-
	11073	+
10955	11074	ratio = ((double) getWidth()) / getHeight();
10956	11075	//System.out.println("ratio = " + ratio);
10957	11076
..	..	@@ -10967,7 +11086,7 @@
10967	11086
10968	11087	if (!IsFrozen() && !ambientOcclusion)
10969	11088	{
10970		- DrawSkyBox(gl);
	11089	+ DrawSkyBox(gl, (float)ratio);
10971	11090	}
10972	11091
10973	11092	//if (selection_view == -1)
..	..	@@ -11150,9 +11269,9 @@
11150	11269
11151	11270	gl.glMatrixMode(GL.GL_MODELVIEW);
11152	11271
11153		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11154		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
11155		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11272	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11273	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11274	+gl.glEnable(gl.GL_MULTISAMPLE);
11156	11275	} else
11157	11276	{
11158	11277	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -11163,7 +11282,7 @@
11163	11282	//System.out.println("BLENDING ON");
11164	11283	gl.glEnable(GL.GL_BLEND);
11165	11284	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
11166		-
	11285	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
11167	11286	gl.glMatrixMode(gl.GL_PROJECTION);
11168	11287	gl.glLoadIdentity();
11169	11288
..	..	@@ -11412,7 +11531,7 @@
11412	11531	}
11413	11532	}
11414	11533
11415		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11534	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11416	11535	{
11417	11536	//gl.glDepthFunc(GL.GL_LEQUAL);
11418	11537	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11420,24 +11539,21 @@
11420	11539
11421	11540	boolean texon = textureon;
11422	11541
11423		- if (RENDERPROGRAM > 0)
11424		- {
11425		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11426		- textureon = false;
11427		- }
	11542	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11543	+ textureon = false;
	11544	+
11428	11545	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11429	11546	//System.out.println("ALLO");
11430	11547	gl.glColorMask(false, false, false, false);
11431	11548	DrawObject(gl);
11432		- if (RENDERPROGRAM > 0)
11433		- {
11434		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11435		- textureon = texon;
11436		- }
	11549	+
	11550	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11551	+ textureon = texon;
	11552	+
11437	11553	gl.glColorMask(true, true, true, true);
11438	11554
11439	11555	gl.glDepthFunc(GL.GL_EQUAL);
11440		- //gl.glDepthMask(false);
	11556	+ gl.glDepthMask(false);
11441	11557	}
11442	11558
11443	11559	if (false) // DrawMode() == SHADOW)
..	..	@@ -11649,7 +11765,7 @@
11649	11765	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11650	11766	{
11651	11767	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11652		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11768	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11653	11769	pingthread.StepToTarget(true); // true);
11654	11770	// zoomonce = false;
11655	11771	}
..	..	@@ -11777,20 +11893,32 @@
11777	11893	ReleaseTextures(DEFAULT_TEXTURES);
11778	11894
11779	11895	if (CLEANCACHE)
11780		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11896	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11781	11897	{
11782		- String tex = e.nextElement();
	11898	+ cTexture tex = e.nextElement();
11783	11899
11784	11900	// System.out.println("Texture --------- " + tex);
11785	11901
11786		- if (tex.equals("WHITE_NOISE"))
	11902	+ if (tex.equals("WHITE_NOISE:"))
11787	11903	continue;
11788	11904
11789		- if (!usedtextures.containsKey(tex))
	11905	+ if (!usedtextures.contains(tex))
11790	11906	{
	11907	+ CacheTexture gettex = texturepigment.get(tex);
11791	11908	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11792		- textures.get(tex).texture.dispose();
11793		- textures.remove(tex);
	11909	+ if (gettex != null)
	11910	+ {
	11911	+ gettex.texture.dispose();
	11912	+ texturepigment.remove(tex);
	11913	+ }
	11914	+
	11915	+ gettex = texturebump.get(tex);
	11916	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11917	+ if (gettex != null)
	11918	+ {
	11919	+ gettex.texture.dispose();
	11920	+ texturebump.remove(tex);
	11921	+ }
11794	11922	}
11795	11923	}
11796	11924	}
..	..	@@ -12318,8 +12446,76 @@
12318	12446
12319	12447	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12320	12448
	12449	+ String program0 =
	12450	+ // Min shader
	12451	+ "!!ARBfp1.0\n" +
	12452	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12453	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12454	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12455	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12456	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12457	+ "PARAM light2cam0 = program.env[10];" +
	12458	+ "PARAM light2cam1 = program.env[11];" +
	12459	+ "PARAM light2cam2 = program.env[12];" +
	12460	+ "TEMP temp;" +
	12461	+ "TEMP light;" +
	12462	+ "TEMP ndotl;" +
	12463	+ "TEMP normal;" +
	12464	+ "TEMP depth;" +
	12465	+ "TEMP eye;" +
	12466	+ "TEMP pos;" +
	12467	+
	12468	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12469	+ Normalize("normal") +
	12470	+ "MOV light, state.light[0].position;" +
	12471	+ "DP3 ndotl.x, light, normal;" +
	12472	+
	12473	+ // shadow
	12474	+ "MOV pos, fragment.texcoord[1];" +
	12475	+ "MOV temp, pos;" +
	12476	+ ShadowTextureFetch("depth", "temp", "1") +
	12477	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12478	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12479	+
	12480	+ // No shadow when out of frustum
	12481	+ //"SGE temp.y, depth.z, zero123.y;" +
	12482	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12483	+
	12484	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12485	+
	12486	+ // Backlit
	12487	+ "MOV pos.w, zero123.y;" +
	12488	+ "DP4 eye.x, pos, light2cam0;" +
	12489	+ "DP4 eye.y, pos, light2cam1;" +
	12490	+ "DP4 eye.z, pos, light2cam2;" +
	12491	+ Normalize("eye") +
	12492	+
	12493	+ "DP3 ndotl.y, -eye, normal;" +
	12494	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12495	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12496	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12497	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12498	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12499	+
	12500	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12501	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12502	+
	12503	+ // Pigment
	12504	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12505	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12506	+ "MUL temp, temp, ndotl.x;" +
	12507	+
	12508	+ "MUL temp, temp, zero123.z;" +
	12509	+
	12510	+ //"MUL temp, temp, ndotl.y;" +
	12511	+
	12512	+ "MOV temp.w, zero123.y;" + // reset alpha
	12513	+ "MOV result.color, temp;" +
	12514	+ "END";
	12515	+
12321	12516	String program =
12322	12517	"!!ARBfp1.0\n" +
	12518	+
12323	12519	//"OPTION ARB_fragment_program_shadow;" +
12324	12520	"PARAM light2cam0 = program.env[10];" +
12325	12521	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12434,8 +12630,7 @@
12434	12630	"TEMP shininess;" +
12435	12631	"\n" +
12436	12632	"MOV texSamp, one;" +
12437		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12438		-
	12633	+
12439	12634	"MOV mapgrid.x, one2048th.x;" +
12440	12635	"MOV temp, fragment.texcoord[1];" +
12441	12636	/*
..	..	@@ -12456,20 +12651,20 @@
12456	12651	"MUL temp, floor, mapgrid.x;" +
12457	12652	//"TEX depth0, temp, texture[1], 2D;" +
12458	12653	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12459		- TextureFetch("depth0", "temp", "1") +
	12654	+ ShadowTextureFetch("depth0", "temp", "1") +
12460	12655	"") +
12461	12656	"ADD temp.x, temp.x, mapgrid.x;" +
12462	12657	//"TEX depth1, temp, texture[1], 2D;" +
12463	12658	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12464		- TextureFetch("depth1", "temp", "1") +
	12659	+ ShadowTextureFetch("depth1", "temp", "1") +
12465	12660	"") +
12466	12661	"ADD temp.y, temp.y, mapgrid.x;" +
12467	12662	//"TEX depth2, temp, texture[1], 2D;" +
12468		- TextureFetch("depth2", "temp", "1") +
	12663	+ ShadowTextureFetch("depth2", "temp", "1") +
12469	12664	"SUB temp.x, temp.x, mapgrid.x;" +
12470	12665	//"TEX depth3, temp, texture[1], 2D;" +
12471	12666	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12472		- TextureFetch("depth3", "temp", "1") +
	12667	+ ShadowTextureFetch("depth3", "temp", "1") +
12473	12668	"") +
12474	12669	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12475	12670	//"MOV params, material;" +
..	..	@@ -12840,10 +13035,10 @@
12840	13035	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12841	13036	"") +
12842	13037
12843		- // display shadow only (bump == 0)
	13038	+ // display shadow only (fakedepth == 0)
12844	13039	"SUB temp.x, half.x, shadow.x;" +
12845	13040	"MOV temp.y, -params5.z;" + // params6.x;" +
12846		- "SLT temp.z, temp.y, -one2048th.x;" +
	13041	+ "SLT temp.z, temp.y, -c256i.x;" +
12847	13042	"SUB temp.y, one.x, temp.z;" +
12848	13043	"MUL temp.x, temp.x, temp.y;" +
12849	13044	"KIL temp.x;" +
..	..	@@ -13267,25 +13462,26 @@
13267	13462	return out;
13268	13463	}
13269	13464
13270		- String TextureFetch(String dest, String src, String unit)
	13465	+ // Also does frustum culling
	13466	+ String ShadowTextureFetch(String dest, String src, String unit)
13271	13467	{
13272	13468	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13273	13469	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13274	13470	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13471	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13472	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13275	13473	"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;" +
	13474	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13475	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13280	13476	//"SWZ buffer, temp, w,w,w,w;";
13281		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13477	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13282	13478	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13283	13479	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13284	13480	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13285		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13481	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13286	13482
13287		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13288		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13483	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13484	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13289	13485	}
13290	13486
13291	13487	String Shadow(String depth, String shadow)
..	..	@@ -13332,7 +13528,7 @@
13332	13528	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13333	13529	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13334	13530
13335		- // No shadow when out of frustrum
	13531	+ // No shadow when out of frustum
13336	13532	"SGE temp.x, " + depth + ".z, one.z;" +
13337	13533	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13338	13534	"";
..	..	@@ -14065,7 +14261,7 @@
14065	14261
14066	14262	// fev 2014???
14067	14263	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
14068		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14264	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
14069	14265	pingthread.StepToTarget(true); // true);
14070	14266	}
14071	14267	// if (!LIVE)
..	..	@@ -14130,14 +14326,15 @@
14130	14326	drag = false;
14131	14327	//System.out.println("Mouse DOWN");
14132	14328	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);
	14329	+ //ClickInfo info = new ClickInfo();
	14330	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14331	+ object.clickInfo.pane = this;
	14332	+ object.clickInfo.camera = renderCamera;
	14333	+ object.clickInfo.x = x;
	14334	+ object.clickInfo.y = y;
	14335	+ object.clickInfo.modifiers = modifiersex;
	14336	+ editObj = object.doEditClick(//info,
	14337	+ 0);
14141	14338	if (!editObj)
14142	14339	{
14143	14340	hasMarquee = true;
..	..	@@ -14419,12 +14616,12 @@
14419	14616	void GoDown(int mod)
14420	14617	{
14421	14618	MODIFIERS \|= COMMAND;
14422		- /*
	14619	+ /**/
14423	14620	if((mod&SHIFT) == SHIFT)
14424	14621	manipCamera.RotatePosition(0, -speed);
14425	14622	else
14426		- manipCamera.BackForth(0, -speed*delta, getWidth());
14427		- */
	14623	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14624	+ /**/
14428	14625	if ((mod & SHIFT) == SHIFT)
14429	14626	{
14430	14627	mouseMode = mouseMode; // VR??
..	..	@@ -14440,12 +14637,12 @@
14440	14637	void GoUp(int mod)
14441	14638	{
14442	14639	MODIFIERS \|= COMMAND;
14443		- /*
	14640	+ /**/
14444	14641	if((mod&SHIFT) == SHIFT)
14445	14642	manipCamera.RotatePosition(0, speed);
14446	14643	else
14447		- manipCamera.BackForth(0, speed*delta, getWidth());
14448		- */
	14644	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14645	+ /**/
14449	14646	if ((mod & SHIFT) == SHIFT)
14450	14647	{
14451	14648	mouseMode = mouseMode;
..	..	@@ -14461,12 +14658,12 @@
14461	14658	void GoLeft(int mod)
14462	14659	{
14463	14660	MODIFIERS \|= COMMAND;
14464		- /*
	14661	+ /**/
14465	14662	if((mod&SHIFT) == SHIFT)
14466		- manipCamera.RotatePosition(speed, 0);
14467		- else
14468	14663	manipCamera.Translate(speed*delta, 0, getWidth());
14469		- */
	14664	+ else
	14665	+ manipCamera.RotatePosition(speed, 0);
	14666	+ /**/
14470	14667	if ((mod & SHIFT) == SHIFT)
14471	14668	{
14472	14669	mouseMode = mouseMode;
..	..	@@ -14482,12 +14679,12 @@
14482	14679	void GoRight(int mod)
14483	14680	{
14484	14681	MODIFIERS \|= COMMAND;
14485		- /*
	14682	+ /**/
14486	14683	if((mod&SHIFT) == SHIFT)
14487		- manipCamera.RotatePosition(-speed, 0);
14488		- else
14489	14684	manipCamera.Translate(-speed*delta, 0, getWidth());
14490		- */
	14685	+ else
	14686	+ manipCamera.RotatePosition(-speed, 0);
	14687	+ /**/
14491	14688	if ((mod & SHIFT) == SHIFT)
14492	14689	{
14493	14690	mouseMode = mouseMode;
..	..	@@ -14537,15 +14734,16 @@
14537	14734	if (editObj)
14538	14735	{
14539	14736	drag = true;
14540		- ClickInfo info = new ClickInfo();
14541		- info.bounds.setBounds(0, 0,
	14737	+ //ClickInfo info = new ClickInfo();
	14738	+ object.clickInfo.bounds.setBounds(0, 0,
14542	14739	(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);
	14740	+ object.clickInfo.pane = this;
	14741	+ object.clickInfo.camera = renderCamera;
	14742	+ object.clickInfo.x = x;
	14743	+ object.clickInfo.y = y;
	14744	+ object //.GetWindow().copy
	14745	+ .doEditDrag(//info,
	14746	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14549	14747	} else
14550	14748	{
14551	14749	if (x < startX)
..	..	@@ -14694,24 +14892,27 @@
14694	14892	}
14695	14893	}
14696	14894
	14895	+// ClickInfo clickInfo = new ClickInfo();
	14896	+
14697	14897	public void mouseMoved(MouseEvent e)
14698	14898	{
14699	14899	//System.out.println("mouseMoved: " + e);
14700	14900	if (isRenderer)
14701	14901	return;
14702	14902
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;
	14903	+ // Mouse cursor feedback
	14904	+ object.clickInfo.x = e.getX();
	14905	+ object.clickInfo.y = e.getY();
	14906	+ object.clickInfo.modifiers = e.getModifiersEx();
	14907	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14908	+ object.clickInfo.pane = this;
	14909	+ object.clickInfo.camera = renderCamera;
14710	14910	if (!isRenderer)
14711	14911	{
14712	14912	//ObjEditor editWindow = object.editWindow;
14713	14913	//Object3D copy = editWindow.copy;
14714		- if (object.doEditClick(ci, 0))
	14914	+ if (object.doEditClick(//clickInfo,
	14915	+ 0))
14715	14916	{
14716	14917	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14717	14918	} else
..	..	@@ -14726,7 +14927,8 @@
14726	14927	Globals.MOUSEDRAGGED = false;
14727	14928
14728	14929	movingcamera = false;
14729		- X = Y = 0;
	14930	+ X = 0; // getBounds().width/2;
	14931	+ Y = 0; // getBounds().height/2;
14730	14932	//System.out.println("mouseReleased: " + e);
14731	14933	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14732	14934	}
..	..	@@ -14982,7 +15184,8 @@
14982	15184	// break;
14983	15185	case 'T':
14984	15186	CACHETEXTURE ^= true;
14985		- textures.clear();
	15187	+ texturepigment.clear();
	15188	+ texturebump.clear();
14986	15189	// repaint();
14987	15190	break;
14988	15191	case 'Y':
..	..	@@ -15067,7 +15270,9 @@
15067	15270	case 'E' : COMPACT ^= true;
15068	15271	repaint();
15069	15272	break;
15070		- case 'W' : DEBUGHSB ^= true;
	15273	+ case 'W' : // Wide Window (fullscreen)
	15274	+ //DEBUGHSB ^= true;
	15275	+ ObjEditor.theFrame.ToggleFullScreen();
15071	15276	repaint();
15072	15277	break;
15073	15278	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -15093,13 +15298,7 @@
15093	15298	repaint();
15094	15299	break;
15095	15300	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':
	15301	+ //case 'L':
15103	15302	if (lightMode)
15104	15303	{
15105	15304	lightMode = false;
..	..	@@ -15169,14 +15368,18 @@
15169	15368	case '3':
15170	15369	case '4':
15171	15370	case '5':
15172		- newenvy = Character.getNumericValue(key);
15173		- repaint();
15174		- break;
15175	15371	case '6':
15176	15372	case '7':
15177	15373	case '8':
15178	15374	case '9':
15179		- BGcolor = (key - '6')/3.f;
	15375	+ if (envyoff)
	15376	+ {
	15377	+ BGcolor = (key - '1')/8.f;
	15378	+ }
	15379	+ else
	15380	+ {
	15381	+ //newenvy = Character.getNumericValue(key);
	15382	+ }
15180	15383	repaint();
15181	15384	break;
15182	15385	case '!':
..	..	@@ -15246,7 +15449,10 @@
15246	15449	// kompactbit = 6;
15247	15450	// break;
15248	15451	case ' ':
15249		- ObjEditor.theFrame.ToggleFullScreen();
	15452	+ lightMode ^= true;
	15453	+ Globals.lighttouched = true;
	15454	+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
	15455	+ targetLookAt.set(manipCamera.lookAt);
15250	15456	repaint();
15251	15457	break;
15252	15458	//case '`' :
..	..	@@ -15295,12 +15501,6 @@
15295	15501	break;
15296	15502	case '+':
15297	15503
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	15504	/*
15305	15505	//fontsize += 1;
15306	15506	bbzoom *= 2;
..	..	@@ -15318,17 +15518,17 @@
15318	15518	case '=':
15319	15519	IncDepth();
15320	15520	//fontsize += 1;
15321		- object.editWindow.refreshContents(true);
	15521	+ object.GetWindow().refreshContents(true);
15322	15522	maskbit = 6;
15323	15523	break;
15324	15524	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
15325	15525	DecDepth();
15326	15526	maskbit = 5;
15327	15527	//if(fontsize > 1) fontsize -= 1;
15328		- if (object.editWindow == null)
15329		- new Exception().printStackTrace();
15330		- else
15331		- object.editWindow.refreshContents(true);
	15528	+// if (object.editWindow == null)
	15529	+// new Exception().printStackTrace();
	15530	+// else
	15531	+ object.GetWindow().refreshContents(true);
15332	15532	break;
15333	15533	case '{':
15334	15534	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15552,7 +15752,7 @@
15552	15752	}
15553	15753	*/
15554	15754
15555		- object.editWindow.EditSelection(false);
	15755	+ object.GetWindow().EditSelection(false);
15556	15756	}
15557	15757
15558	15758	void SelectParent()
..	..	@@ -15569,10 +15769,10 @@
15569	15769	{
15570	15770	//selectees.remove(i);
15571	15771	System.out.println("select parent of " + elem);
15572		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15772	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15573	15773	} else
15574	15774	{
15575		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15775	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15576	15776	}
15577	15777
15578	15778	first = false;
..	..	@@ -15614,12 +15814,12 @@
15614	15814	for (int j = 0; j < group.children.size(); j++)
15615	15815	{
15616	15816	elem = (Object3D) group.children.elementAt(j);
15617		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15817	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15618	15818	first = false;
15619	15819	}
15620	15820	} else
15621	15821	{
15622		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15822	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15623	15823	}
15624	15824
15625	15825	first = false;
..	..	@@ -15630,21 +15830,21 @@
15630	15830	{
15631	15831	//Composite group = (Composite) object;
15632	15832	Object3D group = object;
15633		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15833	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15634	15834	}
15635	15835
15636	15836	void ResetTransform(int mask)
15637	15837	{
15638	15838	//Composite group = (Composite) object;
15639	15839	Object3D group = object;
15640		- group.editWindow.ResetTransform(mask);
	15840	+ group.GetWindow().ResetTransform(mask);
15641	15841	}
15642	15842
15643	15843	void FlipTransform()
15644	15844	{
15645	15845	//Composite group = (Composite) object;
15646	15846	Object3D group = object;
15647		- group.editWindow.FlipTransform();
	15847	+ group.GetWindow().FlipTransform();
15648	15848	// group.editWindow.ReduceMesh(true);
15649	15849	}
15650	15850
..	..	@@ -15652,7 +15852,7 @@
15652	15852	{
15653	15853	//Composite group = (Composite) object;
15654	15854	Object3D group = object;
15655		- group.editWindow.PrintMemory();
	15855	+ group.GetWindow().PrintMemory();
15656	15856	// group.editWindow.ReduceMesh(true);
15657	15857	}
15658	15858
..	..	@@ -15660,7 +15860,7 @@
15660	15860	{
15661	15861	//Composite group = (Composite) object;
15662	15862	Object3D group = object;
15663		- group.editWindow.ResetCentroid();
	15863	+ group.GetWindow().ResetCentroid();
15664	15864	}
15665	15865
15666	15866	void IncDepth()
..	..	@@ -15742,8 +15942,6 @@
15742	15942
15743	15943	int width = getBounds().width;
15744	15944	int height = getBounds().height;
15745		- ClickInfo info = new ClickInfo();
15746		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15747	15945	//Image img = CreateImage(width, height);
15748	15946	//System.out.println("width = " + width + "; height = " + height + "\n");
15749	15947
..	..	@@ -15820,48 +16018,77 @@
15820	16018	}
15821	16019	if (object != null && !hasMarquee)
15822	16020	{
	16021	+ if (object.clickInfo == null)
	16022	+ object.clickInfo = new ClickInfo();
	16023	+ ClickInfo info = object.clickInfo;
	16024	+ //ClickInfo info = new ClickInfo();
	16025	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16026	+
15823	16027	if (isRenderer)
15824	16028	{
15825		- info.flags++;
	16029	+ object.clickInfo.flags++;
15826	16030	double frameAspect = (double) width / (double) height;
15827	16031	if (frameAspect > renderCamera.aspect)
15828	16032	{
15829	16033	int desired = (int) ((double) height * renderCamera.aspect);
15830		- info.bounds.width -= width - desired;
15831		- info.bounds.x += (width - desired) / 2;
	16034	+ object.clickInfo.bounds.width -= width - desired;
	16035	+ object.clickInfo.bounds.x += (width - desired) / 2;
15832	16036	} else
15833	16037	{
15834	16038	int desired = (int) ((double) width / renderCamera.aspect);
15835		- info.bounds.height -= height - desired;
15836		- info.bounds.y += (height - desired) / 2;
	16039	+ object.clickInfo.bounds.height -= height - desired;
	16040	+ object.clickInfo.bounds.y += (height - desired) / 2;
15837	16041	}
15838	16042	}
15839		- info.g = gr;
15840		- info.camera = renderCamera;
	16043	+
	16044	+ object.clickInfo.g = gr;
	16045	+ object.clickInfo.camera = renderCamera;
15841	16046	/*
15842	16047	// Memory intensive (brep.verticescopy)
15843	16048	if (!(object instanceof Composite))
15844	16049	object.draw(info, 0, false); // SLOW :
15845	16050	*/
15846		- if (!isRenderer)
	16051	+ if (!isRenderer) // && drag)
15847	16052	{
15848		- object.drawEditHandles(info, 0);
15849		-
15850		- if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	16053	+ Grafreed.Assert(object != null);
	16054	+ Grafreed.Assert(object.selection != null);
	16055	+ if (object.selection.Size() > 0)
15851	16056	{
15852		- switch (object.selection.get(0).hitSomething)
	16057	+ int hitSomething = object.selection.get(0).hitSomething;
	16058	+
	16059	+ object.clickInfo.DX = 0;
	16060	+ object.clickInfo.DY = 0;
	16061	+ object.clickInfo.W = 1;
	16062	+ if (hitSomething == Object3D.hitCenter)
15853	16063	{
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;
	16064	+ info.DX = X;
	16065	+ if (X != 0)
	16066	+ info.DX -= info.bounds.width/2;
	16067	+
	16068	+ info.DY = Y;
	16069	+ if (Y != 0)
	16070	+ info.DY -= info.bounds.height/2;
15863	16071	}
15864		-
	16072	+
	16073	+ object.drawEditHandles(//info,
	16074	+ 0);
	16075	+
	16076	+ if (drag && (X != 0 \|\| Y != 0))
	16077	+ {
	16078	+ switch (hitSomething)
	16079	+ {
	16080	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16081	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16082	+ break;
	16083	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16084	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16085	+ break;
	16086	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16087	+ gr.drawLine(X, Y, 0, 0);
	16088	+ break;
	16089	+ }
	16090	+
	16091	+ }
15865	16092	}
15866	16093	}
15867	16094	}
..	..	@@ -16375,7 +16602,9 @@
16375	16602
16376	16603	float BGcolor = 0.5f;
16377	16604
16378		- private void DrawSkyBox(GL gl)
	16605	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16606	+
	16607	+ private void DrawSkyBox(GL gl, float ratio)
16379	16608	{
16380	16609	if (envyoff \|\| cubemap == null)
16381	16610	{
..	..	@@ -16392,7 +16621,17 @@
16392	16621	// Compensates for ExaminerViewer's modification of modelview matrix
16393	16622	gl.glMatrixMode(GL.GL_MODELVIEW);
16394	16623	gl.glLoadIdentity();
	16624	+ gl.glScalef(1,ratio,1);
16395	16625
	16626	+ colorV[0] = 2;
	16627	+ colorV[1] = 2;
	16628	+ colorV[2] = 2;
	16629	+ colorV[3] = 1;
	16630	+ gl.glDisable(gl.GL_COLOR_MATERIAL);
	16631	+ gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16632	+
	16633	+ gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16634	+
16396	16635	//gl.glActiveTexture(GL.GL_TEXTURE1);
16397	16636	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16398	16637
..	..	@@ -16405,7 +16644,7 @@
16405	16644	// GL_NORMAL_MAP texgen mode. Temporarily enabling lighting
16406	16645	// causes the normals to be sent down. Thanks to Ken Dyke.
16407	16646	//gl.glEnable(GL.GL_LIGHTING);
16408		- gl.glDisable(GL.GL_LIGHTING);
	16647	+ gl.glEnable(GL.GL_LIGHTING);
16409	16648
16410	16649	gl.glTexGeni(GL.GL_S, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
16411	16650	gl.glTexGeni(GL.GL_T, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
..	..	@@ -16659,6 +16898,14 @@
16659	16898	}
16660	16899	}
16661	16900
	16901	+ private Object3D GetFolder()
	16902	+ {
	16903	+ Object3D folder = object.GetWindow().copy;
	16904	+ if (object.GetWindow().copy.selection.Size() > 0)
	16905	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16906	+ return folder;
	16907	+ }
	16908	+
16662	16909	class SelectBuffer implements GLEventListener
16663	16910	{
16664	16911
..	..	@@ -16674,7 +16921,7 @@
16674	16921	//new Exception().printStackTrace();
16675	16922	System.out.println("select buffer init");
16676	16923	// Use debug pipeline
16677		- drawable.setGL(new DebugGL(drawable.getGL()));
	16924	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16678	16925
16679	16926	GL gl = drawable.getGL();
16680	16927
..	..	@@ -16738,6 +16985,17 @@
16738	16985
16739	16986	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16740	16987
	16988	+ if (PAINTMODE)
	16989	+ {
	16990	+ if (object.GetWindow().copy.selection.Size() > 0)
	16991	+ {
	16992	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16993	+
	16994	+ // Make what you paint not selectable.
	16995	+ paintobj.ResetSelectable();
	16996	+ }
	16997	+ }
	16998	+
16741	16999	//int tmp = selection_view;
16742	17000	//selection_view = -1;
16743	17001	int temp = DrawMode();
..	..	@@ -16749,6 +17007,17 @@
16749	17007	// temp = DEFAULT; // patch for selection debug
16750	17008	Globals.drawMode = temp; // WARNING
16751	17009
	17010	+ if (PAINTMODE)
	17011	+ {
	17012	+ if (object.GetWindow().copy.selection.Size() > 0)
	17013	+ {
	17014	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17015	+
	17016	+ // Revert.
	17017	+ paintobj.RestoreSelectable();
	17018	+ }
	17019	+ }
	17020	+
16752	17021	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16753	17022
16754	17023	// trying different ways of getting the depth info over
..	..	@@ -16852,29 +17121,31 @@
16852	17121	}
16853	17122
16854	17123	if (!movingcamera && !PAINTMODE)
16855		- object.editWindow.ScreenFitPoint(); // fev 2014
	17124	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16856	17125
16857		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17126	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16858	17127	{
16859		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17128	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16860	17129
16861		- Object3D group = new Object3D("inst" + paintcount++);
	17130	+ if (object.GetWindow().copy.selection.Size() > 0)
	17131	+ {
	17132	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16862	17133
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();
	17134	+ Object3D inst = new Object3D("inst" + paintcount++);
	17135	+
	17136	+ inst.CreateMaterial(); // use a void leaf to select instances
	17137	+
	17138	+ inst.add(paintobj); // link
	17139	+
	17140	+ object.GetWindow().SnapObject(inst);
	17141	+
	17142	+ Object3D folder = paintFolder; // GetFolder();
	17143	+
	17144	+ folder.add(inst);
	17145	+
	17146	+ object.GetWindow().ResetModel();
	17147	+ object.GetWindow().refreshContents();
	17148	+ }
16878	17149	}
16879	17150	else
16880	17151	paintcount = 0;