~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
..	..	@@ -335,14 +390,28 @@
335	390	display.options1[2] = material.shadowbias;
336	391	display.options1[3] = material.aniso;
337	392	display.options1[4] = material.anisoV;
	393	+// System.out.println("display.options1[0] " + display.options1[0]);
	394	+// System.out.println("display.options1[1] " + display.options1[1]);
	395	+// System.out.println("display.options1[2] " + display.options1[2]);
	396	+// System.out.println("display.options1[3] " + display.options1[3]);
	397	+// System.out.println("display.options1[4] " + display.options1[4]);
338	398	display.options2[0] = material.opacity;
339	399	display.options2[1] = material.diffuse;
340	400	display.options2[2] = material.factor;
	401	+// System.out.println("display.options2[0] " + display.options2[0]);
	402	+// System.out.println("display.options2[1] " + display.options2[1]);
	403	+// System.out.println("display.options2[2] " + display.options2[2]);
341	404
342	405	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	406	+// System.out.println("display.options3[0] " + display.options3[0]);
	407	+// System.out.println("display.options3[1] " + display.options3[1]);
	408	+// System.out.println("display.options3[2] " + display.options3[2]);
343	409	display.options4[0] = material.cameralight/0.2f;
344	410	display.options4[1] = material.subsurface;
345	411	display.options4[2] = material.sheen;
	412	+// System.out.println("display.options4[0] " + display.options4[0]);
	413	+// System.out.println("display.options4[1] " + display.options4[1]);
	414	+// System.out.println("display.options4[2] " + display.options4[2]);
346	415
347	416	// if (display.CURRENTANTIALIAS > 0)
348	417	// display.options3[3] /= 4;
..	..	@@ -1433,6 +1502,8 @@
1433	1502	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1434	1503	}
1435	1504
	1505	+ float[] colorV = new float[4];
	1506	+
1436	1507	void SetColor(Object3D obj, Vertex p0)
1437	1508	{
1438	1509	CameraPane display = this;
..	..	@@ -1500,8 +1571,6 @@
1500	1571	{
1501	1572	return;
1502	1573	}
1503		-
1504		- float[] colorV = new float[3];
1505	1574
1506	1575	if (false) // marked)
1507	1576	{
..	..	@@ -1983,9 +2052,9 @@
1983	2052	switch(viewcode)
1984	2053	{
1985	2054	case 0: return "main";
1986		- case 1: return "one";
1987		- case 2: return "two";
1988		- case 3: return "three";
	2055	+ case 1: return "Red";
	2056	+ case 2: return "Green";
	2057	+ case 3: return "Blue";
1989	2058	case 4: return "light";
1990	2059	}
1991	2060
..	..	@@ -2051,7 +2120,7 @@
2051	2120	//System.err.println("Oeil on");
2052	2121	OEIL = true;
2053	2122	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2054		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2123	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2055	2124	//pingthread.StepToTarget(true);
2056	2125	}
2057	2126
..	..	@@ -2284,10 +2353,17 @@
2284	2353	HANDLES ^= true;
2285	2354	}
2286	2355
	2356	+ Object3D paintFolder;
	2357	+
2287	2358	void TogglePaint()
2288	2359	{
2289	2360	PAINTMODE ^= true;
2290	2361	paintcount = 0;
	2362	+
	2363	+ if (PAINTMODE)
	2364	+ {
	2365	+ paintFolder = GetFolder();
	2366	+ }
2291	2367	}
2292	2368
2293	2369	void SwapCamera(int a, int b)
..	..	@@ -2384,6 +2460,21 @@
2384	2460	return currentGL;
2385	2461	}
2386	2462
	2463	+ static private BufferedImage CreateBim(TextureData texturedata)
	2464	+ {
	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);
	2476	+ }
	2477	+
2387	2478	/**/
2388	2479	class CacheTexture
2389	2480	{
..	..	@@ -2392,28 +2483,31 @@
2392	2483
2393	2484	int resolution;
2394	2485
2395		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2486	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2396	2487	{
2397		- texture = tex;
	2488	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2489	+ texturedata = texdata;
2398	2490	resolution = res;
2399	2491	}
2400	2492	}
2401	2493	/**/
2402	2494
2403	2495	// TEXTURE static Texture texture;
2404		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2405		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2406		- 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	+
2407	2501	int pigmentdepth = 0;
2408	2502	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2409	2503	int bumpdepth = 0;
2410	2504	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2411	2505	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2412	2506	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2413		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2507	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2414	2508	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2415	2509
2416		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2510	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2417	2511	{
2418	2512	TextureData texturedata = null;
2419	2513
..	..	@@ -2423,7 +2517,7 @@
2423	2517	com.sun.opengl.util.texture.TextureIO.newTextureData(
2424	2518	getClass().getClassLoader().getResourceAsStream(name),
2425	2519	true,
2426		- com.sun.opengl.util.texture.TextureIO.PNG);
	2520	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
2427	2521	} catch (java.io.IOException e)
2428	2522	{
2429	2523	throw new javax.media.opengl.GLException(e);
..	..	@@ -2432,13 +2526,34 @@
2432	2526	if (bump)
2433	2527	texturedata = ConvertBump(texturedata, false);
2434	2528
2435		- com.sun.opengl.util.texture.Texture texture =
2436		- 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);
2437	2531
2438		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2439		- 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);
2440	2534
2441		- 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;
2442	2557	}
2443	2558
2444	2559	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3511,6 +3626,8 @@
3511	3626
3512	3627	System.out.println("LOADING TEXTURE : " + name);
3513	3628
	3629	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3630	+
3514	3631	//
3515	3632	if (false) // compressbit > 0)
3516	3633	{
..	..	@@ -7909,7 +8026,7 @@
7909	8026	String pigment = Object3D.GetPigment(tex);
7910	8027	String bump = Object3D.GetBump(tex);
7911	8028
7912		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8029	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7913	8030	{
7914	8031	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7915	8032	// System.out.println("; bump = " + bump);
..	..	@@ -7924,8 +8041,8 @@
7924	8041	pigment = null;
7925	8042	}
7926	8043
7927		- ReleaseTexture(bump, true);
7928		- ReleaseTexture(pigment, false);
	8044	+ ReleaseTexture(tex, true);
	8045	+ ReleaseTexture(tex, false);
7929	8046	}
7930	8047
7931	8048	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -7943,7 +8060,7 @@
7943	8060
7944	8061	String pigment = Object3D.GetPigment(tex);
7945	8062
7946		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8063	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7947	8064	{
7948	8065	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7949	8066	// System.out.println("; bump = " + bump);
..	..	@@ -7954,7 +8071,7 @@
7954	8071	pigment = null;
7955	8072	}
7956	8073
7957		- ReleaseTexture(pigment, false);
	8074	+ ReleaseTexture(tex, false);
7958	8075	}
7959	8076
7960	8077	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -7972,7 +8089,7 @@
7972	8089
7973	8090	String bump = Object3D.GetBump(tex);
7974	8091
7975		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8092	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7976	8093	{
7977	8094	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7978	8095	// System.out.println("; bump = " + bump);
..	..	@@ -7983,10 +8100,10 @@
7983	8100	bump = null;
7984	8101	}
7985	8102
7986		- ReleaseTexture(bump, true);
	8103	+ ReleaseTexture(tex, true);
7987	8104	}
7988	8105
7989		- void ReleaseTexture(String tex, boolean bump)
	8106	+ void ReleaseTexture(cTexture tex, boolean bump)
7990	8107	{
7991	8108	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7992	8109	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7997,7 +8114,7 @@
7997	8114	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7998	8115
7999	8116	if (tex != null)
8000		- texture = textures.get(tex);
	8117	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
8001	8118
8002	8119	// //assert( texture != null );
8003	8120	// if (texture == null)
..	..	@@ -8091,47 +8208,50 @@
8091	8208
8092	8209	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8093	8210	{
8094		- if (// DrawMode() != 0 \|\| /tex == null \|\|/
8095		- ambientOcclusion ) // \|\| !textureon)
8096		- {
8097		- return; // false;
8098		- }
8099		-
8100		- if (tex == null)
8101		- {
8102		- BindTexture(null,false,resolution);
8103		- BindTexture(null,true,resolution);
8104		- return;
8105		- }
	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;
8106	8252
8107		- String pigment = Object3D.GetPigment(tex);
8108		- String bump = Object3D.GetBump(tex);
8109		-
8110		- usedtextures.put(pigment, pigment);
8111		- usedtextures.put(bump, bump);
8112		-
8113		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8114		- {
8115		- // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8116		- // System.out.println("; bump = " + bump);
8117		- }
8118		-
8119		- if (bump.equals(""))
8120		- {
8121		- bump = null;
8122		- }
8123		- if (pigment.equals(""))
8124		- {
8125		- pigment = null;
8126		- }
8127		-
8128		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8129		- BindTexture(pigment, false, resolution);
8130		- GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8131		- BindTexture(bump, true, resolution);
8132		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8133		-
8134		- return; // true;
	8253	+ BindPigmentTexture(tex, resolution);
	8254	+ BindBumpTexture(tex, resolution);
8135	8255	}
8136	8256
8137	8257	/boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8150,9 +8270,9 @@
8150	8270
8151	8271	String pigment = Object3D.GetPigment(tex);
8152	8272
8153		- usedtextures.put(pigment, pigment);
	8273	+ usedtextures.add(tex);
8154	8274
8155		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8275	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8156	8276	{
8157	8277	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8158	8278	// System.out.println("; bump = " + bump);
..	..	@@ -8164,7 +8284,7 @@
8164	8284	}
8165	8285
8166	8286	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8167		- BindTexture(pigment, false, resolution);
	8287	+ BindTexture(tex, false, resolution);
8168	8288	}
8169	8289
8170	8290	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8183,9 +8303,9 @@
8183	8303
8184	8304	String bump = Object3D.GetBump(tex);
8185	8305
8186		- usedtextures.put(bump, bump);
	8306	+ usedtextures.add(tex);
8187	8307
8188		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8308	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8189	8309	{
8190	8310	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8191	8311	// System.out.println("; bump = " + bump);
..	..	@@ -8197,7 +8317,7 @@
8197	8317	}
8198	8318
8199	8319	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8200		- BindTexture(bump, true, resolution);
	8320	+ BindTexture(tex, true, resolution);
8201	8321	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8202	8322	}
8203	8323
..	..	@@ -8221,13 +8341,19 @@
8221	8341	return fileExists;
8222	8342	}
8223	8343
8224		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8344	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8225	8345	{
8226		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8346	+ CacheTexture texturecache = null;
8227	8347
8228	8348	if (tex != null)
8229	8349	{
8230		- 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	+ }
8231	8357
8232	8358	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8233	8359
..	..	@@ -8237,19 +8363,46 @@
8237	8363	// else
8238	8364	// if (!texname.startsWith("/"))
8239	8365	// texname = "/Users/nbriere/Textures/" + texname;
8240		- if (!FileExists(tex))
	8366	+ if (!FileExists(texname) && !texname.startsWith("@"))
8241	8367	{
8242	8368	texname = fallbackTextureName;
8243	8369	}
8244	8370
8245	8371	if (CACHETEXTURE)
8246		- texture = textures.get(texname); // TEXTURE CACHE
8247		-
8248		- TextureData texturedata = null;
8249		-
8250		- if (texture == null \|\| texture.resolution < resolution)
8251	8372	{
8252		- 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(""))
8253	8406	{
8254	8407	assert(!bump);
8255	8408	// if (bump)
..	..	@@ -8260,19 +8413,23 @@
8260	8413	// }
8261	8414	// else
8262	8415	// {
8263		- texture = textures.get(tex);
8264		- if (texture == null)
	8416	+ // texturecache = textures.get(texname); // suspicious
	8417	+ if (texturecache == null)
8265	8418	{
8266		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8419	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8267	8420	}
	8421	+ else
	8422	+ new Exception().printStackTrace();
8268	8423	// }
8269	8424	} else
8270		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8425	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8271	8426	{
8272	8427	assert(bump);
8273		- texture = textures.get(tex);
8274		- if (texture == null)
8275		- 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();
8276	8433	} else
8277	8434	{
8278	8435	//if (tex.equals("IMMORTAL"))
..	..	@@ -8280,11 +8437,22 @@
8280	8437	// texture = GetResourceTexture("default.png");
8281	8438	//} else
8282	8439	//{
8283		- if (tex.equals("WHITE_NOISE"))
	8440	+ if (texname.endsWith("WHITE_NOISE"))
8284	8441	{
8285		- texture = textures.get(tex);
8286		- if (texture == null)
8287		- 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();
8288	8456	} else
8289	8457	{
8290	8458	if (textureon)
..	..	@@ -8343,19 +8511,20 @@
8343	8511	if (texturedata == null)
8344	8512	throw new Exception();
8345	8513
8346		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8514	+ texturecache = new CacheTexture(texturedata,resolution);
8347	8515	//texture = GetTexture(tex, bump);
8348	8516	}
	8517	+ }
8349	8518	}
8350	8519	//}
8351	8520	}
8352	8521
8353		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8522	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8354	8523	{
8355	8524	//return false;
8356	8525
8357	8526	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8358		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8527	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8359	8528	{
8360	8529	// String ext = "_highres";
8361	8530	// if (REDUCETEXTURE)
..	..	@@ -8372,52 +8541,17 @@
8372	8541	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8373	8542	if (!cachefile.exists())
8374	8543	{
8375		- // cache to disk
8376		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8377		- //buffers[0].
8378		-
8379		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8380		- int[] pixels = new int[bytebuf.capacity()/3];
8381		-
8382		- // squared size heuristic...
8383		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8544	+ //if (texturedata.getWidth() == texturedata.getHeight())
8384	8545	{
8385		- for (int i=pixels.length; --i>=0;)
8386		- {
8387		- int i3 = i*3;
8388		- pixels[i] = 0xFF;
8389		- pixels[i] <<= 8;
8390		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8391		- pixels[i] <<= 8;
8392		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8393		- pixels[i] <<= 8;
8394		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8395		- }
8396		-
8397		- /*
8398		- int r=0,g=0,b=0,a=0;
8399		- for (int i=0; i<width; i++)
8400		- for (int j=0; j<height; j++)
8401		- {
8402		- int index = j*width+i;
8403		- int p = pixels[index];
8404		- a = ((p>>24) & 0xFF);
8405		- r = ((p>>16) & 0xFF);
8406		- g = ((p>>8) & 0xFF);
8407		- b = (p & 0xFF);
8408		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8409		- }
8410		- /**/
8411		- int width = (int)Math.sqrt(pixels.length); // squared
8412		- int height = width;
8413		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8414		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8546	+ BufferedImage rendImage = CreateBim(texturedata);
	8547	+
8415	8548	ImageWriter writer = null;
8416	8549	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8417	8550	if (iter.hasNext()) {
8418	8551	writer = (ImageWriter)iter.next();
8419	8552	}
8420		- float compressionQuality = 0.9f;
	8553	+
	8554	+ float compressionQuality = 0.85f;
8421	8555	try
8422	8556	{
8423	8557	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8434,18 +8568,20 @@
8434	8568	}
8435	8569	}
8436	8570	}
8437		-
	8571	+
	8572	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8573	+
8438	8574	//System.out.println("Texture = " + tex);
8439		- if (textures.containsKey(texname))
	8575	+ if (textures.containsKey(tex))
8440	8576	{
8441		- CacheTexture thetex = textures.get(texname);
	8577	+ CacheTexture thetex = textures.get(tex);
8442	8578	thetex.texture.disable();
8443	8579	thetex.texture.dispose();
8444		- textures.remove(texname);
	8580	+ textures.remove(tex);
8445	8581	}
8446	8582
8447		- texture.texturedata = texturedata;
8448		- textures.put(texname, texture);
	8583	+ //texture.texturedata = texturedata;
	8584	+ textures.put(tex, texturecache);
8449	8585
8450	8586	// newtex = true;
8451	8587	}
..	..	@@ -8461,10 +8597,44 @@
8461	8597	}
8462	8598	}
8463	8599
8464		- return texture;
	8600	+ return texturecache;
8465	8601	}
8466	8602
8467		- 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
8468	8638	{
8469	8639	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8470	8640
..	..	@@ -8482,21 +8652,21 @@
8482	8652	return texture!=null?texture.texture:null;
8483	8653	}
8484	8654
8485		- 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
8486	8656	{
8487	8657	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8488	8658
8489	8659	return texture!=null?texture.texturedata:null;
8490	8660	}
8491	8661
8492		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8662	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8493	8663	{
8494	8664	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8495	8665	{
8496	8666	return false;
8497	8667	}
8498	8668
8499		- boolean newtex = false;
	8669	+ //boolean newtex = false;
8500	8670
8501	8671	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8502	8672
..	..	@@ -8528,9 +8698,75 @@
8528	8698	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8529	8699	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8530	8700
8531		- return newtex;
	8701	+ return true; // Warning: not used.
8532	8702	}
8533	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	+
8534	8770	ShadowBuffer shadowPBuf;
8535	8771	AntialiasBuffer antialiasPBuf;
8536	8772	int MAXSTACK;
..	..	@@ -8547,10 +8783,12 @@
8547	8783
8548	8784	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8549	8785	MAXSTACK = temp[0];
8550		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8786	+ if (Globals.DEBUG)
	8787	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8551	8788	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8552	8789	MAXSTACK = temp[0];
8553		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8790	+ if (Globals.DEBUG)
	8791	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8554	8792
8555	8793	// Use debug pipeline
8556	8794	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8558,7 +8796,8 @@
8558	8796	gl = drawable.getGL(); //
8559	8797
8560	8798	GL gl3 = getGL();
8561		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8562	8801
8563	8802
8564	8803	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8723,7 +8962,7 @@
8723	8962
8724	8963	if (cubemap == null)
8725	8964	{
8726		- LoadEnvy(5);
	8965	+ //LoadEnvy(1);
8727	8966	}
8728	8967
8729	8968	//cubemap.enable();
..	..	@@ -8999,6 +9238,8 @@
8999	9238
9000	9239	void LoadEnvy(int which)
9001	9240	{
	9241	+ assert(false);
	9242	+
9002	9243	String name;
9003	9244	String ext;
9004	9245
..	..	@@ -9010,37 +9251,58 @@
9010	9251	cubemap = null;
9011	9252	return;
9012	9253	case 1:
9013		- name = "cubemaps/box_";
9014		- ext = "png";
	9254	+ name = "cubemaps/rgb/";
	9255	+ ext = "jpg";
9015	9256	reverseUP = false;
9016	9257	break;
9017	9258	case 2:
9018		- name = "cubemaps/uffizi_";
9019		- ext = "png";
9020		- break; // reverseUP = true; break;
	9259	+ name = "cubemaps/uffizi/";
	9260	+ ext = "jpg";
	9261	+ reverseUP = false;
	9262	+ break;
9021	9263	case 3:
9022		- name = "cubemaps/CloudyHills_";
9023		- ext = "tga";
	9264	+ name = "cubemaps/CloudyHills/";
	9265	+ ext = "jpg";
9024	9266	reverseUP = false;
9025	9267	break;
9026	9268	case 4:
9027		- name = "cubemaps/cornell_";
	9269	+ name = "cubemaps/cornell/";
9028	9270	ext = "png";
9029	9271	reverseUP = false;
9030	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;
9031	9298	default:
9032		- name = "cubemaps/rgb_";
9033		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9299	+ name = "cubemaps/box/";
	9300	+ ext = "png"; /mipmap = true;/
	9301	+ reverseUP = false;
9034	9302	break;
9035	9303	}
9036		-
9037		- try
9038		- {
9039		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9040		- } catch (IOException e)
9041		- {
9042		- throw new RuntimeException(e);
9043		- }
	9304	+
	9305	+ LoadSkybox(name, ext, mipmap);
9044	9306	}
9045	9307
9046	9308	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -9072,8 +9334,12 @@
9072	9334	static double[] model = new double[16];
9073	9335	double[] camera2light = new double[16];
9074	9336	double[] light2camera = new double[16];
9075		- int newenvy = -1;
9076		- boolean envyoff = true; // false;
	9337	+
	9338	+ //int newenvy = -1;
	9339	+ //boolean envyoff = false;
	9340	+
	9341	+ String loadedskyboxname;
	9342	+
9077	9343	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9078	9344	//float[] light0 = { 0,0,0 };
9079	9345	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9366,11 +9632,35 @@
9366	9632	jy8[3] = 0.5f;
9367	9633	}
9368	9634
9369		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9635	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9370	9636	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9371	9637	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9372	9638	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9373	9639
	9640	+ void ResetOptions()
	9641	+ {
	9642	+ options1[0] = 100;
	9643	+ options1[1] = 0.025f;
	9644	+ options1[2] = 0.01f;
	9645	+ options1[3] = 0;
	9646	+ options1[4] = 0;
	9647	+
	9648	+ options2[0] = 0;
	9649	+ options2[1] = 0.75f;
	9650	+ options2[2] = 0;
	9651	+ options2[3] = 0;
	9652	+
	9653	+ options3[0] = 1;
	9654	+ options3[1] = 1;
	9655	+ options3[2] = 1;
	9656	+ options3[3] = 0;
	9657	+
	9658	+ options4[0] = 1;
	9659	+ options4[1] = 0;
	9660	+ options4[2] = 1;
	9661	+ options4[3] = 0;
	9662	+ }
	9663	+
9374	9664	static int imagecount = 0; // movie generation
9375	9665
9376	9666	static int jitter = 0;
..	..	@@ -9467,7 +9757,7 @@
9467	9757
9468	9758	if (renderCamera != lightCamera)
9469	9759	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9470		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9760	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9471	9761
9472	9762	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9473	9763
..	..	@@ -9483,7 +9773,7 @@
9483	9773
9484	9774	if (renderCamera != lightCamera)
9485	9775	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9486		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9776	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9487	9777
9488	9778	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9489	9779
..	..	@@ -9529,10 +9819,12 @@
9529	9819	rati = 1 / rati;
9530	9820	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9531	9821	}
9532		- assert (newenvy == -1);
	9822	+
	9823	+ //assert (newenvy == -1);
	9824	+
9533	9825	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9534	9826	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9535		- DrawSkyBox(gl);
	9827	+ DrawSkyBox(gl, (float)rati);
9536	9828	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9537	9829	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9538	9830	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -10398,9 +10690,18 @@
10398	10690	static boolean init = false;
10399	10691
10400	10692	double[][] matrix = LA.newMatrix();
	10693	+
	10694	+ // This is to refresh the UI of the material panel.
	10695	+ ObjEditor patchMaterial;
10401	10696
10402	10697	public void display(GLAutoDrawable drawable)
10403	10698	{
	10699	+ if (patchMaterial.patchMaterial)
	10700	+ {
	10701	+ patchMaterial.patchMaterial = false;
	10702	+ patchMaterial.objectPanel.setSelectedIndex(1);
	10703	+ }
	10704	+
10404	10705	if (Grafreed.savesound && Grafreed.hassound)
10405	10706	{
10406	10707	Grafreed.wav.save();
..	..	@@ -10481,6 +10782,7 @@
10481	10782	ANTIALIAS = 0;
10482	10783	//System.out.println("RESTART");
10483	10784	AAtimer.restart();
	10785	+ Globals.TIMERRUNNING = true;
10484	10786	}
10485	10787	}
10486	10788	}
..	..	@@ -10568,7 +10870,7 @@
10568	10870
10569	10871	if (wait)
10570	10872	{
10571		- Sleep(500);
	10873	+ Sleep(200); // blocks everything
10572	10874
10573	10875	wait = false;
10574	10876	}
..	..	@@ -10683,7 +10985,7 @@
10683	10985	// if (parentcam != renderCamera) // not a light
10684	10986	if (cam != lightCamera)
10685	10987	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10686		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10988	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10687	10989
10688	10990	for (int j = 0; j < 4; j++)
10689	10991	{
..	..	@@ -10698,7 +11000,7 @@
10698	11000	// if (parentcam != renderCamera) // not a light
10699	11001	if (cam != lightCamera)
10700	11002	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10701		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	11003	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10702	11004
10703	11005	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10704	11006
..	..	@@ -10784,13 +11086,43 @@
10784	11086	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10785	11087	}
10786	11088
10787		- 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"))
10788	11097	{
10789		- LoadEnvy(newenvy);
	11098	+ if (cubemaprgb == null)
	11099	+ {
	11100	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11101	+ }
	11102	+
	11103	+ cubemap = cubemaprgb;
10790	11104	}
10791		-
10792		- newenvy = -1;
10793		-
	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	+
10794	11126	ratio = ((double) getWidth()) / getHeight();
10795	11127	//System.out.println("ratio = " + ratio);
10796	11128
..	..	@@ -10806,7 +11138,7 @@
10806	11138
10807	11139	if (!IsFrozen() && !ambientOcclusion)
10808	11140	{
10809		- DrawSkyBox(gl);
	11141	+ DrawSkyBox(gl, (float)ratio);
10810	11142	}
10811	11143
10812	11144	//if (selection_view == -1)
..	..	@@ -10989,9 +11321,9 @@
10989	11321
10990	11322	gl.glMatrixMode(GL.GL_MODELVIEW);
10991	11323
10992		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10993		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10994		-//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);
10995	11327	} else
10996	11328	{
10997	11329	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -11002,7 +11334,7 @@
11002	11334	//System.out.println("BLENDING ON");
11003	11335	gl.glEnable(GL.GL_BLEND);
11004	11336	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
11005		-
	11337	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
11006	11338	gl.glMatrixMode(gl.GL_PROJECTION);
11007	11339	gl.glLoadIdentity();
11008	11340
..	..	@@ -11092,7 +11424,7 @@
11092	11424
11093	11425	// if (cam != lightCamera)
11094	11426	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11095		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11427	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11096	11428	}
11097	11429
11098	11430	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -11251,7 +11583,7 @@
11251	11583	}
11252	11584	}
11253	11585
11254		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11586	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11255	11587	{
11256	11588	//gl.glDepthFunc(GL.GL_LEQUAL);
11257	11589	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11259,24 +11591,21 @@
11259	11591
11260	11592	boolean texon = textureon;
11261	11593
11262		- if (RENDERPROGRAM > 0)
11263		- {
11264		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11265		- textureon = false;
11266		- }
	11594	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11595	+ textureon = false;
	11596	+
11267	11597	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11268	11598	//System.out.println("ALLO");
11269	11599	gl.glColorMask(false, false, false, false);
11270	11600	DrawObject(gl);
11271		- if (RENDERPROGRAM > 0)
11272		- {
11273		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11274		- textureon = texon;
11275		- }
	11601	+
	11602	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11603	+ textureon = texon;
	11604	+
11276	11605	gl.glColorMask(true, true, true, true);
11277	11606
11278	11607	gl.glDepthFunc(GL.GL_EQUAL);
11279		- //gl.glDepthMask(false);
	11608	+ gl.glDepthMask(false);
11280	11609	}
11281	11610
11282	11611	if (false) // DrawMode() == SHADOW)
..	..	@@ -11479,13 +11808,16 @@
11479	11808
11480	11809	void DrawObject(GL gl, boolean draw)
11481	11810	{
	11811	+ // To clear camera values
	11812	+ ResetOptions();
	11813	+
11482	11814	//System.out.println("DRAW OBJECT " + mouseDown);
11483	11815	// DrawMode() = SELECTION;
11484	11816	//GL gl = getGL();
11485	11817	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11486	11818	{
11487	11819	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11488		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11820	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11489	11821	pingthread.StepToTarget(true); // true);
11490	11822	// zoomonce = false;
11491	11823	}
..	..	@@ -11613,20 +11945,32 @@
11613	11945	ReleaseTextures(DEFAULT_TEXTURES);
11614	11946
11615	11947	if (CLEANCACHE)
11616		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11948	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11617	11949	{
11618		- String tex = e.nextElement();
	11950	+ cTexture tex = e.nextElement();
11619	11951
11620	11952	// System.out.println("Texture --------- " + tex);
11621	11953
11622		- if (tex.equals("WHITE_NOISE"))
	11954	+ if (tex.equals("WHITE_NOISE:"))
11623	11955	continue;
11624	11956
11625		- if (!usedtextures.containsKey(tex))
	11957	+ if (!usedtextures.contains(tex))
11626	11958	{
	11959	+ CacheTexture gettex = texturepigment.get(tex);
11627	11960	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11628		- textures.get(tex).texture.dispose();
11629		- 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	+ }
11630	11974	}
11631	11975	}
11632	11976	}
..	..	@@ -12046,7 +12390,7 @@
12046	12390	for (int i = tp.size(); --i >= 0;)
12047	12391	{
12048	12392	//for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12049		- LA.xformPos(light, tp.get(i).GlobalTransform(), light);
	12393	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
12050	12394	}
12051	12395
12052	12396
..	..	@@ -12154,8 +12498,76 @@
12154	12498
12155	12499	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12156	12500
12157		- String program =
	12501	+ String programmin =
	12502	+ // Min shader
12158	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	+
12159	12571	//"OPTION ARB_fragment_program_shadow;" +
12160	12572	"PARAM light2cam0 = program.env[10];" +
12161	12573	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12270,8 +12682,7 @@
12270	12682	"TEMP shininess;" +
12271	12683	"\n" +
12272	12684	"MOV texSamp, one;" +
12273		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12274		-
	12685	+
12275	12686	"MOV mapgrid.x, one2048th.x;" +
12276	12687	"MOV temp, fragment.texcoord[1];" +
12277	12688	/*
..	..	@@ -12292,20 +12703,20 @@
12292	12703	"MUL temp, floor, mapgrid.x;" +
12293	12704	//"TEX depth0, temp, texture[1], 2D;" +
12294	12705	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12295		- TextureFetch("depth0", "temp", "1") +
	12706	+ ShadowTextureFetch("depth0", "temp", "1") +
12296	12707	"") +
12297	12708	"ADD temp.x, temp.x, mapgrid.x;" +
12298	12709	//"TEX depth1, temp, texture[1], 2D;" +
12299	12710	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12300		- TextureFetch("depth1", "temp", "1") +
	12711	+ ShadowTextureFetch("depth1", "temp", "1") +
12301	12712	"") +
12302	12713	"ADD temp.y, temp.y, mapgrid.x;" +
12303	12714	//"TEX depth2, temp, texture[1], 2D;" +
12304		- TextureFetch("depth2", "temp", "1") +
	12715	+ ShadowTextureFetch("depth2", "temp", "1") +
12305	12716	"SUB temp.x, temp.x, mapgrid.x;" +
12306	12717	//"TEX depth3, temp, texture[1], 2D;" +
12307	12718	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12308		- TextureFetch("depth3", "temp", "1") +
	12719	+ ShadowTextureFetch("depth3", "temp", "1") +
12309	12720	"") +
12310	12721	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12311	12722	//"MOV params, material;" +
..	..	@@ -12676,10 +13087,10 @@
12676	13087	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12677	13088	"") +
12678	13089
12679		- // display shadow only (bump == 0)
	13090	+ // display shadow only (fakedepth == 0)
12680	13091	"SUB temp.x, half.x, shadow.x;" +
12681	13092	"MOV temp.y, -params5.z;" + // params6.x;" +
12682		- "SLT temp.z, temp.y, -one2048th.x;" +
	13093	+ "SLT temp.z, temp.y, -c256i.x;" +
12683	13094	"SUB temp.y, one.x, temp.z;" +
12684	13095	"MUL temp.x, temp.x, temp.y;" +
12685	13096	"KIL temp.x;" +
..	..	@@ -13010,8 +13421,19 @@
13010	13421	//once = true;
13011	13422	}
13012	13423
13013		- System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13014		- 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	+
13015	13437	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13016	13438
13017	13439	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13058,7 +13480,8 @@
13058	13480	"\n" +
13059	13481	"END\n";
13060	13482
13061		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13483	+ if (Globals.DEBUG)
	13484	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13062	13485	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13063	13486
13064	13487	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13103,25 +13526,26 @@
13103	13526	return out;
13104	13527	}
13105	13528
13106		- String TextureFetch(String dest, String src, String unit)
	13529	+ // Also does frustum culling
	13530	+ String ShadowTextureFetch(String dest, String src, String unit)
13107	13531	{
13108	13532	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13109	13533	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13110	13534	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13535	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13536	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13111	13537	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13112		- "SLT " + src + ".z, " + src + ".x, one.x;" +
13113		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13114		- "SLT " + src + ".z, " + src + ".y, one.x;" +
13115		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13538	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13539	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13116	13540	//"SWZ buffer, temp, w,w,w,w;";
13117		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13541	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13118	13542	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13119	13543	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13120	13544	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13121		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13545	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13122	13546
13123		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13124		- //"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;";
13125	13549	}
13126	13550
13127	13551	String Shadow(String depth, String shadow)
..	..	@@ -13168,7 +13592,7 @@
13168	13592	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13169	13593	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13170	13594
13171		- // No shadow when out of frustrum
	13595	+ // No shadow when out of frustum
13172	13596	"SGE temp.x, " + depth + ".z, one.z;" +
13173	13597	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13174	13598	"";
..	..	@@ -13333,9 +13757,10 @@
13333	13757	"DP3 " + dest + ".z," + "normals," + "eye;" +
13334	13758	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13335	13759	//"MOV " + dest + ".w," + "normal.z;" +
13336		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13337		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13338		- //"MOV " + dest + ".z," + "params2.w;" +
	13760	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13761	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13762	+
	13763	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13339	13764	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13340	13765	"RCP " + dest + ".w," + dest + ".w;" +
13341	13766	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13840,6 +14265,7 @@
13840	14265	else
13841	14266	if (evt.getSource() == AAtimer)
13842	14267	{
	14268	+ Globals.TIMERRUNNING = false;
13843	14269	if (mouseDown)
13844	14270	{
13845	14271	//new Exception().printStackTrace();
..	..	@@ -13899,7 +14325,7 @@
13899	14325
13900	14326	// fev 2014???
13901	14327	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13902		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14328	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13903	14329	pingthread.StepToTarget(true); // true);
13904	14330	}
13905	14331	// if (!LIVE)
..	..	@@ -13914,6 +14340,7 @@
13914	14340	return;
13915	14341
13916	14342	AAtimer.restart(); //
	14343	+ Globals.TIMERRUNNING = true;
13917	14344
13918	14345	// waslive = LIVE;
13919	14346	// LIVE = false;
..	..	@@ -13963,14 +14390,15 @@
13963	14390	drag = false;
13964	14391	//System.out.println("Mouse DOWN");
13965	14392	editObj = false;
13966		- ClickInfo info = new ClickInfo();
13967		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13968		- info.pane = this;
13969		- info.camera = renderCamera;
13970		- info.x = x;
13971		- info.y = y;
13972		- info.modifiers = modifiersex;
13973		- 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);
13974	14402	if (!editObj)
13975	14403	{
13976	14404	hasMarquee = true;
..	..	@@ -14252,12 +14680,18 @@
14252	14680	void GoDown(int mod)
14253	14681	{
14254	14682	MODIFIERS \|= COMMAND;
14255		- /*
	14683	+ boolean isVR = (mouseMode&VR)!=0;
	14684	+ /**/
14256	14685	if((mod&SHIFT) == SHIFT)
14257		- manipCamera.RotatePosition(0, -speed);
	14686	+ {
	14687	+ if (isVR)
	14688	+ manipCamera.RotateInterest(0, -speed);
	14689	+ else
	14690	+ manipCamera.RotatePosition(0, -speed);
	14691	+ }
14258	14692	else
14259		- manipCamera.BackForth(0, -speed*delta, getWidth());
14260		- */
	14693	+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
	14694	+ /**/
14261	14695	if ((mod & SHIFT) == SHIFT)
14262	14696	{
14263	14697	mouseMode = mouseMode; // VR??
..	..	@@ -14266,6 +14700,8 @@
14266	14700	mouseMode \|= BACKFORTH;
14267	14701	}
14268	14702
	14703	+ targetLookAt.set(manipCamera.lookAt);
	14704	+
14269	14705	//prevX = X = anchorX;
14270	14706	prevY = Y = anchorY - (int) (renderCamera.Distance());
14271	14707	}
..	..	@@ -14273,12 +14709,19 @@
14273	14709	void GoUp(int mod)
14274	14710	{
14275	14711	MODIFIERS \|= COMMAND;
14276		- /*
	14712	+ /**/
	14713	+ boolean isVR = (mouseMode&VR)!=0;
	14714	+
14277	14715	if((mod&SHIFT) == SHIFT)
14278		- manipCamera.RotatePosition(0, speed);
	14716	+ {
	14717	+ if (isVR)
	14718	+ manipCamera.RotateInterest(0, speed);
	14719	+ else
	14720	+ manipCamera.RotatePosition(0, speed);
	14721	+ }
14279	14722	else
14280		- manipCamera.BackForth(0, speed*delta, getWidth());
14281		- */
	14723	+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
	14724	+ /**/
14282	14725	if ((mod & SHIFT) == SHIFT)
14283	14726	{
14284	14727	mouseMode = mouseMode;
..	..	@@ -14287,6 +14730,8 @@
14287	14730	mouseMode \|= BACKFORTH;
14288	14731	}
14289	14732
	14733	+ targetLookAt.set(manipCamera.lookAt);
	14734	+
14290	14735	//prevX = X = anchorX;
14291	14736	prevY = Y = anchorY + (int) (renderCamera.Distance());
14292	14737	}
..	..	@@ -14294,12 +14739,17 @@
14294	14739	void GoLeft(int mod)
14295	14740	{
14296	14741	MODIFIERS \|= COMMAND;
14297		- /*
	14742	+ /**/
14298	14743	if((mod&SHIFT) == SHIFT)
14299		- manipCamera.RotatePosition(speed, 0);
	14744	+ manipCamera.Translate(speed*delta, 0, getWidth());
14300	14745	else
14301		- manipCamera.Translate(speed*delta, 0, getWidth());
14302		- */
	14746	+ {
	14747	+ if ((mouseMode&VR)!=0)
	14748	+ manipCamera.RotateInterest(-speed, 0);
	14749	+ else
	14750	+ manipCamera.RotatePosition(speed, 0);
	14751	+ }
	14752	+ /**/
14303	14753	if ((mod & SHIFT) == SHIFT)
14304	14754	{
14305	14755	mouseMode = mouseMode;
..	..	@@ -14308,6 +14758,8 @@
14308	14758	mouseMode \|= ROTATE;
14309	14759	} // TRANSLATE;
14310	14760
	14761	+ targetLookAt.set(manipCamera.lookAt);
	14762	+
14311	14763	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
14312	14764	prevY = Y = anchorY;
14313	14765	}
..	..	@@ -14315,12 +14767,18 @@
14315	14767	void GoRight(int mod)
14316	14768	{
14317	14769	MODIFIERS \|= COMMAND;
14318		- /*
	14770	+ /**/
14319	14771	if((mod&SHIFT) == SHIFT)
14320		- manipCamera.RotatePosition(-speed, 0);
	14772	+ manipCamera.Translate(-speed*delta, 0, getWidth());
14321	14773	else
14322		- manipCamera.Translate(-speed*delta, 0, getWidth());
14323		- */
	14774	+ {
	14775	+ if ((mouseMode&VR)!=0)
	14776	+ manipCamera.RotateInterest(speed, 0);
	14777	+ else
	14778	+ manipCamera.RotatePosition(-speed, 0);
	14779	+ }
	14780	+
	14781	+ /**/
14324	14782	if ((mod & SHIFT) == SHIFT)
14325	14783	{
14326	14784	mouseMode = mouseMode;
..	..	@@ -14329,6 +14787,8 @@
14329	14787	mouseMode \|= ROTATE;
14330	14788	} // TRANSLATE;
14331	14789
	14790	+ targetLookAt.set(manipCamera.lookAt);
	14791	+
14332	14792	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
14333	14793	prevY = Y = anchorY;
14334	14794	}
..	..	@@ -14370,15 +14830,16 @@
14370	14830	if (editObj)
14371	14831	{
14372	14832	drag = true;
14373		- ClickInfo info = new ClickInfo();
14374		- info.bounds.setBounds(0, 0,
	14833	+ //ClickInfo info = new ClickInfo();
	14834	+ object.clickInfo.bounds.setBounds(0, 0,
14375	14835	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14376		- info.pane = this;
14377		- info.camera = renderCamera;
14378		- info.x = x;
14379		- info.y = y;
14380		- object.manipWindow.copy
14381		- .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);
14382	14843	} else
14383	14844	{
14384	14845	if (x < startX)
..	..	@@ -14527,24 +14988,27 @@
14527	14988	}
14528	14989	}
14529	14990
	14991	+// ClickInfo clickInfo = new ClickInfo();
	14992	+
14530	14993	public void mouseMoved(MouseEvent e)
14531	14994	{
14532	14995	//System.out.println("mouseMoved: " + e);
14533	14996	if (isRenderer)
14534	14997	return;
14535	14998
14536		- ClickInfo ci = new ClickInfo();
14537		- ci.x = e.getX();
14538		- ci.y = e.getY();
14539		- ci.modifiers = e.getModifiersEx();
14540		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14541		- ci.pane = this;
14542		- 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;
14543	15006	if (!isRenderer)
14544	15007	{
14545	15008	//ObjEditor editWindow = object.editWindow;
14546	15009	//Object3D copy = editWindow.copy;
14547		- if (object.doEditClick(ci, 0))
	15010	+ if (object.doEditClick(//clickInfo,
	15011	+ 0))
14548	15012	{
14549	15013	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14550	15014	} else
..	..	@@ -14559,7 +15023,8 @@
14559	15023	Globals.MOUSEDRAGGED = false;
14560	15024
14561	15025	movingcamera = false;
14562		- X = Y = 0;
	15026	+ X = 0; // getBounds().width/2;
	15027	+ Y = 0; // getBounds().height/2;
14563	15028	//System.out.println("mouseReleased: " + e);
14564	15029	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14565	15030	}
..	..	@@ -14815,7 +15280,8 @@
14815	15280	// break;
14816	15281	case 'T':
14817	15282	CACHETEXTURE ^= true;
14818		- textures.clear();
	15283	+ texturepigment.clear();
	15284	+ texturebump.clear();
14819	15285	// repaint();
14820	15286	break;
14821	15287	case 'Y':
..	..	@@ -14825,8 +15291,8 @@
14825	15291	case 'K':
14826	15292	KOMPACTTEXTURE ^= true;
14827	15293	//textures.clear();
14828		- break;
14829		- case 'P': // Texture Projection macros
	15294	+ // break;
	15295	+ //case 'P': // Texture Projection macros
14830	15296	// SAVETEXTURE ^= true;
14831	15297	macromode = true;
14832	15298	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -14900,7 +15366,9 @@
14900	15366	case 'E' : COMPACT ^= true;
14901	15367	repaint();
14902	15368	break;
14903		- case 'W' : DEBUGHSB ^= true;
	15369	+ case 'W' : // Wide Window (fullscreen)
	15370	+ //DEBUGHSB ^= true;
	15371	+ ObjEditor.theFrame.ToggleFullScreen();
14904	15372	repaint();
14905	15373	break;
14906	15374	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14926,13 +15394,7 @@
14926	15394	repaint();
14927	15395	break;
14928	15396	case 'l':
14929		- lightMode ^= true;
14930		- Globals.lighttouched = true;
14931		- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14932		- targetLookAt.set(manipCamera.lookAt);
14933		- repaint();
14934		- break;
14935		- case 'L':
	15397	+ //case 'L':
14936	15398	if (lightMode)
14937	15399	{
14938	15400	lightMode = false;
..	..	@@ -14951,7 +15413,7 @@
14951	15413	targetLookAt.set(manipCamera.lookAt);
14952	15414	repaint();
14953	15415	break;
14954		- case 'p':
	15416	+ case 'P': // p':
14955	15417	// c'est quoi ca au juste? spherical ^= true;
14956	15418	Skinshader ^= true; programInitialized = false;
14957	15419	repaint();
..	..	@@ -14996,20 +15458,24 @@
14996	15458	OCCLUSION_CULLING ^= true;
14997	15459	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14998	15460	break;
14999		- case '0': envyoff ^= true; repaint(); break;
	15461	+ //case '0': envyoff ^= true; repaint(); break;
15000	15462	case '1':
15001	15463	case '2':
15002	15464	case '3':
15003	15465	case '4':
15004	15466	case '5':
15005		- newenvy = Character.getNumericValue(key);
15006		- repaint();
15007		- break;
15008	15467	case '6':
15009	15468	case '7':
15010	15469	case '8':
15011	15470	case '9':
15012		- 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	+ }
15013	15479	repaint();
15014	15480	break;
15015	15481	case '!':
..	..	@@ -15075,11 +15541,14 @@
15075	15541	case '_':
15076	15542	kompactbit = 5;
15077	15543	break;
15078		- case '+':
15079		- kompactbit = 6;
15080		- break;
	15544	+// case '+':
	15545	+// kompactbit = 6;
	15546	+// break;
15081	15547	case ' ':
15082		- ObjEditor.theFrame.ToggleFullScreen();
	15548	+ lightMode ^= true;
	15549	+ Globals.lighttouched = true;
	15550	+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
	15551	+ targetLookAt.set(manipCamera.lookAt);
15083	15552	repaint();
15084	15553	break;
15085	15554	//case '`' :
..	..	@@ -15126,8 +15595,9 @@
15126	15595	case DELETE:
15127	15596	ClearSelection();
15128	15597	break;
15129		- /*
15130	15598	case '+':
	15599	+
	15600	+ /*
15131	15601	//fontsize += 1;
15132	15602	bbzoom *= 2;
15133	15603	repaint();
..	..	@@ -15144,17 +15614,17 @@
15144	15614	case '=':
15145	15615	IncDepth();
15146	15616	//fontsize += 1;
15147		- object.editWindow.refreshContents(true);
	15617	+ object.GetWindow().refreshContents(true);
15148	15618	maskbit = 6;
15149	15619	break;
15150	15620	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
15151	15621	DecDepth();
15152	15622	maskbit = 5;
15153	15623	//if(fontsize > 1) fontsize -= 1;
15154		- if (object.editWindow == null)
15155		- new Exception().printStackTrace();
15156		- else
15157		- object.editWindow.refreshContents(true);
	15624	+// if (object.editWindow == null)
	15625	+// new Exception().printStackTrace();
	15626	+// else
	15627	+ object.GetWindow().refreshContents(true);
15158	15628	break;
15159	15629	case '{':
15160	15630	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15378,7 +15848,7 @@
15378	15848	}
15379	15849	*/
15380	15850
15381		- object.editWindow.EditSelection();
	15851	+ object.GetWindow().EditSelection(false);
15382	15852	}
15383	15853
15384	15854	void SelectParent()
..	..	@@ -15395,10 +15865,10 @@
15395	15865	{
15396	15866	//selectees.remove(i);
15397	15867	System.out.println("select parent of " + elem);
15398		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15868	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15399	15869	} else
15400	15870	{
15401		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15871	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15402	15872	}
15403	15873
15404	15874	first = false;
..	..	@@ -15440,12 +15910,12 @@
15440	15910	for (int j = 0; j < group.children.size(); j++)
15441	15911	{
15442	15912	elem = (Object3D) group.children.elementAt(j);
15443		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15913	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15444	15914	first = false;
15445	15915	}
15446	15916	} else
15447	15917	{
15448		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15918	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15449	15919	}
15450	15920
15451	15921	first = false;
..	..	@@ -15456,21 +15926,21 @@
15456	15926	{
15457	15927	//Composite group = (Composite) object;
15458	15928	Object3D group = object;
15459		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15929	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15460	15930	}
15461	15931
15462	15932	void ResetTransform(int mask)
15463	15933	{
15464	15934	//Composite group = (Composite) object;
15465	15935	Object3D group = object;
15466		- group.editWindow.ResetTransform(mask);
	15936	+ group.GetWindow().ResetTransform(mask);
15467	15937	}
15468	15938
15469	15939	void FlipTransform()
15470	15940	{
15471	15941	//Composite group = (Composite) object;
15472	15942	Object3D group = object;
15473		- group.editWindow.FlipTransform();
	15943	+ group.GetWindow().FlipTransform();
15474	15944	// group.editWindow.ReduceMesh(true);
15475	15945	}
15476	15946
..	..	@@ -15478,7 +15948,7 @@
15478	15948	{
15479	15949	//Composite group = (Composite) object;
15480	15950	Object3D group = object;
15481		- group.editWindow.PrintMemory();
	15951	+ group.GetWindow().PrintMemory();
15482	15952	// group.editWindow.ReduceMesh(true);
15483	15953	}
15484	15954
..	..	@@ -15486,7 +15956,7 @@
15486	15956	{
15487	15957	//Composite group = (Composite) object;
15488	15958	Object3D group = object;
15489		- group.editWindow.ResetCentroid();
	15959	+ group.GetWindow().ResetCentroid();
15490	15960	}
15491	15961
15492	15962	void IncDepth()
..	..	@@ -15568,8 +16038,6 @@
15568	16038
15569	16039	int width = getBounds().width;
15570	16040	int height = getBounds().height;
15571		- ClickInfo info = new ClickInfo();
15572		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15573	16041	//Image img = CreateImage(width, height);
15574	16042	//System.out.println("width = " + width + "; height = " + height + "\n");
15575	16043
..	..	@@ -15646,48 +16114,77 @@
15646	16114	}
15647	16115	if (object != null && !hasMarquee)
15648	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	+
15649	16123	if (isRenderer)
15650	16124	{
15651		- info.flags++;
	16125	+ object.clickInfo.flags++;
15652	16126	double frameAspect = (double) width / (double) height;
15653	16127	if (frameAspect > renderCamera.aspect)
15654	16128	{
15655	16129	int desired = (int) ((double) height * renderCamera.aspect);
15656		- info.bounds.width -= width - desired;
15657		- info.bounds.x += (width - desired) / 2;
	16130	+ object.clickInfo.bounds.width -= width - desired;
	16131	+ object.clickInfo.bounds.x += (width - desired) / 2;
15658	16132	} else
15659	16133	{
15660	16134	int desired = (int) ((double) width / renderCamera.aspect);
15661		- info.bounds.height -= height - desired;
15662		- info.bounds.y += (height - desired) / 2;
	16135	+ object.clickInfo.bounds.height -= height - desired;
	16136	+ object.clickInfo.bounds.y += (height - desired) / 2;
15663	16137	}
15664	16138	}
15665		- info.g = gr;
15666		- info.camera = renderCamera;
	16139	+
	16140	+ object.clickInfo.g = gr;
	16141	+ object.clickInfo.camera = renderCamera;
15667	16142	/*
15668	16143	// Memory intensive (brep.verticescopy)
15669	16144	if (!(object instanceof Composite))
15670	16145	object.draw(info, 0, false); // SLOW :
15671	16146	*/
15672		- if (!isRenderer)
	16147	+ if (!isRenderer) // && drag)
15673	16148	{
15674		- object.drawEditHandles(info, 0);
15675		-
15676		- 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)
15677	16152	{
15678		- 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)
15679	16159	{
15680		- case Object3D.hitCenter: gr.setColor(Color.pink);
15681		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15682		- break;
15683		- case Object3D.hitRotate: gr.setColor(Color.yellow);
15684		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15685		- break;
15686		- case Object3D.hitScale: gr.setColor(Color.cyan);
15687		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15688		- 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;
15689	16167	}
15690		-
	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	+ }
15691	16188	}
15692	16189	}
15693	16190	}
..	..	@@ -15702,7 +16199,7 @@
15702	16199	if (hasMarquee)
15703	16200	{
15704	16201	gr.setXORMode(Color.white);
15705		- gr.setColor(Color.red);
	16202	+ gr.setColor(Color.white);
15706	16203	if (!firstime)
15707	16204	{
15708	16205	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -16169,6 +16666,8 @@
16169	16666	private /static/ boolean firstime;
16170	16667	private /static/ cVector newView = new cVector();
16171	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"};
16172	16671	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16173	16672	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16174	16673	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16181,29 +16680,67 @@
16181	16680	{
16182	16681	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16183	16682
	16683	+ int usedsuf = 0;
	16684	+
16184	16685	for (int i = 0; i < suffixes.length; i++)
16185	16686	{
16186		- String resourceName = basename + suffixes[i] + "." + suffix;
16187		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16188		- mipmapped,
16189		- FileUtil.getFileSuffix(resourceName));
16190		- if (data == null)
	16687	+ String[] suffixe = suffixes;
	16688	+ String[] fallback = suffixes2;
	16689	+ String[] fallfallback = suffixes3;
	16690	+
	16691	+ for (int c=usedsuf; --c>=0;)
16191	16692	{
16192		- throw new IOException("Unable to load texture " + resourceName);
	16693	+// String[] temp = suffixe;
	16694	+// suffixe = fallback;
	16695	+// fallback = fallfallback;
	16696	+// fallfallback = temp;
16193	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	+
16194	16726	//System.out.println("Target = " + targets[i]);
16195	16727	cubemap.updateImage(data, targets[i]);
16196	16728	}
16197	16729
16198	16730	return cubemap;
16199	16731	}
	16732	+
16200	16733	int bigsphere = -1;
16201	16734
16202	16735	float BGcolor = 0.5f;
16203	16736
16204		- private void DrawSkyBox(GL gl)
	16737	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16738	+
	16739	+ private void DrawSkyBox(GL gl, float ratio)
16205	16740	{
16206		- if (envyoff \|\| cubemap == null)
	16741	+ if (//envyoff \|\|
	16742	+ WIREFRAME \|\|
	16743	+ cubemap == null)
16207	16744	{
16208	16745	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16209	16746	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16218,7 +16755,17 @@
16218	16755	// Compensates for ExaminerViewer's modification of modelview matrix
16219	16756	gl.glMatrixMode(GL.GL_MODELVIEW);
16220	16757	gl.glLoadIdentity();
	16758	+ gl.glScalef(1,ratio,1);
16221	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	+
16222	16769	//gl.glActiveTexture(GL.GL_TEXTURE1);
16223	16770	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16224	16771
..	..	@@ -16250,6 +16797,7 @@
16250	16797	{
16251	16798	gl.glScalef(1.0f, -1.0f, 1.0f);
16252	16799	}
	16800	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16253	16801	gl.glMultMatrixd(viewrot_1, 0);
16254	16802	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16255	16803	//viewer.updateInverseRotation(gl);
..	..	@@ -16290,7 +16838,8 @@
16290	16838	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16291	16839
16292	16840	cubemap.disable();
16293		- ////cubemap.unbind();
	16841	+ //cubemap.dispose();
	16842	+
16294	16843	if (CULLFACE)
16295	16844	{
16296	16845	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16485,6 +17034,14 @@
16485	17034	}
16486	17035	}
16487	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	+
16488	17045	class SelectBuffer implements GLEventListener
16489	17046	{
16490	17047
..	..	@@ -16500,7 +17057,7 @@
16500	17057	//new Exception().printStackTrace();
16501	17058	System.out.println("select buffer init");
16502	17059	// Use debug pipeline
16503		- drawable.setGL(new DebugGL(drawable.getGL()));
	17060	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16504	17061
16505	17062	GL gl = drawable.getGL();
16506	17063
..	..	@@ -16564,6 +17121,17 @@
16564	17121
16565	17122	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16566	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	+
16567	17135	//int tmp = selection_view;
16568	17136	//selection_view = -1;
16569	17137	int temp = DrawMode();
..	..	@@ -16575,6 +17143,17 @@
16575	17143	// temp = DEFAULT; // patch for selection debug
16576	17144	Globals.drawMode = temp; // WARNING
16577	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	+
16578	17157	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16579	17158
16580	17159	// trying different ways of getting the depth info over
..	..	@@ -16678,29 +17257,31 @@
16678	17257	}
16679	17258
16680	17259	if (!movingcamera && !PAINTMODE)
16681		- object.editWindow.ScreenFitPoint(); // fev 2014
	17260	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16682	17261
16683		- 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)
16684	17263	{
16685		- 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);
16686	17265
16687		- Object3D group = new Object3D("inst" + paintcount++);
	17266	+ if (object.GetWindow().copy.selection.Size() > 0)
	17267	+ {
	17268	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16688	17269
16689		- group.CreateMaterial(); // use a void leaf to select instances
16690		-
16691		- group.add(paintobj); // link
16692		-
16693		- object.editWindow.SnapObject(group);
16694		-
16695		- Object3D folder = object.editWindow.copy;
16696		-
16697		- if (object.editWindow.copy.selection.Size() > 0)
16698		- folder = object.editWindow.copy.selection.elementAt(0);
16699		-
16700		- folder.add(group);
16701		-
16702		- object.editWindow.ResetModel();
16703		- 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	+ }
16704	17285	}
16705	17286	else
16706	17287	paintcount = 0;
..	..	@@ -16739,6 +17320,11 @@
16739	17320	//System.out.println("objects[color] = " + objects[color]);
16740	17321	//objects[color].Select();
16741	17322	indexcount = 0;
	17323	+ ObjEditor window = object.GetWindow();
	17324	+ if (window != null && deselect)
	17325	+ {
	17326	+ window.Select(null, deselect, true);
	17327	+ }
16742	17328	object.Select(color, deselect);
16743	17329	}
16744	17330
..	..	@@ -16789,6 +17375,7 @@
16789	17375
16790	17376	public void init(GLAutoDrawable drawable)
16791	17377	{
	17378	+ if (Globals.DEBUG)
16792	17379	System.out.println("shadow buffer init");
16793	17380
16794	17381	GL gl = drawable.getGL();
..	..	@@ -17017,10 +17604,14 @@
17017	17604	gl.glFlush();
17018	17605
17019	17606	/**/
17020		- 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);
17021	17608
17022		- float[] pixels = occlusionsizebuffer.array();
	17609	+ float[] depths = occlusiondepthbuffer.array();
17023	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	+
17024	17615	double r = 0, g = 0, b = 0;
17025	17616
17026	17617	double count = 0;
..	..	@@ -17031,7 +17622,7 @@
17031	17622
17032	17623	double FACTOR = 1;
17033	17624
17034		- for (int i = 0; i < pixels.length; i++)
	17625	+ for (int i = 0; i < depths.length; i++)
17035	17626	{
17036	17627	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
17037	17628	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -17114,7 +17705,7 @@
17114	17705
17115	17706	double scale = ray.z; // 1; // cos
17116	17707
17117		- float depth = pixels[newindex];
	17708	+ float depth = depths[newindex];
17118	17709
17119	17710	/*
17120	17711	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17311,11 +17902,14 @@
17311	17902	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17312	17903	static IntBuffer bigAAbuffer;
17313	17904	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17314		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	17905	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17315	17906	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17316	17907	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17317	17908	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17318		- 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	+
17319	17913	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17320	17914	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17321	17915	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();