~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -18,7 +18,10 @@
18	18	import javax.imageio.ImageIO;
19	19	import javax.imageio.ImageWriteParam;
20	20	import javax.imageio.ImageWriter;
	21	+import javax.imageio.ImageReadParam;
	22	+import javax.imageio.ImageReader;
21	23	import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
	24	+import javax.imageio.stream.ImageInputStream;
22	25	import javax.imageio.stream.ImageOutputStream;
23	26	import javax.imageio.ImageWriteParam;
24	27
..	..	@@ -30,6 +33,7 @@
30	33	import java.nio.*;
31	34
32	35	import gleem.linalg.Mat4f;
	36	+import javax.imageio.ImageTypeSpecifier;
33	37
34	38	class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	39	{
..	..	@@ -44,6 +48,39 @@
44	48	static boolean ABORTED = false;
45	49
46	50	static int STEP = 1;
	51	+
	52	+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
	53	+ {
	54	+ int[] pixels = new int[bytes.length/3];
	55	+ for (int i=pixels.length; --i>=0;)
	56	+ {
	57	+ int i3 = i*3;
	58	+ pixels[i] = 0xFF;
	59	+ pixels[i] <<= 8;
	60	+ pixels[i] \|= bytes[i3+2] & 0xFF;
	61	+ pixels[i] <<= 8;
	62	+ pixels[i] \|= bytes[i3+1] & 0xFF;
	63	+ pixels[i] <<= 8;
	64	+ pixels[i] \|= bytes[i3] & 0xFF;
	65	+ }
	66	+ /*
	67	+ int r=0,g=0,b=0,a=0;
	68	+ for (int i=0; i<width; i++)
	69	+ for (int j=0; j<height; j++)
	70	+ {
	71	+ int index = j*width+i;
	72	+ int p = pixels[index];
	73	+ a = ((p>>24) & 0xFF);
	74	+ r = ((p>>16) & 0xFF);
	75	+ g = ((p>>8) & 0xFF);
	76	+ b = (p & 0xFF);
	77	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	78	+ }
	79	+ /**/
	80	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	81	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	82	+ return rendImage;
	83	+ }
47	84
48	85	/static/ private boolean CULLFACE = false; // true;
49	86	/static/ boolean NEAREST = false; // true;
..	..	@@ -60,7 +97,7 @@
60	97	//boolean REDUCETEXTURE = true;
61	98	boolean CACHETEXTURE = true;
62	99	boolean CLEANCACHE = false; // true;
63		- boolean MIPMAP = false; // true;
	100	+ boolean MIPMAP = false; // true; // never works...
64	101	boolean COMPRESSTEXTURE = false;
65	102	boolean KOMPACTTEXTURE = false; // true;
66	103	boolean RESIZETEXTURE = false;
..	..	@@ -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,28 +2478,31 @@
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/com.sun.opengl.util.texture.Texture/> textures
2426		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2427		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	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>();
	2495	+
2428	2496	int pigmentdepth = 0;
2429	2497	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2430	2498	int bumpdepth = 0;
2431	2499	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2432	2500	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2433	2501	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2434		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2502	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2435	2503	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2436	2504
2437		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2505	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2438	2506	{
2439	2507	TextureData texturedata = null;
2440	2508
..	..	@@ -2453,13 +2521,34 @@
2453	2521	if (bump)
2454	2522	texturedata = ConvertBump(texturedata, false);
2455	2523
2456		- com.sun.opengl.util.texture.Texture texture =
2457		- 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);
2458	2526
2459		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2460		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	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);
2461	2529
2462		- return texture;
	2530	+ return texturedata;
	2531	+ }
	2532	+
	2533	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2534	+ {
	2535	+ TextureData texturedata = null;
	2536	+
	2537	+ try
	2538	+ {
	2539	+ texturedata =
	2540	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2541	+ bim,
	2542	+ true);
	2543	+ } catch (Exception e)
	2544	+ {
	2545	+ throw new javax.media.opengl.GLException(e);
	2546	+ }
	2547	+
	2548	+ if (bump)
	2549	+ texturedata = ConvertBump(texturedata, false);
	2550	+
	2551	+ return texturedata;
2463	2552	}
2464	2553
2465	2554	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3532,6 +3621,8 @@
3532	3621
3533	3622	System.out.println("LOADING TEXTURE : " + name);
3534	3623
	3624	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3625	+
3535	3626	//
3536	3627	if (false) // compressbit > 0)
3537	3628	{
..	..	@@ -7945,8 +8036,8 @@
7945	8036	pigment = null;
7946	8037	}
7947	8038
7948		- ReleaseTexture(bump, true);
7949		- ReleaseTexture(pigment, false);
	8039	+ ReleaseTexture(tex, true);
	8040	+ ReleaseTexture(tex, false);
7950	8041	}
7951	8042
7952	8043	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -7975,7 +8066,7 @@
7975	8066	pigment = null;
7976	8067	}
7977	8068
7978		- ReleaseTexture(pigment, false);
	8069	+ ReleaseTexture(tex, false);
7979	8070	}
7980	8071
7981	8072	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -8004,10 +8095,10 @@
8004	8095	bump = null;
8005	8096	}
8006	8097
8007		- ReleaseTexture(bump, true);
	8098	+ ReleaseTexture(tex, true);
8008	8099	}
8009	8100
8010		- void ReleaseTexture(String tex, boolean bump)
	8101	+ void ReleaseTexture(cTexture tex, boolean bump)
8011	8102	{
8012	8103	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8013	8104	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8018,7 +8109,7 @@
8018	8109	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
8019	8110
8020	8111	if (tex != null)
8021		- texture = textures.get(tex);
	8112	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
8022	8113
8023	8114	// //assert( texture != null );
8024	8115	// if (texture == null)
..	..	@@ -8112,47 +8203,50 @@
8112	8203
8113	8204	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8114	8205	{
8115		- if (// DrawMode() != 0 \|\| /tex == null \|\|/
8116		- ambientOcclusion ) // \|\| !textureon)
8117		- {
8118		- return; // false;
8119		- }
8120		-
8121		- if (tex == null)
8122		- {
8123		- BindTexture(null,false,resolution);
8124		- BindTexture(null,true,resolution);
8125		- return;
8126		- }
	8206	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8207	+// ambientOcclusion ) // \|\| !textureon)
	8208	+// {
	8209	+// return; // false;
	8210	+// }
	8211	+//
	8212	+// if (tex == null)
	8213	+// {
	8214	+// BindTexture(null,false,resolution);
	8215	+// BindTexture(null,true,resolution);
	8216	+// return;
	8217	+// }
	8218	+//
	8219	+// String pigment = Object3D.GetPigment(tex);
	8220	+// String bump = Object3D.GetBump(tex);
	8221	+//
	8222	+// usedtextures.add(pigment);
	8223	+// usedtextures.add(bump);
	8224	+//
	8225	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8226	+// {
	8227	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8228	+// // System.out.println("; bump = " + bump);
	8229	+// }
	8230	+//
	8231	+// if (bump.equals(""))
	8232	+// {
	8233	+// bump = null;
	8234	+// }
	8235	+// if (pigment.equals(""))
	8236	+// {
	8237	+// pigment = null;
	8238	+// }
	8239	+//
	8240	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8241	+// BindTexture(pigment, false, resolution);
	8242	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8243	+// BindTexture(bump, true, resolution);
	8244	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8245	+//
	8246	+// return; // true;
8127	8247
8128		- String pigment = Object3D.GetPigment(tex);
8129		- String bump = Object3D.GetBump(tex);
8130		-
8131		- usedtextures.put(pigment, pigment);
8132		- usedtextures.put(bump, bump);
8133		-
8134		- //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8135		- {
8136		- // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8137		- // System.out.println("; bump = " + bump);
8138		- }
8139		-
8140		- if (bump.equals(""))
8141		- {
8142		- bump = null;
8143		- }
8144		- if (pigment.equals(""))
8145		- {
8146		- pigment = null;
8147		- }
8148		-
8149		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8150		- BindTexture(pigment, false, resolution);
8151		- GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8152		- BindTexture(bump, true, resolution);
8153		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8154		-
8155		- return; // true;
	8248	+ BindPigmentTexture(tex, resolution);
	8249	+ BindBumpTexture(tex, resolution);
8156	8250	}
8157	8251
8158	8252	/boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8171,7 +8265,7 @@
8171	8265
8172	8266	String pigment = Object3D.GetPigment(tex);
8173	8267
8174		- usedtextures.put(pigment, pigment);
	8268	+ usedtextures.add(tex);
8175	8269
8176	8270	//if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8177	8271	{
..	..	@@ -8185,7 +8279,7 @@
8185	8279	}
8186	8280
8187	8281	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8188		- BindTexture(pigment, false, resolution);
	8282	+ BindTexture(tex, false, resolution);
8189	8283	}
8190	8284
8191	8285	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8204,7 +8298,7 @@
8204	8298
8205	8299	String bump = Object3D.GetBump(tex);
8206	8300
8207		- usedtextures.put(bump, bump);
	8301	+ usedtextures.add(tex);
8208	8302
8209	8303	//if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8210	8304	{
..	..	@@ -8218,7 +8312,7 @@
8218	8312	}
8219	8313
8220	8314	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8221		- BindTexture(bump, true, resolution);
	8315	+ BindTexture(tex, true, resolution);
8222	8316	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8223	8317	}
8224	8318
..	..	@@ -8242,13 +8336,19 @@
8242	8336	return fileExists;
8243	8337	}
8244	8338
8245		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8339	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8246	8340	{
8247		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8341	+ CacheTexture texturecache = null;
8248	8342
8249	8343	if (tex != null)
8250	8344	{
8251		- 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	+ }
8252	8352
8253	8353	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8254	8354
..	..	@@ -8258,19 +8358,46 @@
8258	8358	// else
8259	8359	// if (!texname.startsWith("/"))
8260	8360	// texname = "/Users/nbriere/Textures/" + texname;
8261		- if (!FileExists(tex))
	8361	+ if (!FileExists(texname))
8262	8362	{
8263	8363	texname = fallbackTextureName;
8264	8364	}
8265	8365
8266	8366	if (CACHETEXTURE)
8267		- texture = textures.get(texname); // TEXTURE CACHE
8268		-
8269		- TextureData texturedata = null;
8270		-
8271		- if (texture == null \|\| texture.resolution < resolution)
8272	8367	{
8273		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8368	+ if (texdata == null)
	8369	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8370	+ else
	8371	+ texturecache = bimtextures.get(texdata);
	8372	+ }
	8373	+
	8374	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8375	+ {
	8376	+ TextureData texturedata = null;
	8377	+
	8378	+ if (texdata != null && textureon)
	8379	+ {
	8380	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	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;
	8398	+ }
	8399	+ else
	8400	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8274	8401	{
8275	8402	assert(!bump);
8276	8403	// if (bump)
..	..	@@ -8281,19 +8408,23 @@
8281	8408	// }
8282	8409	// else
8283	8410	// {
8284		- texture = textures.get(tex);
8285		- if (texture == null)
	8411	+ // texturecache = textures.get(texname); // suspicious
	8412	+ if (texturecache == null)
8286	8413	{
8287		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8414	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8288	8415	}
	8416	+ else
	8417	+ new Exception().printStackTrace();
8289	8418	// }
8290	8419	} else
8291		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8420	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8292	8421	{
8293	8422	assert(bump);
8294		- texture = textures.get(tex);
8295		- if (texture == null)
8296		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8423	+ // texturecache = textures.get(texname); // suspicious
	8424	+ if (texturecache == null)
	8425	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8426	+ else
	8427	+ new Exception().printStackTrace();
8297	8428	} else
8298	8429	{
8299	8430	//if (tex.equals("IMMORTAL"))
..	..	@@ -8301,11 +8432,13 @@
8301	8432	// texture = GetResourceTexture("default.png");
8302	8433	//} else
8303	8434	//{
8304		- if (tex.equals("WHITE_NOISE"))
	8435	+ if (texname.endsWith("WHITE_NOISE"))
8305	8436	{
8306		- texture = textures.get(tex);
8307		- if (texture == null)
8308		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8437	+ // texturecache = textures.get(texname); // suspicious
	8438	+ if (texturecache == null)
	8439	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8440	+ else
	8441	+ new Exception().printStackTrace();
8309	8442	} else
8310	8443	{
8311	8444	if (textureon)
..	..	@@ -8364,19 +8497,19 @@
8364	8497	if (texturedata == null)
8365	8498	throw new Exception();
8366	8499
8367		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8500	+ texturecache = new CacheTexture(texturedata,resolution);
8368	8501	//texture = GetTexture(tex, bump);
8369	8502	}
8370	8503	}
8371	8504	//}
8372	8505	}
8373	8506
8374		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8507	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8375	8508	{
8376	8509	//return false;
8377	8510
8378	8511	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8379		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8512	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8380	8513	{
8381	8514	// String ext = "_highres";
8382	8515	// if (REDUCETEXTURE)
..	..	@@ -8393,52 +8526,17 @@
8393	8526	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8394	8527	if (!cachefile.exists())
8395	8528	{
8396		- // cache to disk
8397		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8398		- //buffers[0].
8399		-
8400		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8401		- int[] pixels = new int[bytebuf.capacity()/3];
8402		-
8403		- // squared size heuristic...
8404		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8529	+ //if (texturedata.getWidth() == texturedata.getHeight())
8405	8530	{
8406		- for (int i=pixels.length; --i>=0;)
8407		- {
8408		- int i3 = i*3;
8409		- pixels[i] = 0xFF;
8410		- pixels[i] <<= 8;
8411		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8412		- pixels[i] <<= 8;
8413		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8414		- pixels[i] <<= 8;
8415		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8416		- }
8417		-
8418		- /*
8419		- int r=0,g=0,b=0,a=0;
8420		- for (int i=0; i<width; i++)
8421		- for (int j=0; j<height; j++)
8422		- {
8423		- int index = j*width+i;
8424		- int p = pixels[index];
8425		- a = ((p>>24) & 0xFF);
8426		- r = ((p>>16) & 0xFF);
8427		- g = ((p>>8) & 0xFF);
8428		- b = (p & 0xFF);
8429		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8430		- }
8431		- /**/
8432		- int width = (int)Math.sqrt(pixels.length); // squared
8433		- int height = width;
8434		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8435		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8531	+ BufferedImage rendImage = CreateBim(texturedata);
	8532	+
8436	8533	ImageWriter writer = null;
8437	8534	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8438	8535	if (iter.hasNext()) {
8439	8536	writer = (ImageWriter)iter.next();
8440	8537	}
8441		- float compressionQuality = 0.9f;
	8538	+
	8539	+ float compressionQuality = 0.85f;
8442	8540	try
8443	8541	{
8444	8542	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8455,18 +8553,20 @@
8455	8553	}
8456	8554	}
8457	8555	}
8458		-
	8556	+
	8557	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8558	+
8459	8559	//System.out.println("Texture = " + tex);
8460		- if (textures.containsKey(texname))
	8560	+ if (textures.containsKey(tex))
8461	8561	{
8462		- CacheTexture thetex = textures.get(texname);
	8562	+ CacheTexture thetex = textures.get(tex);
8463	8563	thetex.texture.disable();
8464	8564	thetex.texture.dispose();
8465		- textures.remove(texname);
	8565	+ textures.remove(tex);
8466	8566	}
8467	8567
8468		- texture.texturedata = texturedata;
8469		- textures.put(texname, texture);
	8568	+ //texture.texturedata = texturedata;
	8569	+ textures.put(tex, texturecache);
8470	8570
8471	8571	// newtex = true;
8472	8572	}
..	..	@@ -8482,10 +8582,44 @@
8482	8582	}
8483	8583	}
8484	8584
8485		- return texture;
	8585	+ return texturecache;
8486	8586	}
8487	8587
8488		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	8588	+ static void EmbedTextures(cTexture tex)
	8589	+ {
	8590	+ if (tex.pigmentdata == null)
	8591	+ {
	8592	+ //String texname = Object3D.GetPigment(tex);
	8593	+
	8594	+ CacheTexture texturecache = texturepigment.get(tex);
	8595	+
	8596	+ if (texturecache != null)
	8597	+ {
	8598	+ tex.pw = texturecache.texturedata.getWidth();
	8599	+ tex.ph = texturecache.texturedata.getHeight();
	8600	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8601	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8602	+ ;
	8603	+ //, tex.pw, tex.ph), 0.5f);
	8604	+ }
	8605	+ }
	8606	+
	8607	+ if (tex.bumpdata == null)
	8608	+ {
	8609	+ //String texname = Object3D.GetBump(tex);
	8610	+
	8611	+ CacheTexture texturecache = texturebump.get(tex);
	8612	+
	8613	+ if (texturecache != null)
	8614	+ {
	8615	+ tex.bw = texturecache.texturedata.getWidth();
	8616	+ tex.bh = texturecache.texturedata.getHeight();
	8617	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8618	+ }
	8619	+ }
	8620	+ }
	8621	+
	8622	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8489	8623	{
8490	8624	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8491	8625
..	..	@@ -8503,14 +8637,14 @@
8503	8637	return texture!=null?texture.texture:null;
8504	8638	}
8505	8639
8506		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
	8640	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8507	8641	{
8508	8642	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8509	8643
8510	8644	return texture!=null?texture.texturedata:null;
8511	8645	}
8512	8646
8513		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8647	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8514	8648	{
8515	8649	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8516	8650	{
..	..	@@ -8552,6 +8686,72 @@
8552	8686	return true; // Warning: not used.
8553	8687	}
8554	8688
	8689	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8690	+ {
	8691	+ try
	8692	+ {
	8693	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8694	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8695	+ ImageWriter writer = writers.next();
	8696	+
	8697	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8698	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8699	+ param.setCompressionQuality(quality);
	8700	+
	8701	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8702	+ writer.setOutput(ios);
	8703	+ writer.write(null, new IIOImage(image, null, null), param);
	8704	+
	8705	+ byte[] data = baos.toByteArray();
	8706	+ writer.dispose();
	8707	+ return data;
	8708	+ }
	8709	+ catch (Exception e)
	8710	+ {
	8711	+ e.printStackTrace();
	8712	+ return null;
	8713	+ }
	8714	+ }
	8715	+
	8716	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8717	+ {
	8718	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8719	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8720	+ ImageReader reader = writers.next();
	8721	+
	8722	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8723	+
	8724	+ ImageReadParam param = reader.getDefaultReadParam();
	8725	+ param.setDestination(bim);
	8726	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8727	+
	8728	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8729	+ reader.setInput(ios);
	8730	+ BufferedImage bim2 = reader.read(0, param);
	8731	+ reader.dispose();
	8732	+
	8733	+// WritableRaster raster = bim2.getRaster();
	8734	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8735	+// byte[] bytes = data.getData();
	8736	+//
	8737	+// int[] pixels = new int[bytes.length/3];
	8738	+// for (int i=pixels.length; --i>=0;)
	8739	+// {
	8740	+// int i3 = i*3;
	8741	+// pixels[i] = 0xFF;
	8742	+// pixels[i] <<= 8;
	8743	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8744	+// pixels[i] <<= 8;
	8745	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8746	+// pixels[i] <<= 8;
	8747	+// pixels[i] \|= bytes[i3] & 0xFF;
	8748	+// }
	8749	+//
	8750	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8751	+
	8752	+ return bim;
	8753	+ }
	8754	+
8555	8755	ShadowBuffer shadowPBuf;
8556	8756	AntialiasBuffer antialiasPBuf;
8557	8757	int MAXSTACK;
..	..	@@ -8744,7 +8944,7 @@
8744	8944
8745	8945	if (cubemap == null)
8746	8946	{
8747		- LoadEnvy(5);
	8947	+ //LoadEnvy(1);
8748	8948	}
8749	8949
8750	8950	//cubemap.enable();
..	..	@@ -9031,37 +9231,58 @@
9031	9231	cubemap = null;
9032	9232	return;
9033	9233	case 1:
9034		- name = "cubemaps/box_";
9035		- ext = "png";
	9234	+ name = "cubemaps/rgb/";
	9235	+ ext = "jpg";
9036	9236	reverseUP = false;
9037	9237	break;
9038	9238	case 2:
9039		- name = "cubemaps/uffizi_";
9040		- ext = "png";
9041		- break; // reverseUP = true; break;
	9239	+ name = "cubemaps/uffizi/";
	9240	+ ext = "jpg";
	9241	+ reverseUP = false;
	9242	+ break;
9042	9243	case 3:
9043		- name = "cubemaps/CloudyHills_";
9044		- ext = "tga";
	9244	+ name = "cubemaps/CloudyHills/";
	9245	+ ext = "jpg";
9045	9246	reverseUP = false;
9046	9247	break;
9047	9248	case 4:
9048		- name = "cubemaps/cornell_";
	9249	+ name = "cubemaps/cornell/";
9049	9250	ext = "png";
9050	9251	reverseUP = false;
9051	9252	break;
	9253	+ case 5:
	9254	+ name = "cubemaps/skycube/";
	9255	+ ext = "jpg";
	9256	+ reverseUP = false;
	9257	+ break;
	9258	+ case 6:
	9259	+ name = "cubemaps/SaintLazarusChurch3/";
	9260	+ ext = "jpg";
	9261	+ reverseUP = false;
	9262	+ break;
	9263	+ case 7:
	9264	+ name = "cubemaps/Sodermalmsallen/";
	9265	+ ext = "jpg";
	9266	+ reverseUP = false;
	9267	+ break;
	9268	+ case 8:
	9269	+ name = "cubemaps/Sodermalmsallen2/";
	9270	+ ext = "jpg";
	9271	+ reverseUP = false;
	9272	+ break;
	9273	+ case 9:
	9274	+ name = "cubemaps/UnionSquare/";
	9275	+ ext = "jpg";
	9276	+ reverseUP = false;
	9277	+ break;
9052	9278	default:
9053		- name = "cubemaps/rgb_";
9054		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9279	+ name = "cubemaps/box/";
	9280	+ ext = "png"; /mipmap = true;/
	9281	+ reverseUP = false;
9055	9282	break;
9056	9283	}
9057		-
9058		- try
9059		- {
9060		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9061		- } catch (IOException e)
9062		- {
9063		- throw new RuntimeException(e);
9064		- }
	9284	+
	9285	+ LoadSkybox(name, ext, mipmap);
9065	9286	}
9066	9287
9067	9288	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -9093,8 +9314,13 @@
9093	9314	static double[] model = new double[16];
9094	9315	double[] camera2light = new double[16];
9095	9316	double[] light2camera = new double[16];
9096		- int newenvy = -1;
	9317	+
	9318	+ //int newenvy = -1;
9097	9319	boolean envyoff = true; // false;
	9320	+ String skyboxname = "";
	9321	+ String skyboxext;
	9322	+ String loadedskyboxname = "";
	9323	+
9098	9324	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9099	9325	//float[] light0 = { 0,0,0 };
9100	9326	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9512,7 +9738,7 @@
9512	9738
9513	9739	if (renderCamera != lightCamera)
9514	9740	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9515		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9741	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9516	9742
9517	9743	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9518	9744
..	..	@@ -9528,7 +9754,7 @@
9528	9754
9529	9755	if (renderCamera != lightCamera)
9530	9756	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9531		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9757	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9532	9758
9533	9759	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9534	9760
..	..	@@ -9574,10 +9800,12 @@
9574	9800	rati = 1 / rati;
9575	9801	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9576	9802	}
9577		- assert (newenvy == -1);
	9803	+
	9804	+ //assert (newenvy == -1);
	9805	+
9578	9806	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9579	9807	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9580		- DrawSkyBox(gl);
	9808	+ DrawSkyBox(gl, (float)rati);
9581	9809	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9582	9810	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9583	9811	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -10729,7 +10957,7 @@
10729	10957	// if (parentcam != renderCamera) // not a light
10730	10958	if (cam != lightCamera)
10731	10959	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10732		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10960	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10733	10961
10734	10962	for (int j = 0; j < 4; j++)
10735	10963	{
..	..	@@ -10744,7 +10972,7 @@
10744	10972	// if (parentcam != renderCamera) // not a light
10745	10973	if (cam != lightCamera)
10746	10974	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10747		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	10975	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10748	10976
10749	10977	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10750	10978
..	..	@@ -10830,13 +11058,19 @@
10830	11058	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10831	11059	}
10832	11060
10833		- if (newenvy > -1)
	11061	+// if (newenvy > -1)
	11062	+// {
	11063	+// LoadEnvy(newenvy);
	11064	+// }
	11065	+//
	11066	+// newenvy = -1;
	11067	+
	11068	+ if (!skyboxname.equals(this.loadedskyboxname))
10834	11069	{
10835		- LoadEnvy(newenvy);
	11070	+ LoadSkybox(skyboxname + "/", skyboxext, false);
	11071	+ loadedskyboxname = skyboxname;
10836	11072	}
10837		-
10838		- newenvy = -1;
10839		-
	11073	+
10840	11074	ratio = ((double) getWidth()) / getHeight();
10841	11075	//System.out.println("ratio = " + ratio);
10842	11076
..	..	@@ -10852,7 +11086,7 @@
10852	11086
10853	11087	if (!IsFrozen() && !ambientOcclusion)
10854	11088	{
10855		- DrawSkyBox(gl);
	11089	+ DrawSkyBox(gl, (float)ratio);
10856	11090	}
10857	11091
10858	11092	//if (selection_view == -1)
..	..	@@ -11297,7 +11531,7 @@
11297	11531	}
11298	11532	}
11299	11533
11300		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11534	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11301	11535	{
11302	11536	//gl.glDepthFunc(GL.GL_LEQUAL);
11303	11537	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11305,24 +11539,21 @@
11305	11539
11306	11540	boolean texon = textureon;
11307	11541
11308		- if (RENDERPROGRAM > 0)
11309		- {
11310		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11311		- textureon = false;
11312		- }
	11542	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11543	+ textureon = false;
	11544	+
11313	11545	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11314	11546	//System.out.println("ALLO");
11315	11547	gl.glColorMask(false, false, false, false);
11316	11548	DrawObject(gl);
11317		- if (RENDERPROGRAM > 0)
11318		- {
11319		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11320		- textureon = texon;
11321		- }
	11549	+
	11550	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11551	+ textureon = texon;
	11552	+
11322	11553	gl.glColorMask(true, true, true, true);
11323	11554
11324	11555	gl.glDepthFunc(GL.GL_EQUAL);
11325		- //gl.glDepthMask(false);
	11556	+ gl.glDepthMask(false);
11326	11557	}
11327	11558
11328	11559	if (false) // DrawMode() == SHADOW)
..	..	@@ -11662,20 +11893,32 @@
11662	11893	ReleaseTextures(DEFAULT_TEXTURES);
11663	11894
11664	11895	if (CLEANCACHE)
11665		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11896	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11666	11897	{
11667		- String tex = e.nextElement();
	11898	+ cTexture tex = e.nextElement();
11668	11899
11669	11900	// System.out.println("Texture --------- " + tex);
11670	11901
11671		- if (tex.equals("WHITE_NOISE"))
	11902	+ if (tex.equals("WHITE_NOISE:"))
11672	11903	continue;
11673	11904
11674		- if (!usedtextures.containsKey(tex))
	11905	+ if (!usedtextures.contains(tex))
11675	11906	{
	11907	+ CacheTexture gettex = texturepigment.get(tex);
11676	11908	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11677		- textures.get(tex).texture.dispose();
11678		- textures.remove(tex);
	11909	+ if (gettex != null)
	11910	+ {
	11911	+ gettex.texture.dispose();
	11912	+ texturepigment.remove(tex);
	11913	+ }
	11914	+
	11915	+ gettex = texturebump.get(tex);
	11916	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11917	+ if (gettex != null)
	11918	+ {
	11919	+ gettex.texture.dispose();
	11920	+ texturebump.remove(tex);
	11921	+ }
11679	11922	}
11680	11923	}
11681	11924	}
..	..	@@ -12203,8 +12446,76 @@
12203	12446
12204	12447	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12205	12448
	12449	+ String program0 =
	12450	+ // Min shader
	12451	+ "!!ARBfp1.0\n" +
	12452	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12453	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12454	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12455	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12456	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12457	+ "PARAM light2cam0 = program.env[10];" +
	12458	+ "PARAM light2cam1 = program.env[11];" +
	12459	+ "PARAM light2cam2 = program.env[12];" +
	12460	+ "TEMP temp;" +
	12461	+ "TEMP light;" +
	12462	+ "TEMP ndotl;" +
	12463	+ "TEMP normal;" +
	12464	+ "TEMP depth;" +
	12465	+ "TEMP eye;" +
	12466	+ "TEMP pos;" +
	12467	+
	12468	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12469	+ Normalize("normal") +
	12470	+ "MOV light, state.light[0].position;" +
	12471	+ "DP3 ndotl.x, light, normal;" +
	12472	+
	12473	+ // shadow
	12474	+ "MOV pos, fragment.texcoord[1];" +
	12475	+ "MOV temp, pos;" +
	12476	+ ShadowTextureFetch("depth", "temp", "1") +
	12477	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12478	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12479	+
	12480	+ // No shadow when out of frustum
	12481	+ //"SGE temp.y, depth.z, zero123.y;" +
	12482	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12483	+
	12484	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12485	+
	12486	+ // Backlit
	12487	+ "MOV pos.w, zero123.y;" +
	12488	+ "DP4 eye.x, pos, light2cam0;" +
	12489	+ "DP4 eye.y, pos, light2cam1;" +
	12490	+ "DP4 eye.z, pos, light2cam2;" +
	12491	+ Normalize("eye") +
	12492	+
	12493	+ "DP3 ndotl.y, -eye, normal;" +
	12494	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12495	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12496	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12497	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12498	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12499	+
	12500	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12501	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12502	+
	12503	+ // Pigment
	12504	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12505	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12506	+ "MUL temp, temp, ndotl.x;" +
	12507	+
	12508	+ "MUL temp, temp, zero123.z;" +
	12509	+
	12510	+ //"MUL temp, temp, ndotl.y;" +
	12511	+
	12512	+ "MOV temp.w, zero123.y;" + // reset alpha
	12513	+ "MOV result.color, temp;" +
	12514	+ "END";
	12515	+
12206	12516	String program =
12207	12517	"!!ARBfp1.0\n" +
	12518	+
12208	12519	//"OPTION ARB_fragment_program_shadow;" +
12209	12520	"PARAM light2cam0 = program.env[10];" +
12210	12521	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12319,8 +12630,7 @@
12319	12630	"TEMP shininess;" +
12320	12631	"\n" +
12321	12632	"MOV texSamp, one;" +
12322		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12323		-
	12633	+
12324	12634	"MOV mapgrid.x, one2048th.x;" +
12325	12635	"MOV temp, fragment.texcoord[1];" +
12326	12636	/*
..	..	@@ -12341,20 +12651,20 @@
12341	12651	"MUL temp, floor, mapgrid.x;" +
12342	12652	//"TEX depth0, temp, texture[1], 2D;" +
12343	12653	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12344		- TextureFetch("depth0", "temp", "1") +
	12654	+ ShadowTextureFetch("depth0", "temp", "1") +
12345	12655	"") +
12346	12656	"ADD temp.x, temp.x, mapgrid.x;" +
12347	12657	//"TEX depth1, temp, texture[1], 2D;" +
12348	12658	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12349		- TextureFetch("depth1", "temp", "1") +
	12659	+ ShadowTextureFetch("depth1", "temp", "1") +
12350	12660	"") +
12351	12661	"ADD temp.y, temp.y, mapgrid.x;" +
12352	12662	//"TEX depth2, temp, texture[1], 2D;" +
12353		- TextureFetch("depth2", "temp", "1") +
	12663	+ ShadowTextureFetch("depth2", "temp", "1") +
12354	12664	"SUB temp.x, temp.x, mapgrid.x;" +
12355	12665	//"TEX depth3, temp, texture[1], 2D;" +
12356	12666	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12357		- TextureFetch("depth3", "temp", "1") +
	12667	+ ShadowTextureFetch("depth3", "temp", "1") +
12358	12668	"") +
12359	12669	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12360	12670	//"MOV params, material;" +
..	..	@@ -12725,10 +13035,10 @@
12725	13035	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12726	13036	"") +
12727	13037
12728		- // display shadow only (bump == 0)
	13038	+ // display shadow only (fakedepth == 0)
12729	13039	"SUB temp.x, half.x, shadow.x;" +
12730	13040	"MOV temp.y, -params5.z;" + // params6.x;" +
12731		- "SLT temp.z, temp.y, -one2048th.x;" +
	13041	+ "SLT temp.z, temp.y, -c256i.x;" +
12732	13042	"SUB temp.y, one.x, temp.z;" +
12733	13043	"MUL temp.x, temp.x, temp.y;" +
12734	13044	"KIL temp.x;" +
..	..	@@ -13152,25 +13462,26 @@
13152	13462	return out;
13153	13463	}
13154	13464
13155		- String TextureFetch(String dest, String src, String unit)
	13465	+ // Also does frustum culling
	13466	+ String ShadowTextureFetch(String dest, String src, String unit)
13156	13467	{
13157	13468	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13158	13469	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13159	13470	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13471	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13472	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13160	13473	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13161		- "SLT " + src + ".z, " + src + ".x, one.x;" +
13162		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13163		- "SLT " + src + ".z, " + src + ".y, one.x;" +
13164		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13474	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13475	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13165	13476	//"SWZ buffer, temp, w,w,w,w;";
13166		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13477	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13167	13478	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13168	13479	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13169	13480	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13170		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13481	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13171	13482
13172		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13173		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13483	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13484	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13174	13485	}
13175	13486
13176	13487	String Shadow(String depth, String shadow)
..	..	@@ -13217,7 +13528,7 @@
13217	13528	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13218	13529	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13219	13530
13220		- // No shadow when out of frustrum
	13531	+ // No shadow when out of frustum
13221	13532	"SGE temp.x, " + depth + ".z, one.z;" +
13222	13533	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13223	13534	"";
..	..	@@ -14015,14 +14326,15 @@
14015	14326	drag = false;
14016	14327	//System.out.println("Mouse DOWN");
14017	14328	editObj = false;
14018		- ClickInfo info = new ClickInfo();
14019		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14020		- info.pane = this;
14021		- info.camera = renderCamera;
14022		- info.x = x;
14023		- info.y = y;
14024		- info.modifiers = modifiersex;
14025		- editObj = object.doEditClick(info, 0);
	14329	+ //ClickInfo info = new ClickInfo();
	14330	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14331	+ object.clickInfo.pane = this;
	14332	+ object.clickInfo.camera = renderCamera;
	14333	+ object.clickInfo.x = x;
	14334	+ object.clickInfo.y = y;
	14335	+ object.clickInfo.modifiers = modifiersex;
	14336	+ editObj = object.doEditClick(//info,
	14337	+ 0);
14026	14338	if (!editObj)
14027	14339	{
14028	14340	hasMarquee = true;
..	..	@@ -14422,15 +14734,16 @@
14422	14734	if (editObj)
14423	14735	{
14424	14736	drag = true;
14425		- ClickInfo info = new ClickInfo();
14426		- info.bounds.setBounds(0, 0,
	14737	+ //ClickInfo info = new ClickInfo();
	14738	+ object.clickInfo.bounds.setBounds(0, 0,
14427	14739	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14428		- info.pane = this;
14429		- info.camera = renderCamera;
14430		- info.x = x;
14431		- info.y = y;
14432		- object.GetWindow().copy
14433		- .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	14740	+ object.clickInfo.pane = this;
	14741	+ object.clickInfo.camera = renderCamera;
	14742	+ object.clickInfo.x = x;
	14743	+ object.clickInfo.y = y;
	14744	+ object //.GetWindow().copy
	14745	+ .doEditDrag(//info,
	14746	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14434	14747	} else
14435	14748	{
14436	14749	if (x < startX)
..	..	@@ -14579,24 +14892,27 @@
14579	14892	}
14580	14893	}
14581	14894
	14895	+// ClickInfo clickInfo = new ClickInfo();
	14896	+
14582	14897	public void mouseMoved(MouseEvent e)
14583	14898	{
14584	14899	//System.out.println("mouseMoved: " + e);
14585	14900	if (isRenderer)
14586	14901	return;
14587	14902
14588		- ClickInfo ci = new ClickInfo();
14589		- ci.x = e.getX();
14590		- ci.y = e.getY();
14591		- ci.modifiers = e.getModifiersEx();
14592		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14593		- ci.pane = this;
14594		- ci.camera = renderCamera;
	14903	+ // Mouse cursor feedback
	14904	+ object.clickInfo.x = e.getX();
	14905	+ object.clickInfo.y = e.getY();
	14906	+ object.clickInfo.modifiers = e.getModifiersEx();
	14907	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14908	+ object.clickInfo.pane = this;
	14909	+ object.clickInfo.camera = renderCamera;
14595	14910	if (!isRenderer)
14596	14911	{
14597	14912	//ObjEditor editWindow = object.editWindow;
14598	14913	//Object3D copy = editWindow.copy;
14599		- if (object.doEditClick(ci, 0))
	14914	+ if (object.doEditClick(//clickInfo,
	14915	+ 0))
14600	14916	{
14601	14917	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14602	14918	} else
..	..	@@ -14868,7 +15184,8 @@
14868	15184	// break;
14869	15185	case 'T':
14870	15186	CACHETEXTURE ^= true;
14871		- textures.clear();
	15187	+ texturepigment.clear();
	15188	+ texturebump.clear();
14872	15189	// repaint();
14873	15190	break;
14874	15191	case 'Y':
..	..	@@ -15051,14 +15368,18 @@
15051	15368	case '3':
15052	15369	case '4':
15053	15370	case '5':
15054		- newenvy = Character.getNumericValue(key);
15055		- repaint();
15056		- break;
15057	15371	case '6':
15058	15372	case '7':
15059	15373	case '8':
15060	15374	case '9':
15061		- BGcolor = (key - '6')/3.f;
	15375	+ if (envyoff)
	15376	+ {
	15377	+ BGcolor = (key - '1')/8.f;
	15378	+ }
	15379	+ else
	15380	+ {
	15381	+ //newenvy = Character.getNumericValue(key);
	15382	+ }
15062	15383	repaint();
15063	15384	break;
15064	15385	case '!':
..	..	@@ -15621,8 +15942,6 @@
15621	15942
15622	15943	int width = getBounds().width;
15623	15944	int height = getBounds().height;
15624		- ClickInfo info = new ClickInfo();
15625		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15626	15945	//Image img = CreateImage(width, height);
15627	15946	//System.out.println("width = " + width + "; height = " + height + "\n");
15628	15947
..	..	@@ -15699,31 +16018,37 @@
15699	16018	}
15700	16019	if (object != null && !hasMarquee)
15701	16020	{
	16021	+ if (object.clickInfo == null)
	16022	+ object.clickInfo = new ClickInfo();
	16023	+ ClickInfo info = object.clickInfo;
	16024	+ //ClickInfo info = new ClickInfo();
	16025	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16026	+
15702	16027	if (isRenderer)
15703	16028	{
15704		- info.flags++;
	16029	+ object.clickInfo.flags++;
15705	16030	double frameAspect = (double) width / (double) height;
15706	16031	if (frameAspect > renderCamera.aspect)
15707	16032	{
15708	16033	int desired = (int) ((double) height * renderCamera.aspect);
15709		- info.bounds.width -= width - desired;
15710		- info.bounds.x += (width - desired) / 2;
	16034	+ object.clickInfo.bounds.width -= width - desired;
	16035	+ object.clickInfo.bounds.x += (width - desired) / 2;
15711	16036	} else
15712	16037	{
15713	16038	int desired = (int) ((double) width / renderCamera.aspect);
15714		- info.bounds.height -= height - desired;
15715		- info.bounds.y += (height - desired) / 2;
	16039	+ object.clickInfo.bounds.height -= height - desired;
	16040	+ object.clickInfo.bounds.y += (height - desired) / 2;
15716	16041	}
15717	16042	}
15718	16043
15719		- info.g = gr;
15720		- info.camera = renderCamera;
	16044	+ object.clickInfo.g = gr;
	16045	+ object.clickInfo.camera = renderCamera;
15721	16046	/*
15722	16047	// Memory intensive (brep.verticescopy)
15723	16048	if (!(object instanceof Composite))
15724	16049	object.draw(info, 0, false); // SLOW :
15725	16050	*/
15726		- if (!isRenderer)
	16051	+ if (!isRenderer) // && drag)
15727	16052	{
15728	16053	Grafreed.Assert(object != null);
15729	16054	Grafreed.Assert(object.selection != null);
..	..	@@ -15731,9 +16056,9 @@
15731	16056	{
15732	16057	int hitSomething = object.selection.get(0).hitSomething;
15733	16058
15734		- info.DX = 0;
15735		- info.DY = 0;
15736		- info.W = 1;
	16059	+ object.clickInfo.DX = 0;
	16060	+ object.clickInfo.DY = 0;
	16061	+ object.clickInfo.W = 1;
15737	16062	if (hitSomething == Object3D.hitCenter)
15738	16063	{
15739	16064	info.DX = X;
..	..	@@ -15745,7 +16070,8 @@
15745	16070	info.DY -= info.bounds.height/2;
15746	16071	}
15747	16072
15748		- object.drawEditHandles(info, 0);
	16073	+ object.drawEditHandles(//info,
	16074	+ 0);
15749	16075
15750	16076	if (drag && (X != 0 \|\| Y != 0))
15751	16077	{
..	..	@@ -15758,7 +16084,7 @@
15758	16084	gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15759	16085	break;
15760	16086	case Object3D.hitScale: gr.setColor(Color.cyan);
15761		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16087	+ gr.drawLine(X, Y, 0, 0);
15762	16088	break;
15763	16089	}
15764	16090
..	..	@@ -16276,7 +16602,9 @@
16276	16602
16277	16603	float BGcolor = 0.5f;
16278	16604
16279		- private void DrawSkyBox(GL gl)
	16605	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16606	+
	16607	+ private void DrawSkyBox(GL gl, float ratio)
16280	16608	{
16281	16609	if (envyoff \|\| cubemap == null)
16282	16610	{
..	..	@@ -16293,7 +16621,17 @@
16293	16621	// Compensates for ExaminerViewer's modification of modelview matrix
16294	16622	gl.glMatrixMode(GL.GL_MODELVIEW);
16295	16623	gl.glLoadIdentity();
	16624	+ gl.glScalef(1,ratio,1);
16296	16625
	16626	+ colorV[0] = 2;
	16627	+ colorV[1] = 2;
	16628	+ colorV[2] = 2;
	16629	+ colorV[3] = 1;
	16630	+ gl.glDisable(gl.GL_COLOR_MATERIAL);
	16631	+ gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16632	+
	16633	+ gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16634	+
16297	16635	//gl.glActiveTexture(GL.GL_TEXTURE1);
16298	16636	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16299	16637
..	..	@@ -16306,7 +16644,7 @@
16306	16644	// GL_NORMAL_MAP texgen mode. Temporarily enabling lighting
16307	16645	// causes the normals to be sent down. Thanks to Ken Dyke.
16308	16646	//gl.glEnable(GL.GL_LIGHTING);
16309		- gl.glDisable(GL.GL_LIGHTING);
	16647	+ gl.glEnable(GL.GL_LIGHTING);
16310	16648
16311	16649	gl.glTexGeni(GL.GL_S, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
16312	16650	gl.glTexGeni(GL.GL_T, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
..	..	@@ -16583,7 +16921,7 @@
16583	16921	//new Exception().printStackTrace();
16584	16922	System.out.println("select buffer init");
16585	16923	// Use debug pipeline
16586		- drawable.setGL(new DebugGL(drawable.getGL()));
	16924	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16587	16925
16588	16926	GL gl = drawable.getGL();
16589	16927