~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -18,7 +18,10 @@
18	18	import javax.imageio.ImageIO;
19	19	import javax.imageio.ImageWriteParam;
20	20	import javax.imageio.ImageWriter;
	21	+import javax.imageio.ImageReadParam;
	22	+import javax.imageio.ImageReader;
21	23	import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
	24	+import javax.imageio.stream.ImageInputStream;
22	25	import javax.imageio.stream.ImageOutputStream;
23	26	import javax.imageio.ImageWriteParam;
24	27
..	..	@@ -30,6 +33,7 @@
30	33	import java.nio.*;
31	34
32	35	import gleem.linalg.Mat4f;
	36	+import javax.imageio.ImageTypeSpecifier;
33	37
34	38	class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	39	{
..	..	@@ -44,6 +48,39 @@
44	48	static boolean ABORTED = false;
45	49
46	50	static int STEP = 1;
	51	+
	52	+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
	53	+ {
	54	+ int[] pixels = new int[bytes.length/3];
	55	+ for (int i=pixels.length; --i>=0;)
	56	+ {
	57	+ int i3 = i*3;
	58	+ pixels[i] = 0xFF;
	59	+ pixels[i] <<= 8;
	60	+ pixels[i] \|= bytes[i3+2] & 0xFF;
	61	+ pixels[i] <<= 8;
	62	+ pixels[i] \|= bytes[i3+1] & 0xFF;
	63	+ pixels[i] <<= 8;
	64	+ pixels[i] \|= bytes[i3] & 0xFF;
	65	+ }
	66	+ /*
	67	+ int r=0,g=0,b=0,a=0;
	68	+ for (int i=0; i<width; i++)
	69	+ for (int j=0; j<height; j++)
	70	+ {
	71	+ int index = j*width+i;
	72	+ int p = pixels[index];
	73	+ a = ((p>>24) & 0xFF);
	74	+ r = ((p>>16) & 0xFF);
	75	+ g = ((p>>8) & 0xFF);
	76	+ b = (p & 0xFF);
	77	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	78	+ }
	79	+ /**/
	80	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	81	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	82	+ return rendImage;
	83	+ }
47	84
48	85	/static/ private boolean CULLFACE = false; // true;
49	86	/static/ boolean NEAREST = false; // true;
..	..	@@ -60,7 +97,7 @@
60	97	//boolean REDUCETEXTURE = true;
61	98	boolean CACHETEXTURE = true;
62	99	boolean CLEANCACHE = false; // true;
63		- boolean MIPMAP = false; // true;
	100	+ boolean MIPMAP = false; // true; // never works...
64	101	boolean COMPRESSTEXTURE = false;
65	102	boolean KOMPACTTEXTURE = false; // true;
66	103	boolean RESIZETEXTURE = false;
..	..	@@ -73,7 +110,11 @@
73	110	//private Mat4f spotlightTransform = new Mat4f();
74	111	//private Mat4f spotlightInverseTransform = new Mat4f();
75	112	static GLContext glcontext = null;
76		- /static/ com.sun.opengl.util.texture.Texture cubemap;
	113	+ /static/ com.sun.opengl.util.texture.Texture cubemap; // Either custom or rgb
	114	+ /static/ com.sun.opengl.util.texture.Texture cubemapcustom;
	115	+ /static/ com.sun.opengl.util.texture.Texture cubemaprgb;
	116	+ boolean transformMode;
	117	+
77	118	boolean reverseUP = false;
78	119	static boolean frozen = false;
79	120	boolean enablebackspace = false; // patch for back buffer refresh
..	..	@@ -127,7 +168,7 @@
127	168
128	169
129	170	// OPTIONS
130		- boolean Skinshader = true;
	171	+ boolean Skinshader = false; // true;
131	172	boolean cameraLight = false;
132	173	boolean UVdebug = false;
133	174	boolean Udebug = false;
..	..	@@ -136,7 +177,7 @@
136	177	static boolean doublesided = false; // true; // reversed normals are awful for conformance
137	178	boolean anisotropy = true;
138	179	boolean softshadow = true; // slower but better false;
139		- boolean opacityhalo = false;
	180	+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
140	181
141	182	boolean macromode = false;
142	183
..	..	@@ -150,6 +191,19 @@
150	191	}
151	192
152	193	private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	194	+
	195	+ public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	196	+ {
	197	+ try
	198	+ {
	199	+ return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	200	+ } catch (IOException e)
	201	+ {
	202	+ System.out.println("NAME = " + name);
	203	+ e.printStackTrace(); // throw new RuntimeException(e);
	204	+ return null;
	205	+ }
	206	+ }
153	207
154	208	void SetAsGLRenderer(boolean b)
155	209	{
..	..	@@ -169,7 +223,8 @@
169	223
170	224	SetCamera(cam);
171	225
172		- SetLight(new Camera(new cVector(10, 10, -20)));
	226	+ // Warning: not used.
	227	+ SetLight(new Camera(new cVector(15, 10, -20)));
173	228
174	229	object = o;
175	230
..	..	@@ -1447,6 +1502,8 @@
1447	1502	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1448	1503	}
1449	1504
	1505	+ float[] colorV = new float[4];
	1506	+
1450	1507	void SetColor(Object3D obj, Vertex p0)
1451	1508	{
1452	1509	CameraPane display = this;
..	..	@@ -1514,8 +1571,6 @@
1514	1571	{
1515	1572	return;
1516	1573	}
1517		-
1518		- float[] colorV = new float[3];
1519	1574
1520	1575	if (false) // marked)
1521	1576	{
..	..	@@ -1764,7 +1819,7 @@
1764	1819
1765	1820	display.modelParams7[0] = 0;
1766	1821	display.modelParams7[1] = 1000;
1767		- display.modelParams7[2] = 0;
	1822	+ display.modelParams7[2] = material.parallax;
1768	1823	display.modelParams7[3] = 0;
1769	1824
1770	1825	//display.modelParams6[0] = 100; // criss de bug de bump
..	..	@@ -1997,9 +2052,9 @@
1997	2052	switch(viewcode)
1998	2053	{
1999	2054	case 0: return "main";
2000		- case 1: return "one";
2001		- case 2: return "two";
2002		- case 3: return "three";
	2055	+ case 1: return "Red";
	2056	+ case 2: return "Green";
	2057	+ case 3: return "Blue";
2003	2058	case 4: return "light";
2004	2059	}
2005	2060
..	..	@@ -2405,6 +2460,21 @@
2405	2460	return currentGL;
2406	2461	}
2407	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	+
2408	2478	/**/
2409	2479	class CacheTexture
2410	2480	{
..	..	@@ -2413,28 +2483,31 @@
2413	2483
2414	2484	int resolution;
2415	2485
2416		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2486	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2417	2487	{
2418		- texture = tex;
	2488	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2489	+ texturedata = texdata;
2419	2490	resolution = res;
2420	2491	}
2421	2492	}
2422	2493	/**/
2423	2494
2424	2495	// TEXTURE static Texture texture;
2425		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2426		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2427		- 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	+
2428	2501	int pigmentdepth = 0;
2429	2502	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2430	2503	int bumpdepth = 0;
2431	2504	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2432	2505	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2433	2506	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2434		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2507	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2435	2508	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2436	2509
2437		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2510	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2438	2511	{
2439	2512	TextureData texturedata = null;
2440	2513
..	..	@@ -2444,7 +2517,7 @@
2444	2517	com.sun.opengl.util.texture.TextureIO.newTextureData(
2445	2518	getClass().getClassLoader().getResourceAsStream(name),
2446	2519	true,
2447		- com.sun.opengl.util.texture.TextureIO.PNG);
	2520	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
2448	2521	} catch (java.io.IOException e)
2449	2522	{
2450	2523	throw new javax.media.opengl.GLException(e);
..	..	@@ -2453,13 +2526,34 @@
2453	2526	if (bump)
2454	2527	texturedata = ConvertBump(texturedata, false);
2455	2528
2456		- com.sun.opengl.util.texture.Texture texture =
2457		- 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);
2458	2531
2459		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2460		- 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);
2461	2534
2462		- 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;
2463	2557	}
2464	2558
2465	2559	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3532,6 +3626,8 @@
3532	3626
3533	3627	System.out.println("LOADING TEXTURE : " + name);
3534	3628
	3629	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3630	+
3535	3631	//
3536	3632	if (false) // compressbit > 0)
3537	3633	{
..	..	@@ -7945,8 +8041,8 @@
7945	8041	pigment = null;
7946	8042	}
7947	8043
7948		- ReleaseTexture(bump, true);
7949		- ReleaseTexture(pigment, false);
	8044	+ ReleaseTexture(tex, true);
	8045	+ ReleaseTexture(tex, false);
7950	8046	}
7951	8047
7952	8048	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -7975,7 +8071,7 @@
7975	8071	pigment = null;
7976	8072	}
7977	8073
7978		- ReleaseTexture(pigment, false);
	8074	+ ReleaseTexture(tex, false);
7979	8075	}
7980	8076
7981	8077	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -8004,10 +8100,10 @@
8004	8100	bump = null;
8005	8101	}
8006	8102
8007		- ReleaseTexture(bump, true);
	8103	+ ReleaseTexture(tex, true);
8008	8104	}
8009	8105
8010		- void ReleaseTexture(String tex, boolean bump)
	8106	+ void ReleaseTexture(cTexture tex, boolean bump)
8011	8107	{
8012	8108	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8013	8109	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8018,7 +8114,7 @@
8018	8114	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
8019	8115
8020	8116	if (tex != null)
8021		- texture = textures.get(tex);
	8117	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
8022	8118
8023	8119	// //assert( texture != null );
8024	8120	// if (texture == null)
..	..	@@ -8112,47 +8208,50 @@
8112	8208
8113	8209	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8114	8210	{
8115		- if (// DrawMode() != 0 \|\| /tex == null \|\|/
8116		- ambientOcclusion ) // \|\| !textureon)
8117		- {
8118		- return; // false;
8119		- }
8120		-
8121		- if (tex == null)
8122		- {
8123		- BindTexture(null,false,resolution);
8124		- BindTexture(null,true,resolution);
8125		- return;
8126		- }
	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;
8127	8252
8128		- String pigment = Object3D.GetPigment(tex);
8129		- String bump = Object3D.GetBump(tex);
8130		-
8131		- usedtextures.put(pigment, pigment);
8132		- usedtextures.put(bump, bump);
8133		-
8134		- //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8135		- {
8136		- // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8137		- // System.out.println("; bump = " + bump);
8138		- }
8139		-
8140		- if (bump.equals(""))
8141		- {
8142		- bump = null;
8143		- }
8144		- if (pigment.equals(""))
8145		- {
8146		- pigment = null;
8147		- }
8148		-
8149		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8150		- BindTexture(pigment, false, resolution);
8151		- GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8152		- BindTexture(bump, true, resolution);
8153		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8154		-
8155		- return; // true;
	8253	+ BindPigmentTexture(tex, resolution);
	8254	+ BindBumpTexture(tex, resolution);
8156	8255	}
8157	8256
8158	8257	/boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8171,7 +8270,7 @@
8171	8270
8172	8271	String pigment = Object3D.GetPigment(tex);
8173	8272
8174		- usedtextures.put(pigment, pigment);
	8273	+ usedtextures.add(tex);
8175	8274
8176	8275	//if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8177	8276	{
..	..	@@ -8185,7 +8284,7 @@
8185	8284	}
8186	8285
8187	8286	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8188		- BindTexture(pigment, false, resolution);
	8287	+ BindTexture(tex, false, resolution);
8189	8288	}
8190	8289
8191	8290	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8204,7 +8303,7 @@
8204	8303
8205	8304	String bump = Object3D.GetBump(tex);
8206	8305
8207		- usedtextures.put(bump, bump);
	8306	+ usedtextures.add(tex);
8208	8307
8209	8308	//if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8210	8309	{
..	..	@@ -8218,7 +8317,7 @@
8218	8317	}
8219	8318
8220	8319	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8221		- BindTexture(bump, true, resolution);
	8320	+ BindTexture(tex, true, resolution);
8222	8321	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8223	8322	}
8224	8323
..	..	@@ -8242,13 +8341,19 @@
8242	8341	return fileExists;
8243	8342	}
8244	8343
8245		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8344	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8246	8345	{
8247		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8346	+ CacheTexture texturecache = null;
8248	8347
8249	8348	if (tex != null)
8250	8349	{
8251		- 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	+ }
8252	8357
8253	8358	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8254	8359
..	..	@@ -8258,19 +8363,46 @@
8258	8363	// else
8259	8364	// if (!texname.startsWith("/"))
8260	8365	// texname = "/Users/nbriere/Textures/" + texname;
8261		- if (!FileExists(tex))
	8366	+ if (!FileExists(texname) && !texname.startsWith("@"))
8262	8367	{
8263	8368	texname = fallbackTextureName;
8264	8369	}
8265	8370
8266	8371	if (CACHETEXTURE)
8267		- texture = textures.get(texname); // TEXTURE CACHE
8268		-
8269		- TextureData texturedata = null;
8270		-
8271		- if (texture == null \|\| texture.resolution < resolution)
8272	8372	{
8273		- 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(""))
8274	8406	{
8275	8407	assert(!bump);
8276	8408	// if (bump)
..	..	@@ -8281,19 +8413,23 @@
8281	8413	// }
8282	8414	// else
8283	8415	// {
8284		- texture = textures.get(tex);
8285		- if (texture == null)
	8416	+ // texturecache = textures.get(texname); // suspicious
	8417	+ if (texturecache == null)
8286	8418	{
8287		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8419	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8288	8420	}
	8421	+ else
	8422	+ new Exception().printStackTrace();
8289	8423	// }
8290	8424	} else
8291		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8425	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8292	8426	{
8293	8427	assert(bump);
8294		- texture = textures.get(tex);
8295		- if (texture == null)
8296		- 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();
8297	8433	} else
8298	8434	{
8299	8435	//if (tex.equals("IMMORTAL"))
..	..	@@ -8301,11 +8437,22 @@
8301	8437	// texture = GetResourceTexture("default.png");
8302	8438	//} else
8303	8439	//{
8304		- if (tex.equals("WHITE_NOISE"))
	8440	+ if (texname.endsWith("WHITE_NOISE"))
8305	8441	{
8306		- texture = textures.get(tex);
8307		- if (texture == null)
8308		- 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();
8309	8456	} else
8310	8457	{
8311	8458	if (textureon)
..	..	@@ -8364,19 +8511,20 @@
8364	8511	if (texturedata == null)
8365	8512	throw new Exception();
8366	8513
8367		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8514	+ texturecache = new CacheTexture(texturedata,resolution);
8368	8515	//texture = GetTexture(tex, bump);
8369	8516	}
	8517	+ }
8370	8518	}
8371	8519	//}
8372	8520	}
8373	8521
8374		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8522	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8375	8523	{
8376	8524	//return false;
8377	8525
8378	8526	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8379		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8527	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8380	8528	{
8381	8529	// String ext = "_highres";
8382	8530	// if (REDUCETEXTURE)
..	..	@@ -8393,52 +8541,17 @@
8393	8541	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8394	8542	if (!cachefile.exists())
8395	8543	{
8396		- // cache to disk
8397		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8398		- //buffers[0].
8399		-
8400		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8401		- int[] pixels = new int[bytebuf.capacity()/3];
8402		-
8403		- // squared size heuristic...
8404		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8544	+ //if (texturedata.getWidth() == texturedata.getHeight())
8405	8545	{
8406		- for (int i=pixels.length; --i>=0;)
8407		- {
8408		- int i3 = i*3;
8409		- pixels[i] = 0xFF;
8410		- pixels[i] <<= 8;
8411		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8412		- pixels[i] <<= 8;
8413		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8414		- pixels[i] <<= 8;
8415		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8416		- }
8417		-
8418		- /*
8419		- int r=0,g=0,b=0,a=0;
8420		- for (int i=0; i<width; i++)
8421		- for (int j=0; j<height; j++)
8422		- {
8423		- int index = j*width+i;
8424		- int p = pixels[index];
8425		- a = ((p>>24) & 0xFF);
8426		- r = ((p>>16) & 0xFF);
8427		- g = ((p>>8) & 0xFF);
8428		- b = (p & 0xFF);
8429		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8430		- }
8431		- /**/
8432		- int width = (int)Math.sqrt(pixels.length); // squared
8433		- int height = width;
8434		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8435		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8546	+ BufferedImage rendImage = CreateBim(texturedata);
	8547	+
8436	8548	ImageWriter writer = null;
8437	8549	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8438	8550	if (iter.hasNext()) {
8439	8551	writer = (ImageWriter)iter.next();
8440	8552	}
8441		- float compressionQuality = 0.9f;
	8553	+
	8554	+ float compressionQuality = 0.85f;
8442	8555	try
8443	8556	{
8444	8557	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8455,18 +8568,20 @@
8455	8568	}
8456	8569	}
8457	8570	}
8458		-
	8571	+
	8572	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8573	+
8459	8574	//System.out.println("Texture = " + tex);
8460		- if (textures.containsKey(texname))
	8575	+ if (textures.containsKey(tex))
8461	8576	{
8462		- CacheTexture thetex = textures.get(texname);
	8577	+ CacheTexture thetex = textures.get(tex);
8463	8578	thetex.texture.disable();
8464	8579	thetex.texture.dispose();
8465		- textures.remove(texname);
	8580	+ textures.remove(tex);
8466	8581	}
8467	8582
8468		- texture.texturedata = texturedata;
8469		- textures.put(texname, texture);
	8583	+ //texture.texturedata = texturedata;
	8584	+ textures.put(tex, texturecache);
8470	8585
8471	8586	// newtex = true;
8472	8587	}
..	..	@@ -8482,10 +8597,44 @@
8482	8597	}
8483	8598	}
8484	8599
8485		- return texture;
	8600	+ return texturecache;
8486	8601	}
8487	8602
8488		- 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
8489	8638	{
8490	8639	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8491	8640
..	..	@@ -8503,14 +8652,14 @@
8503	8652	return texture!=null?texture.texture:null;
8504	8653	}
8505	8654
8506		- 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
8507	8656	{
8508	8657	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8509	8658
8510	8659	return texture!=null?texture.texturedata:null;
8511	8660	}
8512	8661
8513		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8662	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8514	8663	{
8515	8664	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8516	8665	{
..	..	@@ -8552,6 +8701,72 @@
8552	8701	return true; // Warning: not used.
8553	8702	}
8554	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	+
8555	8770	ShadowBuffer shadowPBuf;
8556	8771	AntialiasBuffer antialiasPBuf;
8557	8772	int MAXSTACK;
..	..	@@ -8568,10 +8783,12 @@
8568	8783
8569	8784	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8570	8785	MAXSTACK = temp[0];
8571		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8786	+ if (Globals.DEBUG)
	8787	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8572	8788	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8573	8789	MAXSTACK = temp[0];
8574		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8790	+ if (Globals.DEBUG)
	8791	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8575	8792
8576	8793	// Use debug pipeline
8577	8794	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8579,7 +8796,8 @@
8579	8796	gl = drawable.getGL(); //
8580	8797
8581	8798	GL gl3 = getGL();
8582		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8583	8801
8584	8802
8585	8803	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8744,7 +8962,7 @@
8744	8962
8745	8963	if (cubemap == null)
8746	8964	{
8747		- LoadEnvy(5);
	8965	+ //LoadEnvy(1);
8748	8966	}
8749	8967
8750	8968	//cubemap.enable();
..	..	@@ -9020,6 +9238,8 @@
9020	9238
9021	9239	void LoadEnvy(int which)
9022	9240	{
	9241	+ assert(false);
	9242	+
9023	9243	String name;
9024	9244	String ext;
9025	9245
..	..	@@ -9031,37 +9251,58 @@
9031	9251	cubemap = null;
9032	9252	return;
9033	9253	case 1:
9034		- name = "cubemaps/box_";
9035		- ext = "png";
	9254	+ name = "cubemaps/rgb/";
	9255	+ ext = "jpg";
9036	9256	reverseUP = false;
9037	9257	break;
9038	9258	case 2:
9039		- name = "cubemaps/uffizi_";
9040		- ext = "png";
9041		- break; // reverseUP = true; break;
	9259	+ name = "cubemaps/uffizi/";
	9260	+ ext = "jpg";
	9261	+ reverseUP = false;
	9262	+ break;
9042	9263	case 3:
9043		- name = "cubemaps/CloudyHills_";
9044		- ext = "tga";
	9264	+ name = "cubemaps/CloudyHills/";
	9265	+ ext = "jpg";
9045	9266	reverseUP = false;
9046	9267	break;
9047	9268	case 4:
9048		- name = "cubemaps/cornell_";
	9269	+ name = "cubemaps/cornell/";
9049	9270	ext = "png";
9050	9271	reverseUP = false;
9051	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;
9052	9298	default:
9053		- name = "cubemaps/rgb_";
9054		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9299	+ name = "cubemaps/box/";
	9300	+ ext = "png"; /mipmap = true;/
	9301	+ reverseUP = false;
9055	9302	break;
9056	9303	}
9057		-
9058		- try
9059		- {
9060		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9061		- } catch (IOException e)
9062		- {
9063		- throw new RuntimeException(e);
9064		- }
	9304	+
	9305	+ LoadSkybox(name, ext, mipmap);
9065	9306	}
9066	9307
9067	9308	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -9093,8 +9334,12 @@
9093	9334	static double[] model = new double[16];
9094	9335	double[] camera2light = new double[16];
9095	9336	double[] light2camera = new double[16];
9096		- int newenvy = -1;
9097		- boolean envyoff = true; // false;
	9337	+
	9338	+ //int newenvy = -1;
	9339	+ //boolean envyoff = false;
	9340	+
	9341	+ String loadedskyboxname;
	9342	+
9098	9343	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9099	9344	//float[] light0 = { 0,0,0 };
9100	9345	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9512,7 +9757,7 @@
9512	9757
9513	9758	if (renderCamera != lightCamera)
9514	9759	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9515		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9760	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9516	9761
9517	9762	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9518	9763
..	..	@@ -9528,7 +9773,7 @@
9528	9773
9529	9774	if (renderCamera != lightCamera)
9530	9775	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9531		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9776	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9532	9777
9533	9778	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9534	9779
..	..	@@ -9574,10 +9819,12 @@
9574	9819	rati = 1 / rati;
9575	9820	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9576	9821	}
9577		- assert (newenvy == -1);
	9822	+
	9823	+ //assert (newenvy == -1);
	9824	+
9578	9825	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9579	9826	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9580		- DrawSkyBox(gl);
	9827	+ DrawSkyBox(gl, (float)rati);
9581	9828	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9582	9829	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9583	9830	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -10443,9 +10690,18 @@
10443	10690	static boolean init = false;
10444	10691
10445	10692	double[][] matrix = LA.newMatrix();
	10693	+
	10694	+ // This is to refresh the UI of the material panel.
	10695	+ ObjEditor patchMaterial;
10446	10696
10447	10697	public void display(GLAutoDrawable drawable)
10448	10698	{
	10699	+ if (patchMaterial.patchMaterial)
	10700	+ {
	10701	+ patchMaterial.patchMaterial = false;
	10702	+ patchMaterial.objectPanel.setSelectedIndex(1);
	10703	+ }
	10704	+
10449	10705	if (Grafreed.savesound && Grafreed.hassound)
10450	10706	{
10451	10707	Grafreed.wav.save();
..	..	@@ -10614,7 +10870,7 @@
10614	10870
10615	10871	if (wait)
10616	10872	{
10617		- Sleep(500);
	10873	+ Sleep(200); // blocks everything
10618	10874
10619	10875	wait = false;
10620	10876	}
..	..	@@ -10729,7 +10985,7 @@
10729	10985	// if (parentcam != renderCamera) // not a light
10730	10986	if (cam != lightCamera)
10731	10987	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10732		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10988	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10733	10989
10734	10990	for (int j = 0; j < 4; j++)
10735	10991	{
..	..	@@ -10744,7 +11000,7 @@
10744	11000	// if (parentcam != renderCamera) // not a light
10745	11001	if (cam != lightCamera)
10746	11002	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10747		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	11003	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10748	11004
10749	11005	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10750	11006
..	..	@@ -10830,13 +11086,43 @@
10830	11086	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10831	11087	}
10832	11088
10833		- 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"))
10834	11097	{
10835		- LoadEnvy(newenvy);
	11098	+ if (cubemaprgb == null)
	11099	+ {
	11100	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11101	+ }
	11102	+
	11103	+ cubemap = cubemaprgb;
10836	11104	}
10837		-
10838		- newenvy = -1;
10839		-
	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	+
10840	11126	ratio = ((double) getWidth()) / getHeight();
10841	11127	//System.out.println("ratio = " + ratio);
10842	11128
..	..	@@ -10852,7 +11138,7 @@
10852	11138
10853	11139	if (!IsFrozen() && !ambientOcclusion)
10854	11140	{
10855		- DrawSkyBox(gl);
	11141	+ DrawSkyBox(gl, (float)ratio);
10856	11142	}
10857	11143
10858	11144	//if (selection_view == -1)
..	..	@@ -11138,7 +11424,7 @@
11138	11424
11139	11425	// if (cam != lightCamera)
11140	11426	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11141		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11427	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11142	11428	}
11143	11429
11144	11430	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -11297,7 +11583,7 @@
11297	11583	}
11298	11584	}
11299	11585
11300		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11586	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11301	11587	{
11302	11588	//gl.glDepthFunc(GL.GL_LEQUAL);
11303	11589	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11305,24 +11591,21 @@
11305	11591
11306	11592	boolean texon = textureon;
11307	11593
11308		- if (RENDERPROGRAM > 0)
11309		- {
11310		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11311		- textureon = false;
11312		- }
	11594	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11595	+ textureon = false;
	11596	+
11313	11597	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11314	11598	//System.out.println("ALLO");
11315	11599	gl.glColorMask(false, false, false, false);
11316	11600	DrawObject(gl);
11317		- if (RENDERPROGRAM > 0)
11318		- {
11319		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11320		- textureon = texon;
11321		- }
	11601	+
	11602	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11603	+ textureon = texon;
	11604	+
11322	11605	gl.glColorMask(true, true, true, true);
11323	11606
11324	11607	gl.glDepthFunc(GL.GL_EQUAL);
11325		- //gl.glDepthMask(false);
	11608	+ gl.glDepthMask(false);
11326	11609	}
11327	11610
11328	11611	if (false) // DrawMode() == SHADOW)
..	..	@@ -11662,20 +11945,32 @@
11662	11945	ReleaseTextures(DEFAULT_TEXTURES);
11663	11946
11664	11947	if (CLEANCACHE)
11665		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11948	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11666	11949	{
11667		- String tex = e.nextElement();
	11950	+ cTexture tex = e.nextElement();
11668	11951
11669	11952	// System.out.println("Texture --------- " + tex);
11670	11953
11671		- if (tex.equals("WHITE_NOISE"))
	11954	+ if (tex.equals("WHITE_NOISE:"))
11672	11955	continue;
11673	11956
11674		- if (!usedtextures.containsKey(tex))
	11957	+ if (!usedtextures.contains(tex))
11675	11958	{
	11959	+ CacheTexture gettex = texturepigment.get(tex);
11676	11960	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11677		- textures.get(tex).texture.dispose();
11678		- 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	+ }
11679	11974	}
11680	11975	}
11681	11976	}
..	..	@@ -12203,8 +12498,76 @@
12203	12498
12204	12499	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12205	12500
12206		- String program =
	12501	+ String programmin =
	12502	+ // Min shader
12207	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	+
12208	12571	//"OPTION ARB_fragment_program_shadow;" +
12209	12572	"PARAM light2cam0 = program.env[10];" +
12210	12573	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12230,7 +12593,7 @@
12230	12593	"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
12231	12594	"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
12232	12595	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12233		- "PARAM params7 = program.env[7];" + // noise power, opacity power
	12596	+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
12234	12597	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
12235	12598	"PARAM options1 = program.env[62];" + // fog rgb color
12236	12599	"PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
..	..	@@ -12319,8 +12682,7 @@
12319	12682	"TEMP shininess;" +
12320	12683	"\n" +
12321	12684	"MOV texSamp, one;" +
12322		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12323		-
	12685	+
12324	12686	"MOV mapgrid.x, one2048th.x;" +
12325	12687	"MOV temp, fragment.texcoord[1];" +
12326	12688	/*
..	..	@@ -12341,20 +12703,20 @@
12341	12703	"MUL temp, floor, mapgrid.x;" +
12342	12704	//"TEX depth0, temp, texture[1], 2D;" +
12343	12705	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12344		- TextureFetch("depth0", "temp", "1") +
	12706	+ ShadowTextureFetch("depth0", "temp", "1") +
12345	12707	"") +
12346	12708	"ADD temp.x, temp.x, mapgrid.x;" +
12347	12709	//"TEX depth1, temp, texture[1], 2D;" +
12348	12710	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12349		- TextureFetch("depth1", "temp", "1") +
	12711	+ ShadowTextureFetch("depth1", "temp", "1") +
12350	12712	"") +
12351	12713	"ADD temp.y, temp.y, mapgrid.x;" +
12352	12714	//"TEX depth2, temp, texture[1], 2D;" +
12353		- TextureFetch("depth2", "temp", "1") +
	12715	+ ShadowTextureFetch("depth2", "temp", "1") +
12354	12716	"SUB temp.x, temp.x, mapgrid.x;" +
12355	12717	//"TEX depth3, temp, texture[1], 2D;" +
12356	12718	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12357		- TextureFetch("depth3", "temp", "1") +
	12719	+ ShadowTextureFetch("depth3", "temp", "1") +
12358	12720	"") +
12359	12721	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12360	12722	//"MOV params, material;" +
..	..	@@ -12476,7 +12838,7 @@
12476	12838	"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
12477	12839	// mar 2013 ??? "KIL alpha.a;" +
12478	12840	"MOV alpha, texSamp.aaaa;" + // y;" +
12479		- "KIL alpha.a;" +
	12841	+ "KIL alpha.a;" + // not sure with parallax mapping
12480	12842	/*
12481	12843	"MUL temp.xy, temp, two;" +
12482	12844	"TXB bump, temp, texture[0], 2D;" +
..	..	@@ -12562,11 +12924,6 @@
12562	12924	"SUB bump0, bump0, half;" +
12563	12925	"ADD bump, bump, bump0;" +
12564	12926
12565		- "MOV temp.x, texSamp.a;" +
12566		- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12567		- //"LRP texSamp0, params5.x, texSamp0, one;" +
12568		- "MOV texSamp.a, temp.x;" +
12569		-
12570	12927	// double-sided
12571	12928	/**/
12572	12929	(doublesided?"DP3 temp.z, normal, eye;" +
..	..	@@ -12596,6 +12953,41 @@
12596	12953	Normalize("U") +
12597	12954
12598	12955	// parallax mapping
	12956	+
	12957	+ "DP3 temp2.x, V, eye;" +
	12958	+ "DP3 temp2.y, U, eye;" +
	12959	+ "DP3 temp2.z, normal, eye;" +
	12960	+ "RCP temp2.z, temp2.z;" +
	12961	+
	12962	+ "DP3 temp2.w, texSamp, texSamp;" + // Height
	12963	+ "RSQ temp2.w, temp2.w;" +
	12964	+ "RCP temp2.w, temp2.w;" +
	12965	+
	12966	+ "SUB temp2.w, temp2.w, half;" +
	12967	+// "SGE temp.x, temp2.w, eps.x;" +
	12968	+// "MUL temp2.w, temp2.w, temp.x;" +
	12969	+
	12970	+ //"MOV texSamp, U;" +
	12971	+
	12972	+ "MUL temp2.z, temp2.z, temp2.w;" +
	12973	+ "MUL temp2.z, temp2.z, params7.z;" + // parallax
	12974	+
	12975	+ "MUL temp2, temp2, temp2.z;" +
	12976	+
	12977	+ "MOV temp, fragment.texcoord[0];" +
	12978	+
	12979	+ "SUB temp, temp, temp2;" +
	12980	+
	12981	+ "TEX texSamp, temp, texture[0], 2D;" +
	12982	+ "POW texSamp.a, texSamp.a, params6.w;" + // punch through
	12983	+ "MOV alpha, texSamp.aaaa;" +
	12984	+
	12985	+// parallax mapping
	12986	+
	12987	+ "MOV temp.x, texSamp.a;" +
	12988	+ "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
	12989	+ //"LRP texSamp0, params5.x, texSamp0, one;" +
	12990	+ "MOV texSamp.a, temp.x;" +
12599	12991
12600	12992	//"MOV temp, fragment.texcoord[0];" +
12601	12993	//
..	..	@@ -12725,10 +13117,10 @@
12725	13117	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12726	13118	"") +
12727	13119
12728		- // display shadow only (bump == 0)
	13120	+ // display shadow only (fakedepth == 0)
12729	13121	"SUB temp.x, half.x, shadow.x;" +
12730	13122	"MOV temp.y, -params5.z;" + // params6.x;" +
12731		- "SLT temp.z, temp.y, -one2048th.x;" +
	13123	+ "SLT temp.z, temp.y, -c256i.x;" +
12732	13124	"SUB temp.y, one.x, temp.z;" +
12733	13125	"MUL temp.x, temp.x, temp.y;" +
12734	13126	"KIL temp.x;" +
..	..	@@ -13059,8 +13451,19 @@
13059	13451	//once = true;
13060	13452	}
13061	13453
13062		- System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13063		- System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13454	+ String program = programmax;
	13455	+
	13456	+ if (Globals.MINSHADER)
	13457	+ {
	13458	+ program = programmin;
	13459	+ }
	13460	+
	13461	+ if (Globals.DEBUG)
	13462	+ {
	13463	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
	13464	+ System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13465	+ }
	13466	+
13064	13467	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13065	13468
13066	13469	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13107,7 +13510,8 @@
13107	13510	"\n" +
13108	13511	"END\n";
13109	13512
13110		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13513	+ if (Globals.DEBUG)
	13514	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13111	13515	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13112	13516
13113	13517	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13152,25 +13556,26 @@
13152	13556	return out;
13153	13557	}
13154	13558
13155		- String TextureFetch(String dest, String src, String unit)
	13559	+ // Also does frustum culling
	13560	+ String ShadowTextureFetch(String dest, String src, String unit)
13156	13561	{
13157	13562	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13158	13563	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13159	13564	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13565	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13566	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13160	13567	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13161		- "SLT " + src + ".z, " + src + ".x, one.x;" +
13162		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13163		- "SLT " + src + ".z, " + src + ".y, one.x;" +
13164		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13568	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13569	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13165	13570	//"SWZ buffer, temp, w,w,w,w;";
13166		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13571	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13167	13572	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13168	13573	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13169	13574	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13170		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13575	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13171	13576
13172		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13173		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13577	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13578	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13174	13579	}
13175	13580
13176	13581	String Shadow(String depth, String shadow)
..	..	@@ -13217,7 +13622,7 @@
13217	13622	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13218	13623	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13219	13624
13220		- // No shadow when out of frustrum
	13625	+ // No shadow when out of frustum
13221	13626	"SGE temp.x, " + depth + ".z, one.z;" +
13222	13627	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13223	13628	"";
..	..	@@ -13364,7 +13769,7 @@
13364	13769	/static/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
13365	13770	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13366	13771	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13367		- /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
	13772	+ /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
13368	13773
13369	13774	//Object3D.cVector2[] vector2buffer;
13370	13775
..	..	@@ -14015,14 +14420,15 @@
14015	14420	drag = false;
14016	14421	//System.out.println("Mouse DOWN");
14017	14422	editObj = false;
14018		- ClickInfo info = new ClickInfo();
14019		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14020		- info.pane = this;
14021		- info.camera = renderCamera;
14022		- info.x = x;
14023		- info.y = y;
14024		- info.modifiers = modifiersex;
14025		- editObj = object.doEditClick(info, 0);
	14423	+ //ClickInfo info = new ClickInfo();
	14424	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14425	+ object.clickInfo.pane = this;
	14426	+ object.clickInfo.camera = renderCamera;
	14427	+ object.clickInfo.x = x;
	14428	+ object.clickInfo.y = y;
	14429	+ object.clickInfo.modifiers = modifiersex;
	14430	+ editObj = object.doEditClick(//info,
	14431	+ 0);
14026	14432	if (!editObj)
14027	14433	{
14028	14434	hasMarquee = true;
..	..	@@ -14304,11 +14710,17 @@
14304	14710	void GoDown(int mod)
14305	14711	{
14306	14712	MODIFIERS \|= COMMAND;
	14713	+ boolean isVR = (mouseMode&VR)!=0;
14307	14714	/**/
14308	14715	if((mod&SHIFT) == SHIFT)
14309		- manipCamera.RotatePosition(0, -speed);
	14716	+ {
	14717	+ if (isVR)
	14718	+ manipCamera.RotateInterest(0, -speed);
	14719	+ else
	14720	+ manipCamera.RotatePosition(0, -speed);
	14721	+ }
14310	14722	else
14311		- manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14723	+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
14312	14724	/**/
14313	14725	if ((mod & SHIFT) == SHIFT)
14314	14726	{
..	..	@@ -14318,6 +14730,8 @@
14318	14730	mouseMode \|= BACKFORTH;
14319	14731	}
14320	14732
	14733	+ targetLookAt.set(manipCamera.lookAt);
	14734	+
14321	14735	//prevX = X = anchorX;
14322	14736	prevY = Y = anchorY - (int) (renderCamera.Distance());
14323	14737	}
..	..	@@ -14326,10 +14740,17 @@
14326	14740	{
14327	14741	MODIFIERS \|= COMMAND;
14328	14742	/**/
	14743	+ boolean isVR = (mouseMode&VR)!=0;
	14744	+
14329	14745	if((mod&SHIFT) == SHIFT)
14330		- manipCamera.RotatePosition(0, speed);
	14746	+ {
	14747	+ if (isVR)
	14748	+ manipCamera.RotateInterest(0, speed);
	14749	+ else
	14750	+ manipCamera.RotatePosition(0, speed);
	14751	+ }
14331	14752	else
14332		- manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14753	+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
14333	14754	/**/
14334	14755	if ((mod & SHIFT) == SHIFT)
14335	14756	{
..	..	@@ -14339,6 +14760,8 @@
14339	14760	mouseMode \|= BACKFORTH;
14340	14761	}
14341	14762
	14763	+ targetLookAt.set(manipCamera.lookAt);
	14764	+
14342	14765	//prevX = X = anchorX;
14343	14766	prevY = Y = anchorY + (int) (renderCamera.Distance());
14344	14767	}
..	..	@@ -14348,9 +14771,14 @@
14348	14771	MODIFIERS \|= COMMAND;
14349	14772	/**/
14350	14773	if((mod&SHIFT) == SHIFT)
14351		- manipCamera.Translate(speed*delta, 0, getWidth());
	14774	+ manipCamera.Translate(speed*delta, 0, getWidth());
14352	14775	else
14353		- manipCamera.RotatePosition(speed, 0);
	14776	+ {
	14777	+ if ((mouseMode&VR)!=0)
	14778	+ manipCamera.RotateInterest(-speed, 0);
	14779	+ else
	14780	+ manipCamera.RotatePosition(speed, 0);
	14781	+ }
14354	14782	/**/
14355	14783	if ((mod & SHIFT) == SHIFT)
14356	14784	{
..	..	@@ -14360,6 +14788,8 @@
14360	14788	mouseMode \|= ROTATE;
14361	14789	} // TRANSLATE;
14362	14790
	14791	+ targetLookAt.set(manipCamera.lookAt);
	14792	+
14363	14793	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
14364	14794	prevY = Y = anchorY;
14365	14795	}
..	..	@@ -14369,9 +14799,15 @@
14369	14799	MODIFIERS \|= COMMAND;
14370	14800	/**/
14371	14801	if((mod&SHIFT) == SHIFT)
14372		- manipCamera.Translate(-speed*delta, 0, getWidth());
	14802	+ manipCamera.Translate(-speed*delta, 0, getWidth());
14373	14803	else
14374		- manipCamera.RotatePosition(-speed, 0);
	14804	+ {
	14805	+ if ((mouseMode&VR)!=0)
	14806	+ manipCamera.RotateInterest(speed, 0);
	14807	+ else
	14808	+ manipCamera.RotatePosition(-speed, 0);
	14809	+ }
	14810	+
14375	14811	/**/
14376	14812	if ((mod & SHIFT) == SHIFT)
14377	14813	{
..	..	@@ -14381,6 +14817,8 @@
14381	14817	mouseMode \|= ROTATE;
14382	14818	} // TRANSLATE;
14383	14819
	14820	+ targetLookAt.set(manipCamera.lookAt);
	14821	+
14384	14822	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
14385	14823	prevY = Y = anchorY;
14386	14824	}
..	..	@@ -14422,15 +14860,16 @@
14422	14860	if (editObj)
14423	14861	{
14424	14862	drag = true;
14425		- ClickInfo info = new ClickInfo();
14426		- info.bounds.setBounds(0, 0,
	14863	+ //ClickInfo info = new ClickInfo();
	14864	+ object.clickInfo.bounds.setBounds(0, 0,
14427	14865	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14428		- info.pane = this;
14429		- info.camera = renderCamera;
14430		- info.x = x;
14431		- info.y = y;
14432		- object.GetWindow().copy
14433		- .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	14866	+ object.clickInfo.pane = this;
	14867	+ object.clickInfo.camera = renderCamera;
	14868	+ object.clickInfo.x = x;
	14869	+ object.clickInfo.y = y;
	14870	+ object //.GetWindow().copy
	14871	+ .doEditDrag(//info,
	14872	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14434	14873	} else
14435	14874	{
14436	14875	if (x < startX)
..	..	@@ -14579,24 +15018,27 @@
14579	15018	}
14580	15019	}
14581	15020
	15021	+// ClickInfo clickInfo = new ClickInfo();
	15022	+
14582	15023	public void mouseMoved(MouseEvent e)
14583	15024	{
14584	15025	//System.out.println("mouseMoved: " + e);
14585	15026	if (isRenderer)
14586	15027	return;
14587	15028
14588		- ClickInfo ci = new ClickInfo();
14589		- ci.x = e.getX();
14590		- ci.y = e.getY();
14591		- ci.modifiers = e.getModifiersEx();
14592		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14593		- ci.pane = this;
14594		- ci.camera = renderCamera;
	15029	+ // Mouse cursor feedback
	15030	+ object.clickInfo.x = e.getX();
	15031	+ object.clickInfo.y = e.getY();
	15032	+ object.clickInfo.modifiers = e.getModifiersEx();
	15033	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	15034	+ object.clickInfo.pane = this;
	15035	+ object.clickInfo.camera = renderCamera;
14595	15036	if (!isRenderer)
14596	15037	{
14597	15038	//ObjEditor editWindow = object.editWindow;
14598	15039	//Object3D copy = editWindow.copy;
14599		- if (object.doEditClick(ci, 0))
	15040	+ if (object.doEditClick(//clickInfo,
	15041	+ 0))
14600	15042	{
14601	15043	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14602	15044	} else
..	..	@@ -14868,7 +15310,8 @@
14868	15310	// break;
14869	15311	case 'T':
14870	15312	CACHETEXTURE ^= true;
14871		- textures.clear();
	15313	+ texturepigment.clear();
	15314	+ texturebump.clear();
14872	15315	// repaint();
14873	15316	break;
14874	15317	case 'Y':
..	..	@@ -14878,8 +15321,8 @@
14878	15321	case 'K':
14879	15322	KOMPACTTEXTURE ^= true;
14880	15323	//textures.clear();
14881		- break;
14882		- case 'P': // Texture Projection macros
	15324	+ // break;
	15325	+ //case 'P': // Texture Projection macros
14883	15326	// SAVETEXTURE ^= true;
14884	15327	macromode = true;
14885	15328	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -15000,7 +15443,7 @@
15000	15443	targetLookAt.set(manipCamera.lookAt);
15001	15444	repaint();
15002	15445	break;
15003		- case 'p':
	15446	+ case 'P': // p':
15004	15447	// c'est quoi ca au juste? spherical ^= true;
15005	15448	Skinshader ^= true; programInitialized = false;
15006	15449	repaint();
..	..	@@ -15045,20 +15488,24 @@
15045	15488	OCCLUSION_CULLING ^= true;
15046	15489	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
15047	15490	break;
15048		- case '0': envyoff ^= true; repaint(); break;
	15491	+ //case '0': envyoff ^= true; repaint(); break;
15049	15492	case '1':
15050	15493	case '2':
15051	15494	case '3':
15052	15495	case '4':
15053	15496	case '5':
15054		- newenvy = Character.getNumericValue(key);
15055		- repaint();
15056		- break;
15057	15497	case '6':
15058	15498	case '7':
15059	15499	case '8':
15060	15500	case '9':
15061		- BGcolor = (key - '6')/3.f;
	15501	+ if (true) // envyoff)
	15502	+ {
	15503	+ BGcolor = (key - '1')/8.f;
	15504	+ }
	15505	+ else
	15506	+ {
	15507	+ //newenvy = Character.getNumericValue(key);
	15508	+ }
15062	15509	repaint();
15063	15510	break;
15064	15511	case '!':
..	..	@@ -15621,8 +16068,6 @@
15621	16068
15622	16069	int width = getBounds().width;
15623	16070	int height = getBounds().height;
15624		- ClickInfo info = new ClickInfo();
15625		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15626	16071	//Image img = CreateImage(width, height);
15627	16072	//System.out.println("width = " + width + "; height = " + height + "\n");
15628	16073
..	..	@@ -15699,31 +16144,37 @@
15699	16144	}
15700	16145	if (object != null && !hasMarquee)
15701	16146	{
	16147	+ if (object.clickInfo == null)
	16148	+ object.clickInfo = new ClickInfo();
	16149	+ ClickInfo info = object.clickInfo;
	16150	+ //ClickInfo info = new ClickInfo();
	16151	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16152	+
15702	16153	if (isRenderer)
15703	16154	{
15704		- info.flags++;
	16155	+ object.clickInfo.flags++;
15705	16156	double frameAspect = (double) width / (double) height;
15706	16157	if (frameAspect > renderCamera.aspect)
15707	16158	{
15708	16159	int desired = (int) ((double) height * renderCamera.aspect);
15709		- info.bounds.width -= width - desired;
15710		- info.bounds.x += (width - desired) / 2;
	16160	+ object.clickInfo.bounds.width -= width - desired;
	16161	+ object.clickInfo.bounds.x += (width - desired) / 2;
15711	16162	} else
15712	16163	{
15713	16164	int desired = (int) ((double) width / renderCamera.aspect);
15714		- info.bounds.height -= height - desired;
15715		- info.bounds.y += (height - desired) / 2;
	16165	+ object.clickInfo.bounds.height -= height - desired;
	16166	+ object.clickInfo.bounds.y += (height - desired) / 2;
15716	16167	}
15717	16168	}
15718	16169
15719		- info.g = gr;
15720		- info.camera = renderCamera;
	16170	+ object.clickInfo.g = gr;
	16171	+ object.clickInfo.camera = renderCamera;
15721	16172	/*
15722	16173	// Memory intensive (brep.verticescopy)
15723	16174	if (!(object instanceof Composite))
15724	16175	object.draw(info, 0, false); // SLOW :
15725	16176	*/
15726		- if (!isRenderer)
	16177	+ if (!isRenderer) // && drag)
15727	16178	{
15728	16179	Grafreed.Assert(object != null);
15729	16180	Grafreed.Assert(object.selection != null);
..	..	@@ -15731,9 +16182,9 @@
15731	16182	{
15732	16183	int hitSomething = object.selection.get(0).hitSomething;
15733	16184
15734		- info.DX = 0;
15735		- info.DY = 0;
15736		- info.W = 1;
	16185	+ object.clickInfo.DX = 0;
	16186	+ object.clickInfo.DY = 0;
	16187	+ object.clickInfo.W = 1;
15737	16188	if (hitSomething == Object3D.hitCenter)
15738	16189	{
15739	16190	info.DX = X;
..	..	@@ -15745,13 +16196,14 @@
15745	16196	info.DY -= info.bounds.height/2;
15746	16197	}
15747	16198
15748		- object.drawEditHandles(info, 0);
	16199	+ object.drawEditHandles(//info,
	16200	+ 0);
15749	16201
15750	16202	if (drag && (X != 0 \|\| Y != 0))
15751	16203	{
15752	16204	switch (hitSomething)
15753	16205	{
15754		- case Object3D.hitCenter: gr.setColor(Color.pink);
	16206	+ case Object3D.hitCenter: gr.setColor(Color.white);
15755	16207	gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15756	16208	break;
15757	16209	case Object3D.hitRotate: gr.setColor(Color.yellow);
..	..	@@ -15777,7 +16229,7 @@
15777	16229	if (hasMarquee)
15778	16230	{
15779	16231	gr.setXORMode(Color.white);
15780		- gr.setColor(Color.red);
	16232	+ gr.setColor(Color.white);
15781	16233	if (!firstime)
15782	16234	{
15783	16235	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -16244,6 +16696,8 @@
16244	16696	private /static/ boolean firstime;
16245	16697	private /static/ cVector newView = new cVector();
16246	16698	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16699	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16700	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
16247	16701	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16248	16702	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16249	16703	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16256,29 +16710,67 @@
16256	16710	{
16257	16711	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16258	16712
	16713	+ int usedsuf = 0;
	16714	+
16259	16715	for (int i = 0; i < suffixes.length; i++)
16260	16716	{
16261		- String resourceName = basename + suffixes[i] + "." + suffix;
16262		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16263		- mipmapped,
16264		- FileUtil.getFileSuffix(resourceName));
16265		- if (data == null)
	16717	+ String[] suffixe = suffixes;
	16718	+ String[] fallback = suffixes2;
	16719	+ String[] fallfallback = suffixes3;
	16720	+
	16721	+ for (int c=usedsuf; --c>=0;)
16266	16722	{
16267		- throw new IOException("Unable to load texture " + resourceName);
	16723	+// String[] temp = suffixe;
	16724	+// suffixe = fallback;
	16725	+// fallback = fallfallback;
	16726	+// fallfallback = temp;
16268	16727	}
	16728	+
	16729	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16730	+ TextureData data;
	16731	+
	16732	+ try
	16733	+ {
	16734	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16735	+ mipmapped,
	16736	+ FileUtil.getFileSuffix(resourceName));
	16737	+ }
	16738	+ catch (Exception e)
	16739	+ {
	16740	+ try
	16741	+ {
	16742	+ resourceName = basename + fallback[i] + "." + suffix;
	16743	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16744	+ mipmapped,
	16745	+ FileUtil.getFileSuffix(resourceName));
	16746	+ }
	16747	+ catch (Exception e2)
	16748	+ {
	16749	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16750	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16751	+ mipmapped,
	16752	+ FileUtil.getFileSuffix(resourceName));
	16753	+ }
	16754	+ }
	16755	+
16269	16756	//System.out.println("Target = " + targets[i]);
16270	16757	cubemap.updateImage(data, targets[i]);
16271	16758	}
16272	16759
16273	16760	return cubemap;
16274	16761	}
	16762	+
16275	16763	int bigsphere = -1;
16276	16764
16277	16765	float BGcolor = 0.5f;
16278	16766
16279		- private void DrawSkyBox(GL gl)
	16767	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16768	+
	16769	+ private void DrawSkyBox(GL gl, float ratio)
16280	16770	{
16281		- if (envyoff \|\| cubemap == null)
	16771	+ if (//envyoff \|\|
	16772	+ WIREFRAME \|\|
	16773	+ cubemap == null)
16282	16774	{
16283	16775	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16284	16776	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16293,7 +16785,17 @@
16293	16785	// Compensates for ExaminerViewer's modification of modelview matrix
16294	16786	gl.glMatrixMode(GL.GL_MODELVIEW);
16295	16787	gl.glLoadIdentity();
	16788	+ gl.glScalef(1,ratio,1);
16296	16789
	16790	+// colorV[0] = 2;
	16791	+// colorV[1] = 2;
	16792	+// colorV[2] = 2;
	16793	+// colorV[3] = 1;
	16794	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16795	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16796	+//
	16797	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16798	+
16297	16799	//gl.glActiveTexture(GL.GL_TEXTURE1);
16298	16800	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16299	16801
..	..	@@ -16325,6 +16827,7 @@
16325	16827	{
16326	16828	gl.glScalef(1.0f, -1.0f, 1.0f);
16327	16829	}
	16830	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16328	16831	gl.glMultMatrixd(viewrot_1, 0);
16329	16832	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16330	16833	//viewer.updateInverseRotation(gl);
..	..	@@ -16365,7 +16868,8 @@
16365	16868	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16366	16869
16367	16870	cubemap.disable();
16368		- ////cubemap.unbind();
	16871	+ //cubemap.dispose();
	16872	+
16369	16873	if (CULLFACE)
16370	16874	{
16371	16875	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16583,7 +17087,7 @@
16583	17087	//new Exception().printStackTrace();
16584	17088	System.out.println("select buffer init");
16585	17089	// Use debug pipeline
16586		- drawable.setGL(new DebugGL(drawable.getGL()));
	17090	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16587	17091
16588	17092	GL gl = drawable.getGL();
16589	17093
..	..	@@ -16901,6 +17405,7 @@
16901	17405
16902	17406	public void init(GLAutoDrawable drawable)
16903	17407	{
	17408	+ if (Globals.DEBUG)
16904	17409	System.out.println("shadow buffer init");
16905	17410
16906	17411	GL gl = drawable.getGL();
..	..	@@ -17129,10 +17634,14 @@
17129	17634	gl.glFlush();
17130	17635
17131	17636	/**/
17132		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	17637	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
17133	17638
17134		- float[] pixels = occlusionsizebuffer.array();
	17639	+ float[] depths = occlusiondepthbuffer.array();
17135	17640
	17641	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	17642	+
	17643	+ int[] pixels = selectsizebuffer.array();
	17644	+
17136	17645	double r = 0, g = 0, b = 0;
17137	17646
17138	17647	double count = 0;
..	..	@@ -17143,7 +17652,7 @@
17143	17652
17144	17653	double FACTOR = 1;
17145	17654
17146		- for (int i = 0; i < pixels.length; i++)
	17655	+ for (int i = 0; i < depths.length; i++)
17147	17656	{
17148	17657	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
17149	17658	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -17226,7 +17735,7 @@
17226	17735
17227	17736	double scale = ray.z; // 1; // cos
17228	17737
17229		- float depth = pixels[newindex];
	17738	+ float depth = depths[newindex];
17230	17739
17231	17740	/*
17232	17741	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17423,11 +17932,14 @@
17423	17932	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17424	17933	static IntBuffer bigAAbuffer;
17425	17934	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17426		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	17935	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17427	17936	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17428	17937	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17429	17938	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17430		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17939	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17940	+
	17941	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17942	+
17431	17943	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17432	17944	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17433	17945	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();