~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;
..	..	@@ -73,7 +110,11 @@
73	110	//private Mat4f spotlightTransform = new Mat4f();
74	111	//private Mat4f spotlightInverseTransform = new Mat4f();
75	112	static GLContext glcontext = null;
76		- /static/ com.sun.opengl.util.texture.Texture cubemap;
	113	+ /static/ com.sun.opengl.util.texture.Texture cubemap; // Either custom or rgb
	114	+ /static/ com.sun.opengl.util.texture.Texture cubemapcustom;
	115	+ /static/ com.sun.opengl.util.texture.Texture cubemaprgb;
	116	+ boolean transformMode;
	117	+
77	118	boolean reverseUP = false;
78	119	static boolean frozen = false;
79	120	boolean enablebackspace = false; // patch for back buffer refresh
..	..	@@ -127,7 +168,7 @@
127	168
128	169
129	170	// OPTIONS
130		- boolean Skinshader = true;
	171	+ boolean Skinshader = false; // true;
131	172	boolean cameraLight = false;
132	173	boolean UVdebug = false;
133	174	boolean Udebug = false;
..	..	@@ -136,7 +177,7 @@
136	177	static boolean doublesided = false; // true; // reversed normals are awful for conformance
137	178	boolean anisotropy = true;
138	179	boolean softshadow = true; // slower but better false;
139		- boolean opacityhalo = false;
	180	+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
140	181
141	182	boolean macromode = false;
142	183
..	..	@@ -150,6 +191,19 @@
150	191	}
151	192
152	193	private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	194	+
	195	+ public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	196	+ {
	197	+ try
	198	+ {
	199	+ return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	200	+ } catch (IOException e)
	201	+ {
	202	+ System.out.println("NAME = " + name);
	203	+ e.printStackTrace(); // throw new RuntimeException(e);
	204	+ return null;
	205	+ }
	206	+ }
153	207
154	208	void SetAsGLRenderer(boolean b)
155	209	{
..	..	@@ -169,7 +223,8 @@
169	223
170	224	SetCamera(cam);
171	225
172		- SetLight(new Camera(new cVector(10, 10, -20)));
	226	+ // Warning: not used.
	227	+ SetLight(new Camera(new cVector(15, 10, -20)));
173	228
174	229	object = o;
175	230
..	..	@@ -1447,6 +1502,8 @@
1447	1502	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1448	1503	}
1449	1504
	1505	+ float[] colorV = new float[4];
	1506	+
1450	1507	void SetColor(Object3D obj, Vertex p0)
1451	1508	{
1452	1509	CameraPane display = this;
..	..	@@ -1514,8 +1571,6 @@
1514	1571	{
1515	1572	return;
1516	1573	}
1517		-
1518		- float[] colorV = new float[3];
1519	1574
1520	1575	if (false) // marked)
1521	1576	{
..	..	@@ -2298,10 +2353,17 @@
2298	2353	HANDLES ^= true;
2299	2354	}
2300	2355
	2356	+ Object3D paintFolder;
	2357	+
2301	2358	void TogglePaint()
2302	2359	{
2303	2360	PAINTMODE ^= true;
2304	2361	paintcount = 0;
	2362	+
	2363	+ if (PAINTMODE)
	2364	+ {
	2365	+ paintFolder = GetFolder();
	2366	+ }
2305	2367	}
2306	2368
2307	2369	void SwapCamera(int a, int b)
..	..	@@ -2398,6 +2460,21 @@
2398	2460	return currentGL;
2399	2461	}
2400	2462
	2463	+ static private BufferedImage CreateBim(TextureData texturedata)
	2464	+ {
	2465	+ Grafreed.Assert(texturedata != null);
	2466	+
	2467	+ int width = texturedata.getWidth();
	2468	+ int height = texturedata.getHeight();
	2469	+
	2470	+ Buffer buffer = texturedata.getBuffer();
	2471	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2472	+
	2473	+ byte[] bytes = bytebuf.array();
	2474	+
	2475	+ return CreateBim(bytes, width, height);
	2476	+ }
	2477	+
2401	2478	/**/
2402	2479	class CacheTexture
2403	2480	{
..	..	@@ -2406,28 +2483,31 @@
2406	2483
2407	2484	int resolution;
2408	2485
2409		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2486	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2410	2487	{
2411		- texture = tex;
	2488	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2489	+ texturedata = texdata;
2412	2490	resolution = res;
2413	2491	}
2414	2492	}
2415	2493	/**/
2416	2494
2417	2495	// 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>();
	2496	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2497	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2498	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2499	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2500	+
2421	2501	int pigmentdepth = 0;
2422	2502	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2423	2503	int bumpdepth = 0;
2424	2504	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2425	2505	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2426	2506	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2427		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2507	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2428	2508	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2429	2509
2430		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2510	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2431	2511	{
2432	2512	TextureData texturedata = null;
2433	2513
..	..	@@ -2437,7 +2517,7 @@
2437	2517	com.sun.opengl.util.texture.TextureIO.newTextureData(
2438	2518	getClass().getClassLoader().getResourceAsStream(name),
2439	2519	true,
2440		- com.sun.opengl.util.texture.TextureIO.PNG);
	2520	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
2441	2521	} catch (java.io.IOException e)
2442	2522	{
2443	2523	throw new javax.media.opengl.GLException(e);
..	..	@@ -2446,13 +2526,34 @@
2446	2526	if (bump)
2447	2527	texturedata = ConvertBump(texturedata, false);
2448	2528
2449		- com.sun.opengl.util.texture.Texture texture =
2450		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2529	+// com.sun.opengl.util.texture.Texture texture =
	2530	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2451	2531
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);
	2532	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2533	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2454	2534
2455		- return texture;
	2535	+ return texturedata;
	2536	+ }
	2537	+
	2538	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2539	+ {
	2540	+ TextureData texturedata = null;
	2541	+
	2542	+ try
	2543	+ {
	2544	+ texturedata =
	2545	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2546	+ bim,
	2547	+ true);
	2548	+ } catch (Exception e)
	2549	+ {
	2550	+ throw new javax.media.opengl.GLException(e);
	2551	+ }
	2552	+
	2553	+ if (bump)
	2554	+ texturedata = ConvertBump(texturedata, false);
	2555	+
	2556	+ return texturedata;
2456	2557	}
2457	2558
2458	2559	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3525,6 +3626,8 @@
3525	3626
3526	3627	System.out.println("LOADING TEXTURE : " + name);
3527	3628
	3629	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3630	+
3528	3631	//
3529	3632	if (false) // compressbit > 0)
3530	3633	{
..	..	@@ -7923,7 +8026,7 @@
7923	8026	String pigment = Object3D.GetPigment(tex);
7924	8027	String bump = Object3D.GetBump(tex);
7925	8028
7926		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8029	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7927	8030	{
7928	8031	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7929	8032	// System.out.println("; bump = " + bump);
..	..	@@ -7938,8 +8041,8 @@
7938	8041	pigment = null;
7939	8042	}
7940	8043
7941		- ReleaseTexture(bump, true);
7942		- ReleaseTexture(pigment, false);
	8044	+ ReleaseTexture(tex, true);
	8045	+ ReleaseTexture(tex, false);
7943	8046	}
7944	8047
7945	8048	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -7957,7 +8060,7 @@
7957	8060
7958	8061	String pigment = Object3D.GetPigment(tex);
7959	8062
7960		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8063	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7961	8064	{
7962	8065	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7963	8066	// System.out.println("; bump = " + bump);
..	..	@@ -7968,7 +8071,7 @@
7968	8071	pigment = null;
7969	8072	}
7970	8073
7971		- ReleaseTexture(pigment, false);
	8074	+ ReleaseTexture(tex, false);
7972	8075	}
7973	8076
7974	8077	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -7986,7 +8089,7 @@
7986	8089
7987	8090	String bump = Object3D.GetBump(tex);
7988	8091
7989		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8092	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7990	8093	{
7991	8094	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7992	8095	// System.out.println("; bump = " + bump);
..	..	@@ -7997,10 +8100,10 @@
7997	8100	bump = null;
7998	8101	}
7999	8102
8000		- ReleaseTexture(bump, true);
	8103	+ ReleaseTexture(tex, true);
8001	8104	}
8002	8105
8003		- void ReleaseTexture(String tex, boolean bump)
	8106	+ void ReleaseTexture(cTexture tex, boolean bump)
8004	8107	{
8005	8108	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8006	8109	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8011,7 +8114,7 @@
8011	8114	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
8012	8115
8013	8116	if (tex != null)
8014		- texture = textures.get(tex);
	8117	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
8015	8118
8016	8119	// //assert( texture != null );
8017	8120	// if (texture == null)
..	..	@@ -8105,47 +8208,50 @@
8105	8208
8106	8209	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8107	8210	{
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		- }
	8211	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8212	+// ambientOcclusion ) // \|\| !textureon)
	8213	+// {
	8214	+// return; // false;
	8215	+// }
	8216	+//
	8217	+// if (tex == null)
	8218	+// {
	8219	+// BindTexture(null,false,resolution);
	8220	+// BindTexture(null,true,resolution);
	8221	+// return;
	8222	+// }
	8223	+//
	8224	+// String pigment = Object3D.GetPigment(tex);
	8225	+// String bump = Object3D.GetBump(tex);
	8226	+//
	8227	+// usedtextures.add(pigment);
	8228	+// usedtextures.add(bump);
	8229	+//
	8230	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8231	+// {
	8232	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8233	+// // System.out.println("; bump = " + bump);
	8234	+// }
	8235	+//
	8236	+// if (bump.equals(""))
	8237	+// {
	8238	+// bump = null;
	8239	+// }
	8240	+// if (pigment.equals(""))
	8241	+// {
	8242	+// pigment = null;
	8243	+// }
	8244	+//
	8245	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8246	+// BindTexture(pigment, false, resolution);
	8247	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8248	+// BindTexture(bump, true, resolution);
	8249	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8250	+//
	8251	+// return; // true;
8120	8252
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;
	8253	+ BindPigmentTexture(tex, resolution);
	8254	+ BindBumpTexture(tex, resolution);
8149	8255	}
8150	8256
8151	8257	/boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8164,9 +8270,9 @@
8164	8270
8165	8271	String pigment = Object3D.GetPigment(tex);
8166	8272
8167		- usedtextures.put(pigment, pigment);
	8273	+ usedtextures.add(tex);
8168	8274
8169		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8275	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8170	8276	{
8171	8277	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8172	8278	// System.out.println("; bump = " + bump);
..	..	@@ -8178,7 +8284,7 @@
8178	8284	}
8179	8285
8180	8286	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8181		- BindTexture(pigment, false, resolution);
	8287	+ BindTexture(tex, false, resolution);
8182	8288	}
8183	8289
8184	8290	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8197,9 +8303,9 @@
8197	8303
8198	8304	String bump = Object3D.GetBump(tex);
8199	8305
8200		- usedtextures.put(bump, bump);
	8306	+ usedtextures.add(tex);
8201	8307
8202		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8308	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8203	8309	{
8204	8310	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8205	8311	// System.out.println("; bump = " + bump);
..	..	@@ -8211,7 +8317,7 @@
8211	8317	}
8212	8318
8213	8319	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8214		- BindTexture(bump, true, resolution);
	8320	+ BindTexture(tex, true, resolution);
8215	8321	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8216	8322	}
8217	8323
..	..	@@ -8235,13 +8341,19 @@
8235	8341	return fileExists;
8236	8342	}
8237	8343
8238		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8344	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8239	8345	{
8240		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8346	+ CacheTexture texturecache = null;
8241	8347
8242	8348	if (tex != null)
8243	8349	{
8244		- String texname = tex;
	8350	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8351	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
	8352	+
	8353	+ if (texname.equals("") && texdata == null)
	8354	+ {
	8355	+ return null;
	8356	+ }
8245	8357
8246	8358	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8247	8359
..	..	@@ -8251,19 +8363,46 @@
8251	8363	// else
8252	8364	// if (!texname.startsWith("/"))
8253	8365	// texname = "/Users/nbriere/Textures/" + texname;
8254		- if (!FileExists(tex))
	8366	+ if (!FileExists(texname) && !texname.startsWith("@"))
8255	8367	{
8256	8368	texname = fallbackTextureName;
8257	8369	}
8258	8370
8259	8371	if (CACHETEXTURE)
8260		- texture = textures.get(texname); // TEXTURE CACHE
8261		-
8262		- TextureData texturedata = null;
8263		-
8264		- if (texture == null \|\| texture.resolution < resolution)
8265	8372	{
8266		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8373	+ if (texdata == null)
	8374	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8375	+ else
	8376	+ texturecache = bimtextures.get(texdata);
	8377	+ }
	8378	+
	8379	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8380	+ {
	8381	+ TextureData texturedata = null;
	8382	+
	8383	+ if (texdata != null && textureon)
	8384	+ {
	8385	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8386	+
	8387	+ try
	8388	+ {
	8389	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8390	+ }
	8391	+ catch (Exception e)
	8392	+ {
	8393	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8394	+ }
	8395	+
	8396	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8397	+ bimtextures.put(texdata, texturecache);
	8398	+
	8399	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8400	+
	8401	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8402	+ //bim2 = bim;
	8403	+ }
	8404	+ else
	8405	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8267	8406	{
8268	8407	assert(!bump);
8269	8408	// if (bump)
..	..	@@ -8274,19 +8413,23 @@
8274	8413	// }
8275	8414	// else
8276	8415	// {
8277		- texture = textures.get(tex);
8278		- if (texture == null)
	8416	+ // texturecache = textures.get(texname); // suspicious
	8417	+ if (texturecache == null)
8279	8418	{
8280		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8419	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8281	8420	}
	8421	+ else
	8422	+ new Exception().printStackTrace();
8282	8423	// }
8283	8424	} else
8284		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8425	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8285	8426	{
8286	8427	assert(bump);
8287		- texture = textures.get(tex);
8288		- if (texture == null)
8289		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8428	+ // texturecache = textures.get(texname); // suspicious
	8429	+ if (texturecache == null)
	8430	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8431	+ else
	8432	+ new Exception().printStackTrace();
8290	8433	} else
8291	8434	{
8292	8435	//if (tex.equals("IMMORTAL"))
..	..	@@ -8294,11 +8437,22 @@
8294	8437	// texture = GetResourceTexture("default.png");
8295	8438	//} else
8296	8439	//{
8297		- if (tex.equals("WHITE_NOISE"))
	8440	+ if (texname.endsWith("WHITE_NOISE"))
8298	8441	{
8299		- texture = textures.get(tex);
8300		- if (texture == null)
8301		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8442	+ // texturecache = textures.get(texname); // suspicious
	8443	+ if (texturecache == null)
	8444	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8445	+ else
	8446	+ new Exception().printStackTrace();
	8447	+ } else
	8448	+ {
	8449	+ if (texname.startsWith("@"))
	8450	+ {
	8451	+ // texturecache = textures.get(texname); // suspicious
	8452	+ if (texturecache == null)
	8453	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
	8454	+ else
	8455	+ new Exception().printStackTrace();
8302	8456	} else
8303	8457	{
8304	8458	if (textureon)
..	..	@@ -8357,19 +8511,20 @@
8357	8511	if (texturedata == null)
8358	8512	throw new Exception();
8359	8513
8360		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8514	+ texturecache = new CacheTexture(texturedata,resolution);
8361	8515	//texture = GetTexture(tex, bump);
8362	8516	}
	8517	+ }
8363	8518	}
8364	8519	//}
8365	8520	}
8366	8521
8367		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8522	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8368	8523	{
8369	8524	//return false;
8370	8525
8371	8526	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8372		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8527	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8373	8528	{
8374	8529	// String ext = "_highres";
8375	8530	// if (REDUCETEXTURE)
..	..	@@ -8386,52 +8541,17 @@
8386	8541	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8387	8542	if (!cachefile.exists())
8388	8543	{
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))
	8544	+ //if (texturedata.getWidth() == texturedata.getHeight())
8398	8545	{
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);
	8546	+ BufferedImage rendImage = CreateBim(texturedata);
	8547	+
8429	8548	ImageWriter writer = null;
8430	8549	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8431	8550	if (iter.hasNext()) {
8432	8551	writer = (ImageWriter)iter.next();
8433	8552	}
8434		- float compressionQuality = 0.9f;
	8553	+
	8554	+ float compressionQuality = 0.85f;
8435	8555	try
8436	8556	{
8437	8557	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8448,18 +8568,20 @@
8448	8568	}
8449	8569	}
8450	8570	}
8451		-
	8571	+
	8572	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8573	+
8452	8574	//System.out.println("Texture = " + tex);
8453		- if (textures.containsKey(texname))
	8575	+ if (textures.containsKey(tex))
8454	8576	{
8455		- CacheTexture thetex = textures.get(texname);
	8577	+ CacheTexture thetex = textures.get(tex);
8456	8578	thetex.texture.disable();
8457	8579	thetex.texture.dispose();
8458		- textures.remove(texname);
	8580	+ textures.remove(tex);
8459	8581	}
8460	8582
8461		- texture.texturedata = texturedata;
8462		- textures.put(texname, texture);
	8583	+ //texture.texturedata = texturedata;
	8584	+ textures.put(tex, texturecache);
8463	8585
8464	8586	// newtex = true;
8465	8587	}
..	..	@@ -8475,10 +8597,44 @@
8475	8597	}
8476	8598	}
8477	8599
8478		- return texture;
	8600	+ return texturecache;
8479	8601	}
8480	8602
8481		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	8603	+ static void EmbedTextures(cTexture tex)
	8604	+ {
	8605	+ if (tex.pigmentdata == null)
	8606	+ {
	8607	+ //String texname = Object3D.GetPigment(tex);
	8608	+
	8609	+ CacheTexture texturecache = texturepigment.get(tex);
	8610	+
	8611	+ if (texturecache != null)
	8612	+ {
	8613	+ tex.pw = texturecache.texturedata.getWidth();
	8614	+ tex.ph = texturecache.texturedata.getHeight();
	8615	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8616	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8617	+ ;
	8618	+ //, tex.pw, tex.ph), 0.5f);
	8619	+ }
	8620	+ }
	8621	+
	8622	+ if (tex.bumpdata == null)
	8623	+ {
	8624	+ //String texname = Object3D.GetBump(tex);
	8625	+
	8626	+ CacheTexture texturecache = texturebump.get(tex);
	8627	+
	8628	+ if (texturecache != null)
	8629	+ {
	8630	+ tex.bw = texturecache.texturedata.getWidth();
	8631	+ tex.bh = texturecache.texturedata.getHeight();
	8632	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8633	+ }
	8634	+ }
	8635	+ }
	8636	+
	8637	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8482	8638	{
8483	8639	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8484	8640
..	..	@@ -8496,21 +8652,21 @@
8496	8652	return texture!=null?texture.texture:null;
8497	8653	}
8498	8654
8499		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
	8655	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8500	8656	{
8501	8657	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8502	8658
8503	8659	return texture!=null?texture.texturedata:null;
8504	8660	}
8505	8661
8506		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8662	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8507	8663	{
8508	8664	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8509	8665	{
8510	8666	return false;
8511	8667	}
8512	8668
8513		- boolean newtex = false;
	8669	+ //boolean newtex = false;
8514	8670
8515	8671	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8516	8672
..	..	@@ -8542,9 +8698,75 @@
8542	8698	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8543	8699	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8544	8700
8545		- return newtex;
	8701	+ return true; // Warning: not used.
8546	8702	}
8547	8703
	8704	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8705	+ {
	8706	+ try
	8707	+ {
	8708	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8709	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8710	+ ImageWriter writer = writers.next();
	8711	+
	8712	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8713	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8714	+ param.setCompressionQuality(quality);
	8715	+
	8716	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8717	+ writer.setOutput(ios);
	8718	+ writer.write(null, new IIOImage(image, null, null), param);
	8719	+
	8720	+ byte[] data = baos.toByteArray();
	8721	+ writer.dispose();
	8722	+ return data;
	8723	+ }
	8724	+ catch (Exception e)
	8725	+ {
	8726	+ e.printStackTrace();
	8727	+ return null;
	8728	+ }
	8729	+ }
	8730	+
	8731	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8732	+ {
	8733	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8734	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8735	+ ImageReader reader = writers.next();
	8736	+
	8737	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8738	+
	8739	+ ImageReadParam param = reader.getDefaultReadParam();
	8740	+ param.setDestination(bim);
	8741	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8742	+
	8743	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8744	+ reader.setInput(ios);
	8745	+ BufferedImage bim2 = reader.read(0, param);
	8746	+ reader.dispose();
	8747	+
	8748	+// WritableRaster raster = bim2.getRaster();
	8749	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8750	+// byte[] bytes = data.getData();
	8751	+//
	8752	+// int[] pixels = new int[bytes.length/3];
	8753	+// for (int i=pixels.length; --i>=0;)
	8754	+// {
	8755	+// int i3 = i*3;
	8756	+// pixels[i] = 0xFF;
	8757	+// pixels[i] <<= 8;
	8758	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8759	+// pixels[i] <<= 8;
	8760	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8761	+// pixels[i] <<= 8;
	8762	+// pixels[i] \|= bytes[i3] & 0xFF;
	8763	+// }
	8764	+//
	8765	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8766	+
	8767	+ return bim;
	8768	+ }
	8769	+
8548	8770	ShadowBuffer shadowPBuf;
8549	8771	AntialiasBuffer antialiasPBuf;
8550	8772	int MAXSTACK;
..	..	@@ -8561,10 +8783,12 @@
8561	8783
8562	8784	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8563	8785	MAXSTACK = temp[0];
8564		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8786	+ if (Globals.DEBUG)
	8787	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8565	8788	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8566	8789	MAXSTACK = temp[0];
8567		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8790	+ if (Globals.DEBUG)
	8791	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8568	8792
8569	8793	// Use debug pipeline
8570	8794	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8572,7 +8796,8 @@
8572	8796	gl = drawable.getGL(); //
8573	8797
8574	8798	GL gl3 = getGL();
8575		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8576	8801
8577	8802
8578	8803	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8737,7 +8962,7 @@
8737	8962
8738	8963	if (cubemap == null)
8739	8964	{
8740		- LoadEnvy(5);
	8965	+ //LoadEnvy(1);
8741	8966	}
8742	8967
8743	8968	//cubemap.enable();
..	..	@@ -9013,6 +9238,8 @@
9013	9238
9014	9239	void LoadEnvy(int which)
9015	9240	{
	9241	+ assert(false);
	9242	+
9016	9243	String name;
9017	9244	String ext;
9018	9245
..	..	@@ -9024,37 +9251,58 @@
9024	9251	cubemap = null;
9025	9252	return;
9026	9253	case 1:
9027		- name = "cubemaps/box_";
9028		- ext = "png";
	9254	+ name = "cubemaps/rgb/";
	9255	+ ext = "jpg";
9029	9256	reverseUP = false;
9030	9257	break;
9031	9258	case 2:
9032		- name = "cubemaps/uffizi_";
9033		- ext = "png";
9034		- break; // reverseUP = true; break;
	9259	+ name = "cubemaps/uffizi/";
	9260	+ ext = "jpg";
	9261	+ reverseUP = false;
	9262	+ break;
9035	9263	case 3:
9036		- name = "cubemaps/CloudyHills_";
9037		- ext = "tga";
	9264	+ name = "cubemaps/CloudyHills/";
	9265	+ ext = "jpg";
9038	9266	reverseUP = false;
9039	9267	break;
9040	9268	case 4:
9041		- name = "cubemaps/cornell_";
	9269	+ name = "cubemaps/cornell/";
9042	9270	ext = "png";
9043	9271	reverseUP = false;
9044	9272	break;
	9273	+ case 5:
	9274	+ name = "cubemaps/skycube/";
	9275	+ ext = "jpg";
	9276	+ reverseUP = false;
	9277	+ break;
	9278	+ case 6:
	9279	+ name = "cubemaps/SaintLazarusChurch3/";
	9280	+ ext = "jpg";
	9281	+ reverseUP = false;
	9282	+ break;
	9283	+ case 7:
	9284	+ name = "cubemaps/Sodermalmsallen/";
	9285	+ ext = "jpg";
	9286	+ reverseUP = false;
	9287	+ break;
	9288	+ case 8:
	9289	+ name = "cubemaps/Sodermalmsallen2/";
	9290	+ ext = "jpg";
	9291	+ reverseUP = false;
	9292	+ break;
	9293	+ case 9:
	9294	+ name = "cubemaps/UnionSquare/";
	9295	+ ext = "jpg";
	9296	+ reverseUP = false;
	9297	+ break;
9045	9298	default:
9046		- name = "cubemaps/rgb_";
9047		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9299	+ name = "cubemaps/box/";
	9300	+ ext = "png"; /mipmap = true;/
	9301	+ reverseUP = false;
9048	9302	break;
9049	9303	}
9050		-
9051		- try
9052		- {
9053		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9054		- } catch (IOException e)
9055		- {
9056		- throw new RuntimeException(e);
9057		- }
	9304	+
	9305	+ LoadSkybox(name, ext, mipmap);
9058	9306	}
9059	9307
9060	9308	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -9086,8 +9334,12 @@
9086	9334	static double[] model = new double[16];
9087	9335	double[] camera2light = new double[16];
9088	9336	double[] light2camera = new double[16];
9089		- int newenvy = -1;
9090		- boolean envyoff = true; // false;
	9337	+
	9338	+ //int newenvy = -1;
	9339	+ //boolean envyoff = false;
	9340	+
	9341	+ String loadedskyboxname;
	9342	+
9091	9343	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9092	9344	//float[] light0 = { 0,0,0 };
9093	9345	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9505,7 +9757,7 @@
9505	9757
9506	9758	if (renderCamera != lightCamera)
9507	9759	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9508		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9760	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9509	9761
9510	9762	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9511	9763
..	..	@@ -9521,7 +9773,7 @@
9521	9773
9522	9774	if (renderCamera != lightCamera)
9523	9775	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9524		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9776	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9525	9777
9526	9778	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9527	9779
..	..	@@ -9567,10 +9819,12 @@
9567	9819	rati = 1 / rati;
9568	9820	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9569	9821	}
9570		- assert (newenvy == -1);
	9822	+
	9823	+ //assert (newenvy == -1);
	9824	+
9571	9825	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9572	9826	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9573		- DrawSkyBox(gl);
	9827	+ DrawSkyBox(gl, (float)rati);
9574	9828	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9575	9829	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9576	9830	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -10436,9 +10690,18 @@
10436	10690	static boolean init = false;
10437	10691
10438	10692	double[][] matrix = LA.newMatrix();
	10693	+
	10694	+ // This is to refresh the UI of the material panel.
	10695	+ ObjEditor patchMaterial;
10439	10696
10440	10697	public void display(GLAutoDrawable drawable)
10441	10698	{
	10699	+ if (patchMaterial.patchMaterial)
	10700	+ {
	10701	+ patchMaterial.patchMaterial = false;
	10702	+ patchMaterial.objectPanel.setSelectedIndex(0);
	10703	+ }
	10704	+
10442	10705	if (Grafreed.savesound && Grafreed.hassound)
10443	10706	{
10444	10707	Grafreed.wav.save();
..	..	@@ -10607,7 +10870,7 @@
10607	10870
10608	10871	if (wait)
10609	10872	{
10610		- Sleep(500);
	10873	+ Sleep(200); // blocks everything
10611	10874
10612	10875	wait = false;
10613	10876	}
..	..	@@ -10722,7 +10985,7 @@
10722	10985	// if (parentcam != renderCamera) // not a light
10723	10986	if (cam != lightCamera)
10724	10987	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10725		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10988	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10726	10989
10727	10990	for (int j = 0; j < 4; j++)
10728	10991	{
..	..	@@ -10737,7 +11000,7 @@
10737	11000	// if (parentcam != renderCamera) // not a light
10738	11001	if (cam != lightCamera)
10739	11002	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10740		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	11003	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10741	11004
10742	11005	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10743	11006
..	..	@@ -10823,13 +11086,43 @@
10823	11086	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10824	11087	}
10825	11088
10826		- if (newenvy > -1)
	11089	+// if (newenvy > -1)
	11090	+// {
	11091	+// LoadEnvy(newenvy);
	11092	+// }
	11093	+//
	11094	+// newenvy = -1;
	11095	+
	11096	+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
10827	11097	{
10828		- LoadEnvy(newenvy);
	11098	+ if (cubemaprgb == null)
	11099	+ {
	11100	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11101	+ }
	11102	+
	11103	+ cubemap = cubemaprgb;
10829	11104	}
10830		-
10831		- newenvy = -1;
10832		-
	11105	+ else
	11106	+ {
	11107	+ if (object.skyboxname != null)
	11108	+ {
	11109	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11110	+ {
	11111	+ if (cubemap != null && cubemap != cubemaprgb)
	11112	+ cubemap.dispose();
	11113	+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11114	+ loadedskyboxname = object.skyboxname;
	11115	+ }
	11116	+ }
	11117	+ else
	11118	+ {
	11119	+ cubemapcustom = null;
	11120	+ loadedskyboxname = null;
	11121	+ }
	11122	+
	11123	+ cubemap = cubemapcustom;
	11124	+ }
	11125	+
10833	11126	ratio = ((double) getWidth()) / getHeight();
10834	11127	//System.out.println("ratio = " + ratio);
10835	11128
..	..	@@ -10845,7 +11138,7 @@
10845	11138
10846	11139	if (!IsFrozen() && !ambientOcclusion)
10847	11140	{
10848		- DrawSkyBox(gl);
	11141	+ DrawSkyBox(gl, (float)ratio);
10849	11142	}
10850	11143
10851	11144	//if (selection_view == -1)
..	..	@@ -11131,7 +11424,7 @@
11131	11424
11132	11425	// if (cam != lightCamera)
11133	11426	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11134		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11427	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11135	11428	}
11136	11429
11137	11430	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -11290,7 +11583,7 @@
11290	11583	}
11291	11584	}
11292	11585
11293		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11586	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11294	11587	{
11295	11588	//gl.glDepthFunc(GL.GL_LEQUAL);
11296	11589	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11298,24 +11591,21 @@
11298	11591
11299	11592	boolean texon = textureon;
11300	11593
11301		- if (RENDERPROGRAM > 0)
11302		- {
11303		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11304		- textureon = false;
11305		- }
	11594	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11595	+ textureon = false;
	11596	+
11306	11597	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11307	11598	//System.out.println("ALLO");
11308	11599	gl.glColorMask(false, false, false, false);
11309	11600	DrawObject(gl);
11310		- if (RENDERPROGRAM > 0)
11311		- {
11312		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11313		- textureon = texon;
11314		- }
	11601	+
	11602	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11603	+ textureon = texon;
	11604	+
11315	11605	gl.glColorMask(true, true, true, true);
11316	11606
11317	11607	gl.glDepthFunc(GL.GL_EQUAL);
11318		- //gl.glDepthMask(false);
	11608	+ gl.glDepthMask(false);
11319	11609	}
11320	11610
11321	11611	if (false) // DrawMode() == SHADOW)
..	..	@@ -11655,20 +11945,32 @@
11655	11945	ReleaseTextures(DEFAULT_TEXTURES);
11656	11946
11657	11947	if (CLEANCACHE)
11658		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11948	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11659	11949	{
11660		- String tex = e.nextElement();
	11950	+ cTexture tex = e.nextElement();
11661	11951
11662	11952	// System.out.println("Texture --------- " + tex);
11663	11953
11664		- if (tex.equals("WHITE_NOISE"))
	11954	+ if (tex.equals("WHITE_NOISE:"))
11665	11955	continue;
11666	11956
11667		- if (!usedtextures.containsKey(tex))
	11957	+ if (!usedtextures.contains(tex))
11668	11958	{
	11959	+ CacheTexture gettex = texturepigment.get(tex);
11669	11960	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11670		- textures.get(tex).texture.dispose();
11671		- textures.remove(tex);
	11961	+ if (gettex != null)
	11962	+ {
	11963	+ gettex.texture.dispose();
	11964	+ texturepigment.remove(tex);
	11965	+ }
	11966	+
	11967	+ gettex = texturebump.get(tex);
	11968	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11969	+ if (gettex != null)
	11970	+ {
	11971	+ gettex.texture.dispose();
	11972	+ texturebump.remove(tex);
	11973	+ }
11672	11974	}
11673	11975	}
11674	11976	}
..	..	@@ -12196,8 +12498,76 @@
12196	12498
12197	12499	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12198	12500
12199		- String program =
	12501	+ String programmin =
	12502	+ // Min shader
12200	12503	"!!ARBfp1.0\n" +
	12504	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12505	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12506	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12507	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12508	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12509	+ "PARAM light2cam0 = program.env[10];" +
	12510	+ "PARAM light2cam1 = program.env[11];" +
	12511	+ "PARAM light2cam2 = program.env[12];" +
	12512	+ "TEMP temp;" +
	12513	+ "TEMP light;" +
	12514	+ "TEMP ndotl;" +
	12515	+ "TEMP normal;" +
	12516	+ "TEMP depth;" +
	12517	+ "TEMP eye;" +
	12518	+ "TEMP pos;" +
	12519	+
	12520	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12521	+ Normalize("normal") +
	12522	+ "MOV light, state.light[0].position;" +
	12523	+ "DP3 ndotl.x, light, normal;" +
	12524	+
	12525	+ // shadow
	12526	+ "MOV pos, fragment.texcoord[1];" +
	12527	+ "MOV temp, pos;" +
	12528	+ ShadowTextureFetch("depth", "temp", "1") +
	12529	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12530	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12531	+
	12532	+ // No shadow when out of frustum
	12533	+ //"SGE temp.y, depth.z, zero123.y;" +
	12534	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12535	+
	12536	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12537	+
	12538	+ // Backlit
	12539	+ "MOV pos.w, zero123.y;" +
	12540	+ "DP4 eye.x, pos, light2cam0;" +
	12541	+ "DP4 eye.y, pos, light2cam1;" +
	12542	+ "DP4 eye.z, pos, light2cam2;" +
	12543	+ Normalize("eye") +
	12544	+
	12545	+ "DP3 ndotl.y, -eye, normal;" +
	12546	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12547	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12548	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12549	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12550	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12551	+
	12552	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12553	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12554	+
	12555	+ // Pigment
	12556	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12557	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12558	+ "MUL temp, temp, ndotl.x;" +
	12559	+
	12560	+ "MUL temp, temp, zero123.z;" +
	12561	+
	12562	+ //"MUL temp, temp, ndotl.y;" +
	12563	+
	12564	+ "MOV temp.w, zero123.y;" + // reset alpha
	12565	+ "MOV result.color, temp;" +
	12566	+ "END";
	12567	+
	12568	+ String programmax =
	12569	+ "!!ARBfp1.0\n" +
	12570	+
12201	12571	//"OPTION ARB_fragment_program_shadow;" +
12202	12572	"PARAM light2cam0 = program.env[10];" +
12203	12573	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12312,8 +12682,7 @@
12312	12682	"TEMP shininess;" +
12313	12683	"\n" +
12314	12684	"MOV texSamp, one;" +
12315		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12316		-
	12685	+
12317	12686	"MOV mapgrid.x, one2048th.x;" +
12318	12687	"MOV temp, fragment.texcoord[1];" +
12319	12688	/*
..	..	@@ -12334,20 +12703,20 @@
12334	12703	"MUL temp, floor, mapgrid.x;" +
12335	12704	//"TEX depth0, temp, texture[1], 2D;" +
12336	12705	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12337		- TextureFetch("depth0", "temp", "1") +
	12706	+ ShadowTextureFetch("depth0", "temp", "1") +
12338	12707	"") +
12339	12708	"ADD temp.x, temp.x, mapgrid.x;" +
12340	12709	//"TEX depth1, temp, texture[1], 2D;" +
12341	12710	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12342		- TextureFetch("depth1", "temp", "1") +
	12711	+ ShadowTextureFetch("depth1", "temp", "1") +
12343	12712	"") +
12344	12713	"ADD temp.y, temp.y, mapgrid.x;" +
12345	12714	//"TEX depth2, temp, texture[1], 2D;" +
12346		- TextureFetch("depth2", "temp", "1") +
	12715	+ ShadowTextureFetch("depth2", "temp", "1") +
12347	12716	"SUB temp.x, temp.x, mapgrid.x;" +
12348	12717	//"TEX depth3, temp, texture[1], 2D;" +
12349	12718	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12350		- TextureFetch("depth3", "temp", "1") +
	12719	+ ShadowTextureFetch("depth3", "temp", "1") +
12351	12720	"") +
12352	12721	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12353	12722	//"MOV params, material;" +
..	..	@@ -12718,10 +13087,10 @@
12718	13087	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12719	13088	"") +
12720	13089
12721		- // display shadow only (bump == 0)
	13090	+ // display shadow only (fakedepth == 0)
12722	13091	"SUB temp.x, half.x, shadow.x;" +
12723	13092	"MOV temp.y, -params5.z;" + // params6.x;" +
12724		- "SLT temp.z, temp.y, -one2048th.x;" +
	13093	+ "SLT temp.z, temp.y, -c256i.x;" +
12725	13094	"SUB temp.y, one.x, temp.z;" +
12726	13095	"MUL temp.x, temp.x, temp.y;" +
12727	13096	"KIL temp.x;" +
..	..	@@ -13052,8 +13421,19 @@
13052	13421	//once = true;
13053	13422	}
13054	13423
13055		- System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13056		- System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13424	+ String program = programmax;
	13425	+
	13426	+ if (Globals.MINSHADER)
	13427	+ {
	13428	+ program = programmin;
	13429	+ }
	13430	+
	13431	+ if (Globals.DEBUG)
	13432	+ {
	13433	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
	13434	+ System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13435	+ }
	13436	+
13057	13437	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13058	13438
13059	13439	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13100,7 +13480,8 @@
13100	13480	"\n" +
13101	13481	"END\n";
13102	13482
13103		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13483	+ if (Globals.DEBUG)
	13484	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13104	13485	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13105	13486
13106	13487	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13145,25 +13526,26 @@
13145	13526	return out;
13146	13527	}
13147	13528
13148		- String TextureFetch(String dest, String src, String unit)
	13529	+ // Also does frustum culling
	13530	+ String ShadowTextureFetch(String dest, String src, String unit)
13149	13531	{
13150	13532	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13151	13533	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13152	13534	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13535	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13536	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13153	13537	"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;" +
	13538	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13539	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13158	13540	//"SWZ buffer, temp, w,w,w,w;";
13159		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13541	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13160	13542	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13161	13543	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13162	13544	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13163		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13545	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13164	13546
13165		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13166		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13547	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13548	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13167	13549	}
13168	13550
13169	13551	String Shadow(String depth, String shadow)
..	..	@@ -13210,7 +13592,7 @@
13210	13592	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13211	13593	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13212	13594
13213		- // No shadow when out of frustrum
	13595	+ // No shadow when out of frustum
13214	13596	"SGE temp.x, " + depth + ".z, one.z;" +
13215	13597	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13216	13598	"";
..	..	@@ -14008,14 +14390,15 @@
14008	14390	drag = false;
14009	14391	//System.out.println("Mouse DOWN");
14010	14392	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);
	14393	+ //ClickInfo info = new ClickInfo();
	14394	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14395	+ object.clickInfo.pane = this;
	14396	+ object.clickInfo.camera = renderCamera;
	14397	+ object.clickInfo.x = x;
	14398	+ object.clickInfo.y = y;
	14399	+ object.clickInfo.modifiers = modifiersex;
	14400	+ editObj = object.doEditClick(//info,
	14401	+ 0);
14019	14402	if (!editObj)
14020	14403	{
14021	14404	hasMarquee = true;
..	..	@@ -14297,11 +14680,17 @@
14297	14680	void GoDown(int mod)
14298	14681	{
14299	14682	MODIFIERS \|= COMMAND;
	14683	+ boolean isVR = (mouseMode&VR)!=0;
14300	14684	/**/
14301	14685	if((mod&SHIFT) == SHIFT)
14302		- manipCamera.RotatePosition(0, -speed);
	14686	+ {
	14687	+ if (isVR)
	14688	+ manipCamera.RotateInterest(0, -speed);
	14689	+ else
	14690	+ manipCamera.RotatePosition(0, -speed);
	14691	+ }
14303	14692	else
14304		- manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14693	+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
14305	14694	/**/
14306	14695	if ((mod & SHIFT) == SHIFT)
14307	14696	{
..	..	@@ -14311,6 +14700,8 @@
14311	14700	mouseMode \|= BACKFORTH;
14312	14701	}
14313	14702
	14703	+ targetLookAt.set(manipCamera.lookAt);
	14704	+
14314	14705	//prevX = X = anchorX;
14315	14706	prevY = Y = anchorY - (int) (renderCamera.Distance());
14316	14707	}
..	..	@@ -14319,10 +14710,17 @@
14319	14710	{
14320	14711	MODIFIERS \|= COMMAND;
14321	14712	/**/
	14713	+ boolean isVR = (mouseMode&VR)!=0;
	14714	+
14322	14715	if((mod&SHIFT) == SHIFT)
14323		- manipCamera.RotatePosition(0, speed);
	14716	+ {
	14717	+ if (isVR)
	14718	+ manipCamera.RotateInterest(0, speed);
	14719	+ else
	14720	+ manipCamera.RotatePosition(0, speed);
	14721	+ }
14324	14722	else
14325		- manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14723	+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
14326	14724	/**/
14327	14725	if ((mod & SHIFT) == SHIFT)
14328	14726	{
..	..	@@ -14332,6 +14730,8 @@
14332	14730	mouseMode \|= BACKFORTH;
14333	14731	}
14334	14732
	14733	+ targetLookAt.set(manipCamera.lookAt);
	14734	+
14335	14735	//prevX = X = anchorX;
14336	14736	prevY = Y = anchorY + (int) (renderCamera.Distance());
14337	14737	}
..	..	@@ -14341,9 +14741,14 @@
14341	14741	MODIFIERS \|= COMMAND;
14342	14742	/**/
14343	14743	if((mod&SHIFT) == SHIFT)
14344		- manipCamera.Translate(speed*delta, 0, getWidth());
	14744	+ manipCamera.Translate(speed*delta, 0, getWidth());
14345	14745	else
14346		- manipCamera.RotatePosition(speed, 0);
	14746	+ {
	14747	+ if ((mouseMode&VR)!=0)
	14748	+ manipCamera.RotateInterest(-speed, 0);
	14749	+ else
	14750	+ manipCamera.RotatePosition(speed, 0);
	14751	+ }
14347	14752	/**/
14348	14753	if ((mod & SHIFT) == SHIFT)
14349	14754	{
..	..	@@ -14353,6 +14758,8 @@
14353	14758	mouseMode \|= ROTATE;
14354	14759	} // TRANSLATE;
14355	14760
	14761	+ targetLookAt.set(manipCamera.lookAt);
	14762	+
14356	14763	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
14357	14764	prevY = Y = anchorY;
14358	14765	}
..	..	@@ -14362,9 +14769,15 @@
14362	14769	MODIFIERS \|= COMMAND;
14363	14770	/**/
14364	14771	if((mod&SHIFT) == SHIFT)
14365		- manipCamera.Translate(-speed*delta, 0, getWidth());
	14772	+ manipCamera.Translate(-speed*delta, 0, getWidth());
14366	14773	else
14367		- manipCamera.RotatePosition(-speed, 0);
	14774	+ {
	14775	+ if ((mouseMode&VR)!=0)
	14776	+ manipCamera.RotateInterest(speed, 0);
	14777	+ else
	14778	+ manipCamera.RotatePosition(-speed, 0);
	14779	+ }
	14780	+
14368	14781	/**/
14369	14782	if ((mod & SHIFT) == SHIFT)
14370	14783	{
..	..	@@ -14374,6 +14787,8 @@
14374	14787	mouseMode \|= ROTATE;
14375	14788	} // TRANSLATE;
14376	14789
	14790	+ targetLookAt.set(manipCamera.lookAt);
	14791	+
14377	14792	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
14378	14793	prevY = Y = anchorY;
14379	14794	}
..	..	@@ -14415,15 +14830,16 @@
14415	14830	if (editObj)
14416	14831	{
14417	14832	drag = true;
14418		- ClickInfo info = new ClickInfo();
14419		- info.bounds.setBounds(0, 0,
	14833	+ //ClickInfo info = new ClickInfo();
	14834	+ object.clickInfo.bounds.setBounds(0, 0,
14420	14835	(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);
	14836	+ object.clickInfo.pane = this;
	14837	+ object.clickInfo.camera = renderCamera;
	14838	+ object.clickInfo.x = x;
	14839	+ object.clickInfo.y = y;
	14840	+ object //.GetWindow().copy
	14841	+ .doEditDrag(//info,
	14842	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14427	14843	} else
14428	14844	{
14429	14845	if (x < startX)
..	..	@@ -14572,24 +14988,27 @@
14572	14988	}
14573	14989	}
14574	14990
	14991	+// ClickInfo clickInfo = new ClickInfo();
	14992	+
14575	14993	public void mouseMoved(MouseEvent e)
14576	14994	{
14577	14995	//System.out.println("mouseMoved: " + e);
14578	14996	if (isRenderer)
14579	14997	return;
14580	14998
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;
	14999	+ // Mouse cursor feedback
	15000	+ object.clickInfo.x = e.getX();
	15001	+ object.clickInfo.y = e.getY();
	15002	+ object.clickInfo.modifiers = e.getModifiersEx();
	15003	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	15004	+ object.clickInfo.pane = this;
	15005	+ object.clickInfo.camera = renderCamera;
14588	15006	if (!isRenderer)
14589	15007	{
14590	15008	//ObjEditor editWindow = object.editWindow;
14591	15009	//Object3D copy = editWindow.copy;
14592		- if (object.doEditClick(ci, 0))
	15010	+ if (object.doEditClick(//clickInfo,
	15011	+ 0))
14593	15012	{
14594	15013	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14595	15014	} else
..	..	@@ -14861,7 +15280,8 @@
14861	15280	// break;
14862	15281	case 'T':
14863	15282	CACHETEXTURE ^= true;
14864		- textures.clear();
	15283	+ texturepigment.clear();
	15284	+ texturebump.clear();
14865	15285	// repaint();
14866	15286	break;
14867	15287	case 'Y':
..	..	@@ -14871,8 +15291,8 @@
14871	15291	case 'K':
14872	15292	KOMPACTTEXTURE ^= true;
14873	15293	//textures.clear();
14874		- break;
14875		- case 'P': // Texture Projection macros
	15294	+ // break;
	15295	+ //case 'P': // Texture Projection macros
14876	15296	// SAVETEXTURE ^= true;
14877	15297	macromode = true;
14878	15298	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -14993,7 +15413,7 @@
14993	15413	targetLookAt.set(manipCamera.lookAt);
14994	15414	repaint();
14995	15415	break;
14996		- case 'p':
	15416	+ case 'P': // p':
14997	15417	// c'est quoi ca au juste? spherical ^= true;
14998	15418	Skinshader ^= true; programInitialized = false;
14999	15419	repaint();
..	..	@@ -15038,20 +15458,24 @@
15038	15458	OCCLUSION_CULLING ^= true;
15039	15459	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
15040	15460	break;
15041		- case '0': envyoff ^= true; repaint(); break;
	15461	+ //case '0': envyoff ^= true; repaint(); break;
15042	15462	case '1':
15043	15463	case '2':
15044	15464	case '3':
15045	15465	case '4':
15046	15466	case '5':
15047		- newenvy = Character.getNumericValue(key);
15048		- repaint();
15049		- break;
15050	15467	case '6':
15051	15468	case '7':
15052	15469	case '8':
15053	15470	case '9':
15054		- BGcolor = (key - '6')/3.f;
	15471	+ if (true) // envyoff)
	15472	+ {
	15473	+ BGcolor = (key - '1')/8.f;
	15474	+ }
	15475	+ else
	15476	+ {
	15477	+ //newenvy = Character.getNumericValue(key);
	15478	+ }
15055	15479	repaint();
15056	15480	break;
15057	15481	case '!':
..	..	@@ -15614,8 +16038,6 @@
15614	16038
15615	16039	int width = getBounds().width;
15616	16040	int height = getBounds().height;
15617		- ClickInfo info = new ClickInfo();
15618		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15619	16041	//Image img = CreateImage(width, height);
15620	16042	//System.out.println("width = " + width + "; height = " + height + "\n");
15621	16043
..	..	@@ -15692,31 +16114,37 @@
15692	16114	}
15693	16115	if (object != null && !hasMarquee)
15694	16116	{
	16117	+ if (object.clickInfo == null)
	16118	+ object.clickInfo = new ClickInfo();
	16119	+ ClickInfo info = object.clickInfo;
	16120	+ //ClickInfo info = new ClickInfo();
	16121	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16122	+
15695	16123	if (isRenderer)
15696	16124	{
15697		- info.flags++;
	16125	+ object.clickInfo.flags++;
15698	16126	double frameAspect = (double) width / (double) height;
15699	16127	if (frameAspect > renderCamera.aspect)
15700	16128	{
15701	16129	int desired = (int) ((double) height * renderCamera.aspect);
15702		- info.bounds.width -= width - desired;
15703		- info.bounds.x += (width - desired) / 2;
	16130	+ object.clickInfo.bounds.width -= width - desired;
	16131	+ object.clickInfo.bounds.x += (width - desired) / 2;
15704	16132	} else
15705	16133	{
15706	16134	int desired = (int) ((double) width / renderCamera.aspect);
15707		- info.bounds.height -= height - desired;
15708		- info.bounds.y += (height - desired) / 2;
	16135	+ object.clickInfo.bounds.height -= height - desired;
	16136	+ object.clickInfo.bounds.y += (height - desired) / 2;
15709	16137	}
15710	16138	}
15711	16139
15712		- info.g = gr;
15713		- info.camera = renderCamera;
	16140	+ object.clickInfo.g = gr;
	16141	+ object.clickInfo.camera = renderCamera;
15714	16142	/*
15715	16143	// Memory intensive (brep.verticescopy)
15716	16144	if (!(object instanceof Composite))
15717	16145	object.draw(info, 0, false); // SLOW :
15718	16146	*/
15719		- if (!isRenderer)
	16147	+ if (!isRenderer) // && drag)
15720	16148	{
15721	16149	Grafreed.Assert(object != null);
15722	16150	Grafreed.Assert(object.selection != null);
..	..	@@ -15724,9 +16152,9 @@
15724	16152	{
15725	16153	int hitSomething = object.selection.get(0).hitSomething;
15726	16154
15727		- info.DX = 0;
15728		- info.DY = 0;
15729		- info.W = 1;
	16155	+ object.clickInfo.DX = 0;
	16156	+ object.clickInfo.DY = 0;
	16157	+ object.clickInfo.W = 1;
15730	16158	if (hitSomething == Object3D.hitCenter)
15731	16159	{
15732	16160	info.DX = X;
..	..	@@ -15738,13 +16166,14 @@
15738	16166	info.DY -= info.bounds.height/2;
15739	16167	}
15740	16168
15741		- object.drawEditHandles(info, 0);
	16169	+ object.drawEditHandles(//info,
	16170	+ 0);
15742	16171
15743	16172	if (drag && (X != 0 \|\| Y != 0))
15744	16173	{
15745	16174	switch (hitSomething)
15746	16175	{
15747		- case Object3D.hitCenter: gr.setColor(Color.pink);
	16176	+ case Object3D.hitCenter: gr.setColor(Color.white);
15748	16177	gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15749	16178	break;
15750	16179	case Object3D.hitRotate: gr.setColor(Color.yellow);
..	..	@@ -15770,7 +16199,7 @@
15770	16199	if (hasMarquee)
15771	16200	{
15772	16201	gr.setXORMode(Color.white);
15773		- gr.setColor(Color.red);
	16202	+ gr.setColor(Color.white);
15774	16203	if (!firstime)
15775	16204	{
15776	16205	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -16237,6 +16666,8 @@
16237	16666	private /static/ boolean firstime;
16238	16667	private /static/ cVector newView = new cVector();
16239	16668	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16669	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16670	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
16240	16671	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16241	16672	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16242	16673	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16249,29 +16680,67 @@
16249	16680	{
16250	16681	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16251	16682
	16683	+ int usedsuf = 0;
	16684	+
16252	16685	for (int i = 0; i < suffixes.length; i++)
16253	16686	{
16254		- String resourceName = basename + suffixes[i] + "." + suffix;
16255		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16256		- mipmapped,
16257		- FileUtil.getFileSuffix(resourceName));
16258		- if (data == null)
	16687	+ String[] suffixe = suffixes;
	16688	+ String[] fallback = suffixes2;
	16689	+ String[] fallfallback = suffixes3;
	16690	+
	16691	+ for (int c=usedsuf; --c>=0;)
16259	16692	{
16260		- throw new IOException("Unable to load texture " + resourceName);
	16693	+// String[] temp = suffixe;
	16694	+// suffixe = fallback;
	16695	+// fallback = fallfallback;
	16696	+// fallfallback = temp;
16261	16697	}
	16698	+
	16699	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16700	+ TextureData data;
	16701	+
	16702	+ try
	16703	+ {
	16704	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16705	+ mipmapped,
	16706	+ FileUtil.getFileSuffix(resourceName));
	16707	+ }
	16708	+ catch (Exception e)
	16709	+ {
	16710	+ try
	16711	+ {
	16712	+ resourceName = basename + fallback[i] + "." + suffix;
	16713	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16714	+ mipmapped,
	16715	+ FileUtil.getFileSuffix(resourceName));
	16716	+ }
	16717	+ catch (Exception e2)
	16718	+ {
	16719	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16720	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16721	+ mipmapped,
	16722	+ FileUtil.getFileSuffix(resourceName));
	16723	+ }
	16724	+ }
	16725	+
16262	16726	//System.out.println("Target = " + targets[i]);
16263	16727	cubemap.updateImage(data, targets[i]);
16264	16728	}
16265	16729
16266	16730	return cubemap;
16267	16731	}
	16732	+
16268	16733	int bigsphere = -1;
16269	16734
16270	16735	float BGcolor = 0.5f;
16271	16736
16272		- private void DrawSkyBox(GL gl)
	16737	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16738	+
	16739	+ private void DrawSkyBox(GL gl, float ratio)
16273	16740	{
16274		- if (envyoff \|\| cubemap == null)
	16741	+ if (//envyoff \|\|
	16742	+ WIREFRAME \|\|
	16743	+ cubemap == null)
16275	16744	{
16276	16745	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16277	16746	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16286,7 +16755,17 @@
16286	16755	// Compensates for ExaminerViewer's modification of modelview matrix
16287	16756	gl.glMatrixMode(GL.GL_MODELVIEW);
16288	16757	gl.glLoadIdentity();
	16758	+ gl.glScalef(1,ratio,1);
16289	16759
	16760	+// colorV[0] = 2;
	16761	+// colorV[1] = 2;
	16762	+// colorV[2] = 2;
	16763	+// colorV[3] = 1;
	16764	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16765	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16766	+//
	16767	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16768	+
16290	16769	//gl.glActiveTexture(GL.GL_TEXTURE1);
16291	16770	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16292	16771
..	..	@@ -16318,6 +16797,7 @@
16318	16797	{
16319	16798	gl.glScalef(1.0f, -1.0f, 1.0f);
16320	16799	}
	16800	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16321	16801	gl.glMultMatrixd(viewrot_1, 0);
16322	16802	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16323	16803	//viewer.updateInverseRotation(gl);
..	..	@@ -16358,7 +16838,8 @@
16358	16838	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16359	16839
16360	16840	cubemap.disable();
16361		- ////cubemap.unbind();
	16841	+ //cubemap.dispose();
	16842	+
16362	16843	if (CULLFACE)
16363	16844	{
16364	16845	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16553,6 +17034,14 @@
16553	17034	}
16554	17035	}
16555	17036
	17037	+ private Object3D GetFolder()
	17038	+ {
	17039	+ Object3D folder = object.GetWindow().copy;
	17040	+ if (object.GetWindow().copy.selection.Size() > 0)
	17041	+ folder = object.GetWindow().copy.selection.elementAt(0);
	17042	+ return folder;
	17043	+ }
	17044	+
16556	17045	class SelectBuffer implements GLEventListener
16557	17046	{
16558	17047
..	..	@@ -16568,7 +17057,7 @@
16568	17057	//new Exception().printStackTrace();
16569	17058	System.out.println("select buffer init");
16570	17059	// Use debug pipeline
16571		- drawable.setGL(new DebugGL(drawable.getGL()));
	17060	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16572	17061
16573	17062	GL gl = drawable.getGL();
16574	17063
..	..	@@ -16632,6 +17121,17 @@
16632	17121
16633	17122	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16634	17123
	17124	+ if (PAINTMODE)
	17125	+ {
	17126	+ if (object.GetWindow().copy.selection.Size() > 0)
	17127	+ {
	17128	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17129	+
	17130	+ // Make what you paint not selectable.
	17131	+ paintobj.ResetSelectable();
	17132	+ }
	17133	+ }
	17134	+
16635	17135	//int tmp = selection_view;
16636	17136	//selection_view = -1;
16637	17137	int temp = DrawMode();
..	..	@@ -16643,6 +17143,17 @@
16643	17143	// temp = DEFAULT; // patch for selection debug
16644	17144	Globals.drawMode = temp; // WARNING
16645	17145
	17146	+ if (PAINTMODE)
	17147	+ {
	17148	+ if (object.GetWindow().copy.selection.Size() > 0)
	17149	+ {
	17150	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17151	+
	17152	+ // Revert.
	17153	+ paintobj.RestoreSelectable();
	17154	+ }
	17155	+ }
	17156	+
16646	17157	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16647	17158
16648	17159	// trying different ways of getting the depth info over
..	..	@@ -16748,27 +17259,29 @@
16748	17259	if (!movingcamera && !PAINTMODE)
16749	17260	object.GetWindow().ScreenFitPoint(); // fev 2014
16750	17261
16751		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17262	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16752	17263	{
16753		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16754		-
16755		- Object3D group = new Object3D("inst" + paintcount++);
16756		-
16757		- group.CreateMaterial(); // use a void leaf to select instances
16758		-
16759		- group.add(paintobj); // link
16760		-
16761		- object.GetWindow().SnapObject(group);
16762		-
16763		- Object3D folder = object.GetWindow().copy;
	17264	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16764	17265
16765	17266	if (object.GetWindow().copy.selection.Size() > 0)
16766		- folder = object.GetWindow().copy.selection.elementAt(0);
	17267	+ {
	17268	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16767	17269
16768		- folder.add(group);
16769		-
16770		- object.GetWindow().ResetModel();
16771		- object.GetWindow().refreshContents();
	17270	+ Object3D inst = new Object3D("inst" + paintcount++);
	17271	+
	17272	+ inst.CreateMaterial(); // use a void leaf to select instances
	17273	+
	17274	+ inst.add(paintobj); // link
	17275	+
	17276	+ object.GetWindow().SnapObject(inst);
	17277	+
	17278	+ Object3D folder = paintFolder; // GetFolder();
	17279	+
	17280	+ folder.add(inst);
	17281	+
	17282	+ object.GetWindow().ResetModel();
	17283	+ object.GetWindow().refreshContents();
	17284	+ }
16772	17285	}
16773	17286	else
16774	17287	paintcount = 0;
..	..	@@ -16862,6 +17375,7 @@
16862	17375
16863	17376	public void init(GLAutoDrawable drawable)
16864	17377	{
	17378	+ if (Globals.DEBUG)
16865	17379	System.out.println("shadow buffer init");
16866	17380
16867	17381	GL gl = drawable.getGL();
..	..	@@ -17090,10 +17604,14 @@
17090	17604	gl.glFlush();
17091	17605
17092	17606	/**/
17093		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	17607	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
17094	17608
17095		- float[] pixels = occlusionsizebuffer.array();
	17609	+ float[] depths = occlusiondepthbuffer.array();
17096	17610
	17611	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	17612	+
	17613	+ int[] pixels = selectsizebuffer.array();
	17614	+
17097	17615	double r = 0, g = 0, b = 0;
17098	17616
17099	17617	double count = 0;
..	..	@@ -17104,7 +17622,7 @@
17104	17622
17105	17623	double FACTOR = 1;
17106	17624
17107		- for (int i = 0; i < pixels.length; i++)
	17625	+ for (int i = 0; i < depths.length; i++)
17108	17626	{
17109	17627	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
17110	17628	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -17187,7 +17705,7 @@
17187	17705
17188	17706	double scale = ray.z; // 1; // cos
17189	17707
17190		- float depth = pixels[newindex];
	17708	+ float depth = depths[newindex];
17191	17709
17192	17710	/*
17193	17711	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17384,11 +17902,14 @@
17384	17902	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17385	17903	static IntBuffer bigAAbuffer;
17386	17904	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17387		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	17905	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17388	17906	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17389	17907	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17390	17908	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17391		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17909	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17910	+
	17911	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17912	+
17392	17913	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17393	17914	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17394	17915	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();