~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;
..	..	@@ -150,6 +187,18 @@
150	187	}
151	188
152	189	private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	190	+
	191	+ public void LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	192	+ {
	193	+ try
	194	+ {
	195	+ cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	196	+ } catch (IOException e)
	197	+ {
	198	+ System.out.println("NAME = " + name);
	199	+ e.printStackTrace(); // throw new RuntimeException(e);
	200	+ }
	201	+ }
153	202
154	203	void SetAsGLRenderer(boolean b)
155	204	{
..	..	@@ -169,7 +218,8 @@
169	218
170	219	SetCamera(cam);
171	220
172		- SetLight(new Camera(new cVector(10, 10, -20)));
	221	+ // Warning: not used.
	222	+ SetLight(new Camera(new cVector(15, 10, -20)));
173	223
174	224	object = o;
175	225
..	..	@@ -1447,6 +1497,8 @@
1447	1497	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1448	1498	}
1449	1499
	1500	+ float[] colorV = new float[4];
	1501	+
1450	1502	void SetColor(Object3D obj, Vertex p0)
1451	1503	{
1452	1504	CameraPane display = this;
..	..	@@ -1514,8 +1566,6 @@
1514	1566	{
1515	1567	return;
1516	1568	}
1517		-
1518		- float[] colorV = new float[3];
1519	1569
1520	1570	if (false) // marked)
1521	1571	{
..	..	@@ -2405,6 +2455,21 @@
2405	2455	return currentGL;
2406	2456	}
2407	2457
	2458	+ static private BufferedImage CreateBim(TextureData texturedata)
	2459	+ {
	2460	+ Grafreed.Assert(texturedata != null);
	2461	+
	2462	+ int width = texturedata.getWidth();
	2463	+ int height = texturedata.getHeight();
	2464	+
	2465	+ Buffer buffer = texturedata.getBuffer();
	2466	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2467	+
	2468	+ byte[] bytes = bytebuf.array();
	2469	+
	2470	+ return CreateBim(bytes, width, height);
	2471	+ }
	2472	+
2408	2473	/**/
2409	2474	class CacheTexture
2410	2475	{
..	..	@@ -2413,18 +2478,20 @@
2413	2478
2414	2479	int resolution;
2415	2480
2416		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2481	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2417	2482	{
2418		- texture = tex;
	2483	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2484	+ texturedata = texdata;
2419	2485	resolution = res;
2420	2486	}
2421	2487	}
2422	2488	/**/
2423	2489
2424	2490	// 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>();
	2491	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2492	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2493	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2494	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
2428	2495
2429	2496	int pigmentdepth = 0;
2430	2497	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
..	..	@@ -2432,10 +2499,10 @@
2432	2499	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2433	2500	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2434	2501	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2435		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2502	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2436	2503	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2437	2504
2438		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2505	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2439	2506	{
2440	2507	TextureData texturedata = null;
2441	2508
..	..	@@ -2454,16 +2521,16 @@
2454	2521	if (bump)
2455	2522	texturedata = ConvertBump(texturedata, false);
2456	2523
2457		- com.sun.opengl.util.texture.Texture texture =
2458		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2524	+// com.sun.opengl.util.texture.Texture texture =
	2525	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2459	2526
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);
	2527	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2528	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2462	2529
2463		- return texture;
	2530	+ return texturedata;
2464	2531	}
2465	2532
2466		- com.sun.opengl.util.texture.Texture GetBimTexture(BufferedImage name, boolean bump)
	2533	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
2467	2534	{
2468	2535	TextureData texturedata = null;
2469	2536
..	..	@@ -2471,7 +2538,7 @@
2471	2538	{
2472	2539	texturedata =
2473	2540	com.sun.opengl.util.texture.TextureIO.newTextureData(
2474		- name,
	2541	+ bim,
2475	2542	true);
2476	2543	} catch (Exception e)
2477	2544	{
..	..	@@ -2480,14 +2547,8 @@
2480	2547
2481	2548	if (bump)
2482	2549	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;
	2550	+
	2551	+ return texturedata;
2491	2552	}
2492	2553
2493	2554	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -7975,8 +8036,8 @@
7975	8036	pigment = null;
7976	8037	}
7977	8038
7978		- ReleaseTexture(bump, true);
7979		- ReleaseTexture(pigment, false);
	8039	+ ReleaseTexture(tex, true);
	8040	+ ReleaseTexture(tex, false);
7980	8041	}
7981	8042
7982	8043	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -8005,7 +8066,7 @@
8005	8066	pigment = null;
8006	8067	}
8007	8068
8008		- ReleaseTexture(pigment, false);
	8069	+ ReleaseTexture(tex, false);
8009	8070	}
8010	8071
8011	8072	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -8034,10 +8095,10 @@
8034	8095	bump = null;
8035	8096	}
8036	8097
8037		- ReleaseTexture(bump, true);
	8098	+ ReleaseTexture(tex, true);
8038	8099	}
8039	8100
8040		- void ReleaseTexture(String tex, boolean bump)
	8101	+ void ReleaseTexture(cTexture tex, boolean bump)
8041	8102	{
8042	8103	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8043	8104	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8048,7 +8109,7 @@
8048	8109	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
8049	8110
8050	8111	if (tex != null)
8051		- texture = textures.get(tex);
	8112	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
8052	8113
8053	8114	// //assert( texture != null );
8054	8115	// if (texture == null)
..	..	@@ -8198,13 +8259,13 @@
8198	8259
8199	8260	if (tex == null)
8200	8261	{
8201		- BindTexture(null, null,false,resolution);
	8262	+ BindTexture(null,false,resolution);
8202	8263	return;
8203	8264	}
8204	8265
8205	8266	String pigment = Object3D.GetPigment(tex);
8206	8267
8207		- usedtextures.add(pigment);
	8268	+ usedtextures.add(tex);
8208	8269
8209	8270	//if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8210	8271	{
..	..	@@ -8218,7 +8279,7 @@
8218	8279	}
8219	8280
8220	8281	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8221		- BindTexture(tex.pigmenttexture, pigment, false, resolution);
	8282	+ BindTexture(tex, false, resolution);
8222	8283	}
8223	8284
8224	8285	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8231,13 +8292,13 @@
8231	8292
8232	8293	if (tex == null)
8233	8294	{
8234		- BindTexture(null, null,true,resolution);
	8295	+ BindTexture(null,true,resolution);
8235	8296	return;
8236	8297	}
8237	8298
8238	8299	String bump = Object3D.GetBump(tex);
8239	8300
8240		- usedtextures.add(bump);
	8301	+ usedtextures.add(tex);
8241	8302
8242	8303	//if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8243	8304	{
..	..	@@ -8251,7 +8312,7 @@
8251	8312	}
8252	8313
8253	8314	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8254		- BindTexture(tex.bumptexture, bump, true, resolution);
	8315	+ BindTexture(tex, true, resolution);
8255	8316	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8256	8317	}
8257	8318
..	..	@@ -8275,13 +8336,19 @@
8275	8336	return fileExists;
8276	8337	}
8277	8338
8278		- CacheTexture GetCacheTexture(java.awt.image.BufferedImage bim, String tex, boolean bump, int resolution) throws Exception
	8339	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8279	8340	{
8280	8341	CacheTexture texturecache = null;
8281	8342
8282	8343	if (tex != null)
8283	8344	{
8284		- String texname = tex;
	8345	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8346	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
	8347	+
	8348	+ if (texname.equals("") && texdata == null)
	8349	+ {
	8350	+ return null;
	8351	+ }
8285	8352
8286	8353	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8287	8354
..	..	@@ -8291,29 +8358,46 @@
8291	8358	// else
8292	8359	// if (!texname.startsWith("/"))
8293	8360	// texname = "/Users/nbriere/Textures/" + texname;
8294		- if (!FileExists(tex))
	8361	+ if (!FileExists(texname) && !texname.startsWith("@"))
8295	8362	{
8296	8363	texname = fallbackTextureName;
8297	8364	}
8298	8365
8299	8366	if (CACHETEXTURE)
8300	8367	{
8301		- if (bim == null)
8302		- texturecache = textures.get(texname); // TEXTURE CACHE
	8368	+ if (texdata == null)
	8369	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
8303	8370	else
8304		- texturecache = bimtextures.get(bim); // TEXTURE CACHE
	8371	+ texturecache = bimtextures.get(texdata);
8305	8372	}
8306	8373
8307		- if (texturecache == null \|\| texturecache.resolution < resolution)
	8374	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
8308	8375	{
8309	8376	TextureData texturedata = null;
8310	8377
8311		- if (bim == null)
	8378	+ if (texdata != null && textureon)
8312	8379	{
	8380	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
8313	8381
	8382	+ try
	8383	+ {
	8384	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8385	+ }
	8386	+ catch (Exception e)
	8387	+ {
	8388	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8389	+ }
	8390	+
	8391	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8392	+ bimtextures.put(texdata, texturecache);
	8393	+
	8394	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8395	+
	8396	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8397	+ //bim2 = bim;
8314	8398	}
8315	8399	else
8316		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8400	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8317	8401	{
8318	8402	assert(!bump);
8319	8403	// if (bump)
..	..	@@ -8324,19 +8408,23 @@
8324	8408	// }
8325	8409	// else
8326	8410	// {
8327		- texturecache = textures.get(tex);
	8411	+ // texturecache = textures.get(texname); // suspicious
8328	8412	if (texturecache == null)
8329	8413	{
8330	8414	texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8331	8415	}
	8416	+ else
	8417	+ new Exception().printStackTrace();
8332	8418	// }
8333	8419	} else
8334		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8420	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8335	8421	{
8336	8422	assert(bump);
8337		- texturecache = textures.get(tex);
	8423	+ // texturecache = textures.get(texname); // suspicious
8338	8424	if (texturecache == null)
8339	8425	texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8426	+ else
	8427	+ new Exception().printStackTrace();
8340	8428	} else
8341	8429	{
8342	8430	//if (tex.equals("IMMORTAL"))
..	..	@@ -8344,11 +8432,22 @@
8344	8432	// texture = GetResourceTexture("default.png");
8345	8433	//} else
8346	8434	//{
8347		- if (tex.equals("WHITE_NOISE"))
	8435	+ if (texname.endsWith("WHITE_NOISE"))
8348	8436	{
8349		- texturecache = textures.get(tex);
	8437	+ // texturecache = textures.get(texname); // suspicious
8350	8438	if (texturecache == null)
8351	8439	texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8440	+ else
	8441	+ new Exception().printStackTrace();
	8442	+ } else
	8443	+ {
	8444	+ if (texname.startsWith("@"))
	8445	+ {
	8446	+ // texturecache = textures.get(texname); // suspicious
	8447	+ if (texturecache == null)
	8448	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
	8449	+ else
	8450	+ new Exception().printStackTrace();
8352	8451	} else
8353	8452	{
8354	8453	if (textureon)
..	..	@@ -8407,14 +8506,15 @@
8407	8506	if (texturedata == null)
8408	8507	throw new Exception();
8409	8508
8410		- texturecache = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8509	+ texturecache = new CacheTexture(texturedata,resolution);
8411	8510	//texture = GetTexture(tex, bump);
8412	8511	}
	8512	+ }
8413	8513	}
8414	8514	//}
8415	8515	}
8416	8516
8417		- if (/CACHETEXTURE &&/ texturecache != null && textureon)
	8517	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8418	8518	{
8419	8519	//return false;
8420	8520
..	..	@@ -8436,52 +8536,17 @@
8436	8536	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8437	8537	if (!cachefile.exists())
8438	8538	{
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))
	8539	+ //if (texturedata.getWidth() == texturedata.getHeight())
8448	8540	{
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);
	8541	+ BufferedImage rendImage = CreateBim(texturedata);
	8542	+
8479	8543	ImageWriter writer = null;
8480	8544	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8481	8545	if (iter.hasNext()) {
8482	8546	writer = (ImageWriter)iter.next();
8483	8547	}
8484		- float compressionQuality = 0.9f;
	8548	+
	8549	+ float compressionQuality = 0.85f;
8485	8550	try
8486	8551	{
8487	8552	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8498,18 +8563,20 @@
8498	8563	}
8499	8564	}
8500	8565	}
8501		-
	8566	+
	8567	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8568	+
8502	8569	//System.out.println("Texture = " + tex);
8503		- if (textures.containsKey(texname))
	8570	+ if (textures.containsKey(tex))
8504	8571	{
8505		- CacheTexture thetex = textures.get(texname);
	8572	+ CacheTexture thetex = textures.get(tex);
8506	8573	thetex.texture.disable();
8507	8574	thetex.texture.dispose();
8508		- textures.remove(texname);
	8575	+ textures.remove(tex);
8509	8576	}
8510	8577
8511	8578	//texture.texturedata = texturedata;
8512		- textures.put(texname, texturecache);
	8579	+ textures.put(tex, texturecache);
8513	8580
8514	8581	// newtex = true;
8515	8582	}
..	..	@@ -8528,9 +8595,43 @@
8528	8595	return texturecache;
8529	8596	}
8530	8597
8531		- com.sun.opengl.util.texture.Texture GetTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
	8598	+ static void EmbedTextures(cTexture tex)
8532	8599	{
8533		- CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
	8600	+ if (tex.pigmentdata == null)
	8601	+ {
	8602	+ //String texname = Object3D.GetPigment(tex);
	8603	+
	8604	+ CacheTexture texturecache = texturepigment.get(tex);
	8605	+
	8606	+ if (texturecache != null)
	8607	+ {
	8608	+ tex.pw = texturecache.texturedata.getWidth();
	8609	+ tex.ph = texturecache.texturedata.getHeight();
	8610	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8611	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8612	+ ;
	8613	+ //, tex.pw, tex.ph), 0.5f);
	8614	+ }
	8615	+ }
	8616	+
	8617	+ if (tex.bumpdata == null)
	8618	+ {
	8619	+ //String texname = Object3D.GetBump(tex);
	8620	+
	8621	+ CacheTexture texturecache = texturebump.get(tex);
	8622	+
	8623	+ if (texturecache != null)
	8624	+ {
	8625	+ tex.bw = texturecache.texturedata.getWidth();
	8626	+ tex.bh = texturecache.texturedata.getHeight();
	8627	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8628	+ }
	8629	+ }
	8630	+ }
	8631	+
	8632	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8633	+ {
	8634	+ CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8534	8635
8535	8636	if (bump)
8536	8637	{
..	..	@@ -8546,14 +8647,14 @@
8546	8647	return texture!=null?texture.texture:null;
8547	8648	}
8548	8649
8549		- public com.sun.opengl.util.texture.TextureData GetTextureData(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
	8650	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8550	8651	{
8551		- CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
	8652	+ CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8552	8653
8553	8654	return texture!=null?texture.texturedata:null;
8554	8655	}
8555	8656
8556		- boolean BindTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
	8657	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8557	8658	{
8558	8659	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8559	8660	{
..	..	@@ -8562,7 +8663,7 @@
8562	8663
8563	8664	//boolean newtex = false;
8564	8665
8565		- com.sun.opengl.util.texture.Texture texture = GetTexture(stream, tex, bump, resolution);
	8666	+ com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8566	8667
8567	8668	if (texture == null)
8568	8669	return false;
..	..	@@ -8595,6 +8696,72 @@
8595	8696	return true; // Warning: not used.
8596	8697	}
8597	8698
	8699	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8700	+ {
	8701	+ try
	8702	+ {
	8703	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8704	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8705	+ ImageWriter writer = writers.next();
	8706	+
	8707	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8708	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8709	+ param.setCompressionQuality(quality);
	8710	+
	8711	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8712	+ writer.setOutput(ios);
	8713	+ writer.write(null, new IIOImage(image, null, null), param);
	8714	+
	8715	+ byte[] data = baos.toByteArray();
	8716	+ writer.dispose();
	8717	+ return data;
	8718	+ }
	8719	+ catch (Exception e)
	8720	+ {
	8721	+ e.printStackTrace();
	8722	+ return null;
	8723	+ }
	8724	+ }
	8725	+
	8726	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8727	+ {
	8728	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8729	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8730	+ ImageReader reader = writers.next();
	8731	+
	8732	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8733	+
	8734	+ ImageReadParam param = reader.getDefaultReadParam();
	8735	+ param.setDestination(bim);
	8736	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8737	+
	8738	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8739	+ reader.setInput(ios);
	8740	+ BufferedImage bim2 = reader.read(0, param);
	8741	+ reader.dispose();
	8742	+
	8743	+// WritableRaster raster = bim2.getRaster();
	8744	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8745	+// byte[] bytes = data.getData();
	8746	+//
	8747	+// int[] pixels = new int[bytes.length/3];
	8748	+// for (int i=pixels.length; --i>=0;)
	8749	+// {
	8750	+// int i3 = i*3;
	8751	+// pixels[i] = 0xFF;
	8752	+// pixels[i] <<= 8;
	8753	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8754	+// pixels[i] <<= 8;
	8755	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8756	+// pixels[i] <<= 8;
	8757	+// pixels[i] \|= bytes[i3] & 0xFF;
	8758	+// }
	8759	+//
	8760	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8761	+
	8762	+ return bim;
	8763	+ }
	8764	+
8598	8765	ShadowBuffer shadowPBuf;
8599	8766	AntialiasBuffer antialiasPBuf;
8600	8767	int MAXSTACK;
..	..	@@ -8787,7 +8954,7 @@
8787	8954
8788	8955	if (cubemap == null)
8789	8956	{
8790		- LoadEnvy(5);
	8957	+ //LoadEnvy(1);
8791	8958	}
8792	8959
8793	8960	//cubemap.enable();
..	..	@@ -9074,37 +9241,58 @@
9074	9241	cubemap = null;
9075	9242	return;
9076	9243	case 1:
9077		- name = "cubemaps/box_";
9078		- ext = "png";
	9244	+ name = "cubemaps/rgb/";
	9245	+ ext = "jpg";
9079	9246	reverseUP = false;
9080	9247	break;
9081	9248	case 2:
9082		- name = "cubemaps/uffizi_";
9083		- ext = "png";
9084		- break; // reverseUP = true; break;
	9249	+ name = "cubemaps/uffizi/";
	9250	+ ext = "jpg";
	9251	+ reverseUP = false;
	9252	+ break;
9085	9253	case 3:
9086		- name = "cubemaps/CloudyHills_";
9087		- ext = "tga";
	9254	+ name = "cubemaps/CloudyHills/";
	9255	+ ext = "jpg";
9088	9256	reverseUP = false;
9089	9257	break;
9090	9258	case 4:
9091		- name = "cubemaps/cornell_";
	9259	+ name = "cubemaps/cornell/";
9092	9260	ext = "png";
9093	9261	reverseUP = false;
9094	9262	break;
	9263	+ case 5:
	9264	+ name = "cubemaps/skycube/";
	9265	+ ext = "jpg";
	9266	+ reverseUP = false;
	9267	+ break;
	9268	+ case 6:
	9269	+ name = "cubemaps/SaintLazarusChurch3/";
	9270	+ ext = "jpg";
	9271	+ reverseUP = false;
	9272	+ break;
	9273	+ case 7:
	9274	+ name = "cubemaps/Sodermalmsallen/";
	9275	+ ext = "jpg";
	9276	+ reverseUP = false;
	9277	+ break;
	9278	+ case 8:
	9279	+ name = "cubemaps/Sodermalmsallen2/";
	9280	+ ext = "jpg";
	9281	+ reverseUP = false;
	9282	+ break;
	9283	+ case 9:
	9284	+ name = "cubemaps/UnionSquare/";
	9285	+ ext = "jpg";
	9286	+ reverseUP = false;
	9287	+ break;
9095	9288	default:
9096		- name = "cubemaps/rgb_";
9097		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9289	+ name = "cubemaps/box/";
	9290	+ ext = "png"; /mipmap = true;/
	9291	+ reverseUP = false;
9098	9292	break;
9099	9293	}
9100		-
9101		- try
9102		- {
9103		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9104		- } catch (IOException e)
9105		- {
9106		- throw new RuntimeException(e);
9107		- }
	9294	+
	9295	+ LoadSkybox(name, ext, mipmap);
9108	9296	}
9109	9297
9110	9298	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -9136,8 +9324,12 @@
9136	9324	static double[] model = new double[16];
9137	9325	double[] camera2light = new double[16];
9138	9326	double[] light2camera = new double[16];
9139		- int newenvy = -1;
9140		- boolean envyoff = true; // false;
	9327	+
	9328	+ //int newenvy = -1;
	9329	+ //boolean envyoff = false;
	9330	+
	9331	+ String loadedskyboxname;
	9332	+
9141	9333	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9142	9334	//float[] light0 = { 0,0,0 };
9143	9335	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9555,7 +9747,7 @@
9555	9747
9556	9748	if (renderCamera != lightCamera)
9557	9749	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9558		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9750	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9559	9751
9560	9752	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9561	9753
..	..	@@ -9571,7 +9763,7 @@
9571	9763
9572	9764	if (renderCamera != lightCamera)
9573	9765	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9574		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9766	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9575	9767
9576	9768	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9577	9769
..	..	@@ -9617,10 +9809,12 @@
9617	9809	rati = 1 / rati;
9618	9810	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9619	9811	}
9620		- assert (newenvy == -1);
	9812	+
	9813	+ //assert (newenvy == -1);
	9814	+
9621	9815	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9622	9816	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9623		- DrawSkyBox(gl);
	9817	+ DrawSkyBox(gl, (float)rati);
9624	9818	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9625	9819	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9626	9820	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -10657,7 +10851,7 @@
10657	10851
10658	10852	if (wait)
10659	10853	{
10660		- Sleep(500);
	10854	+ Sleep(200); // blocks everything
10661	10855
10662	10856	wait = false;
10663	10857	}
..	..	@@ -10772,7 +10966,7 @@
10772	10966	// if (parentcam != renderCamera) // not a light
10773	10967	if (cam != lightCamera)
10774	10968	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10775		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10969	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10776	10970
10777	10971	for (int j = 0; j < 4; j++)
10778	10972	{
..	..	@@ -10787,7 +10981,7 @@
10787	10981	// if (parentcam != renderCamera) // not a light
10788	10982	if (cam != lightCamera)
10789	10983	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10790		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	10984	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10791	10985
10792	10986	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10793	10987
..	..	@@ -10873,13 +11067,27 @@
10873	11067	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10874	11068	}
10875	11069
10876		- if (newenvy > -1)
	11070	+// if (newenvy > -1)
	11071	+// {
	11072	+// LoadEnvy(newenvy);
	11073	+// }
	11074	+//
	11075	+// newenvy = -1;
	11076	+
	11077	+ if (object.skyboxname != null)
10877	11078	{
10878		- LoadEnvy(newenvy);
	11079	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11080	+ {
	11081	+ LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11082	+ loadedskyboxname = object.skyboxname;
	11083	+ }
10879	11084	}
10880		-
10881		- newenvy = -1;
10882		-
	11085	+ else
	11086	+ {
	11087	+ cubemap = null;
	11088	+ loadedskyboxname = null;
	11089	+ }
	11090	+
10883	11091	ratio = ((double) getWidth()) / getHeight();
10884	11092	//System.out.println("ratio = " + ratio);
10885	11093
..	..	@@ -10895,7 +11103,7 @@
10895	11103
10896	11104	if (!IsFrozen() && !ambientOcclusion)
10897	11105	{
10898		- DrawSkyBox(gl);
	11106	+ DrawSkyBox(gl, (float)ratio);
10899	11107	}
10900	11108
10901	11109	//if (selection_view == -1)
..	..	@@ -11049,7 +11257,7 @@
11049	11257
11050	11258	try
11051	11259	{
11052		- BindTexture(null, NOISE_TEXTURE, false, 2);
	11260	+ BindTexture(NOISE_TEXTURE, false, 2);
11053	11261	}
11054	11262	catch (Exception e)
11055	11263	{
..	..	@@ -11181,7 +11389,7 @@
11181	11389
11182	11390	// if (cam != lightCamera)
11183	11391	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11184		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11392	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11185	11393	}
11186	11394
11187	11395	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -11340,7 +11548,7 @@
11340	11548	}
11341	11549	}
11342	11550
11343		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11551	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11344	11552	{
11345	11553	//gl.glDepthFunc(GL.GL_LEQUAL);
11346	11554	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11348,24 +11556,21 @@
11348	11556
11349	11557	boolean texon = textureon;
11350	11558
11351		- if (RENDERPROGRAM > 0)
11352		- {
11353		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11354		- textureon = false;
11355		- }
	11559	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11560	+ textureon = false;
	11561	+
11356	11562	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11357	11563	//System.out.println("ALLO");
11358	11564	gl.glColorMask(false, false, false, false);
11359	11565	DrawObject(gl);
11360		- if (RENDERPROGRAM > 0)
11361		- {
11362		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11363		- textureon = texon;
11364		- }
	11566	+
	11567	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11568	+ textureon = texon;
	11569	+
11365	11570	gl.glColorMask(true, true, true, true);
11366	11571
11367	11572	gl.glDepthFunc(GL.GL_EQUAL);
11368		- //gl.glDepthMask(false);
	11573	+ gl.glDepthMask(false);
11369	11574	}
11370	11575
11371	11576	if (false) // DrawMode() == SHADOW)
..	..	@@ -11705,20 +11910,32 @@
11705	11910	ReleaseTextures(DEFAULT_TEXTURES);
11706	11911
11707	11912	if (CLEANCACHE)
11708		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11913	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11709	11914	{
11710		- String tex = e.nextElement();
	11915	+ cTexture tex = e.nextElement();
11711	11916
11712	11917	// System.out.println("Texture --------- " + tex);
11713	11918
11714		- if (tex.equals("WHITE_NOISE"))
	11919	+ if (tex.equals("WHITE_NOISE:"))
11715	11920	continue;
11716	11921
11717	11922	if (!usedtextures.contains(tex))
11718	11923	{
	11924	+ CacheTexture gettex = texturepigment.get(tex);
11719	11925	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11720		- textures.get(tex).texture.dispose();
11721		- textures.remove(tex);
	11926	+ if (gettex != null)
	11927	+ {
	11928	+ gettex.texture.dispose();
	11929	+ texturepigment.remove(tex);
	11930	+ }
	11931	+
	11932	+ gettex = texturebump.get(tex);
	11933	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11934	+ if (gettex != null)
	11935	+ {
	11936	+ gettex.texture.dispose();
	11937	+ texturebump.remove(tex);
	11938	+ }
11722	11939	}
11723	11940	}
11724	11941	}
..	..	@@ -12246,8 +12463,76 @@
12246	12463
12247	12464	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12248	12465
12249		- String program =
	12466	+ String programmin =
	12467	+ // Min shader
12250	12468	"!!ARBfp1.0\n" +
	12469	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12470	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12471	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12472	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12473	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12474	+ "PARAM light2cam0 = program.env[10];" +
	12475	+ "PARAM light2cam1 = program.env[11];" +
	12476	+ "PARAM light2cam2 = program.env[12];" +
	12477	+ "TEMP temp;" +
	12478	+ "TEMP light;" +
	12479	+ "TEMP ndotl;" +
	12480	+ "TEMP normal;" +
	12481	+ "TEMP depth;" +
	12482	+ "TEMP eye;" +
	12483	+ "TEMP pos;" +
	12484	+
	12485	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12486	+ Normalize("normal") +
	12487	+ "MOV light, state.light[0].position;" +
	12488	+ "DP3 ndotl.x, light, normal;" +
	12489	+
	12490	+ // shadow
	12491	+ "MOV pos, fragment.texcoord[1];" +
	12492	+ "MOV temp, pos;" +
	12493	+ ShadowTextureFetch("depth", "temp", "1") +
	12494	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12495	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12496	+
	12497	+ // No shadow when out of frustum
	12498	+ //"SGE temp.y, depth.z, zero123.y;" +
	12499	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12500	+
	12501	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12502	+
	12503	+ // Backlit
	12504	+ "MOV pos.w, zero123.y;" +
	12505	+ "DP4 eye.x, pos, light2cam0;" +
	12506	+ "DP4 eye.y, pos, light2cam1;" +
	12507	+ "DP4 eye.z, pos, light2cam2;" +
	12508	+ Normalize("eye") +
	12509	+
	12510	+ "DP3 ndotl.y, -eye, normal;" +
	12511	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12512	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12513	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12514	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12515	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12516	+
	12517	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12518	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12519	+
	12520	+ // Pigment
	12521	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12522	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12523	+ "MUL temp, temp, ndotl.x;" +
	12524	+
	12525	+ "MUL temp, temp, zero123.z;" +
	12526	+
	12527	+ //"MUL temp, temp, ndotl.y;" +
	12528	+
	12529	+ "MOV temp.w, zero123.y;" + // reset alpha
	12530	+ "MOV result.color, temp;" +
	12531	+ "END";
	12532	+
	12533	+ String programmax =
	12534	+ "!!ARBfp1.0\n" +
	12535	+
12251	12536	//"OPTION ARB_fragment_program_shadow;" +
12252	12537	"PARAM light2cam0 = program.env[10];" +
12253	12538	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12362,8 +12647,7 @@
12362	12647	"TEMP shininess;" +
12363	12648	"\n" +
12364	12649	"MOV texSamp, one;" +
12365		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12366		-
	12650	+
12367	12651	"MOV mapgrid.x, one2048th.x;" +
12368	12652	"MOV temp, fragment.texcoord[1];" +
12369	12653	/*
..	..	@@ -12384,20 +12668,20 @@
12384	12668	"MUL temp, floor, mapgrid.x;" +
12385	12669	//"TEX depth0, temp, texture[1], 2D;" +
12386	12670	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12387		- TextureFetch("depth0", "temp", "1") +
	12671	+ ShadowTextureFetch("depth0", "temp", "1") +
12388	12672	"") +
12389	12673	"ADD temp.x, temp.x, mapgrid.x;" +
12390	12674	//"TEX depth1, temp, texture[1], 2D;" +
12391	12675	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12392		- TextureFetch("depth1", "temp", "1") +
	12676	+ ShadowTextureFetch("depth1", "temp", "1") +
12393	12677	"") +
12394	12678	"ADD temp.y, temp.y, mapgrid.x;" +
12395	12679	//"TEX depth2, temp, texture[1], 2D;" +
12396		- TextureFetch("depth2", "temp", "1") +
	12680	+ ShadowTextureFetch("depth2", "temp", "1") +
12397	12681	"SUB temp.x, temp.x, mapgrid.x;" +
12398	12682	//"TEX depth3, temp, texture[1], 2D;" +
12399	12683	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12400		- TextureFetch("depth3", "temp", "1") +
	12684	+ ShadowTextureFetch("depth3", "temp", "1") +
12401	12685	"") +
12402	12686	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12403	12687	//"MOV params, material;" +
..	..	@@ -12768,10 +13052,10 @@
12768	13052	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12769	13053	"") +
12770	13054
12771		- // display shadow only (bump == 0)
	13055	+ // display shadow only (fakedepth == 0)
12772	13056	"SUB temp.x, half.x, shadow.x;" +
12773	13057	"MOV temp.y, -params5.z;" + // params6.x;" +
12774		- "SLT temp.z, temp.y, -one2048th.x;" +
	13058	+ "SLT temp.z, temp.y, -c256i.x;" +
12775	13059	"SUB temp.y, one.x, temp.z;" +
12776	13060	"MUL temp.x, temp.x, temp.y;" +
12777	13061	"KIL temp.x;" +
..	..	@@ -13102,6 +13386,13 @@
13102	13386	//once = true;
13103	13387	}
13104	13388
	13389	+ String program = programmax;
	13390	+
	13391	+ if (Globals.MINSHADER)
	13392	+ {
	13393	+ program = programmin;
	13394	+ }
	13395	+
13105	13396	System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13106	13397	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13107	13398	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
..	..	@@ -13195,25 +13486,26 @@
13195	13486	return out;
13196	13487	}
13197	13488
13198		- String TextureFetch(String dest, String src, String unit)
	13489	+ // Also does frustum culling
	13490	+ String ShadowTextureFetch(String dest, String src, String unit)
13199	13491	{
13200	13492	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13201	13493	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13202	13494	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13495	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13496	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13203	13497	"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;" +
	13498	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13499	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13208	13500	//"SWZ buffer, temp, w,w,w,w;";
13209		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13501	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13210	13502	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13211	13503	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13212	13504	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13213		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13505	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13214	13506
13215		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13216		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13507	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13508	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13217	13509	}
13218	13510
13219	13511	String Shadow(String depth, String shadow)
..	..	@@ -13260,7 +13552,7 @@
13260	13552	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13261	13553	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13262	13554
13263		- // No shadow when out of frustrum
	13555	+ // No shadow when out of frustum
13264	13556	"SGE temp.x, " + depth + ".z, one.z;" +
13265	13557	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13266	13558	"";
..	..	@@ -14058,14 +14350,15 @@
14058	14350	drag = false;
14059	14351	//System.out.println("Mouse DOWN");
14060	14352	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);
	14353	+ //ClickInfo info = new ClickInfo();
	14354	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14355	+ object.clickInfo.pane = this;
	14356	+ object.clickInfo.camera = renderCamera;
	14357	+ object.clickInfo.x = x;
	14358	+ object.clickInfo.y = y;
	14359	+ object.clickInfo.modifiers = modifiersex;
	14360	+ editObj = object.doEditClick(//info,
	14361	+ 0);
14069	14362	if (!editObj)
14070	14363	{
14071	14364	hasMarquee = true;
..	..	@@ -14349,9 +14642,9 @@
14349	14642	MODIFIERS \|= COMMAND;
14350	14643	/**/
14351	14644	if((mod&SHIFT) == SHIFT)
14352		- manipCamera.RotatePosition(0, -speed);
14353		- else
14354	14645	manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14646	+ else
	14647	+ manipCamera.RotatePosition(0, -speed);
14355	14648	/**/
14356	14649	if ((mod & SHIFT) == SHIFT)
14357	14650	{
..	..	@@ -14370,9 +14663,9 @@
14370	14663	MODIFIERS \|= COMMAND;
14371	14664	/**/
14372	14665	if((mod&SHIFT) == SHIFT)
14373		- manipCamera.RotatePosition(0, speed);
14374		- else
14375	14666	manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14667	+ else
	14668	+ manipCamera.RotatePosition(0, speed);
14376	14669	/**/
14377	14670	if ((mod & SHIFT) == SHIFT)
14378	14671	{
..	..	@@ -14465,15 +14758,16 @@
14465	14758	if (editObj)
14466	14759	{
14467	14760	drag = true;
14468		- ClickInfo info = new ClickInfo();
14469		- info.bounds.setBounds(0, 0,
	14761	+ //ClickInfo info = new ClickInfo();
	14762	+ object.clickInfo.bounds.setBounds(0, 0,
14470	14763	(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);
	14764	+ object.clickInfo.pane = this;
	14765	+ object.clickInfo.camera = renderCamera;
	14766	+ object.clickInfo.x = x;
	14767	+ object.clickInfo.y = y;
	14768	+ object //.GetWindow().copy
	14769	+ .doEditDrag(//info,
	14770	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14477	14771	} else
14478	14772	{
14479	14773	if (x < startX)
..	..	@@ -14622,24 +14916,27 @@
14622	14916	}
14623	14917	}
14624	14918
	14919	+// ClickInfo clickInfo = new ClickInfo();
	14920	+
14625	14921	public void mouseMoved(MouseEvent e)
14626	14922	{
14627	14923	//System.out.println("mouseMoved: " + e);
14628	14924	if (isRenderer)
14629	14925	return;
14630	14926
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;
	14927	+ // Mouse cursor feedback
	14928	+ object.clickInfo.x = e.getX();
	14929	+ object.clickInfo.y = e.getY();
	14930	+ object.clickInfo.modifiers = e.getModifiersEx();
	14931	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14932	+ object.clickInfo.pane = this;
	14933	+ object.clickInfo.camera = renderCamera;
14638	14934	if (!isRenderer)
14639	14935	{
14640	14936	//ObjEditor editWindow = object.editWindow;
14641	14937	//Object3D copy = editWindow.copy;
14642		- if (object.doEditClick(ci, 0))
	14938	+ if (object.doEditClick(//clickInfo,
	14939	+ 0))
14643	14940	{
14644	14941	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14645	14942	} else
..	..	@@ -14911,7 +15208,8 @@
14911	15208	// break;
14912	15209	case 'T':
14913	15210	CACHETEXTURE ^= true;
14914		- textures.clear();
	15211	+ texturepigment.clear();
	15212	+ texturebump.clear();
14915	15213	// repaint();
14916	15214	break;
14917	15215	case 'Y':
..	..	@@ -15088,20 +15386,24 @@
15088	15386	OCCLUSION_CULLING ^= true;
15089	15387	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
15090	15388	break;
15091		- case '0': envyoff ^= true; repaint(); break;
	15389	+ //case '0': envyoff ^= true; repaint(); break;
15092	15390	case '1':
15093	15391	case '2':
15094	15392	case '3':
15095	15393	case '4':
15096	15394	case '5':
15097		- newenvy = Character.getNumericValue(key);
15098		- repaint();
15099		- break;
15100	15395	case '6':
15101	15396	case '7':
15102	15397	case '8':
15103	15398	case '9':
15104		- BGcolor = (key - '6')/3.f;
	15399	+ if (true) // envyoff)
	15400	+ {
	15401	+ BGcolor = (key - '1')/8.f;
	15402	+ }
	15403	+ else
	15404	+ {
	15405	+ //newenvy = Character.getNumericValue(key);
	15406	+ }
15105	15407	repaint();
15106	15408	break;
15107	15409	case '!':
..	..	@@ -15664,8 +15966,6 @@
15664	15966
15665	15967	int width = getBounds().width;
15666	15968	int height = getBounds().height;
15667		- ClickInfo info = new ClickInfo();
15668		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15669	15969	//Image img = CreateImage(width, height);
15670	15970	//System.out.println("width = " + width + "; height = " + height + "\n");
15671	15971
..	..	@@ -15742,31 +16042,37 @@
15742	16042	}
15743	16043	if (object != null && !hasMarquee)
15744	16044	{
	16045	+ if (object.clickInfo == null)
	16046	+ object.clickInfo = new ClickInfo();
	16047	+ ClickInfo info = object.clickInfo;
	16048	+ //ClickInfo info = new ClickInfo();
	16049	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16050	+
15745	16051	if (isRenderer)
15746	16052	{
15747		- info.flags++;
	16053	+ object.clickInfo.flags++;
15748	16054	double frameAspect = (double) width / (double) height;
15749	16055	if (frameAspect > renderCamera.aspect)
15750	16056	{
15751	16057	int desired = (int) ((double) height * renderCamera.aspect);
15752		- info.bounds.width -= width - desired;
15753		- info.bounds.x += (width - desired) / 2;
	16058	+ object.clickInfo.bounds.width -= width - desired;
	16059	+ object.clickInfo.bounds.x += (width - desired) / 2;
15754	16060	} else
15755	16061	{
15756	16062	int desired = (int) ((double) width / renderCamera.aspect);
15757		- info.bounds.height -= height - desired;
15758		- info.bounds.y += (height - desired) / 2;
	16063	+ object.clickInfo.bounds.height -= height - desired;
	16064	+ object.clickInfo.bounds.y += (height - desired) / 2;
15759	16065	}
15760	16066	}
15761	16067
15762		- info.g = gr;
15763		- info.camera = renderCamera;
	16068	+ object.clickInfo.g = gr;
	16069	+ object.clickInfo.camera = renderCamera;
15764	16070	/*
15765	16071	// Memory intensive (brep.verticescopy)
15766	16072	if (!(object instanceof Composite))
15767	16073	object.draw(info, 0, false); // SLOW :
15768	16074	*/
15769		- if (!isRenderer)
	16075	+ if (!isRenderer) // && drag)
15770	16076	{
15771	16077	Grafreed.Assert(object != null);
15772	16078	Grafreed.Assert(object.selection != null);
..	..	@@ -15774,9 +16080,9 @@
15774	16080	{
15775	16081	int hitSomething = object.selection.get(0).hitSomething;
15776	16082
15777		- info.DX = 0;
15778		- info.DY = 0;
15779		- info.W = 1;
	16083	+ object.clickInfo.DX = 0;
	16084	+ object.clickInfo.DY = 0;
	16085	+ object.clickInfo.W = 1;
15780	16086	if (hitSomething == Object3D.hitCenter)
15781	16087	{
15782	16088	info.DX = X;
..	..	@@ -15788,7 +16094,8 @@
15788	16094	info.DY -= info.bounds.height/2;
15789	16095	}
15790	16096
15791		- object.drawEditHandles(info, 0);
	16097	+ object.drawEditHandles(//info,
	16098	+ 0);
15792	16099
15793	16100	if (drag && (X != 0 \|\| Y != 0))
15794	16101	{
..	..	@@ -16287,6 +16594,8 @@
16287	16594	private /static/ boolean firstime;
16288	16595	private /static/ cVector newView = new cVector();
16289	16596	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16597	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16598	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
16290	16599	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16291	16600	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16292	16601	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16299,29 +16608,67 @@
16299	16608	{
16300	16609	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16301	16610
	16611	+ int usedsuf = 0;
	16612	+
16302	16613	for (int i = 0; i < suffixes.length; i++)
16303	16614	{
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)
	16615	+ String[] suffixe = suffixes;
	16616	+ String[] fallback = suffixes2;
	16617	+ String[] fallfallback = suffixes3;
	16618	+
	16619	+ for (int c=usedsuf; --c>=0;)
16309	16620	{
16310		- throw new IOException("Unable to load texture " + resourceName);
	16621	+// String[] temp = suffixe;
	16622	+// suffixe = fallback;
	16623	+// fallback = fallfallback;
	16624	+// fallfallback = temp;
16311	16625	}
	16626	+
	16627	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16628	+ TextureData data;
	16629	+
	16630	+ try
	16631	+ {
	16632	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16633	+ mipmapped,
	16634	+ FileUtil.getFileSuffix(resourceName));
	16635	+ }
	16636	+ catch (Exception e)
	16637	+ {
	16638	+ try
	16639	+ {
	16640	+ resourceName = basename + fallback[i] + "." + suffix;
	16641	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16642	+ mipmapped,
	16643	+ FileUtil.getFileSuffix(resourceName));
	16644	+ }
	16645	+ catch (Exception e2)
	16646	+ {
	16647	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16648	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16649	+ mipmapped,
	16650	+ FileUtil.getFileSuffix(resourceName));
	16651	+ }
	16652	+ }
	16653	+
16312	16654	//System.out.println("Target = " + targets[i]);
16313	16655	cubemap.updateImage(data, targets[i]);
16314	16656	}
16315	16657
16316	16658	return cubemap;
16317	16659	}
	16660	+
16318	16661	int bigsphere = -1;
16319	16662
16320	16663	float BGcolor = 0.5f;
16321	16664
16322		- private void DrawSkyBox(GL gl)
	16665	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16666	+
	16667	+ private void DrawSkyBox(GL gl, float ratio)
16323	16668	{
16324		- if (envyoff \|\| cubemap == null)
	16669	+ if (//envyoff \|\|
	16670	+ WIREFRAME \|\|
	16671	+ cubemap == null)
16325	16672	{
16326	16673	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16327	16674	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16336,7 +16683,17 @@
16336	16683	// Compensates for ExaminerViewer's modification of modelview matrix
16337	16684	gl.glMatrixMode(GL.GL_MODELVIEW);
16338	16685	gl.glLoadIdentity();
	16686	+ gl.glScalef(1,ratio,1);
16339	16687
	16688	+// colorV[0] = 2;
	16689	+// colorV[1] = 2;
	16690	+// colorV[2] = 2;
	16691	+// colorV[3] = 1;
	16692	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16693	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16694	+//
	16695	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16696	+
16340	16697	//gl.glActiveTexture(GL.GL_TEXTURE1);
16341	16698	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16342	16699
..	..	@@ -16368,6 +16725,7 @@
16368	16725	{
16369	16726	gl.glScalef(1.0f, -1.0f, 1.0f);
16370	16727	}
	16728	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16371	16729	gl.glMultMatrixd(viewrot_1, 0);
16372	16730	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16373	16731	//viewer.updateInverseRotation(gl);
..	..	@@ -16626,7 +16984,7 @@
16626	16984	//new Exception().printStackTrace();
16627	16985	System.out.println("select buffer init");
16628	16986	// Use debug pipeline
16629		- drawable.setGL(new DebugGL(drawable.getGL()));
	16987	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16630	16988
16631	16989	GL gl = drawable.getGL();
16632	16990