~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	{
..	..	@@ -2298,10 +2348,17 @@
2298	2348	HANDLES ^= true;
2299	2349	}
2300	2350
	2351	+ Object3D paintFolder;
	2352	+
2301	2353	void TogglePaint()
2302	2354	{
2303	2355	PAINTMODE ^= true;
2304	2356	paintcount = 0;
	2357	+
	2358	+ if (PAINTMODE)
	2359	+ {
	2360	+ paintFolder = GetFolder();
	2361	+ }
2305	2362	}
2306	2363
2307	2364	void SwapCamera(int a, int b)
..	..	@@ -2398,6 +2455,21 @@
2398	2455	return currentGL;
2399	2456	}
2400	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	+
2401	2473	/**/
2402	2474	class CacheTexture
2403	2475	{
..	..	@@ -2406,28 +2478,31 @@
2406	2478
2407	2479	int resolution;
2408	2480
2409		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2481	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2410	2482	{
2411		- texture = tex;
	2483	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2484	+ texturedata = texdata;
2412	2485	resolution = res;
2413	2486	}
2414	2487	}
2415	2488	/**/
2416	2489
2417	2490	// TEXTURE static Texture texture;
2418		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2419		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2420		- 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	+
2421	2496	int pigmentdepth = 0;
2422	2497	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2423	2498	int bumpdepth = 0;
2424	2499	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2425	2500	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2426	2501	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2427		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2502	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2428	2503	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2429	2504
2430		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2505	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2431	2506	{
2432	2507	TextureData texturedata = null;
2433	2508
..	..	@@ -2446,13 +2521,34 @@
2446	2521	if (bump)
2447	2522	texturedata = ConvertBump(texturedata, false);
2448	2523
2449		- com.sun.opengl.util.texture.Texture texture =
2450		- 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);
2451	2526
2452		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2453		- 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);
2454	2529
2455		- 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;
2456	2552	}
2457	2553
2458	2554	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3525,6 +3621,8 @@
3525	3621
3526	3622	System.out.println("LOADING TEXTURE : " + name);
3527	3623
	3624	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3625	+
3528	3626	//
3529	3627	if (false) // compressbit > 0)
3530	3628	{
..	..	@@ -7923,7 +8021,7 @@
7923	8021	String pigment = Object3D.GetPigment(tex);
7924	8022	String bump = Object3D.GetBump(tex);
7925	8023
7926		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8024	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7927	8025	{
7928	8026	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7929	8027	// System.out.println("; bump = " + bump);
..	..	@@ -7938,8 +8036,8 @@
7938	8036	pigment = null;
7939	8037	}
7940	8038
7941		- ReleaseTexture(bump, true);
7942		- ReleaseTexture(pigment, false);
	8039	+ ReleaseTexture(tex, true);
	8040	+ ReleaseTexture(tex, false);
7943	8041	}
7944	8042
7945	8043	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -7957,7 +8055,7 @@
7957	8055
7958	8056	String pigment = Object3D.GetPigment(tex);
7959	8057
7960		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8058	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7961	8059	{
7962	8060	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7963	8061	// System.out.println("; bump = " + bump);
..	..	@@ -7968,7 +8066,7 @@
7968	8066	pigment = null;
7969	8067	}
7970	8068
7971		- ReleaseTexture(pigment, false);
	8069	+ ReleaseTexture(tex, false);
7972	8070	}
7973	8071
7974	8072	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -7986,7 +8084,7 @@
7986	8084
7987	8085	String bump = Object3D.GetBump(tex);
7988	8086
7989		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8087	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7990	8088	{
7991	8089	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7992	8090	// System.out.println("; bump = " + bump);
..	..	@@ -7997,10 +8095,10 @@
7997	8095	bump = null;
7998	8096	}
7999	8097
8000		- ReleaseTexture(bump, true);
	8098	+ ReleaseTexture(tex, true);
8001	8099	}
8002	8100
8003		- void ReleaseTexture(String tex, boolean bump)
	8101	+ void ReleaseTexture(cTexture tex, boolean bump)
8004	8102	{
8005	8103	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8006	8104	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8011,7 +8109,7 @@
8011	8109	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
8012	8110
8013	8111	if (tex != null)
8014		- texture = textures.get(tex);
	8112	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
8015	8113
8016	8114	// //assert( texture != null );
8017	8115	// if (texture == null)
..	..	@@ -8105,47 +8203,50 @@
8105	8203
8106	8204	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8107	8205	{
8108		- if (// DrawMode() != 0 \|\| /tex == null \|\|/
8109		- ambientOcclusion ) // \|\| !textureon)
8110		- {
8111		- return; // false;
8112		- }
8113		-
8114		- if (tex == null)
8115		- {
8116		- BindTexture(null,false,resolution);
8117		- BindTexture(null,true,resolution);
8118		- return;
8119		- }
	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;
8120	8247
8121		- String pigment = Object3D.GetPigment(tex);
8122		- String bump = Object3D.GetBump(tex);
8123		-
8124		- usedtextures.put(pigment, pigment);
8125		- usedtextures.put(bump, bump);
8126		-
8127		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8128		- {
8129		- // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8130		- // System.out.println("; bump = " + bump);
8131		- }
8132		-
8133		- if (bump.equals(""))
8134		- {
8135		- bump = null;
8136		- }
8137		- if (pigment.equals(""))
8138		- {
8139		- pigment = null;
8140		- }
8141		-
8142		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8143		- BindTexture(pigment, false, resolution);
8144		- GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8145		- BindTexture(bump, true, resolution);
8146		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8147		-
8148		- return; // true;
	8248	+ BindPigmentTexture(tex, resolution);
	8249	+ BindBumpTexture(tex, resolution);
8149	8250	}
8150	8251
8151	8252	/boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8164,9 +8265,9 @@
8164	8265
8165	8266	String pigment = Object3D.GetPigment(tex);
8166	8267
8167		- usedtextures.put(pigment, pigment);
	8268	+ usedtextures.add(tex);
8168	8269
8169		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8270	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8170	8271	{
8171	8272	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8172	8273	// System.out.println("; bump = " + bump);
..	..	@@ -8178,7 +8279,7 @@
8178	8279	}
8179	8280
8180	8281	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8181		- BindTexture(pigment, false, resolution);
	8282	+ BindTexture(tex, false, resolution);
8182	8283	}
8183	8284
8184	8285	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8197,9 +8298,9 @@
8197	8298
8198	8299	String bump = Object3D.GetBump(tex);
8199	8300
8200		- usedtextures.put(bump, bump);
	8301	+ usedtextures.add(tex);
8201	8302
8202		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8303	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8203	8304	{
8204	8305	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8205	8306	// System.out.println("; bump = " + bump);
..	..	@@ -8211,7 +8312,7 @@
8211	8312	}
8212	8313
8213	8314	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8214		- BindTexture(bump, true, resolution);
	8315	+ BindTexture(tex, true, resolution);
8215	8316	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8216	8317	}
8217	8318
..	..	@@ -8235,13 +8336,19 @@
8235	8336	return fileExists;
8236	8337	}
8237	8338
8238		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8339	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8239	8340	{
8240		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8341	+ CacheTexture texturecache = null;
8241	8342
8242	8343	if (tex != null)
8243	8344	{
8244		- 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	+ }
8245	8352
8246	8353	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8247	8354
..	..	@@ -8251,19 +8358,46 @@
8251	8358	// else
8252	8359	// if (!texname.startsWith("/"))
8253	8360	// texname = "/Users/nbriere/Textures/" + texname;
8254		- if (!FileExists(tex))
	8361	+ if (!FileExists(texname))
8255	8362	{
8256	8363	texname = fallbackTextureName;
8257	8364	}
8258	8365
8259	8366	if (CACHETEXTURE)
8260		- texture = textures.get(texname); // TEXTURE CACHE
8261		-
8262		- TextureData texturedata = null;
8263		-
8264		- if (texture == null \|\| texture.resolution < resolution)
8265	8367	{
8266		- 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(""))
8267	8401	{
8268	8402	assert(!bump);
8269	8403	// if (bump)
..	..	@@ -8274,19 +8408,23 @@
8274	8408	// }
8275	8409	// else
8276	8410	// {
8277		- texture = textures.get(tex);
8278		- if (texture == null)
	8411	+ // texturecache = textures.get(texname); // suspicious
	8412	+ if (texturecache == null)
8279	8413	{
8280		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8414	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8281	8415	}
	8416	+ else
	8417	+ new Exception().printStackTrace();
8282	8418	// }
8283	8419	} else
8284		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8420	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8285	8421	{
8286	8422	assert(bump);
8287		- texture = textures.get(tex);
8288		- if (texture == null)
8289		- 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();
8290	8428	} else
8291	8429	{
8292	8430	//if (tex.equals("IMMORTAL"))
..	..	@@ -8294,11 +8432,13 @@
8294	8432	// texture = GetResourceTexture("default.png");
8295	8433	//} else
8296	8434	//{
8297		- if (tex.equals("WHITE_NOISE"))
	8435	+ if (texname.endsWith("WHITE_NOISE"))
8298	8436	{
8299		- texture = textures.get(tex);
8300		- if (texture == null)
8301		- 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();
8302	8442	} else
8303	8443	{
8304	8444	if (textureon)
..	..	@@ -8357,19 +8497,19 @@
8357	8497	if (texturedata == null)
8358	8498	throw new Exception();
8359	8499
8360		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8500	+ texturecache = new CacheTexture(texturedata,resolution);
8361	8501	//texture = GetTexture(tex, bump);
8362	8502	}
8363	8503	}
8364	8504	//}
8365	8505	}
8366	8506
8367		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8507	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8368	8508	{
8369	8509	//return false;
8370	8510
8371	8511	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8372		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8512	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8373	8513	{
8374	8514	// String ext = "_highres";
8375	8515	// if (REDUCETEXTURE)
..	..	@@ -8386,52 +8526,17 @@
8386	8526	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8387	8527	if (!cachefile.exists())
8388	8528	{
8389		- // cache to disk
8390		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8391		- //buffers[0].
8392		-
8393		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8394		- int[] pixels = new int[bytebuf.capacity()/3];
8395		-
8396		- // squared size heuristic...
8397		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8529	+ //if (texturedata.getWidth() == texturedata.getHeight())
8398	8530	{
8399		- for (int i=pixels.length; --i>=0;)
8400		- {
8401		- int i3 = i*3;
8402		- pixels[i] = 0xFF;
8403		- pixels[i] <<= 8;
8404		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8405		- pixels[i] <<= 8;
8406		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8407		- pixels[i] <<= 8;
8408		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8409		- }
8410		-
8411		- /*
8412		- int r=0,g=0,b=0,a=0;
8413		- for (int i=0; i<width; i++)
8414		- for (int j=0; j<height; j++)
8415		- {
8416		- int index = j*width+i;
8417		- int p = pixels[index];
8418		- a = ((p>>24) & 0xFF);
8419		- r = ((p>>16) & 0xFF);
8420		- g = ((p>>8) & 0xFF);
8421		- b = (p & 0xFF);
8422		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8423		- }
8424		- /**/
8425		- int width = (int)Math.sqrt(pixels.length); // squared
8426		- int height = width;
8427		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8428		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8531	+ BufferedImage rendImage = CreateBim(texturedata);
	8532	+
8429	8533	ImageWriter writer = null;
8430	8534	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8431	8535	if (iter.hasNext()) {
8432	8536	writer = (ImageWriter)iter.next();
8433	8537	}
8434		- float compressionQuality = 0.9f;
	8538	+
	8539	+ float compressionQuality = 0.85f;
8435	8540	try
8436	8541	{
8437	8542	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8448,18 +8553,20 @@
8448	8553	}
8449	8554	}
8450	8555	}
8451		-
	8556	+
	8557	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8558	+
8452	8559	//System.out.println("Texture = " + tex);
8453		- if (textures.containsKey(texname))
	8560	+ if (textures.containsKey(tex))
8454	8561	{
8455		- CacheTexture thetex = textures.get(texname);
	8562	+ CacheTexture thetex = textures.get(tex);
8456	8563	thetex.texture.disable();
8457	8564	thetex.texture.dispose();
8458		- textures.remove(texname);
	8565	+ textures.remove(tex);
8459	8566	}
8460	8567
8461		- texture.texturedata = texturedata;
8462		- textures.put(texname, texture);
	8568	+ //texture.texturedata = texturedata;
	8569	+ textures.put(tex, texturecache);
8463	8570
8464	8571	// newtex = true;
8465	8572	}
..	..	@@ -8475,10 +8582,44 @@
8475	8582	}
8476	8583	}
8477	8584
8478		- return texture;
	8585	+ return texturecache;
8479	8586	}
8480	8587
8481		- 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
8482	8623	{
8483	8624	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8484	8625
..	..	@@ -8496,21 +8637,21 @@
8496	8637	return texture!=null?texture.texture:null;
8497	8638	}
8498	8639
8499		- 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
8500	8641	{
8501	8642	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8502	8643
8503	8644	return texture!=null?texture.texturedata:null;
8504	8645	}
8505	8646
8506		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8647	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8507	8648	{
8508	8649	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8509	8650	{
8510	8651	return false;
8511	8652	}
8512	8653
8513		- boolean newtex = false;
	8654	+ //boolean newtex = false;
8514	8655
8515	8656	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8516	8657
..	..	@@ -8542,9 +8683,75 @@
8542	8683	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8543	8684	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8544	8685
8545		- return newtex;
	8686	+ return true; // Warning: not used.
8546	8687	}
8547	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	+
8548	8755	ShadowBuffer shadowPBuf;
8549	8756	AntialiasBuffer antialiasPBuf;
8550	8757	int MAXSTACK;
..	..	@@ -8737,7 +8944,7 @@
8737	8944
8738	8945	if (cubemap == null)
8739	8946	{
8740		- LoadEnvy(5);
	8947	+ //LoadEnvy(1);
8741	8948	}
8742	8949
8743	8950	//cubemap.enable();
..	..	@@ -9024,37 +9231,58 @@
9024	9231	cubemap = null;
9025	9232	return;
9026	9233	case 1:
9027		- name = "cubemaps/box_";
9028		- ext = "png";
	9234	+ name = "cubemaps/rgb/";
	9235	+ ext = "jpg";
9029	9236	reverseUP = false;
9030	9237	break;
9031	9238	case 2:
9032		- name = "cubemaps/uffizi_";
9033		- ext = "png";
9034		- break; // reverseUP = true; break;
	9239	+ name = "cubemaps/uffizi/";
	9240	+ ext = "jpg";
	9241	+ reverseUP = false;
	9242	+ break;
9035	9243	case 3:
9036		- name = "cubemaps/CloudyHills_";
9037		- ext = "tga";
	9244	+ name = "cubemaps/CloudyHills/";
	9245	+ ext = "jpg";
9038	9246	reverseUP = false;
9039	9247	break;
9040	9248	case 4:
9041		- name = "cubemaps/cornell_";
	9249	+ name = "cubemaps/cornell/";
9042	9250	ext = "png";
9043	9251	reverseUP = false;
9044	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;
9045	9278	default:
9046		- name = "cubemaps/rgb_";
9047		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9279	+ name = "cubemaps/box/";
	9280	+ ext = "png"; /mipmap = true;/
	9281	+ reverseUP = false;
9048	9282	break;
9049	9283	}
9050		-
9051		- try
9052		- {
9053		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9054		- } catch (IOException e)
9055		- {
9056		- throw new RuntimeException(e);
9057		- }
	9284	+
	9285	+ LoadSkybox(name, ext, mipmap);
9058	9286	}
9059	9287
9060	9288	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -9086,8 +9314,12 @@
9086	9314	static double[] model = new double[16];
9087	9315	double[] camera2light = new double[16];
9088	9316	double[] light2camera = new double[16];
9089		- int newenvy = -1;
9090		- boolean envyoff = true; // false;
	9317	+
	9318	+ //int newenvy = -1;
	9319	+ //boolean envyoff = false;
	9320	+
	9321	+ String loadedskyboxname;
	9322	+
9091	9323	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9092	9324	//float[] light0 = { 0,0,0 };
9093	9325	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9505,7 +9737,7 @@
9505	9737
9506	9738	if (renderCamera != lightCamera)
9507	9739	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9508		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9740	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9509	9741
9510	9742	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9511	9743
..	..	@@ -9521,7 +9753,7 @@
9521	9753
9522	9754	if (renderCamera != lightCamera)
9523	9755	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9524		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9756	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9525	9757
9526	9758	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9527	9759
..	..	@@ -9567,10 +9799,12 @@
9567	9799	rati = 1 / rati;
9568	9800	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9569	9801	}
9570		- assert (newenvy == -1);
	9802	+
	9803	+ //assert (newenvy == -1);
	9804	+
9571	9805	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9572	9806	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9573		- DrawSkyBox(gl);
	9807	+ DrawSkyBox(gl, (float)rati);
9574	9808	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9575	9809	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9576	9810	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -10722,7 +10956,7 @@
10722	10956	// if (parentcam != renderCamera) // not a light
10723	10957	if (cam != lightCamera)
10724	10958	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10725		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10959	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10726	10960
10727	10961	for (int j = 0; j < 4; j++)
10728	10962	{
..	..	@@ -10737,7 +10971,7 @@
10737	10971	// if (parentcam != renderCamera) // not a light
10738	10972	if (cam != lightCamera)
10739	10973	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10740		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	10974	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10741	10975
10742	10976	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10743	10977
..	..	@@ -10823,13 +11057,27 @@
10823	11057	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10824	11058	}
10825	11059
10826		- if (newenvy > -1)
	11060	+// if (newenvy > -1)
	11061	+// {
	11062	+// LoadEnvy(newenvy);
	11063	+// }
	11064	+//
	11065	+// newenvy = -1;
	11066	+
	11067	+ if (object.skyboxname != null)
10827	11068	{
10828		- LoadEnvy(newenvy);
	11069	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11070	+ {
	11071	+ LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11072	+ loadedskyboxname = object.skyboxname;
	11073	+ }
10829	11074	}
10830		-
10831		- newenvy = -1;
10832		-
	11075	+ else
	11076	+ {
	11077	+ cubemap = null;
	11078	+ loadedskyboxname = null;
	11079	+ }
	11080	+
10833	11081	ratio = ((double) getWidth()) / getHeight();
10834	11082	//System.out.println("ratio = " + ratio);
10835	11083
..	..	@@ -10845,7 +11093,7 @@
10845	11093
10846	11094	if (!IsFrozen() && !ambientOcclusion)
10847	11095	{
10848		- DrawSkyBox(gl);
	11096	+ DrawSkyBox(gl, (float)ratio);
10849	11097	}
10850	11098
10851	11099	//if (selection_view == -1)
..	..	@@ -11028,9 +11276,9 @@
11028	11276
11029	11277	gl.glMatrixMode(GL.GL_MODELVIEW);
11030	11278
11031		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11032		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
11033		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11279	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11280	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11281	+gl.glEnable(gl.GL_MULTISAMPLE);
11034	11282	} else
11035	11283	{
11036	11284	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -11041,7 +11289,7 @@
11041	11289	//System.out.println("BLENDING ON");
11042	11290	gl.glEnable(GL.GL_BLEND);
11043	11291	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
11044		-
	11292	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
11045	11293	gl.glMatrixMode(gl.GL_PROJECTION);
11046	11294	gl.glLoadIdentity();
11047	11295
..	..	@@ -11131,7 +11379,7 @@
11131	11379
11132	11380	// if (cam != lightCamera)
11133	11381	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11134		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11382	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11135	11383	}
11136	11384
11137	11385	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -11290,7 +11538,7 @@
11290	11538	}
11291	11539	}
11292	11540
11293		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11541	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11294	11542	{
11295	11543	//gl.glDepthFunc(GL.GL_LEQUAL);
11296	11544	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11298,24 +11546,21 @@
11298	11546
11299	11547	boolean texon = textureon;
11300	11548
11301		- if (RENDERPROGRAM > 0)
11302		- {
11303		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11304		- textureon = false;
11305		- }
	11549	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11550	+ textureon = false;
	11551	+
11306	11552	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11307	11553	//System.out.println("ALLO");
11308	11554	gl.glColorMask(false, false, false, false);
11309	11555	DrawObject(gl);
11310		- if (RENDERPROGRAM > 0)
11311		- {
11312		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11313		- textureon = texon;
11314		- }
	11556	+
	11557	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11558	+ textureon = texon;
	11559	+
11315	11560	gl.glColorMask(true, true, true, true);
11316	11561
11317	11562	gl.glDepthFunc(GL.GL_EQUAL);
11318		- //gl.glDepthMask(false);
	11563	+ gl.glDepthMask(false);
11319	11564	}
11320	11565
11321	11566	if (false) // DrawMode() == SHADOW)
..	..	@@ -11655,20 +11900,32 @@
11655	11900	ReleaseTextures(DEFAULT_TEXTURES);
11656	11901
11657	11902	if (CLEANCACHE)
11658		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11903	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11659	11904	{
11660		- String tex = e.nextElement();
	11905	+ cTexture tex = e.nextElement();
11661	11906
11662	11907	// System.out.println("Texture --------- " + tex);
11663	11908
11664		- if (tex.equals("WHITE_NOISE"))
	11909	+ if (tex.equals("WHITE_NOISE:"))
11665	11910	continue;
11666	11911
11667		- if (!usedtextures.containsKey(tex))
	11912	+ if (!usedtextures.contains(tex))
11668	11913	{
	11914	+ CacheTexture gettex = texturepigment.get(tex);
11669	11915	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11670		- textures.get(tex).texture.dispose();
11671		- textures.remove(tex);
	11916	+ if (gettex != null)
	11917	+ {
	11918	+ gettex.texture.dispose();
	11919	+ texturepigment.remove(tex);
	11920	+ }
	11921	+
	11922	+ gettex = texturebump.get(tex);
	11923	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11924	+ if (gettex != null)
	11925	+ {
	11926	+ gettex.texture.dispose();
	11927	+ texturebump.remove(tex);
	11928	+ }
11672	11929	}
11673	11930	}
11674	11931	}
..	..	@@ -12196,8 +12453,76 @@
12196	12453
12197	12454	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12198	12455
12199		- String program =
	12456	+ String programmin =
	12457	+ // Min shader
12200	12458	"!!ARBfp1.0\n" +
	12459	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12460	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12461	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12462	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12463	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12464	+ "PARAM light2cam0 = program.env[10];" +
	12465	+ "PARAM light2cam1 = program.env[11];" +
	12466	+ "PARAM light2cam2 = program.env[12];" +
	12467	+ "TEMP temp;" +
	12468	+ "TEMP light;" +
	12469	+ "TEMP ndotl;" +
	12470	+ "TEMP normal;" +
	12471	+ "TEMP depth;" +
	12472	+ "TEMP eye;" +
	12473	+ "TEMP pos;" +
	12474	+
	12475	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12476	+ Normalize("normal") +
	12477	+ "MOV light, state.light[0].position;" +
	12478	+ "DP3 ndotl.x, light, normal;" +
	12479	+
	12480	+ // shadow
	12481	+ "MOV pos, fragment.texcoord[1];" +
	12482	+ "MOV temp, pos;" +
	12483	+ ShadowTextureFetch("depth", "temp", "1") +
	12484	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12485	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12486	+
	12487	+ // No shadow when out of frustum
	12488	+ //"SGE temp.y, depth.z, zero123.y;" +
	12489	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12490	+
	12491	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12492	+
	12493	+ // Backlit
	12494	+ "MOV pos.w, zero123.y;" +
	12495	+ "DP4 eye.x, pos, light2cam0;" +
	12496	+ "DP4 eye.y, pos, light2cam1;" +
	12497	+ "DP4 eye.z, pos, light2cam2;" +
	12498	+ Normalize("eye") +
	12499	+
	12500	+ "DP3 ndotl.y, -eye, normal;" +
	12501	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12502	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12503	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12504	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12505	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12506	+
	12507	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12508	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12509	+
	12510	+ // Pigment
	12511	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12512	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12513	+ "MUL temp, temp, ndotl.x;" +
	12514	+
	12515	+ "MUL temp, temp, zero123.z;" +
	12516	+
	12517	+ //"MUL temp, temp, ndotl.y;" +
	12518	+
	12519	+ "MOV temp.w, zero123.y;" + // reset alpha
	12520	+ "MOV result.color, temp;" +
	12521	+ "END";
	12522	+
	12523	+ String programmax =
	12524	+ "!!ARBfp1.0\n" +
	12525	+
12201	12526	//"OPTION ARB_fragment_program_shadow;" +
12202	12527	"PARAM light2cam0 = program.env[10];" +
12203	12528	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12312,8 +12637,7 @@
12312	12637	"TEMP shininess;" +
12313	12638	"\n" +
12314	12639	"MOV texSamp, one;" +
12315		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12316		-
	12640	+
12317	12641	"MOV mapgrid.x, one2048th.x;" +
12318	12642	"MOV temp, fragment.texcoord[1];" +
12319	12643	/*
..	..	@@ -12334,20 +12658,20 @@
12334	12658	"MUL temp, floor, mapgrid.x;" +
12335	12659	//"TEX depth0, temp, texture[1], 2D;" +
12336	12660	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12337		- TextureFetch("depth0", "temp", "1") +
	12661	+ ShadowTextureFetch("depth0", "temp", "1") +
12338	12662	"") +
12339	12663	"ADD temp.x, temp.x, mapgrid.x;" +
12340	12664	//"TEX depth1, temp, texture[1], 2D;" +
12341	12665	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12342		- TextureFetch("depth1", "temp", "1") +
	12666	+ ShadowTextureFetch("depth1", "temp", "1") +
12343	12667	"") +
12344	12668	"ADD temp.y, temp.y, mapgrid.x;" +
12345	12669	//"TEX depth2, temp, texture[1], 2D;" +
12346		- TextureFetch("depth2", "temp", "1") +
	12670	+ ShadowTextureFetch("depth2", "temp", "1") +
12347	12671	"SUB temp.x, temp.x, mapgrid.x;" +
12348	12672	//"TEX depth3, temp, texture[1], 2D;" +
12349	12673	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12350		- TextureFetch("depth3", "temp", "1") +
	12674	+ ShadowTextureFetch("depth3", "temp", "1") +
12351	12675	"") +
12352	12676	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12353	12677	//"MOV params, material;" +
..	..	@@ -12718,10 +13042,10 @@
12718	13042	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12719	13043	"") +
12720	13044
12721		- // display shadow only (bump == 0)
	13045	+ // display shadow only (fakedepth == 0)
12722	13046	"SUB temp.x, half.x, shadow.x;" +
12723	13047	"MOV temp.y, -params5.z;" + // params6.x;" +
12724		- "SLT temp.z, temp.y, -one2048th.x;" +
	13048	+ "SLT temp.z, temp.y, -c256i.x;" +
12725	13049	"SUB temp.y, one.x, temp.z;" +
12726	13050	"MUL temp.x, temp.x, temp.y;" +
12727	13051	"KIL temp.x;" +
..	..	@@ -13052,6 +13376,13 @@
13052	13376	//once = true;
13053	13377	}
13054	13378
	13379	+ String program = programmax;
	13380	+
	13381	+ if (Globals.MINSHADER)
	13382	+ {
	13383	+ program = programmin;
	13384	+ }
	13385	+
13055	13386	System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13056	13387	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13057	13388	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
..	..	@@ -13145,25 +13476,26 @@
13145	13476	return out;
13146	13477	}
13147	13478
13148		- String TextureFetch(String dest, String src, String unit)
	13479	+ // Also does frustum culling
	13480	+ String ShadowTextureFetch(String dest, String src, String unit)
13149	13481	{
13150	13482	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13151	13483	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13152	13484	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13485	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13486	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13153	13487	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13154		- "SLT " + src + ".z, " + src + ".x, one.x;" +
13155		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13156		- "SLT " + src + ".z, " + src + ".y, one.x;" +
13157		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13488	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13489	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13158	13490	//"SWZ buffer, temp, w,w,w,w;";
13159		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13491	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13160	13492	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13161	13493	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13162	13494	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13163		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13495	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13164	13496
13165		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13166		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13497	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13498	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13167	13499	}
13168	13500
13169	13501	String Shadow(String depth, String shadow)
..	..	@@ -13210,7 +13542,7 @@
13210	13542	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13211	13543	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13212	13544
13213		- // No shadow when out of frustrum
	13545	+ // No shadow when out of frustum
13214	13546	"SGE temp.x, " + depth + ".z, one.z;" +
13215	13547	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13216	13548	"";
..	..	@@ -14008,14 +14340,15 @@
14008	14340	drag = false;
14009	14341	//System.out.println("Mouse DOWN");
14010	14342	editObj = false;
14011		- ClickInfo info = new ClickInfo();
14012		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14013		- info.pane = this;
14014		- info.camera = renderCamera;
14015		- info.x = x;
14016		- info.y = y;
14017		- info.modifiers = modifiersex;
14018		- editObj = object.doEditClick(info, 0);
	14343	+ //ClickInfo info = new ClickInfo();
	14344	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14345	+ object.clickInfo.pane = this;
	14346	+ object.clickInfo.camera = renderCamera;
	14347	+ object.clickInfo.x = x;
	14348	+ object.clickInfo.y = y;
	14349	+ object.clickInfo.modifiers = modifiersex;
	14350	+ editObj = object.doEditClick(//info,
	14351	+ 0);
14019	14352	if (!editObj)
14020	14353	{
14021	14354	hasMarquee = true;
..	..	@@ -14297,12 +14630,12 @@
14297	14630	void GoDown(int mod)
14298	14631	{
14299	14632	MODIFIERS \|= COMMAND;
14300		- /*
	14633	+ /**/
14301	14634	if((mod&SHIFT) == SHIFT)
14302		- manipCamera.RotatePosition(0, -speed);
	14635	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14303	14636	else
14304		- manipCamera.BackForth(0, -speed*delta, getWidth());
14305		- */
	14637	+ manipCamera.RotatePosition(0, -speed);
	14638	+ /**/
14306	14639	if ((mod & SHIFT) == SHIFT)
14307	14640	{
14308	14641	mouseMode = mouseMode; // VR??
..	..	@@ -14318,12 +14651,12 @@
14318	14651	void GoUp(int mod)
14319	14652	{
14320	14653	MODIFIERS \|= COMMAND;
14321		- /*
	14654	+ /**/
14322	14655	if((mod&SHIFT) == SHIFT)
14323		- manipCamera.RotatePosition(0, speed);
	14656	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14324	14657	else
14325		- manipCamera.BackForth(0, speed*delta, getWidth());
14326		- */
	14658	+ manipCamera.RotatePosition(0, speed);
	14659	+ /**/
14327	14660	if ((mod & SHIFT) == SHIFT)
14328	14661	{
14329	14662	mouseMode = mouseMode;
..	..	@@ -14339,12 +14672,12 @@
14339	14672	void GoLeft(int mod)
14340	14673	{
14341	14674	MODIFIERS \|= COMMAND;
14342		- /*
	14675	+ /**/
14343	14676	if((mod&SHIFT) == SHIFT)
14344		- manipCamera.RotatePosition(speed, 0);
14345		- else
14346	14677	manipCamera.Translate(speed*delta, 0, getWidth());
14347		- */
	14678	+ else
	14679	+ manipCamera.RotatePosition(speed, 0);
	14680	+ /**/
14348	14681	if ((mod & SHIFT) == SHIFT)
14349	14682	{
14350	14683	mouseMode = mouseMode;
..	..	@@ -14360,12 +14693,12 @@
14360	14693	void GoRight(int mod)
14361	14694	{
14362	14695	MODIFIERS \|= COMMAND;
14363		- /*
	14696	+ /**/
14364	14697	if((mod&SHIFT) == SHIFT)
14365		- manipCamera.RotatePosition(-speed, 0);
14366		- else
14367	14698	manipCamera.Translate(-speed*delta, 0, getWidth());
14368		- */
	14699	+ else
	14700	+ manipCamera.RotatePosition(-speed, 0);
	14701	+ /**/
14369	14702	if ((mod & SHIFT) == SHIFT)
14370	14703	{
14371	14704	mouseMode = mouseMode;
..	..	@@ -14415,15 +14748,16 @@
14415	14748	if (editObj)
14416	14749	{
14417	14750	drag = true;
14418		- ClickInfo info = new ClickInfo();
14419		- info.bounds.setBounds(0, 0,
	14751	+ //ClickInfo info = new ClickInfo();
	14752	+ object.clickInfo.bounds.setBounds(0, 0,
14420	14753	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14421		- info.pane = this;
14422		- info.camera = renderCamera;
14423		- info.x = x;
14424		- info.y = y;
14425		- object.GetWindow().copy
14426		- .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	14754	+ object.clickInfo.pane = this;
	14755	+ object.clickInfo.camera = renderCamera;
	14756	+ object.clickInfo.x = x;
	14757	+ object.clickInfo.y = y;
	14758	+ object //.GetWindow().copy
	14759	+ .doEditDrag(//info,
	14760	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14427	14761	} else
14428	14762	{
14429	14763	if (x < startX)
..	..	@@ -14572,24 +14906,27 @@
14572	14906	}
14573	14907	}
14574	14908
	14909	+// ClickInfo clickInfo = new ClickInfo();
	14910	+
14575	14911	public void mouseMoved(MouseEvent e)
14576	14912	{
14577	14913	//System.out.println("mouseMoved: " + e);
14578	14914	if (isRenderer)
14579	14915	return;
14580	14916
14581		- ClickInfo ci = new ClickInfo();
14582		- ci.x = e.getX();
14583		- ci.y = e.getY();
14584		- ci.modifiers = e.getModifiersEx();
14585		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14586		- ci.pane = this;
14587		- ci.camera = renderCamera;
	14917	+ // Mouse cursor feedback
	14918	+ object.clickInfo.x = e.getX();
	14919	+ object.clickInfo.y = e.getY();
	14920	+ object.clickInfo.modifiers = e.getModifiersEx();
	14921	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14922	+ object.clickInfo.pane = this;
	14923	+ object.clickInfo.camera = renderCamera;
14588	14924	if (!isRenderer)
14589	14925	{
14590	14926	//ObjEditor editWindow = object.editWindow;
14591	14927	//Object3D copy = editWindow.copy;
14592		- if (object.doEditClick(ci, 0))
	14928	+ if (object.doEditClick(//clickInfo,
	14929	+ 0))
14593	14930	{
14594	14931	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14595	14932	} else
..	..	@@ -14861,7 +15198,8 @@
14861	15198	// break;
14862	15199	case 'T':
14863	15200	CACHETEXTURE ^= true;
14864		- textures.clear();
	15201	+ texturepigment.clear();
	15202	+ texturebump.clear();
14865	15203	// repaint();
14866	15204	break;
14867	15205	case 'Y':
..	..	@@ -14946,7 +15284,9 @@
14946	15284	case 'E' : COMPACT ^= true;
14947	15285	repaint();
14948	15286	break;
14949		- case 'W' : DEBUGHSB ^= true;
	15287	+ case 'W' : // Wide Window (fullscreen)
	15288	+ //DEBUGHSB ^= true;
	15289	+ ObjEditor.theFrame.ToggleFullScreen();
14950	15290	repaint();
14951	15291	break;
14952	15292	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14972,13 +15312,7 @@
14972	15312	repaint();
14973	15313	break;
14974	15314	case 'l':
14975		- lightMode ^= true;
14976		- Globals.lighttouched = true;
14977		- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14978		- targetLookAt.set(manipCamera.lookAt);
14979		- repaint();
14980		- break;
14981		- case 'L':
	15315	+ //case 'L':
14982	15316	if (lightMode)
14983	15317	{
14984	15318	lightMode = false;
..	..	@@ -15042,20 +15376,24 @@
15042	15376	OCCLUSION_CULLING ^= true;
15043	15377	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
15044	15378	break;
15045		- case '0': envyoff ^= true; repaint(); break;
	15379	+ //case '0': envyoff ^= true; repaint(); break;
15046	15380	case '1':
15047	15381	case '2':
15048	15382	case '3':
15049	15383	case '4':
15050	15384	case '5':
15051		- newenvy = Character.getNumericValue(key);
15052		- repaint();
15053		- break;
15054	15385	case '6':
15055	15386	case '7':
15056	15387	case '8':
15057	15388	case '9':
15058		- BGcolor = (key - '6')/3.f;
	15389	+ if (true) // envyoff)
	15390	+ {
	15391	+ BGcolor = (key - '1')/8.f;
	15392	+ }
	15393	+ else
	15394	+ {
	15395	+ //newenvy = Character.getNumericValue(key);
	15396	+ }
15059	15397	repaint();
15060	15398	break;
15061	15399	case '!':
..	..	@@ -15125,7 +15463,10 @@
15125	15463	// kompactbit = 6;
15126	15464	// break;
15127	15465	case ' ':
15128		- ObjEditor.theFrame.ToggleFullScreen();
	15466	+ lightMode ^= true;
	15467	+ Globals.lighttouched = true;
	15468	+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
	15469	+ targetLookAt.set(manipCamera.lookAt);
15129	15470	repaint();
15130	15471	break;
15131	15472	//case '`' :
..	..	@@ -15615,8 +15956,6 @@
15615	15956
15616	15957	int width = getBounds().width;
15617	15958	int height = getBounds().height;
15618		- ClickInfo info = new ClickInfo();
15619		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15620	15959	//Image img = CreateImage(width, height);
15621	15960	//System.out.println("width = " + width + "; height = " + height + "\n");
15622	15961
..	..	@@ -15693,38 +16032,47 @@
15693	16032	}
15694	16033	if (object != null && !hasMarquee)
15695	16034	{
	16035	+ if (object.clickInfo == null)
	16036	+ object.clickInfo = new ClickInfo();
	16037	+ ClickInfo info = object.clickInfo;
	16038	+ //ClickInfo info = new ClickInfo();
	16039	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16040	+
15696	16041	if (isRenderer)
15697	16042	{
15698		- info.flags++;
	16043	+ object.clickInfo.flags++;
15699	16044	double frameAspect = (double) width / (double) height;
15700	16045	if (frameAspect > renderCamera.aspect)
15701	16046	{
15702	16047	int desired = (int) ((double) height * renderCamera.aspect);
15703		- info.bounds.width -= width - desired;
15704		- info.bounds.x += (width - desired) / 2;
	16048	+ object.clickInfo.bounds.width -= width - desired;
	16049	+ object.clickInfo.bounds.x += (width - desired) / 2;
15705	16050	} else
15706	16051	{
15707	16052	int desired = (int) ((double) width / renderCamera.aspect);
15708		- info.bounds.height -= height - desired;
15709		- info.bounds.y += (height - desired) / 2;
	16053	+ object.clickInfo.bounds.height -= height - desired;
	16054	+ object.clickInfo.bounds.y += (height - desired) / 2;
15710	16055	}
15711	16056	}
15712		- info.g = gr;
15713		- info.camera = renderCamera;
	16057	+
	16058	+ object.clickInfo.g = gr;
	16059	+ object.clickInfo.camera = renderCamera;
15714	16060	/*
15715	16061	// Memory intensive (brep.verticescopy)
15716	16062	if (!(object instanceof Composite))
15717	16063	object.draw(info, 0, false); // SLOW :
15718	16064	*/
15719		- if (!isRenderer)
	16065	+ if (!isRenderer) // && drag)
15720	16066	{
	16067	+ Grafreed.Assert(object != null);
	16068	+ Grafreed.Assert(object.selection != null);
15721	16069	if (object.selection.Size() > 0)
15722	16070	{
15723	16071	int hitSomething = object.selection.get(0).hitSomething;
15724	16072
15725		- info.DX = 0;
15726		- info.DY = 0;
15727		- info.W = 1;
	16073	+ object.clickInfo.DX = 0;
	16074	+ object.clickInfo.DY = 0;
	16075	+ object.clickInfo.W = 1;
15728	16076	if (hitSomething == Object3D.hitCenter)
15729	16077	{
15730	16078	info.DX = X;
..	..	@@ -15736,7 +16084,8 @@
15736	16084	info.DY -= info.bounds.height/2;
15737	16085	}
15738	16086
15739		- object.drawEditHandles(info, 0);
	16087	+ object.drawEditHandles(//info,
	16088	+ 0);
15740	16089
15741	16090	if (drag && (X != 0 \|\| Y != 0))
15742	16091	{
..	..	@@ -16235,6 +16584,8 @@
16235	16584	private /static/ boolean firstime;
16236	16585	private /static/ cVector newView = new cVector();
16237	16586	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16587	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16588	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
16238	16589	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16239	16590	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16240	16591	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16247,29 +16598,66 @@
16247	16598	{
16248	16599	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16249	16600
	16601	+ int usedsuf = 0;
	16602	+
16250	16603	for (int i = 0; i < suffixes.length; i++)
16251	16604	{
16252		- String resourceName = basename + suffixes[i] + "." + suffix;
16253		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16254		- mipmapped,
16255		- FileUtil.getFileSuffix(resourceName));
16256		- if (data == null)
	16605	+ String[] suffixe = suffixes;
	16606	+ String[] fallback = suffixes2;
	16607	+ String[] fallfallback = suffixes3;
	16608	+
	16609	+ for (int c=usedsuf; --c>=0;)
16257	16610	{
16258		- throw new IOException("Unable to load texture " + resourceName);
	16611	+// String[] temp = suffixe;
	16612	+// suffixe = fallback;
	16613	+// fallback = fallfallback;
	16614	+// fallfallback = temp;
16259	16615	}
	16616	+
	16617	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16618	+ TextureData data;
	16619	+
	16620	+ try
	16621	+ {
	16622	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16623	+ mipmapped,
	16624	+ FileUtil.getFileSuffix(resourceName));
	16625	+ }
	16626	+ catch (Exception e)
	16627	+ {
	16628	+ try
	16629	+ {
	16630	+ resourceName = basename + fallback[i] + "." + suffix;
	16631	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16632	+ mipmapped,
	16633	+ FileUtil.getFileSuffix(resourceName));
	16634	+ }
	16635	+ catch (Exception e2)
	16636	+ {
	16637	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16638	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16639	+ mipmapped,
	16640	+ FileUtil.getFileSuffix(resourceName));
	16641	+ }
	16642	+ }
	16643	+
16260	16644	//System.out.println("Target = " + targets[i]);
16261	16645	cubemap.updateImage(data, targets[i]);
16262	16646	}
16263	16647
16264	16648	return cubemap;
16265	16649	}
	16650	+
16266	16651	int bigsphere = -1;
16267	16652
16268	16653	float BGcolor = 0.5f;
16269	16654
16270		- private void DrawSkyBox(GL gl)
	16655	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16656	+
	16657	+ private void DrawSkyBox(GL gl, float ratio)
16271	16658	{
16272		- if (envyoff \|\| cubemap == null)
	16659	+ if (//envyoff \|\|
	16660	+ cubemap == null)
16273	16661	{
16274	16662	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16275	16663	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16284,7 +16672,17 @@
16284	16672	// Compensates for ExaminerViewer's modification of modelview matrix
16285	16673	gl.glMatrixMode(GL.GL_MODELVIEW);
16286	16674	gl.glLoadIdentity();
	16675	+ gl.glScalef(1,ratio,1);
16287	16676
	16677	+// colorV[0] = 2;
	16678	+// colorV[1] = 2;
	16679	+// colorV[2] = 2;
	16680	+// colorV[3] = 1;
	16681	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16682	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16683	+//
	16684	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16685	+
16288	16686	//gl.glActiveTexture(GL.GL_TEXTURE1);
16289	16687	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16290	16688
..	..	@@ -16316,6 +16714,7 @@
16316	16714	{
16317	16715	gl.glScalef(1.0f, -1.0f, 1.0f);
16318	16716	}
	16717	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16319	16718	gl.glMultMatrixd(viewrot_1, 0);
16320	16719	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16321	16720	//viewer.updateInverseRotation(gl);
..	..	@@ -16551,6 +16950,14 @@
16551	16950	}
16552	16951	}
16553	16952
	16953	+ private Object3D GetFolder()
	16954	+ {
	16955	+ Object3D folder = object.GetWindow().copy;
	16956	+ if (object.GetWindow().copy.selection.Size() > 0)
	16957	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16958	+ return folder;
	16959	+ }
	16960	+
16554	16961	class SelectBuffer implements GLEventListener
16555	16962	{
16556	16963
..	..	@@ -16566,7 +16973,7 @@
16566	16973	//new Exception().printStackTrace();
16567	16974	System.out.println("select buffer init");
16568	16975	// Use debug pipeline
16569		- drawable.setGL(new DebugGL(drawable.getGL()));
	16976	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16570	16977
16571	16978	GL gl = drawable.getGL();
16572	16979
..	..	@@ -16630,6 +17037,17 @@
16630	17037
16631	17038	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16632	17039
	17040	+ if (PAINTMODE)
	17041	+ {
	17042	+ if (object.GetWindow().copy.selection.Size() > 0)
	17043	+ {
	17044	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17045	+
	17046	+ // Make what you paint not selectable.
	17047	+ paintobj.ResetSelectable();
	17048	+ }
	17049	+ }
	17050	+
16633	17051	//int tmp = selection_view;
16634	17052	//selection_view = -1;
16635	17053	int temp = DrawMode();
..	..	@@ -16641,6 +17059,17 @@
16641	17059	// temp = DEFAULT; // patch for selection debug
16642	17060	Globals.drawMode = temp; // WARNING
16643	17061
	17062	+ if (PAINTMODE)
	17063	+ {
	17064	+ if (object.GetWindow().copy.selection.Size() > 0)
	17065	+ {
	17066	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17067	+
	17068	+ // Revert.
	17069	+ paintobj.RestoreSelectable();
	17070	+ }
	17071	+ }
	17072	+
16644	17073	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16645	17074
16646	17075	// trying different ways of getting the depth info over
..	..	@@ -16746,27 +17175,29 @@
16746	17175	if (!movingcamera && !PAINTMODE)
16747	17176	object.GetWindow().ScreenFitPoint(); // fev 2014
16748	17177
16749		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17178	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16750	17179	{
16751		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16752		-
16753		- Object3D group = new Object3D("inst" + paintcount++);
16754		-
16755		- group.CreateMaterial(); // use a void leaf to select instances
16756		-
16757		- group.add(paintobj); // link
16758		-
16759		- object.GetWindow().SnapObject(group);
16760		-
16761		- Object3D folder = object.GetWindow().copy;
	17180	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16762	17181
16763	17182	if (object.GetWindow().copy.selection.Size() > 0)
16764		- folder = object.GetWindow().copy.selection.elementAt(0);
	17183	+ {
	17184	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16765	17185
16766		- folder.add(group);
16767		-
16768		- object.GetWindow().ResetModel();
16769		- object.GetWindow().refreshContents();
	17186	+ Object3D inst = new Object3D("inst" + paintcount++);
	17187	+
	17188	+ inst.CreateMaterial(); // use a void leaf to select instances
	17189	+
	17190	+ inst.add(paintobj); // link
	17191	+
	17192	+ object.GetWindow().SnapObject(inst);
	17193	+
	17194	+ Object3D folder = paintFolder; // GetFolder();
	17195	+
	17196	+ folder.add(inst);
	17197	+
	17198	+ object.GetWindow().ResetModel();
	17199	+ object.GetWindow().refreshContents();
	17200	+ }
16770	17201	}
16771	17202	else
16772	17203	paintcount = 0;