~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 = true; // 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,18 +2483,20 @@
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> textures = new java.util.Hashtable<String, CacheTexture>();
2426		- static public java.util.Hashtable<BufferedImage, CacheTexture> bimtextures = new java.util.Hashtable<BufferedImage, CacheTexture>();
2427		- static public java.util.HashSet<String> usedtextures = new java.util.HashSet<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>();
2428	2500
2429	2501	int pigmentdepth = 0;
2430	2502	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
..	..	@@ -2432,10 +2504,10 @@
2432	2504	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2433	2505	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2434	2506	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2435		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2507	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2436	2508	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2437	2509
2438		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2510	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2439	2511	{
2440	2512	TextureData texturedata = null;
2441	2513
..	..	@@ -2445,7 +2517,7 @@
2445	2517	com.sun.opengl.util.texture.TextureIO.newTextureData(
2446	2518	getClass().getClassLoader().getResourceAsStream(name),
2447	2519	true,
2448		- com.sun.opengl.util.texture.TextureIO.PNG);
	2520	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
2449	2521	} catch (java.io.IOException e)
2450	2522	{
2451	2523	throw new javax.media.opengl.GLException(e);
..	..	@@ -2454,16 +2526,16 @@
2454	2526	if (bump)
2455	2527	texturedata = ConvertBump(texturedata, false);
2456	2528
2457		- com.sun.opengl.util.texture.Texture texture =
2458		- 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);
2459	2531
2460		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2461		- 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);
2462	2534
2463		- return texture;
	2535	+ return texturedata;
2464	2536	}
2465	2537
2466		- com.sun.opengl.util.texture.Texture GetBimTexture(BufferedImage name, boolean bump)
	2538	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
2467	2539	{
2468	2540	TextureData texturedata = null;
2469	2541
..	..	@@ -2471,7 +2543,7 @@
2471	2543	{
2472	2544	texturedata =
2473	2545	com.sun.opengl.util.texture.TextureIO.newTextureData(
2474		- name,
	2546	+ bim,
2475	2547	true);
2476	2548	} catch (Exception e)
2477	2549	{
..	..	@@ -2480,14 +2552,8 @@
2480	2552
2481	2553	if (bump)
2482	2554	texturedata = ConvertBump(texturedata, false);
2483		-
2484		- com.sun.opengl.util.texture.Texture texture =
2485		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2486		-
2487		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2488		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2489		-
2490		- return texture;
	2555	+
	2556	+ return texturedata;
2491	2557	}
2492	2558
2493	2559	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -7975,8 +8041,8 @@
7975	8041	pigment = null;
7976	8042	}
7977	8043
7978		- ReleaseTexture(bump, true);
7979		- ReleaseTexture(pigment, false);
	8044	+ ReleaseTexture(tex, true);
	8045	+ ReleaseTexture(tex, false);
7980	8046	}
7981	8047
7982	8048	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -8005,7 +8071,7 @@
8005	8071	pigment = null;
8006	8072	}
8007	8073
8008		- ReleaseTexture(pigment, false);
	8074	+ ReleaseTexture(tex, false);
8009	8075	}
8010	8076
8011	8077	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -8034,10 +8100,10 @@
8034	8100	bump = null;
8035	8101	}
8036	8102
8037		- ReleaseTexture(bump, true);
	8103	+ ReleaseTexture(tex, true);
8038	8104	}
8039	8105
8040		- void ReleaseTexture(String tex, boolean bump)
	8106	+ void ReleaseTexture(cTexture tex, boolean bump)
8041	8107	{
8042	8108	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8043	8109	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8048,7 +8114,7 @@
8048	8114	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
8049	8115
8050	8116	if (tex != null)
8051		- texture = textures.get(tex);
	8117	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
8052	8118
8053	8119	// //assert( texture != null );
8054	8120	// if (texture == null)
..	..	@@ -8198,13 +8264,13 @@
8198	8264
8199	8265	if (tex == null)
8200	8266	{
8201		- BindTexture(null, null,false,resolution);
	8267	+ BindTexture(null,false,resolution);
8202	8268	return;
8203	8269	}
8204	8270
8205	8271	String pigment = Object3D.GetPigment(tex);
8206	8272
8207		- usedtextures.add(pigment);
	8273	+ usedtextures.add(tex);
8208	8274
8209	8275	//if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8210	8276	{
..	..	@@ -8218,7 +8284,7 @@
8218	8284	}
8219	8285
8220	8286	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8221		- BindTexture(tex.pigmenttexture, pigment, false, resolution);
	8287	+ BindTexture(tex, false, resolution);
8222	8288	}
8223	8289
8224	8290	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8231,13 +8297,13 @@
8231	8297
8232	8298	if (tex == null)
8233	8299	{
8234		- BindTexture(null, null,true,resolution);
	8300	+ BindTexture(null,true,resolution);
8235	8301	return;
8236	8302	}
8237	8303
8238	8304	String bump = Object3D.GetBump(tex);
8239	8305
8240		- usedtextures.add(bump);
	8306	+ usedtextures.add(tex);
8241	8307
8242	8308	//if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8243	8309	{
..	..	@@ -8251,7 +8317,7 @@
8251	8317	}
8252	8318
8253	8319	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8254		- BindTexture(tex.bumptexture, bump, true, resolution);
	8320	+ BindTexture(tex, true, resolution);
8255	8321	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8256	8322	}
8257	8323
..	..	@@ -8275,13 +8341,19 @@
8275	8341	return fileExists;
8276	8342	}
8277	8343
8278		- CacheTexture GetCacheTexture(java.awt.image.BufferedImage bim, String tex, boolean bump, int resolution) throws Exception
	8344	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8279	8345	{
8280	8346	CacheTexture texturecache = null;
8281	8347
8282	8348	if (tex != null)
8283	8349	{
8284		- 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	+ }
8285	8357
8286	8358	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8287	8359
..	..	@@ -8291,29 +8363,46 @@
8291	8363	// else
8292	8364	// if (!texname.startsWith("/"))
8293	8365	// texname = "/Users/nbriere/Textures/" + texname;
8294		- if (!FileExists(tex))
	8366	+ if (!FileExists(texname) && !texname.startsWith("@"))
8295	8367	{
8296	8368	texname = fallbackTextureName;
8297	8369	}
8298	8370
8299	8371	if (CACHETEXTURE)
8300	8372	{
8301		- if (bim == null)
8302		- texturecache = textures.get(texname); // TEXTURE CACHE
	8373	+ if (texdata == null)
	8374	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
8303	8375	else
8304		- texturecache = bimtextures.get(bim); // TEXTURE CACHE
	8376	+ texturecache = bimtextures.get(texdata);
8305	8377	}
8306	8378
8307		- if (texturecache == null \|\| texturecache.resolution < resolution)
	8379	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
8308	8380	{
8309	8381	TextureData texturedata = null;
8310	8382
8311		- if (bim == null)
	8383	+ if (texdata != null && textureon)
8312	8384	{
	8385	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
8313	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;
8314	8403	}
8315	8404	else
8316		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8405	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8317	8406	{
8318	8407	assert(!bump);
8319	8408	// if (bump)
..	..	@@ -8324,19 +8413,23 @@
8324	8413	// }
8325	8414	// else
8326	8415	// {
8327		- texturecache = textures.get(tex);
	8416	+ // texturecache = textures.get(texname); // suspicious
8328	8417	if (texturecache == null)
8329	8418	{
8330	8419	texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8331	8420	}
	8421	+ else
	8422	+ new Exception().printStackTrace();
8332	8423	// }
8333	8424	} else
8334		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8425	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8335	8426	{
8336	8427	assert(bump);
8337		- texturecache = textures.get(tex);
	8428	+ // texturecache = textures.get(texname); // suspicious
8338	8429	if (texturecache == null)
8339	8430	texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8431	+ else
	8432	+ new Exception().printStackTrace();
8340	8433	} else
8341	8434	{
8342	8435	//if (tex.equals("IMMORTAL"))
..	..	@@ -8344,11 +8437,22 @@
8344	8437	// texture = GetResourceTexture("default.png");
8345	8438	//} else
8346	8439	//{
8347		- if (tex.equals("WHITE_NOISE"))
	8440	+ if (texname.endsWith("WHITE_NOISE"))
8348	8441	{
8349		- texturecache = textures.get(tex);
	8442	+ // texturecache = textures.get(texname); // suspicious
8350	8443	if (texturecache == null)
8351	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();
8352	8456	} else
8353	8457	{
8354	8458	if (textureon)
..	..	@@ -8407,14 +8511,15 @@
8407	8511	if (texturedata == null)
8408	8512	throw new Exception();
8409	8513
8410		- texturecache = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8514	+ texturecache = new CacheTexture(texturedata,resolution);
8411	8515	//texture = GetTexture(tex, bump);
8412	8516	}
	8517	+ }
8413	8518	}
8414	8519	//}
8415	8520	}
8416	8521
8417		- if (/CACHETEXTURE &&/ texturecache != null && textureon)
	8522	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8418	8523	{
8419	8524	//return false;
8420	8525
..	..	@@ -8436,52 +8541,17 @@
8436	8541	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8437	8542	if (!cachefile.exists())
8438	8543	{
8439		- // cache to disk
8440		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8441		- //buffers[0].
8442		-
8443		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8444		- int[] pixels = new int[bytebuf.capacity()/3];
8445		-
8446		- // squared size heuristic...
8447		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8544	+ //if (texturedata.getWidth() == texturedata.getHeight())
8448	8545	{
8449		- for (int i=pixels.length; --i>=0;)
8450		- {
8451		- int i3 = i*3;
8452		- pixels[i] = 0xFF;
8453		- pixels[i] <<= 8;
8454		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8455		- pixels[i] <<= 8;
8456		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8457		- pixels[i] <<= 8;
8458		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8459		- }
8460		-
8461		- /*
8462		- int r=0,g=0,b=0,a=0;
8463		- for (int i=0; i<width; i++)
8464		- for (int j=0; j<height; j++)
8465		- {
8466		- int index = j*width+i;
8467		- int p = pixels[index];
8468		- a = ((p>>24) & 0xFF);
8469		- r = ((p>>16) & 0xFF);
8470		- g = ((p>>8) & 0xFF);
8471		- b = (p & 0xFF);
8472		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8473		- }
8474		- /**/
8475		- int width = (int)Math.sqrt(pixels.length); // squared
8476		- int height = width;
8477		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8478		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8546	+ BufferedImage rendImage = CreateBim(texturedata);
	8547	+
8479	8548	ImageWriter writer = null;
8480	8549	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8481	8550	if (iter.hasNext()) {
8482	8551	writer = (ImageWriter)iter.next();
8483	8552	}
8484		- float compressionQuality = 0.9f;
	8553	+
	8554	+ float compressionQuality = 0.85f;
8485	8555	try
8486	8556	{
8487	8557	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8498,18 +8568,20 @@
8498	8568	}
8499	8569	}
8500	8570	}
8501		-
	8571	+
	8572	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8573	+
8502	8574	//System.out.println("Texture = " + tex);
8503		- if (textures.containsKey(texname))
	8575	+ if (textures.containsKey(tex))
8504	8576	{
8505		- CacheTexture thetex = textures.get(texname);
	8577	+ CacheTexture thetex = textures.get(tex);
8506	8578	thetex.texture.disable();
8507	8579	thetex.texture.dispose();
8508		- textures.remove(texname);
	8580	+ textures.remove(tex);
8509	8581	}
8510	8582
8511	8583	//texture.texturedata = texturedata;
8512		- textures.put(texname, texturecache);
	8584	+ textures.put(tex, texturecache);
8513	8585
8514	8586	// newtex = true;
8515	8587	}
..	..	@@ -8528,9 +8600,43 @@
8528	8600	return texturecache;
8529	8601	}
8530	8602
8531		- com.sun.opengl.util.texture.Texture GetTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
	8603	+ static void EmbedTextures(cTexture tex)
8532	8604	{
8533		- CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
	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
	8638	+ {
	8639	+ CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8534	8640
8535	8641	if (bump)
8536	8642	{
..	..	@@ -8546,14 +8652,14 @@
8546	8652	return texture!=null?texture.texture:null;
8547	8653	}
8548	8654
8549		- public com.sun.opengl.util.texture.TextureData GetTextureData(java.awt.image.BufferedImage stream, 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
8550	8656	{
8551		- CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
	8657	+ CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8552	8658
8553	8659	return texture!=null?texture.texturedata:null;
8554	8660	}
8555	8661
8556		- boolean BindTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
	8662	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8557	8663	{
8558	8664	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8559	8665	{
..	..	@@ -8562,7 +8668,7 @@
8562	8668
8563	8669	//boolean newtex = false;
8564	8670
8565		- com.sun.opengl.util.texture.Texture texture = GetTexture(stream, tex, bump, resolution);
	8671	+ com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8566	8672
8567	8673	if (texture == null)
8568	8674	return false;
..	..	@@ -8595,6 +8701,72 @@
8595	8701	return true; // Warning: not used.
8596	8702	}
8597	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	+
8598	8770	ShadowBuffer shadowPBuf;
8599	8771	AntialiasBuffer antialiasPBuf;
8600	8772	int MAXSTACK;
..	..	@@ -8611,10 +8783,12 @@
8611	8783
8612	8784	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8613	8785	MAXSTACK = temp[0];
8614		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8786	+ if (Globals.DEBUG)
	8787	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8615	8788	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8616	8789	MAXSTACK = temp[0];
8617		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8790	+ if (Globals.DEBUG)
	8791	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8618	8792
8619	8793	// Use debug pipeline
8620	8794	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8622,7 +8796,8 @@
8622	8796	gl = drawable.getGL(); //
8623	8797
8624	8798	GL gl3 = getGL();
8625		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8626	8801
8627	8802
8628	8803	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8787,7 +8962,7 @@
8787	8962
8788	8963	if (cubemap == null)
8789	8964	{
8790		- LoadEnvy(5);
	8965	+ //LoadEnvy(1);
8791	8966	}
8792	8967
8793	8968	//cubemap.enable();
..	..	@@ -9063,6 +9238,8 @@
9063	9238
9064	9239	void LoadEnvy(int which)
9065	9240	{
	9241	+ assert(false);
	9242	+
9066	9243	String name;
9067	9244	String ext;
9068	9245
..	..	@@ -9074,37 +9251,58 @@
9074	9251	cubemap = null;
9075	9252	return;
9076	9253	case 1:
9077		- name = "cubemaps/box_";
9078		- ext = "png";
	9254	+ name = "cubemaps/rgb/";
	9255	+ ext = "jpg";
9079	9256	reverseUP = false;
9080	9257	break;
9081	9258	case 2:
9082		- name = "cubemaps/uffizi_";
9083		- ext = "png";
9084		- break; // reverseUP = true; break;
	9259	+ name = "cubemaps/uffizi/";
	9260	+ ext = "jpg";
	9261	+ reverseUP = false;
	9262	+ break;
9085	9263	case 3:
9086		- name = "cubemaps/CloudyHills_";
9087		- ext = "tga";
	9264	+ name = "cubemaps/CloudyHills/";
	9265	+ ext = "jpg";
9088	9266	reverseUP = false;
9089	9267	break;
9090	9268	case 4:
9091		- name = "cubemaps/cornell_";
	9269	+ name = "cubemaps/cornell/";
9092	9270	ext = "png";
9093	9271	reverseUP = false;
9094	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;
9095	9298	default:
9096		- name = "cubemaps/rgb_";
9097		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9299	+ name = "cubemaps/box/";
	9300	+ ext = "png"; /mipmap = true;/
	9301	+ reverseUP = false;
9098	9302	break;
9099	9303	}
9100		-
9101		- try
9102		- {
9103		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9104		- } catch (IOException e)
9105		- {
9106		- throw new RuntimeException(e);
9107		- }
	9304	+
	9305	+ LoadSkybox(name, ext, mipmap);
9108	9306	}
9109	9307
9110	9308	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -9136,8 +9334,12 @@
9136	9334	static double[] model = new double[16];
9137	9335	double[] camera2light = new double[16];
9138	9336	double[] light2camera = new double[16];
9139		- int newenvy = -1;
9140		- boolean envyoff = true; // false;
	9337	+
	9338	+ //int newenvy = -1;
	9339	+ //boolean envyoff = false;
	9340	+
	9341	+ String loadedskyboxname;
	9342	+
9141	9343	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9142	9344	//float[] light0 = { 0,0,0 };
9143	9345	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9555,7 +9757,7 @@
9555	9757
9556	9758	if (renderCamera != lightCamera)
9557	9759	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9558		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9760	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9559	9761
9560	9762	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9561	9763
..	..	@@ -9571,7 +9773,7 @@
9571	9773
9572	9774	if (renderCamera != lightCamera)
9573	9775	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9574		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9776	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9575	9777
9576	9778	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9577	9779
..	..	@@ -9617,10 +9819,12 @@
9617	9819	rati = 1 / rati;
9618	9820	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9619	9821	}
9620		- assert (newenvy == -1);
	9822	+
	9823	+ //assert (newenvy == -1);
	9824	+
9621	9825	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9622	9826	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9623		- DrawSkyBox(gl);
	9827	+ DrawSkyBox(gl, (float)rati);
9624	9828	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9625	9829	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9626	9830	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -10486,9 +10690,18 @@
10486	10690	static boolean init = false;
10487	10691
10488	10692	double[][] matrix = LA.newMatrix();
	10693	+
	10694	+ // This is to refresh the UI of the material panel.
	10695	+ ObjEditor patchMaterial;
10489	10696
10490	10697	public void display(GLAutoDrawable drawable)
10491	10698	{
	10699	+ if (patchMaterial.patchMaterial)
	10700	+ {
	10701	+ patchMaterial.patchMaterial = false;
	10702	+ patchMaterial.objectPanel.setSelectedIndex(1);
	10703	+ }
	10704	+
10492	10705	if (Grafreed.savesound && Grafreed.hassound)
10493	10706	{
10494	10707	Grafreed.wav.save();
..	..	@@ -10657,7 +10870,7 @@
10657	10870
10658	10871	if (wait)
10659	10872	{
10660		- Sleep(500);
	10873	+ Sleep(200); // blocks everything
10661	10874
10662	10875	wait = false;
10663	10876	}
..	..	@@ -10772,7 +10985,7 @@
10772	10985	// if (parentcam != renderCamera) // not a light
10773	10986	if (cam != lightCamera)
10774	10987	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10775		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10988	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10776	10989
10777	10990	for (int j = 0; j < 4; j++)
10778	10991	{
..	..	@@ -10787,7 +11000,7 @@
10787	11000	// if (parentcam != renderCamera) // not a light
10788	11001	if (cam != lightCamera)
10789	11002	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10790		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	11003	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10791	11004
10792	11005	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10793	11006
..	..	@@ -10873,13 +11086,43 @@
10873	11086	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10874	11087	}
10875	11088
10876		- 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"))
10877	11097	{
10878		- LoadEnvy(newenvy);
	11098	+ if (cubemaprgb == null)
	11099	+ {
	11100	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11101	+ }
	11102	+
	11103	+ cubemap = cubemaprgb;
10879	11104	}
10880		-
10881		- newenvy = -1;
10882		-
	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	+
10883	11126	ratio = ((double) getWidth()) / getHeight();
10884	11127	//System.out.println("ratio = " + ratio);
10885	11128
..	..	@@ -10895,7 +11138,7 @@
10895	11138
10896	11139	if (!IsFrozen() && !ambientOcclusion)
10897	11140	{
10898		- DrawSkyBox(gl);
	11141	+ DrawSkyBox(gl, (float)ratio);
10899	11142	}
10900	11143
10901	11144	//if (selection_view == -1)
..	..	@@ -11049,7 +11292,7 @@
11049	11292
11050	11293	try
11051	11294	{
11052		- BindTexture(null, NOISE_TEXTURE, false, 2);
	11295	+ BindTexture(NOISE_TEXTURE, false, 2);
11053	11296	}
11054	11297	catch (Exception e)
11055	11298	{
..	..	@@ -11181,7 +11424,7 @@
11181	11424
11182	11425	// if (cam != lightCamera)
11183	11426	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11184		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11427	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11185	11428	}
11186	11429
11187	11430	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -11340,7 +11583,7 @@
11340	11583	}
11341	11584	}
11342	11585
11343		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11586	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11344	11587	{
11345	11588	//gl.glDepthFunc(GL.GL_LEQUAL);
11346	11589	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11348,24 +11591,21 @@
11348	11591
11349	11592	boolean texon = textureon;
11350	11593
11351		- if (RENDERPROGRAM > 0)
11352		- {
11353		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11354		- textureon = false;
11355		- }
	11594	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11595	+ textureon = false;
	11596	+
11356	11597	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11357	11598	//System.out.println("ALLO");
11358	11599	gl.glColorMask(false, false, false, false);
11359	11600	DrawObject(gl);
11360		- if (RENDERPROGRAM > 0)
11361		- {
11362		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11363		- textureon = texon;
11364		- }
	11601	+
	11602	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11603	+ textureon = texon;
	11604	+
11365	11605	gl.glColorMask(true, true, true, true);
11366	11606
11367	11607	gl.glDepthFunc(GL.GL_EQUAL);
11368		- //gl.glDepthMask(false);
	11608	+ gl.glDepthMask(false);
11369	11609	}
11370	11610
11371	11611	if (false) // DrawMode() == SHADOW)
..	..	@@ -11705,20 +11945,32 @@
11705	11945	ReleaseTextures(DEFAULT_TEXTURES);
11706	11946
11707	11947	if (CLEANCACHE)
11708		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11948	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11709	11949	{
11710		- String tex = e.nextElement();
	11950	+ cTexture tex = e.nextElement();
11711	11951
11712	11952	// System.out.println("Texture --------- " + tex);
11713	11953
11714		- if (tex.equals("WHITE_NOISE"))
	11954	+ if (tex.equals("WHITE_NOISE:"))
11715	11955	continue;
11716	11956
11717	11957	if (!usedtextures.contains(tex))
11718	11958	{
	11959	+ CacheTexture gettex = texturepigment.get(tex);
11719	11960	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11720		- textures.get(tex).texture.dispose();
11721		- 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	+ }
11722	11974	}
11723	11975	}
11724	11976	}
..	..	@@ -12246,8 +12498,76 @@
12246	12498
12247	12499	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12248	12500
12249		- String program =
	12501	+ String programmin =
	12502	+ // Min shader
12250	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	+
12251	12571	//"OPTION ARB_fragment_program_shadow;" +
12252	12572	"PARAM light2cam0 = program.env[10];" +
12253	12573	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12273,7 +12593,7 @@
12273	12593	"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
12274	12594	"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
12275	12595	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12276		- "PARAM params7 = program.env[7];" + // noise power, opacity power
	12596	+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
12277	12597	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
12278	12598	"PARAM options1 = program.env[62];" + // fog rgb color
12279	12599	"PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
..	..	@@ -12362,8 +12682,7 @@
12362	12682	"TEMP shininess;" +
12363	12683	"\n" +
12364	12684	"MOV texSamp, one;" +
12365		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12366		-
	12685	+
12367	12686	"MOV mapgrid.x, one2048th.x;" +
12368	12687	"MOV temp, fragment.texcoord[1];" +
12369	12688	/*
..	..	@@ -12384,20 +12703,20 @@
12384	12703	"MUL temp, floor, mapgrid.x;" +
12385	12704	//"TEX depth0, temp, texture[1], 2D;" +
12386	12705	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12387		- TextureFetch("depth0", "temp", "1") +
	12706	+ ShadowTextureFetch("depth0", "temp", "1") +
12388	12707	"") +
12389	12708	"ADD temp.x, temp.x, mapgrid.x;" +
12390	12709	//"TEX depth1, temp, texture[1], 2D;" +
12391	12710	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12392		- TextureFetch("depth1", "temp", "1") +
	12711	+ ShadowTextureFetch("depth1", "temp", "1") +
12393	12712	"") +
12394	12713	"ADD temp.y, temp.y, mapgrid.x;" +
12395	12714	//"TEX depth2, temp, texture[1], 2D;" +
12396		- TextureFetch("depth2", "temp", "1") +
	12715	+ ShadowTextureFetch("depth2", "temp", "1") +
12397	12716	"SUB temp.x, temp.x, mapgrid.x;" +
12398	12717	//"TEX depth3, temp, texture[1], 2D;" +
12399	12718	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12400		- TextureFetch("depth3", "temp", "1") +
	12719	+ ShadowTextureFetch("depth3", "temp", "1") +
12401	12720	"") +
12402	12721	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12403	12722	//"MOV params, material;" +
..	..	@@ -12519,7 +12838,7 @@
12519	12838	"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
12520	12839	// mar 2013 ??? "KIL alpha.a;" +
12521	12840	"MOV alpha, texSamp.aaaa;" + // y;" +
12522		- "KIL alpha.a;" +
	12841	+ "KIL alpha.a;" + // not sure with parallax mapping
12523	12842	/*
12524	12843	"MUL temp.xy, temp, two;" +
12525	12844	"TXB bump, temp, texture[0], 2D;" +
..	..	@@ -12605,11 +12924,6 @@
12605	12924	"SUB bump0, bump0, half;" +
12606	12925	"ADD bump, bump, bump0;" +
12607	12926
12608		- "MOV temp.x, texSamp.a;" +
12609		- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12610		- //"LRP texSamp0, params5.x, texSamp0, one;" +
12611		- "MOV texSamp.a, temp.x;" +
12612		-
12613	12927	// double-sided
12614	12928	/**/
12615	12929	(doublesided?"DP3 temp.z, normal, eye;" +
..	..	@@ -12639,6 +12953,41 @@
12639	12953	Normalize("U") +
12640	12954
12641	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;" +
12642	12991
12643	12992	//"MOV temp, fragment.texcoord[0];" +
12644	12993	//
..	..	@@ -12768,10 +13117,10 @@
12768	13117	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12769	13118	"") +
12770	13119
12771		- // display shadow only (bump == 0)
	13120	+ // display shadow only (fakedepth == 0)
12772	13121	"SUB temp.x, half.x, shadow.x;" +
12773	13122	"MOV temp.y, -params5.z;" + // params6.x;" +
12774		- "SLT temp.z, temp.y, -one2048th.x;" +
	13123	+ "SLT temp.z, temp.y, -c256i.x;" +
12775	13124	"SUB temp.y, one.x, temp.z;" +
12776	13125	"MUL temp.x, temp.x, temp.y;" +
12777	13126	"KIL temp.x;" +
..	..	@@ -13102,8 +13451,19 @@
13102	13451	//once = true;
13103	13452	}
13104	13453
13105		- System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13106		- 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	+
13107	13467	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13108	13468
13109	13469	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13150,7 +13510,8 @@
13150	13510	"\n" +
13151	13511	"END\n";
13152	13512
13153		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13513	+ if (Globals.DEBUG)
	13514	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13154	13515	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13155	13516
13156	13517	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13195,25 +13556,26 @@
13195	13556	return out;
13196	13557	}
13197	13558
13198		- String TextureFetch(String dest, String src, String unit)
	13559	+ // Also does frustum culling
	13560	+ String ShadowTextureFetch(String dest, String src, String unit)
13199	13561	{
13200	13562	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13201	13563	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13202	13564	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13565	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13566	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13203	13567	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13204		- "SLT " + src + ".z, " + src + ".x, one.x;" +
13205		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13206		- "SLT " + src + ".z, " + src + ".y, one.x;" +
13207		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13568	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13569	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13208	13570	//"SWZ buffer, temp, w,w,w,w;";
13209		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13571	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13210	13572	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13211	13573	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13212	13574	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13213		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13575	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13214	13576
13215		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13216		- //"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;";
13217	13579	}
13218	13580
13219	13581	String Shadow(String depth, String shadow)
..	..	@@ -13260,7 +13622,7 @@
13260	13622	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13261	13623	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13262	13624
13263		- // No shadow when out of frustrum
	13625	+ // No shadow when out of frustum
13264	13626	"SGE temp.x, " + depth + ".z, one.z;" +
13265	13627	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13266	13628	"";
..	..	@@ -13407,7 +13769,7 @@
13407	13769	/static/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
13408	13770	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13409	13771	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13410		- /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
13411	13773
13412	13774	//Object3D.cVector2[] vector2buffer;
13413	13775
..	..	@@ -14058,14 +14420,15 @@
14058	14420	drag = false;
14059	14421	//System.out.println("Mouse DOWN");
14060	14422	editObj = false;
14061		- ClickInfo info = new ClickInfo();
14062		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14063		- info.pane = this;
14064		- info.camera = renderCamera;
14065		- info.x = x;
14066		- info.y = y;
14067		- info.modifiers = modifiersex;
14068		- 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);
14069	14432	if (!editObj)
14070	14433	{
14071	14434	hasMarquee = true;
..	..	@@ -14347,11 +14710,17 @@
14347	14710	void GoDown(int mod)
14348	14711	{
14349	14712	MODIFIERS \|= COMMAND;
	14713	+ boolean isVR = (mouseMode&VR)!=0;
14350	14714	/**/
14351	14715	if((mod&SHIFT) == SHIFT)
14352		- manipCamera.RotatePosition(0, -speed);
	14716	+ {
	14717	+ if (isVR)
	14718	+ manipCamera.RotateInterest(0, -speed);
	14719	+ else
	14720	+ manipCamera.RotatePosition(0, -speed);
	14721	+ }
14353	14722	else
14354		- manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14723	+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
14355	14724	/**/
14356	14725	if ((mod & SHIFT) == SHIFT)
14357	14726	{
..	..	@@ -14361,6 +14730,8 @@
14361	14730	mouseMode \|= BACKFORTH;
14362	14731	}
14363	14732
	14733	+ targetLookAt.set(manipCamera.lookAt);
	14734	+
14364	14735	//prevX = X = anchorX;
14365	14736	prevY = Y = anchorY - (int) (renderCamera.Distance());
14366	14737	}
..	..	@@ -14369,10 +14740,17 @@
14369	14740	{
14370	14741	MODIFIERS \|= COMMAND;
14371	14742	/**/
	14743	+ boolean isVR = (mouseMode&VR)!=0;
	14744	+
14372	14745	if((mod&SHIFT) == SHIFT)
14373		- manipCamera.RotatePosition(0, speed);
	14746	+ {
	14747	+ if (isVR)
	14748	+ manipCamera.RotateInterest(0, speed);
	14749	+ else
	14750	+ manipCamera.RotatePosition(0, speed);
	14751	+ }
14374	14752	else
14375		- manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14753	+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
14376	14754	/**/
14377	14755	if ((mod & SHIFT) == SHIFT)
14378	14756	{
..	..	@@ -14382,6 +14760,8 @@
14382	14760	mouseMode \|= BACKFORTH;
14383	14761	}
14384	14762
	14763	+ targetLookAt.set(manipCamera.lookAt);
	14764	+
14385	14765	//prevX = X = anchorX;
14386	14766	prevY = Y = anchorY + (int) (renderCamera.Distance());
14387	14767	}
..	..	@@ -14391,9 +14771,14 @@
14391	14771	MODIFIERS \|= COMMAND;
14392	14772	/**/
14393	14773	if((mod&SHIFT) == SHIFT)
14394		- manipCamera.Translate(speed*delta, 0, getWidth());
	14774	+ manipCamera.Translate(speed*delta, 0, getWidth());
14395	14775	else
14396		- manipCamera.RotatePosition(speed, 0);
	14776	+ {
	14777	+ if ((mouseMode&VR)!=0)
	14778	+ manipCamera.RotateInterest(-speed, 0);
	14779	+ else
	14780	+ manipCamera.RotatePosition(speed, 0);
	14781	+ }
14397	14782	/**/
14398	14783	if ((mod & SHIFT) == SHIFT)
14399	14784	{
..	..	@@ -14403,6 +14788,8 @@
14403	14788	mouseMode \|= ROTATE;
14404	14789	} // TRANSLATE;
14405	14790
	14791	+ targetLookAt.set(manipCamera.lookAt);
	14792	+
14406	14793	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
14407	14794	prevY = Y = anchorY;
14408	14795	}
..	..	@@ -14412,9 +14799,15 @@
14412	14799	MODIFIERS \|= COMMAND;
14413	14800	/**/
14414	14801	if((mod&SHIFT) == SHIFT)
14415		- manipCamera.Translate(-speed*delta, 0, getWidth());
	14802	+ manipCamera.Translate(-speed*delta, 0, getWidth());
14416	14803	else
14417		- manipCamera.RotatePosition(-speed, 0);
	14804	+ {
	14805	+ if ((mouseMode&VR)!=0)
	14806	+ manipCamera.RotateInterest(speed, 0);
	14807	+ else
	14808	+ manipCamera.RotatePosition(-speed, 0);
	14809	+ }
	14810	+
14418	14811	/**/
14419	14812	if ((mod & SHIFT) == SHIFT)
14420	14813	{
..	..	@@ -14424,6 +14817,8 @@
14424	14817	mouseMode \|= ROTATE;
14425	14818	} // TRANSLATE;
14426	14819
	14820	+ targetLookAt.set(manipCamera.lookAt);
	14821	+
14427	14822	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
14428	14823	prevY = Y = anchorY;
14429	14824	}
..	..	@@ -14465,15 +14860,16 @@
14465	14860	if (editObj)
14466	14861	{
14467	14862	drag = true;
14468		- ClickInfo info = new ClickInfo();
14469		- info.bounds.setBounds(0, 0,
	14863	+ //ClickInfo info = new ClickInfo();
	14864	+ object.clickInfo.bounds.setBounds(0, 0,
14470	14865	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14471		- info.pane = this;
14472		- info.camera = renderCamera;
14473		- info.x = x;
14474		- info.y = y;
14475		- object.GetWindow().copy
14476		- .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);
14477	14873	} else
14478	14874	{
14479	14875	if (x < startX)
..	..	@@ -14622,24 +15018,27 @@
14622	15018	}
14623	15019	}
14624	15020
	15021	+// ClickInfo clickInfo = new ClickInfo();
	15022	+
14625	15023	public void mouseMoved(MouseEvent e)
14626	15024	{
14627	15025	//System.out.println("mouseMoved: " + e);
14628	15026	if (isRenderer)
14629	15027	return;
14630	15028
14631		- ClickInfo ci = new ClickInfo();
14632		- ci.x = e.getX();
14633		- ci.y = e.getY();
14634		- ci.modifiers = e.getModifiersEx();
14635		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14636		- ci.pane = this;
14637		- 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;
14638	15036	if (!isRenderer)
14639	15037	{
14640	15038	//ObjEditor editWindow = object.editWindow;
14641	15039	//Object3D copy = editWindow.copy;
14642		- if (object.doEditClick(ci, 0))
	15040	+ if (object.doEditClick(//clickInfo,
	15041	+ 0))
14643	15042	{
14644	15043	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14645	15044	} else
..	..	@@ -14911,7 +15310,8 @@
14911	15310	// break;
14912	15311	case 'T':
14913	15312	CACHETEXTURE ^= true;
14914		- textures.clear();
	15313	+ texturepigment.clear();
	15314	+ texturebump.clear();
14915	15315	// repaint();
14916	15316	break;
14917	15317	case 'Y':
..	..	@@ -14921,8 +15321,8 @@
14921	15321	case 'K':
14922	15322	KOMPACTTEXTURE ^= true;
14923	15323	//textures.clear();
14924		- break;
14925		- case 'P': // Texture Projection macros
	15324	+ // break;
	15325	+ //case 'P': // Texture Projection macros
14926	15326	// SAVETEXTURE ^= true;
14927	15327	macromode = true;
14928	15328	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -15043,7 +15443,7 @@
15043	15443	targetLookAt.set(manipCamera.lookAt);
15044	15444	repaint();
15045	15445	break;
15046		- case 'p':
	15446	+ case 'P': // p':
15047	15447	// c'est quoi ca au juste? spherical ^= true;
15048	15448	Skinshader ^= true; programInitialized = false;
15049	15449	repaint();
..	..	@@ -15088,20 +15488,24 @@
15088	15488	OCCLUSION_CULLING ^= true;
15089	15489	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
15090	15490	break;
15091		- case '0': envyoff ^= true; repaint(); break;
	15491	+ //case '0': envyoff ^= true; repaint(); break;
15092	15492	case '1':
15093	15493	case '2':
15094	15494	case '3':
15095	15495	case '4':
15096	15496	case '5':
15097		- newenvy = Character.getNumericValue(key);
15098		- repaint();
15099		- break;
15100	15497	case '6':
15101	15498	case '7':
15102	15499	case '8':
15103	15500	case '9':
15104		- 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	+ }
15105	15509	repaint();
15106	15510	break;
15107	15511	case '!':
..	..	@@ -15664,8 +16068,6 @@
15664	16068
15665	16069	int width = getBounds().width;
15666	16070	int height = getBounds().height;
15667		- ClickInfo info = new ClickInfo();
15668		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15669	16071	//Image img = CreateImage(width, height);
15670	16072	//System.out.println("width = " + width + "; height = " + height + "\n");
15671	16073
..	..	@@ -15742,31 +16144,37 @@
15742	16144	}
15743	16145	if (object != null && !hasMarquee)
15744	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	+
15745	16153	if (isRenderer)
15746	16154	{
15747		- info.flags++;
	16155	+ object.clickInfo.flags++;
15748	16156	double frameAspect = (double) width / (double) height;
15749	16157	if (frameAspect > renderCamera.aspect)
15750	16158	{
15751	16159	int desired = (int) ((double) height * renderCamera.aspect);
15752		- info.bounds.width -= width - desired;
15753		- info.bounds.x += (width - desired) / 2;
	16160	+ object.clickInfo.bounds.width -= width - desired;
	16161	+ object.clickInfo.bounds.x += (width - desired) / 2;
15754	16162	} else
15755	16163	{
15756	16164	int desired = (int) ((double) width / renderCamera.aspect);
15757		- info.bounds.height -= height - desired;
15758		- info.bounds.y += (height - desired) / 2;
	16165	+ object.clickInfo.bounds.height -= height - desired;
	16166	+ object.clickInfo.bounds.y += (height - desired) / 2;
15759	16167	}
15760	16168	}
15761	16169
15762		- info.g = gr;
15763		- info.camera = renderCamera;
	16170	+ object.clickInfo.g = gr;
	16171	+ object.clickInfo.camera = renderCamera;
15764	16172	/*
15765	16173	// Memory intensive (brep.verticescopy)
15766	16174	if (!(object instanceof Composite))
15767	16175	object.draw(info, 0, false); // SLOW :
15768	16176	*/
15769		- if (!isRenderer)
	16177	+ if (!isRenderer) // && drag)
15770	16178	{
15771	16179	Grafreed.Assert(object != null);
15772	16180	Grafreed.Assert(object.selection != null);
..	..	@@ -15774,9 +16182,9 @@
15774	16182	{
15775	16183	int hitSomething = object.selection.get(0).hitSomething;
15776	16184
15777		- info.DX = 0;
15778		- info.DY = 0;
15779		- info.W = 1;
	16185	+ object.clickInfo.DX = 0;
	16186	+ object.clickInfo.DY = 0;
	16187	+ object.clickInfo.W = 1;
15780	16188	if (hitSomething == Object3D.hitCenter)
15781	16189	{
15782	16190	info.DX = X;
..	..	@@ -15788,13 +16196,14 @@
15788	16196	info.DY -= info.bounds.height/2;
15789	16197	}
15790	16198
15791		- object.drawEditHandles(info, 0);
	16199	+ object.drawEditHandles(//info,
	16200	+ 0);
15792	16201
15793	16202	if (drag && (X != 0 \|\| Y != 0))
15794	16203	{
15795	16204	switch (hitSomething)
15796	16205	{
15797		- case Object3D.hitCenter: gr.setColor(Color.pink);
	16206	+ case Object3D.hitCenter: gr.setColor(Color.white);
15798	16207	gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15799	16208	break;
15800	16209	case Object3D.hitRotate: gr.setColor(Color.yellow);
..	..	@@ -15820,7 +16229,7 @@
15820	16229	if (hasMarquee)
15821	16230	{
15822	16231	gr.setXORMode(Color.white);
15823		- gr.setColor(Color.red);
	16232	+ gr.setColor(Color.white);
15824	16233	if (!firstime)
15825	16234	{
15826	16235	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -16287,6 +16696,8 @@
16287	16696	private /static/ boolean firstime;
16288	16697	private /static/ cVector newView = new cVector();
16289	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"};
16290	16701	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16291	16702	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16292	16703	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16299,29 +16710,67 @@
16299	16710	{
16300	16711	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16301	16712
	16713	+ int usedsuf = 0;
	16714	+
16302	16715	for (int i = 0; i < suffixes.length; i++)
16303	16716	{
16304		- String resourceName = basename + suffixes[i] + "." + suffix;
16305		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16306		- mipmapped,
16307		- FileUtil.getFileSuffix(resourceName));
16308		- if (data == null)
	16717	+ String[] suffixe = suffixes;
	16718	+ String[] fallback = suffixes2;
	16719	+ String[] fallfallback = suffixes3;
	16720	+
	16721	+ for (int c=usedsuf; --c>=0;)
16309	16722	{
16310		- throw new IOException("Unable to load texture " + resourceName);
	16723	+// String[] temp = suffixe;
	16724	+// suffixe = fallback;
	16725	+// fallback = fallfallback;
	16726	+// fallfallback = temp;
16311	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	+
16312	16756	//System.out.println("Target = " + targets[i]);
16313	16757	cubemap.updateImage(data, targets[i]);
16314	16758	}
16315	16759
16316	16760	return cubemap;
16317	16761	}
	16762	+
16318	16763	int bigsphere = -1;
16319	16764
16320	16765	float BGcolor = 0.5f;
16321	16766
16322		- private void DrawSkyBox(GL gl)
	16767	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16768	+
	16769	+ private void DrawSkyBox(GL gl, float ratio)
16323	16770	{
16324		- if (envyoff \|\| cubemap == null)
	16771	+ if (//envyoff \|\|
	16772	+ WIREFRAME \|\|
	16773	+ cubemap == null)
16325	16774	{
16326	16775	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16327	16776	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16336,7 +16785,17 @@
16336	16785	// Compensates for ExaminerViewer's modification of modelview matrix
16337	16786	gl.glMatrixMode(GL.GL_MODELVIEW);
16338	16787	gl.glLoadIdentity();
	16788	+ gl.glScalef(1,ratio,1);
16339	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	+
16340	16799	//gl.glActiveTexture(GL.GL_TEXTURE1);
16341	16800	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16342	16801
..	..	@@ -16368,6 +16827,7 @@
16368	16827	{
16369	16828	gl.glScalef(1.0f, -1.0f, 1.0f);
16370	16829	}
	16830	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16371	16831	gl.glMultMatrixd(viewrot_1, 0);
16372	16832	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16373	16833	//viewer.updateInverseRotation(gl);
..	..	@@ -16408,7 +16868,8 @@
16408	16868	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16409	16869
16410	16870	cubemap.disable();
16411		- ////cubemap.unbind();
	16871	+ //cubemap.dispose();
	16872	+
16412	16873	if (CULLFACE)
16413	16874	{
16414	16875	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16626,7 +17087,7 @@
16626	17087	//new Exception().printStackTrace();
16627	17088	System.out.println("select buffer init");
16628	17089	// Use debug pipeline
16629		- drawable.setGL(new DebugGL(drawable.getGL()));
	17090	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16630	17091
16631	17092	GL gl = drawable.getGL();
16632	17093
..	..	@@ -16944,6 +17405,7 @@
16944	17405
16945	17406	public void init(GLAutoDrawable drawable)
16946	17407	{
	17408	+ if (Globals.DEBUG)
16947	17409	System.out.println("shadow buffer init");
16948	17410
16949	17411	GL gl = drawable.getGL();
..	..	@@ -17172,10 +17634,14 @@
17172	17634	gl.glFlush();
17173	17635
17174	17636	/**/
17175		- 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);
17176	17638
17177		- float[] pixels = occlusionsizebuffer.array();
	17639	+ float[] depths = occlusiondepthbuffer.array();
17178	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	+
17179	17645	double r = 0, g = 0, b = 0;
17180	17646
17181	17647	double count = 0;
..	..	@@ -17186,7 +17652,7 @@
17186	17652
17187	17653	double FACTOR = 1;
17188	17654
17189		- for (int i = 0; i < pixels.length; i++)
	17655	+ for (int i = 0; i < depths.length; i++)
17190	17656	{
17191	17657	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
17192	17658	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -17269,7 +17735,7 @@
17269	17735
17270	17736	double scale = ray.z; // 1; // cos
17271	17737
17272		- float depth = pixels[newindex];
	17738	+ float depth = depths[newindex];
17273	17739
17274	17740	/*
17275	17741	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17466,11 +17932,14 @@
17466	17932	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17467	17933	static IntBuffer bigAAbuffer;
17468	17934	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17469		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	17935	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17470	17936	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17471	17937	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17472	17938	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17473		- 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	+
17474	17943	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17475	17944	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17476	17945	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();