~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,9 @@
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;
77	116	boolean reverseUP = false;
78	117	static boolean frozen = false;
79	118	boolean enablebackspace = false; // patch for back buffer refresh
..	..	@@ -136,7 +175,7 @@
136	175	static boolean doublesided = false; // true; // reversed normals are awful for conformance
137	176	boolean anisotropy = true;
138	177	boolean softshadow = true; // slower but better false;
139		- boolean opacityhalo = false;
	178	+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
140	179
141	180	boolean macromode = false;
142	181
..	..	@@ -150,6 +189,19 @@
150	189	}
151	190
152	191	private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	192	+
	193	+ public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	194	+ {
	195	+ try
	196	+ {
	197	+ return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	198	+ } catch (IOException e)
	199	+ {
	200	+ System.out.println("NAME = " + name);
	201	+ e.printStackTrace(); // throw new RuntimeException(e);
	202	+ return null;
	203	+ }
	204	+ }
153	205
154	206	void SetAsGLRenderer(boolean b)
155	207	{
..	..	@@ -169,7 +221,8 @@
169	221
170	222	SetCamera(cam);
171	223
172		- SetLight(new Camera(new cVector(10, 10, -20)));
	224	+ // Warning: not used.
	225	+ SetLight(new Camera(new cVector(15, 10, -20)));
173	226
174	227	object = o;
175	228
..	..	@@ -1447,6 +1500,8 @@
1447	1500	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1448	1501	}
1449	1502
	1503	+ float[] colorV = new float[4];
	1504	+
1450	1505	void SetColor(Object3D obj, Vertex p0)
1451	1506	{
1452	1507	CameraPane display = this;
..	..	@@ -1514,8 +1569,6 @@
1514	1569	{
1515	1570	return;
1516	1571	}
1517		-
1518		- float[] colorV = new float[3];
1519	1572
1520	1573	if (false) // marked)
1521	1574	{
..	..	@@ -2405,43 +2458,19 @@
2405	2458	return currentGL;
2406	2459	}
2407	2460
2408		- private BufferedImage CreateBim(TextureData texturedata)
	2461	+ static private BufferedImage CreateBim(TextureData texturedata)
2409	2462	{
2410		- // cache to disk
2411		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
2412		- //buffers[0].
2413		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
2414		- int[] pixels = new int[bytebuf.capacity()/3];
2415		- int width = texturedata.getWidth(); //(int)Math.sqrt(pixels.length); // squared
2416		- int height = width;
2417		- for (int i=pixels.length; --i>=0;)
2418		- {
2419		- int i3 = i*3;
2420		- pixels[i] = 0xFF;
2421		- pixels[i] <<= 8;
2422		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
2423		- pixels[i] <<= 8;
2424		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
2425		- pixels[i] <<= 8;
2426		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
2427		- }
2428		- /*
2429		- int r=0,g=0,b=0,a=0;
2430		- for (int i=0; i<width; i++)
2431		- for (int j=0; j<height; j++)
2432		- {
2433		- int index = j*width+i;
2434		- int p = pixels[index];
2435		- a = ((p>>24) & 0xFF);
2436		- r = ((p>>16) & 0xFF);
2437		- g = ((p>>8) & 0xFF);
2438		- b = (p & 0xFF);
2439		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
2440		- }
2441		- /**/
2442		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
2443		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
2444		- return rendImage;
	2463	+ Grafreed.Assert(texturedata != null);
	2464	+
	2465	+ int width = texturedata.getWidth();
	2466	+ int height = texturedata.getHeight();
	2467	+
	2468	+ Buffer buffer = texturedata.getBuffer();
	2469	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2470	+
	2471	+ byte[] bytes = bytebuf.array();
	2472	+
	2473	+ return CreateBim(bytes, width, height);
2445	2474	}
2446	2475
2447	2476	/**/
..	..	@@ -2452,18 +2481,20 @@
2452	2481
2453	2482	int resolution;
2454	2483
2455		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2484	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2456	2485	{
2457		- texture = tex;
	2486	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2487	+ texturedata = texdata;
2458	2488	resolution = res;
2459	2489	}
2460	2490	}
2461	2491	/**/
2462	2492
2463	2493	// TEXTURE static Texture texture;
2464		- static public java.util.Hashtable<String, CacheTexture> textures = new java.util.Hashtable<String, CacheTexture>();
2465		- static public java.util.Hashtable<BufferedImage, CacheTexture> bimtextures = new java.util.Hashtable<BufferedImage, CacheTexture>();
2466		- static public java.util.HashSet<String> usedtextures = new java.util.HashSet<String>();
	2494	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2495	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2496	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2497	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
2467	2498
2468	2499	int pigmentdepth = 0;
2469	2500	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
..	..	@@ -2471,10 +2502,10 @@
2471	2502	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2472	2503	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2473	2504	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2474		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2505	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2475	2506	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2476	2507
2477		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2508	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2478	2509	{
2479	2510	TextureData texturedata = null;
2480	2511
..	..	@@ -2493,16 +2524,16 @@
2493	2524	if (bump)
2494	2525	texturedata = ConvertBump(texturedata, false);
2495	2526
2496		- com.sun.opengl.util.texture.Texture texture =
2497		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2527	+// com.sun.opengl.util.texture.Texture texture =
	2528	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2498	2529
2499		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2500		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2530	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2531	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2501	2532
2502		- return texture;
	2533	+ return texturedata;
2503	2534	}
2504	2535
2505		- com.sun.opengl.util.texture.Texture GetBimTexture(BufferedImage name, boolean bump)
	2536	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
2506	2537	{
2507	2538	TextureData texturedata = null;
2508	2539
..	..	@@ -2510,7 +2541,7 @@
2510	2541	{
2511	2542	texturedata =
2512	2543	com.sun.opengl.util.texture.TextureIO.newTextureData(
2513		- name,
	2544	+ bim,
2514	2545	true);
2515	2546	} catch (Exception e)
2516	2547	{
..	..	@@ -2519,14 +2550,8 @@
2519	2550
2520	2551	if (bump)
2521	2552	texturedata = ConvertBump(texturedata, false);
2522		-
2523		- com.sun.opengl.util.texture.Texture texture =
2524		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2525		-
2526		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2527		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2528		-
2529		- return texture;
	2553	+
	2554	+ return texturedata;
2530	2555	}
2531	2556
2532	2557	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -8014,8 +8039,8 @@
8014	8039	pigment = null;
8015	8040	}
8016	8041
8017		- ReleaseTexture(bump, true);
8018		- ReleaseTexture(pigment, false);
	8042	+ ReleaseTexture(tex, true);
	8043	+ ReleaseTexture(tex, false);
8019	8044	}
8020	8045
8021	8046	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -8044,7 +8069,7 @@
8044	8069	pigment = null;
8045	8070	}
8046	8071
8047		- ReleaseTexture(pigment, false);
	8072	+ ReleaseTexture(tex, false);
8048	8073	}
8049	8074
8050	8075	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -8073,10 +8098,10 @@
8073	8098	bump = null;
8074	8099	}
8075	8100
8076		- ReleaseTexture(bump, true);
	8101	+ ReleaseTexture(tex, true);
8077	8102	}
8078	8103
8079		- void ReleaseTexture(String tex, boolean bump)
	8104	+ void ReleaseTexture(cTexture tex, boolean bump)
8080	8105	{
8081	8106	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8082	8107	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8087,7 +8112,7 @@
8087	8112	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
8088	8113
8089	8114	if (tex != null)
8090		- texture = textures.get(tex);
	8115	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
8091	8116
8092	8117	// //assert( texture != null );
8093	8118	// if (texture == null)
..	..	@@ -8237,13 +8262,13 @@
8237	8262
8238	8263	if (tex == null)
8239	8264	{
8240		- BindTexture(null, null,false,resolution);
	8265	+ BindTexture(null,false,resolution);
8241	8266	return;
8242	8267	}
8243	8268
8244	8269	String pigment = Object3D.GetPigment(tex);
8245	8270
8246		- usedtextures.add(pigment);
	8271	+ usedtextures.add(tex);
8247	8272
8248	8273	//if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8249	8274	{
..	..	@@ -8257,7 +8282,7 @@
8257	8282	}
8258	8283
8259	8284	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8260		- BindTexture(tex.pigmenttexture, pigment, false, resolution);
	8285	+ BindTexture(tex, false, resolution);
8261	8286	}
8262	8287
8263	8288	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8270,13 +8295,13 @@
8270	8295
8271	8296	if (tex == null)
8272	8297	{
8273		- BindTexture(null, null,true,resolution);
	8298	+ BindTexture(null,true,resolution);
8274	8299	return;
8275	8300	}
8276	8301
8277	8302	String bump = Object3D.GetBump(tex);
8278	8303
8279		- usedtextures.add(bump);
	8304	+ usedtextures.add(tex);
8280	8305
8281	8306	//if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8282	8307	{
..	..	@@ -8290,7 +8315,7 @@
8290	8315	}
8291	8316
8292	8317	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8293		- BindTexture(tex.bumptexture, bump, true, resolution);
	8318	+ BindTexture(tex, true, resolution);
8294	8319	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8295	8320	}
8296	8321
..	..	@@ -8314,13 +8339,19 @@
8314	8339	return fileExists;
8315	8340	}
8316	8341
8317		- CacheTexture GetCacheTexture(java.awt.image.BufferedImage bim, String tex, boolean bump, int resolution) throws Exception
	8342	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8318	8343	{
8319	8344	CacheTexture texturecache = null;
8320	8345
8321	8346	if (tex != null)
8322	8347	{
8323		- String texname = tex;
	8348	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8349	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
	8350	+
	8351	+ if (texname.equals("") && texdata == null)
	8352	+ {
	8353	+ return null;
	8354	+ }
8324	8355
8325	8356	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8326	8357
..	..	@@ -8330,29 +8361,46 @@
8330	8361	// else
8331	8362	// if (!texname.startsWith("/"))
8332	8363	// texname = "/Users/nbriere/Textures/" + texname;
8333		- if (!FileExists(tex))
	8364	+ if (!FileExists(texname) && !texname.startsWith("@"))
8334	8365	{
8335	8366	texname = fallbackTextureName;
8336	8367	}
8337	8368
8338	8369	if (CACHETEXTURE)
8339	8370	{
8340		- if (bim == null)
8341		- texturecache = textures.get(texname); // TEXTURE CACHE
	8371	+ if (texdata == null)
	8372	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
8342	8373	else
8343		- texturecache = bimtextures.get(bim); // TEXTURE CACHE
	8374	+ texturecache = bimtextures.get(texdata);
8344	8375	}
8345	8376
8346		- if (texturecache == null \|\| texturecache.resolution < resolution)
	8377	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
8347	8378	{
8348	8379	TextureData texturedata = null;
8349	8380
8350		- if (bim != null)
	8381	+ if (texdata != null && textureon)
8351	8382	{
	8383	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8384	+
	8385	+ try
	8386	+ {
	8387	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8388	+ }
	8389	+ catch (Exception e)
	8390	+ {
	8391	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8392	+ }
	8393	+
8352	8394	texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8395	+ bimtextures.put(texdata, texturecache);
	8396	+
	8397	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8398	+
	8399	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8400	+ //bim2 = bim;
8353	8401	}
8354	8402	else
8355		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8403	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8356	8404	{
8357	8405	assert(!bump);
8358	8406	// if (bump)
..	..	@@ -8363,7 +8411,7 @@
8363	8411	// }
8364	8412	// else
8365	8413	// {
8366		- texturecache = textures.get(tex);
	8414	+ // texturecache = textures.get(texname); // suspicious
8367	8415	if (texturecache == null)
8368	8416	{
8369	8417	texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
..	..	@@ -8372,10 +8420,10 @@
8372	8420	new Exception().printStackTrace();
8373	8421	// }
8374	8422	} else
8375		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8423	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8376	8424	{
8377	8425	assert(bump);
8378		- texturecache = textures.get(tex);
	8426	+ // texturecache = textures.get(texname); // suspicious
8379	8427	if (texturecache == null)
8380	8428	texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8381	8429	else
..	..	@@ -8387,11 +8435,20 @@
8387	8435	// texture = GetResourceTexture("default.png");
8388	8436	//} else
8389	8437	//{
8390		- if (tex.equals("WHITE_NOISE"))
	8438	+ if (texname.endsWith("WHITE_NOISE"))
8391	8439	{
8392		- texturecache = textures.get(tex);
	8440	+ // texturecache = textures.get(texname); // suspicious
8393	8441	if (texturecache == null)
8394	8442	texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8443	+ else
	8444	+ new Exception().printStackTrace();
	8445	+ } else
	8446	+ {
	8447	+ if (texname.startsWith("@"))
	8448	+ {
	8449	+ // texturecache = textures.get(texname); // suspicious
	8450	+ if (texturecache == null)
	8451	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
8395	8452	else
8396	8453	new Exception().printStackTrace();
8397	8454	} else
..	..	@@ -8452,17 +8509,17 @@
8452	8509	if (texturedata == null)
8453	8510	throw new Exception();
8454	8511
8455		- texturecache = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8512	+ texturecache = new CacheTexture(texturedata,resolution);
8456	8513	//texture = GetTexture(tex, bump);
8457	8514	}
	8515	+ }
8458	8516	}
8459	8517	//}
8460	8518	}
8461	8519
8462		- if (/CACHETEXTURE &&/ texturecache != null && textureon)
	8520	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8463	8521	{
8464	8522	//return false;
8465		- assert(bim == null);
8466	8523
8467	8524	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8468	8525	if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
..	..	@@ -8509,18 +8566,20 @@
8509	8566	}
8510	8567	}
8511	8568	}
8512		-
	8569	+
	8570	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8571	+
8513	8572	//System.out.println("Texture = " + tex);
8514		- if (textures.containsKey(texname))
	8573	+ if (textures.containsKey(tex))
8515	8574	{
8516		- CacheTexture thetex = textures.get(texname);
	8575	+ CacheTexture thetex = textures.get(tex);
8517	8576	thetex.texture.disable();
8518	8577	thetex.texture.dispose();
8519		- textures.remove(texname);
	8578	+ textures.remove(tex);
8520	8579	}
8521	8580
8522	8581	//texture.texturedata = texturedata;
8523		- textures.put(texname, texturecache);
	8582	+ textures.put(tex, texturecache);
8524	8583
8525	8584	// newtex = true;
8526	8585	}
..	..	@@ -8541,12 +8600,41 @@
8541	8600
8542	8601	static void EmbedTextures(cTexture tex)
8543	8602	{
	8603	+ if (tex.pigmentdata == null)
	8604	+ {
	8605	+ //String texname = Object3D.GetPigment(tex);
	8606	+
	8607	+ CacheTexture texturecache = texturepigment.get(tex);
	8608	+
	8609	+ if (texturecache != null)
	8610	+ {
	8611	+ tex.pw = texturecache.texturedata.getWidth();
	8612	+ tex.ph = texturecache.texturedata.getHeight();
	8613	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8614	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8615	+ ;
	8616	+ //, tex.pw, tex.ph), 0.5f);
	8617	+ }
	8618	+ }
8544	8619
	8620	+ if (tex.bumpdata == null)
	8621	+ {
	8622	+ //String texname = Object3D.GetBump(tex);
	8623	+
	8624	+ CacheTexture texturecache = texturebump.get(tex);
	8625	+
	8626	+ if (texturecache != null)
	8627	+ {
	8628	+ tex.bw = texturecache.texturedata.getWidth();
	8629	+ tex.bh = texturecache.texturedata.getHeight();
	8630	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8631	+ }
	8632	+ }
8545	8633	}
8546	8634
8547		- com.sun.opengl.util.texture.Texture GetTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
	8635	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8548	8636	{
8549		- CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
	8637	+ CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8550	8638
8551	8639	if (bump)
8552	8640	{
..	..	@@ -8562,14 +8650,14 @@
8562	8650	return texture!=null?texture.texture:null;
8563	8651	}
8564	8652
8565		- public com.sun.opengl.util.texture.TextureData GetTextureData(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
	8653	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8566	8654	{
8567		- CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
	8655	+ CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8568	8656
8569	8657	return texture!=null?texture.texturedata:null;
8570	8658	}
8571	8659
8572		- boolean BindTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
	8660	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8573	8661	{
8574	8662	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8575	8663	{
..	..	@@ -8578,7 +8666,7 @@
8578	8666
8579	8667	//boolean newtex = false;
8580	8668
8581		- com.sun.opengl.util.texture.Texture texture = GetTexture(stream, tex, bump, resolution);
	8669	+ com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8582	8670
8583	8671	if (texture == null)
8584	8672	return false;
..	..	@@ -8611,6 +8699,72 @@
8611	8699	return true; // Warning: not used.
8612	8700	}
8613	8701
	8702	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8703	+ {
	8704	+ try
	8705	+ {
	8706	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8707	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8708	+ ImageWriter writer = writers.next();
	8709	+
	8710	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8711	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8712	+ param.setCompressionQuality(quality);
	8713	+
	8714	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8715	+ writer.setOutput(ios);
	8716	+ writer.write(null, new IIOImage(image, null, null), param);
	8717	+
	8718	+ byte[] data = baos.toByteArray();
	8719	+ writer.dispose();
	8720	+ return data;
	8721	+ }
	8722	+ catch (Exception e)
	8723	+ {
	8724	+ e.printStackTrace();
	8725	+ return null;
	8726	+ }
	8727	+ }
	8728	+
	8729	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8730	+ {
	8731	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8732	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8733	+ ImageReader reader = writers.next();
	8734	+
	8735	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8736	+
	8737	+ ImageReadParam param = reader.getDefaultReadParam();
	8738	+ param.setDestination(bim);
	8739	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8740	+
	8741	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8742	+ reader.setInput(ios);
	8743	+ BufferedImage bim2 = reader.read(0, param);
	8744	+ reader.dispose();
	8745	+
	8746	+// WritableRaster raster = bim2.getRaster();
	8747	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8748	+// byte[] bytes = data.getData();
	8749	+//
	8750	+// int[] pixels = new int[bytes.length/3];
	8751	+// for (int i=pixels.length; --i>=0;)
	8752	+// {
	8753	+// int i3 = i*3;
	8754	+// pixels[i] = 0xFF;
	8755	+// pixels[i] <<= 8;
	8756	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8757	+// pixels[i] <<= 8;
	8758	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8759	+// pixels[i] <<= 8;
	8760	+// pixels[i] \|= bytes[i3] & 0xFF;
	8761	+// }
	8762	+//
	8763	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8764	+
	8765	+ return bim;
	8766	+ }
	8767	+
8614	8768	ShadowBuffer shadowPBuf;
8615	8769	AntialiasBuffer antialiasPBuf;
8616	8770	int MAXSTACK;
..	..	@@ -8627,10 +8781,12 @@
8627	8781
8628	8782	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8629	8783	MAXSTACK = temp[0];
8630		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8784	+ if (Globals.DEBUG)
	8785	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8631	8786	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8632	8787	MAXSTACK = temp[0];
8633		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8788	+ if (Globals.DEBUG)
	8789	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8634	8790
8635	8791	// Use debug pipeline
8636	8792	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8638,7 +8794,8 @@
8638	8794	gl = drawable.getGL(); //
8639	8795
8640	8796	GL gl3 = getGL();
8641		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8797	+ if (Globals.DEBUG)
	8798	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8642	8799
8643	8800
8644	8801	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8803,7 +8960,7 @@
8803	8960
8804	8961	if (cubemap == null)
8805	8962	{
8806		- LoadEnvy(5);
	8963	+ //LoadEnvy(1);
8807	8964	}
8808	8965
8809	8966	//cubemap.enable();
..	..	@@ -9079,6 +9236,8 @@
9079	9236
9080	9237	void LoadEnvy(int which)
9081	9238	{
	9239	+ assert(false);
	9240	+
9082	9241	String name;
9083	9242	String ext;
9084	9243
..	..	@@ -9090,37 +9249,58 @@
9090	9249	cubemap = null;
9091	9250	return;
9092	9251	case 1:
9093		- name = "cubemaps/box_";
9094		- ext = "png";
	9252	+ name = "cubemaps/rgb/";
	9253	+ ext = "jpg";
9095	9254	reverseUP = false;
9096	9255	break;
9097	9256	case 2:
9098		- name = "cubemaps/uffizi_";
9099		- ext = "png";
9100		- break; // reverseUP = true; break;
	9257	+ name = "cubemaps/uffizi/";
	9258	+ ext = "jpg";
	9259	+ reverseUP = false;
	9260	+ break;
9101	9261	case 3:
9102		- name = "cubemaps/CloudyHills_";
9103		- ext = "tga";
	9262	+ name = "cubemaps/CloudyHills/";
	9263	+ ext = "jpg";
9104	9264	reverseUP = false;
9105	9265	break;
9106	9266	case 4:
9107		- name = "cubemaps/cornell_";
	9267	+ name = "cubemaps/cornell/";
9108	9268	ext = "png";
9109	9269	reverseUP = false;
9110	9270	break;
	9271	+ case 5:
	9272	+ name = "cubemaps/skycube/";
	9273	+ ext = "jpg";
	9274	+ reverseUP = false;
	9275	+ break;
	9276	+ case 6:
	9277	+ name = "cubemaps/SaintLazarusChurch3/";
	9278	+ ext = "jpg";
	9279	+ reverseUP = false;
	9280	+ break;
	9281	+ case 7:
	9282	+ name = "cubemaps/Sodermalmsallen/";
	9283	+ ext = "jpg";
	9284	+ reverseUP = false;
	9285	+ break;
	9286	+ case 8:
	9287	+ name = "cubemaps/Sodermalmsallen2/";
	9288	+ ext = "jpg";
	9289	+ reverseUP = false;
	9290	+ break;
	9291	+ case 9:
	9292	+ name = "cubemaps/UnionSquare/";
	9293	+ ext = "jpg";
	9294	+ reverseUP = false;
	9295	+ break;
9111	9296	default:
9112		- name = "cubemaps/rgb_";
9113		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9297	+ name = "cubemaps/box/";
	9298	+ ext = "png"; /mipmap = true;/
	9299	+ reverseUP = false;
9114	9300	break;
9115	9301	}
9116		-
9117		- try
9118		- {
9119		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9120		- } catch (IOException e)
9121		- {
9122		- throw new RuntimeException(e);
9123		- }
	9302	+
	9303	+ LoadSkybox(name, ext, mipmap);
9124	9304	}
9125	9305
9126	9306	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -9152,8 +9332,12 @@
9152	9332	static double[] model = new double[16];
9153	9333	double[] camera2light = new double[16];
9154	9334	double[] light2camera = new double[16];
9155		- int newenvy = -1;
9156		- boolean envyoff = true; // false;
	9335	+
	9336	+ //int newenvy = -1;
	9337	+ //boolean envyoff = false;
	9338	+
	9339	+ String loadedskyboxname;
	9340	+
9157	9341	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9158	9342	//float[] light0 = { 0,0,0 };
9159	9343	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9571,7 +9755,7 @@
9571	9755
9572	9756	if (renderCamera != lightCamera)
9573	9757	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9574		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9758	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9575	9759
9576	9760	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9577	9761
..	..	@@ -9587,7 +9771,7 @@
9587	9771
9588	9772	if (renderCamera != lightCamera)
9589	9773	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9590		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9774	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9591	9775
9592	9776	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9593	9777
..	..	@@ -9633,10 +9817,12 @@
9633	9817	rati = 1 / rati;
9634	9818	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9635	9819	}
9636		- assert (newenvy == -1);
	9820	+
	9821	+ //assert (newenvy == -1);
	9822	+
9637	9823	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9638	9824	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9639		- DrawSkyBox(gl);
	9825	+ DrawSkyBox(gl, (float)rati);
9640	9826	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9641	9827	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9642	9828	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -10673,7 +10859,7 @@
10673	10859
10674	10860	if (wait)
10675	10861	{
10676		- Sleep(500);
	10862	+ Sleep(200); // blocks everything
10677	10863
10678	10864	wait = false;
10679	10865	}
..	..	@@ -10788,7 +10974,7 @@
10788	10974	// if (parentcam != renderCamera) // not a light
10789	10975	if (cam != lightCamera)
10790	10976	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10791		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10977	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10792	10978
10793	10979	for (int j = 0; j < 4; j++)
10794	10980	{
..	..	@@ -10803,7 +10989,7 @@
10803	10989	// if (parentcam != renderCamera) // not a light
10804	10990	if (cam != lightCamera)
10805	10991	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10806		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	10992	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10807	10993
10808	10994	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10809	10995
..	..	@@ -10889,13 +11075,41 @@
10889	11075	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10890	11076	}
10891	11077
10892		- if (newenvy > -1)
	11078	+// if (newenvy > -1)
	11079	+// {
	11080	+// LoadEnvy(newenvy);
	11081	+// }
	11082	+//
	11083	+// newenvy = -1;
	11084	+
	11085	+ if (object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
10893	11086	{
10894		- LoadEnvy(newenvy);
	11087	+ if (cubemaprgb == null)
	11088	+ {
	11089	+ cubemaprgb = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11090	+ }
	11091	+
	11092	+ cubemap = cubemaprgb;
10895	11093	}
10896		-
10897		- newenvy = -1;
10898		-
	11094	+ else
	11095	+ {
	11096	+ if (object.skyboxname != null)
	11097	+ {
	11098	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11099	+ {
	11100	+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11101	+ loadedskyboxname = object.skyboxname;
	11102	+ }
	11103	+ }
	11104	+ else
	11105	+ {
	11106	+ cubemapcustom = null;
	11107	+ loadedskyboxname = null;
	11108	+ }
	11109	+
	11110	+ cubemap = cubemapcustom;
	11111	+ }
	11112	+
10899	11113	ratio = ((double) getWidth()) / getHeight();
10900	11114	//System.out.println("ratio = " + ratio);
10901	11115
..	..	@@ -10911,7 +11125,7 @@
10911	11125
10912	11126	if (!IsFrozen() && !ambientOcclusion)
10913	11127	{
10914		- DrawSkyBox(gl);
	11128	+ DrawSkyBox(gl, (float)ratio);
10915	11129	}
10916	11130
10917	11131	//if (selection_view == -1)
..	..	@@ -11065,7 +11279,7 @@
11065	11279
11066	11280	try
11067	11281	{
11068		- BindTexture(null, NOISE_TEXTURE, false, 2);
	11282	+ BindTexture(NOISE_TEXTURE, false, 2);
11069	11283	}
11070	11284	catch (Exception e)
11071	11285	{
..	..	@@ -11197,7 +11411,7 @@
11197	11411
11198	11412	// if (cam != lightCamera)
11199	11413	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11200		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11414	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11201	11415	}
11202	11416
11203	11417	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -11356,7 +11570,7 @@
11356	11570	}
11357	11571	}
11358	11572
11359		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11573	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11360	11574	{
11361	11575	//gl.glDepthFunc(GL.GL_LEQUAL);
11362	11576	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11364,24 +11578,21 @@
11364	11578
11365	11579	boolean texon = textureon;
11366	11580
11367		- if (RENDERPROGRAM > 0)
11368		- {
11369		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11370		- textureon = false;
11371		- }
	11581	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11582	+ textureon = false;
	11583	+
11372	11584	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11373	11585	//System.out.println("ALLO");
11374	11586	gl.glColorMask(false, false, false, false);
11375	11587	DrawObject(gl);
11376		- if (RENDERPROGRAM > 0)
11377		- {
11378		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11379		- textureon = texon;
11380		- }
	11588	+
	11589	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11590	+ textureon = texon;
	11591	+
11381	11592	gl.glColorMask(true, true, true, true);
11382	11593
11383	11594	gl.glDepthFunc(GL.GL_EQUAL);
11384		- //gl.glDepthMask(false);
	11595	+ gl.glDepthMask(false);
11385	11596	}
11386	11597
11387	11598	if (false) // DrawMode() == SHADOW)
..	..	@@ -11721,20 +11932,32 @@
11721	11932	ReleaseTextures(DEFAULT_TEXTURES);
11722	11933
11723	11934	if (CLEANCACHE)
11724		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11935	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11725	11936	{
11726		- String tex = e.nextElement();
	11937	+ cTexture tex = e.nextElement();
11727	11938
11728	11939	// System.out.println("Texture --------- " + tex);
11729	11940
11730		- if (tex.equals("WHITE_NOISE"))
	11941	+ if (tex.equals("WHITE_NOISE:"))
11731	11942	continue;
11732	11943
11733	11944	if (!usedtextures.contains(tex))
11734	11945	{
	11946	+ CacheTexture gettex = texturepigment.get(tex);
11735	11947	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11736		- textures.get(tex).texture.dispose();
11737		- textures.remove(tex);
	11948	+ if (gettex != null)
	11949	+ {
	11950	+ gettex.texture.dispose();
	11951	+ texturepigment.remove(tex);
	11952	+ }
	11953	+
	11954	+ gettex = texturebump.get(tex);
	11955	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11956	+ if (gettex != null)
	11957	+ {
	11958	+ gettex.texture.dispose();
	11959	+ texturebump.remove(tex);
	11960	+ }
11738	11961	}
11739	11962	}
11740	11963	}
..	..	@@ -12262,8 +12485,76 @@
12262	12485
12263	12486	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12264	12487
12265		- String program =
	12488	+ String programmin =
	12489	+ // Min shader
12266	12490	"!!ARBfp1.0\n" +
	12491	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12492	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12493	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12494	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12495	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12496	+ "PARAM light2cam0 = program.env[10];" +
	12497	+ "PARAM light2cam1 = program.env[11];" +
	12498	+ "PARAM light2cam2 = program.env[12];" +
	12499	+ "TEMP temp;" +
	12500	+ "TEMP light;" +
	12501	+ "TEMP ndotl;" +
	12502	+ "TEMP normal;" +
	12503	+ "TEMP depth;" +
	12504	+ "TEMP eye;" +
	12505	+ "TEMP pos;" +
	12506	+
	12507	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12508	+ Normalize("normal") +
	12509	+ "MOV light, state.light[0].position;" +
	12510	+ "DP3 ndotl.x, light, normal;" +
	12511	+
	12512	+ // shadow
	12513	+ "MOV pos, fragment.texcoord[1];" +
	12514	+ "MOV temp, pos;" +
	12515	+ ShadowTextureFetch("depth", "temp", "1") +
	12516	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12517	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12518	+
	12519	+ // No shadow when out of frustum
	12520	+ //"SGE temp.y, depth.z, zero123.y;" +
	12521	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12522	+
	12523	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12524	+
	12525	+ // Backlit
	12526	+ "MOV pos.w, zero123.y;" +
	12527	+ "DP4 eye.x, pos, light2cam0;" +
	12528	+ "DP4 eye.y, pos, light2cam1;" +
	12529	+ "DP4 eye.z, pos, light2cam2;" +
	12530	+ Normalize("eye") +
	12531	+
	12532	+ "DP3 ndotl.y, -eye, normal;" +
	12533	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12534	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12535	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12536	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12537	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12538	+
	12539	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12540	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12541	+
	12542	+ // Pigment
	12543	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12544	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12545	+ "MUL temp, temp, ndotl.x;" +
	12546	+
	12547	+ "MUL temp, temp, zero123.z;" +
	12548	+
	12549	+ //"MUL temp, temp, ndotl.y;" +
	12550	+
	12551	+ "MOV temp.w, zero123.y;" + // reset alpha
	12552	+ "MOV result.color, temp;" +
	12553	+ "END";
	12554	+
	12555	+ String programmax =
	12556	+ "!!ARBfp1.0\n" +
	12557	+
12267	12558	//"OPTION ARB_fragment_program_shadow;" +
12268	12559	"PARAM light2cam0 = program.env[10];" +
12269	12560	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12378,8 +12669,7 @@
12378	12669	"TEMP shininess;" +
12379	12670	"\n" +
12380	12671	"MOV texSamp, one;" +
12381		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12382		-
	12672	+
12383	12673	"MOV mapgrid.x, one2048th.x;" +
12384	12674	"MOV temp, fragment.texcoord[1];" +
12385	12675	/*
..	..	@@ -12400,20 +12690,20 @@
12400	12690	"MUL temp, floor, mapgrid.x;" +
12401	12691	//"TEX depth0, temp, texture[1], 2D;" +
12402	12692	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12403		- TextureFetch("depth0", "temp", "1") +
	12693	+ ShadowTextureFetch("depth0", "temp", "1") +
12404	12694	"") +
12405	12695	"ADD temp.x, temp.x, mapgrid.x;" +
12406	12696	//"TEX depth1, temp, texture[1], 2D;" +
12407	12697	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12408		- TextureFetch("depth1", "temp", "1") +
	12698	+ ShadowTextureFetch("depth1", "temp", "1") +
12409	12699	"") +
12410	12700	"ADD temp.y, temp.y, mapgrid.x;" +
12411	12701	//"TEX depth2, temp, texture[1], 2D;" +
12412		- TextureFetch("depth2", "temp", "1") +
	12702	+ ShadowTextureFetch("depth2", "temp", "1") +
12413	12703	"SUB temp.x, temp.x, mapgrid.x;" +
12414	12704	//"TEX depth3, temp, texture[1], 2D;" +
12415	12705	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12416		- TextureFetch("depth3", "temp", "1") +
	12706	+ ShadowTextureFetch("depth3", "temp", "1") +
12417	12707	"") +
12418	12708	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12419	12709	//"MOV params, material;" +
..	..	@@ -12784,10 +13074,10 @@
12784	13074	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12785	13075	"") +
12786	13076
12787		- // display shadow only (bump == 0)
	13077	+ // display shadow only (fakedepth == 0)
12788	13078	"SUB temp.x, half.x, shadow.x;" +
12789	13079	"MOV temp.y, -params5.z;" + // params6.x;" +
12790		- "SLT temp.z, temp.y, -one2048th.x;" +
	13080	+ "SLT temp.z, temp.y, -c256i.x;" +
12791	13081	"SUB temp.y, one.x, temp.z;" +
12792	13082	"MUL temp.x, temp.x, temp.y;" +
12793	13083	"KIL temp.x;" +
..	..	@@ -13118,6 +13408,13 @@
13118	13408	//once = true;
13119	13409	}
13120	13410
	13411	+ String program = programmax;
	13412	+
	13413	+ if (Globals.MINSHADER)
	13414	+ {
	13415	+ program = programmin;
	13416	+ }
	13417	+
13121	13418	System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13122	13419	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13123	13420	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
..	..	@@ -13211,25 +13508,26 @@
13211	13508	return out;
13212	13509	}
13213	13510
13214		- String TextureFetch(String dest, String src, String unit)
	13511	+ // Also does frustum culling
	13512	+ String ShadowTextureFetch(String dest, String src, String unit)
13215	13513	{
13216	13514	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13217	13515	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13218	13516	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13517	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13518	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13219	13519	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13220		- "SLT " + src + ".z, " + src + ".x, one.x;" +
13221		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13222		- "SLT " + src + ".z, " + src + ".y, one.x;" +
13223		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13520	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13521	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13224	13522	//"SWZ buffer, temp, w,w,w,w;";
13225		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13523	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13226	13524	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13227	13525	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13228	13526	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13229		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13527	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13230	13528
13231		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13232		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13529	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13530	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13233	13531	}
13234	13532
13235	13533	String Shadow(String depth, String shadow)
..	..	@@ -13276,7 +13574,7 @@
13276	13574	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13277	13575	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13278	13576
13279		- // No shadow when out of frustrum
	13577	+ // No shadow when out of frustum
13280	13578	"SGE temp.x, " + depth + ".z, one.z;" +
13281	13579	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13282	13580	"";
..	..	@@ -14074,14 +14372,15 @@
14074	14372	drag = false;
14075	14373	//System.out.println("Mouse DOWN");
14076	14374	editObj = false;
14077		- ClickInfo info = new ClickInfo();
14078		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14079		- info.pane = this;
14080		- info.camera = renderCamera;
14081		- info.x = x;
14082		- info.y = y;
14083		- info.modifiers = modifiersex;
14084		- editObj = object.doEditClick(info, 0);
	14375	+ //ClickInfo info = new ClickInfo();
	14376	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14377	+ object.clickInfo.pane = this;
	14378	+ object.clickInfo.camera = renderCamera;
	14379	+ object.clickInfo.x = x;
	14380	+ object.clickInfo.y = y;
	14381	+ object.clickInfo.modifiers = modifiersex;
	14382	+ editObj = object.doEditClick(//info,
	14383	+ 0);
14085	14384	if (!editObj)
14086	14385	{
14087	14386	hasMarquee = true;
..	..	@@ -14365,9 +14664,9 @@
14365	14664	MODIFIERS \|= COMMAND;
14366	14665	/**/
14367	14666	if((mod&SHIFT) == SHIFT)
14368		- manipCamera.RotatePosition(0, -speed);
14369		- else
14370	14667	manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14668	+ else
	14669	+ manipCamera.RotatePosition(0, -speed);
14371	14670	/**/
14372	14671	if ((mod & SHIFT) == SHIFT)
14373	14672	{
..	..	@@ -14386,9 +14685,9 @@
14386	14685	MODIFIERS \|= COMMAND;
14387	14686	/**/
14388	14687	if((mod&SHIFT) == SHIFT)
14389		- manipCamera.RotatePosition(0, speed);
14390		- else
14391	14688	manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14689	+ else
	14690	+ manipCamera.RotatePosition(0, speed);
14392	14691	/**/
14393	14692	if ((mod & SHIFT) == SHIFT)
14394	14693	{
..	..	@@ -14481,15 +14780,16 @@
14481	14780	if (editObj)
14482	14781	{
14483	14782	drag = true;
14484		- ClickInfo info = new ClickInfo();
14485		- info.bounds.setBounds(0, 0,
	14783	+ //ClickInfo info = new ClickInfo();
	14784	+ object.clickInfo.bounds.setBounds(0, 0,
14486	14785	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14487		- info.pane = this;
14488		- info.camera = renderCamera;
14489		- info.x = x;
14490		- info.y = y;
14491		- object.GetWindow().copy
14492		- .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	14786	+ object.clickInfo.pane = this;
	14787	+ object.clickInfo.camera = renderCamera;
	14788	+ object.clickInfo.x = x;
	14789	+ object.clickInfo.y = y;
	14790	+ object //.GetWindow().copy
	14791	+ .doEditDrag(//info,
	14792	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14493	14793	} else
14494	14794	{
14495	14795	if (x < startX)
..	..	@@ -14638,24 +14938,27 @@
14638	14938	}
14639	14939	}
14640	14940
	14941	+// ClickInfo clickInfo = new ClickInfo();
	14942	+
14641	14943	public void mouseMoved(MouseEvent e)
14642	14944	{
14643	14945	//System.out.println("mouseMoved: " + e);
14644	14946	if (isRenderer)
14645	14947	return;
14646	14948
14647		- ClickInfo ci = new ClickInfo();
14648		- ci.x = e.getX();
14649		- ci.y = e.getY();
14650		- ci.modifiers = e.getModifiersEx();
14651		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14652		- ci.pane = this;
14653		- ci.camera = renderCamera;
	14949	+ // Mouse cursor feedback
	14950	+ object.clickInfo.x = e.getX();
	14951	+ object.clickInfo.y = e.getY();
	14952	+ object.clickInfo.modifiers = e.getModifiersEx();
	14953	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14954	+ object.clickInfo.pane = this;
	14955	+ object.clickInfo.camera = renderCamera;
14654	14956	if (!isRenderer)
14655	14957	{
14656	14958	//ObjEditor editWindow = object.editWindow;
14657	14959	//Object3D copy = editWindow.copy;
14658		- if (object.doEditClick(ci, 0))
	14960	+ if (object.doEditClick(//clickInfo,
	14961	+ 0))
14659	14962	{
14660	14963	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14661	14964	} else
..	..	@@ -14927,7 +15230,8 @@
14927	15230	// break;
14928	15231	case 'T':
14929	15232	CACHETEXTURE ^= true;
14930		- textures.clear();
	15233	+ texturepigment.clear();
	15234	+ texturebump.clear();
14931	15235	// repaint();
14932	15236	break;
14933	15237	case 'Y':
..	..	@@ -15104,20 +15408,24 @@
15104	15408	OCCLUSION_CULLING ^= true;
15105	15409	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
15106	15410	break;
15107		- case '0': envyoff ^= true; repaint(); break;
	15411	+ //case '0': envyoff ^= true; repaint(); break;
15108	15412	case '1':
15109	15413	case '2':
15110	15414	case '3':
15111	15415	case '4':
15112	15416	case '5':
15113		- newenvy = Character.getNumericValue(key);
15114		- repaint();
15115		- break;
15116	15417	case '6':
15117	15418	case '7':
15118	15419	case '8':
15119	15420	case '9':
15120		- BGcolor = (key - '6')/3.f;
	15421	+ if (true) // envyoff)
	15422	+ {
	15423	+ BGcolor = (key - '1')/8.f;
	15424	+ }
	15425	+ else
	15426	+ {
	15427	+ //newenvy = Character.getNumericValue(key);
	15428	+ }
15121	15429	repaint();
15122	15430	break;
15123	15431	case '!':
..	..	@@ -15680,8 +15988,6 @@
15680	15988
15681	15989	int width = getBounds().width;
15682	15990	int height = getBounds().height;
15683		- ClickInfo info = new ClickInfo();
15684		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15685	15991	//Image img = CreateImage(width, height);
15686	15992	//System.out.println("width = " + width + "; height = " + height + "\n");
15687	15993
..	..	@@ -15758,31 +16064,37 @@
15758	16064	}
15759	16065	if (object != null && !hasMarquee)
15760	16066	{
	16067	+ if (object.clickInfo == null)
	16068	+ object.clickInfo = new ClickInfo();
	16069	+ ClickInfo info = object.clickInfo;
	16070	+ //ClickInfo info = new ClickInfo();
	16071	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16072	+
15761	16073	if (isRenderer)
15762	16074	{
15763		- info.flags++;
	16075	+ object.clickInfo.flags++;
15764	16076	double frameAspect = (double) width / (double) height;
15765	16077	if (frameAspect > renderCamera.aspect)
15766	16078	{
15767	16079	int desired = (int) ((double) height * renderCamera.aspect);
15768		- info.bounds.width -= width - desired;
15769		- info.bounds.x += (width - desired) / 2;
	16080	+ object.clickInfo.bounds.width -= width - desired;
	16081	+ object.clickInfo.bounds.x += (width - desired) / 2;
15770	16082	} else
15771	16083	{
15772	16084	int desired = (int) ((double) width / renderCamera.aspect);
15773		- info.bounds.height -= height - desired;
15774		- info.bounds.y += (height - desired) / 2;
	16085	+ object.clickInfo.bounds.height -= height - desired;
	16086	+ object.clickInfo.bounds.y += (height - desired) / 2;
15775	16087	}
15776	16088	}
15777	16089
15778		- info.g = gr;
15779		- info.camera = renderCamera;
	16090	+ object.clickInfo.g = gr;
	16091	+ object.clickInfo.camera = renderCamera;
15780	16092	/*
15781	16093	// Memory intensive (brep.verticescopy)
15782	16094	if (!(object instanceof Composite))
15783	16095	object.draw(info, 0, false); // SLOW :
15784	16096	*/
15785		- if (!isRenderer)
	16097	+ if (!isRenderer) // && drag)
15786	16098	{
15787	16099	Grafreed.Assert(object != null);
15788	16100	Grafreed.Assert(object.selection != null);
..	..	@@ -15790,9 +16102,9 @@
15790	16102	{
15791	16103	int hitSomething = object.selection.get(0).hitSomething;
15792	16104
15793		- info.DX = 0;
15794		- info.DY = 0;
15795		- info.W = 1;
	16105	+ object.clickInfo.DX = 0;
	16106	+ object.clickInfo.DY = 0;
	16107	+ object.clickInfo.W = 1;
15796	16108	if (hitSomething == Object3D.hitCenter)
15797	16109	{
15798	16110	info.DX = X;
..	..	@@ -15804,7 +16116,8 @@
15804	16116	info.DY -= info.bounds.height/2;
15805	16117	}
15806	16118
15807		- object.drawEditHandles(info, 0);
	16119	+ object.drawEditHandles(//info,
	16120	+ 0);
15808	16121
15809	16122	if (drag && (X != 0 \|\| Y != 0))
15810	16123	{
..	..	@@ -16303,6 +16616,8 @@
16303	16616	private /static/ boolean firstime;
16304	16617	private /static/ cVector newView = new cVector();
16305	16618	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16619	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16620	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
16306	16621	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16307	16622	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16308	16623	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16315,29 +16630,67 @@
16315	16630	{
16316	16631	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16317	16632
	16633	+ int usedsuf = 0;
	16634	+
16318	16635	for (int i = 0; i < suffixes.length; i++)
16319	16636	{
16320		- String resourceName = basename + suffixes[i] + "." + suffix;
16321		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16322		- mipmapped,
16323		- FileUtil.getFileSuffix(resourceName));
16324		- if (data == null)
	16637	+ String[] suffixe = suffixes;
	16638	+ String[] fallback = suffixes2;
	16639	+ String[] fallfallback = suffixes3;
	16640	+
	16641	+ for (int c=usedsuf; --c>=0;)
16325	16642	{
16326		- throw new IOException("Unable to load texture " + resourceName);
	16643	+// String[] temp = suffixe;
	16644	+// suffixe = fallback;
	16645	+// fallback = fallfallback;
	16646	+// fallfallback = temp;
16327	16647	}
	16648	+
	16649	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16650	+ TextureData data;
	16651	+
	16652	+ try
	16653	+ {
	16654	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16655	+ mipmapped,
	16656	+ FileUtil.getFileSuffix(resourceName));
	16657	+ }
	16658	+ catch (Exception e)
	16659	+ {
	16660	+ try
	16661	+ {
	16662	+ resourceName = basename + fallback[i] + "." + suffix;
	16663	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16664	+ mipmapped,
	16665	+ FileUtil.getFileSuffix(resourceName));
	16666	+ }
	16667	+ catch (Exception e2)
	16668	+ {
	16669	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16670	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16671	+ mipmapped,
	16672	+ FileUtil.getFileSuffix(resourceName));
	16673	+ }
	16674	+ }
	16675	+
16328	16676	//System.out.println("Target = " + targets[i]);
16329	16677	cubemap.updateImage(data, targets[i]);
16330	16678	}
16331	16679
16332	16680	return cubemap;
16333	16681	}
	16682	+
16334	16683	int bigsphere = -1;
16335	16684
16336	16685	float BGcolor = 0.5f;
16337	16686
16338		- private void DrawSkyBox(GL gl)
	16687	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16688	+
	16689	+ private void DrawSkyBox(GL gl, float ratio)
16339	16690	{
16340		- if (envyoff \|\| cubemap == null)
	16691	+ if (//envyoff \|\|
	16692	+ WIREFRAME \|\|
	16693	+ cubemap == null)
16341	16694	{
16342	16695	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16343	16696	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16352,7 +16705,17 @@
16352	16705	// Compensates for ExaminerViewer's modification of modelview matrix
16353	16706	gl.glMatrixMode(GL.GL_MODELVIEW);
16354	16707	gl.glLoadIdentity();
	16708	+ gl.glScalef(1,ratio,1);
16355	16709
	16710	+// colorV[0] = 2;
	16711	+// colorV[1] = 2;
	16712	+// colorV[2] = 2;
	16713	+// colorV[3] = 1;
	16714	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16715	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16716	+//
	16717	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16718	+
16356	16719	//gl.glActiveTexture(GL.GL_TEXTURE1);
16357	16720	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16358	16721
..	..	@@ -16384,6 +16747,7 @@
16384	16747	{
16385	16748	gl.glScalef(1.0f, -1.0f, 1.0f);
16386	16749	}
	16750	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16387	16751	gl.glMultMatrixd(viewrot_1, 0);
16388	16752	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16389	16753	//viewer.updateInverseRotation(gl);
..	..	@@ -16642,7 +17006,7 @@
16642	17006	//new Exception().printStackTrace();
16643	17007	System.out.println("select buffer init");
16644	17008	// Use debug pipeline
16645		- drawable.setGL(new DebugGL(drawable.getGL()));
	17009	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16646	17010
16647	17011	GL gl = drawable.getGL();
16648	17012
..	..	@@ -17188,10 +17552,14 @@
17188	17552	gl.glFlush();
17189	17553
17190	17554	/**/
17191		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	17555	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
17192	17556
17193		- float[] pixels = occlusionsizebuffer.array();
	17557	+ float[] depths = occlusiondepthbuffer.array();
17194	17558
	17559	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	17560	+
	17561	+ int[] pixels = selectsizebuffer.array();
	17562	+
17195	17563	double r = 0, g = 0, b = 0;
17196	17564
17197	17565	double count = 0;
..	..	@@ -17202,7 +17570,7 @@
17202	17570
17203	17571	double FACTOR = 1;
17204	17572
17205		- for (int i = 0; i < pixels.length; i++)
	17573	+ for (int i = 0; i < depths.length; i++)
17206	17574	{
17207	17575	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
17208	17576	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -17285,7 +17653,7 @@
17285	17653
17286	17654	double scale = ray.z; // 1; // cos
17287	17655
17288		- float depth = pixels[newindex];
	17656	+ float depth = depths[newindex];
17289	17657
17290	17658	/*
17291	17659	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17482,11 +17850,14 @@
17482	17850	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17483	17851	static IntBuffer bigAAbuffer;
17484	17852	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17485		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	17853	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17486	17854	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17487	17855	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17488	17856	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17489		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17857	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17858	+
	17859	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17860	+
17490	17861	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17491	17862	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17492	17863	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();