~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,9 @@
73	110	//private Mat4f spotlightTransform = new Mat4f();
74	111	//private Mat4f spotlightInverseTransform = new Mat4f();
75	112	static GLContext glcontext = null;
76		- /static/ com.sun.opengl.util.texture.Texture cubemap;
	113	+ /static/ com.sun.opengl.util.texture.Texture cubemap; // Either custom or rgb
	114	+ /static/ com.sun.opengl.util.texture.Texture cubemapcustom;
	115	+ /static/ com.sun.opengl.util.texture.Texture cubemaprgb;
77	116	boolean reverseUP = false;
78	117	static boolean frozen = false;
79	118	boolean enablebackspace = false; // patch for back buffer refresh
..	..	@@ -136,7 +175,7 @@
136	175	static boolean doublesided = false; // true; // reversed normals are awful for conformance
137	176	boolean anisotropy = true;
138	177	boolean softshadow = true; // slower but better false;
139		- boolean opacityhalo = false;
	178	+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
140	179
141	180	boolean macromode = false;
142	181
..	..	@@ -150,6 +189,19 @@
150	189	}
151	190
152	191	private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	192	+
	193	+ public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	194	+ {
	195	+ try
	196	+ {
	197	+ return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	198	+ } catch (IOException e)
	199	+ {
	200	+ System.out.println("NAME = " + name);
	201	+ e.printStackTrace(); // throw new RuntimeException(e);
	202	+ return null;
	203	+ }
	204	+ }
153	205
154	206	void SetAsGLRenderer(boolean b)
155	207	{
..	..	@@ -169,7 +221,8 @@
169	221
170	222	SetCamera(cam);
171	223
172		- SetLight(new Camera(new cVector(10, 10, -20)));
	224	+ // Warning: not used.
	225	+ SetLight(new Camera(new cVector(15, 10, -20)));
173	226
174	227	object = o;
175	228
..	..	@@ -1447,6 +1500,8 @@
1447	1500	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1448	1501	}
1449	1502
	1503	+ float[] colorV = new float[4];
	1504	+
1450	1505	void SetColor(Object3D obj, Vertex p0)
1451	1506	{
1452	1507	CameraPane display = this;
..	..	@@ -1514,8 +1569,6 @@
1514	1569	{
1515	1570	return;
1516	1571	}
1517		-
1518		- float[] colorV = new float[3];
1519	1572
1520	1573	if (false) // marked)
1521	1574	{
..	..	@@ -2298,10 +2351,17 @@
2298	2351	HANDLES ^= true;
2299	2352	}
2300	2353
	2354	+ Object3D paintFolder;
	2355	+
2301	2356	void TogglePaint()
2302	2357	{
2303	2358	PAINTMODE ^= true;
2304	2359	paintcount = 0;
	2360	+
	2361	+ if (PAINTMODE)
	2362	+ {
	2363	+ paintFolder = GetFolder();
	2364	+ }
2305	2365	}
2306	2366
2307	2367	void SwapCamera(int a, int b)
..	..	@@ -2398,6 +2458,21 @@
2398	2458	return currentGL;
2399	2459	}
2400	2460
	2461	+ static private BufferedImage CreateBim(TextureData texturedata)
	2462	+ {
	2463	+ Grafreed.Assert(texturedata != null);
	2464	+
	2465	+ int width = texturedata.getWidth();
	2466	+ int height = texturedata.getHeight();
	2467	+
	2468	+ Buffer buffer = texturedata.getBuffer();
	2469	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2470	+
	2471	+ byte[] bytes = bytebuf.array();
	2472	+
	2473	+ return CreateBim(bytes, width, height);
	2474	+ }
	2475	+
2401	2476	/**/
2402	2477	class CacheTexture
2403	2478	{
..	..	@@ -2406,28 +2481,31 @@
2406	2481
2407	2482	int resolution;
2408	2483
2409		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2484	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2410	2485	{
2411		- texture = tex;
	2486	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2487	+ texturedata = texdata;
2412	2488	resolution = res;
2413	2489	}
2414	2490	}
2415	2491	/**/
2416	2492
2417	2493	// 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>();
	2494	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2495	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2496	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2497	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2498	+
2421	2499	int pigmentdepth = 0;
2422	2500	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2423	2501	int bumpdepth = 0;
2424	2502	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2425	2503	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2426	2504	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2427		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2505	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2428	2506	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2429	2507
2430		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2508	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2431	2509	{
2432	2510	TextureData texturedata = null;
2433	2511
..	..	@@ -2446,13 +2524,34 @@
2446	2524	if (bump)
2447	2525	texturedata = ConvertBump(texturedata, false);
2448	2526
2449		- com.sun.opengl.util.texture.Texture texture =
2450		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2527	+// com.sun.opengl.util.texture.Texture texture =
	2528	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2451	2529
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);
	2530	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2531	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2454	2532
2455		- return texture;
	2533	+ return texturedata;
	2534	+ }
	2535	+
	2536	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2537	+ {
	2538	+ TextureData texturedata = null;
	2539	+
	2540	+ try
	2541	+ {
	2542	+ texturedata =
	2543	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2544	+ bim,
	2545	+ true);
	2546	+ } catch (Exception e)
	2547	+ {
	2548	+ throw new javax.media.opengl.GLException(e);
	2549	+ }
	2550	+
	2551	+ if (bump)
	2552	+ texturedata = ConvertBump(texturedata, false);
	2553	+
	2554	+ return texturedata;
2456	2555	}
2457	2556
2458	2557	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3525,6 +3624,8 @@
3525	3624
3526	3625	System.out.println("LOADING TEXTURE : " + name);
3527	3626
	3627	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3628	+
3528	3629	//
3529	3630	if (false) // compressbit > 0)
3530	3631	{
..	..	@@ -7923,7 +8024,7 @@
7923	8024	String pigment = Object3D.GetPigment(tex);
7924	8025	String bump = Object3D.GetBump(tex);
7925	8026
7926		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8027	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7927	8028	{
7928	8029	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7929	8030	// System.out.println("; bump = " + bump);
..	..	@@ -7938,8 +8039,8 @@
7938	8039	pigment = null;
7939	8040	}
7940	8041
7941		- ReleaseTexture(bump, true);
7942		- ReleaseTexture(pigment, false);
	8042	+ ReleaseTexture(tex, true);
	8043	+ ReleaseTexture(tex, false);
7943	8044	}
7944	8045
7945	8046	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -7957,7 +8058,7 @@
7957	8058
7958	8059	String pigment = Object3D.GetPigment(tex);
7959	8060
7960		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8061	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7961	8062	{
7962	8063	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7963	8064	// System.out.println("; bump = " + bump);
..	..	@@ -7968,7 +8069,7 @@
7968	8069	pigment = null;
7969	8070	}
7970	8071
7971		- ReleaseTexture(pigment, false);
	8072	+ ReleaseTexture(tex, false);
7972	8073	}
7973	8074
7974	8075	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -7986,7 +8087,7 @@
7986	8087
7987	8088	String bump = Object3D.GetBump(tex);
7988	8089
7989		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8090	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7990	8091	{
7991	8092	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7992	8093	// System.out.println("; bump = " + bump);
..	..	@@ -7997,10 +8098,10 @@
7997	8098	bump = null;
7998	8099	}
7999	8100
8000		- ReleaseTexture(bump, true);
	8101	+ ReleaseTexture(tex, true);
8001	8102	}
8002	8103
8003		- void ReleaseTexture(String tex, boolean bump)
	8104	+ void ReleaseTexture(cTexture tex, boolean bump)
8004	8105	{
8005	8106	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8006	8107	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8011,7 +8112,7 @@
8011	8112	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
8012	8113
8013	8114	if (tex != null)
8014		- texture = textures.get(tex);
	8115	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
8015	8116
8016	8117	// //assert( texture != null );
8017	8118	// if (texture == null)
..	..	@@ -8105,47 +8206,50 @@
8105	8206
8106	8207	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8107	8208	{
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		- }
	8209	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8210	+// ambientOcclusion ) // \|\| !textureon)
	8211	+// {
	8212	+// return; // false;
	8213	+// }
	8214	+//
	8215	+// if (tex == null)
	8216	+// {
	8217	+// BindTexture(null,false,resolution);
	8218	+// BindTexture(null,true,resolution);
	8219	+// return;
	8220	+// }
	8221	+//
	8222	+// String pigment = Object3D.GetPigment(tex);
	8223	+// String bump = Object3D.GetBump(tex);
	8224	+//
	8225	+// usedtextures.add(pigment);
	8226	+// usedtextures.add(bump);
	8227	+//
	8228	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8229	+// {
	8230	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8231	+// // System.out.println("; bump = " + bump);
	8232	+// }
	8233	+//
	8234	+// if (bump.equals(""))
	8235	+// {
	8236	+// bump = null;
	8237	+// }
	8238	+// if (pigment.equals(""))
	8239	+// {
	8240	+// pigment = null;
	8241	+// }
	8242	+//
	8243	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8244	+// BindTexture(pigment, false, resolution);
	8245	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8246	+// BindTexture(bump, true, resolution);
	8247	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8248	+//
	8249	+// return; // true;
8120	8250
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;
	8251	+ BindPigmentTexture(tex, resolution);
	8252	+ BindBumpTexture(tex, resolution);
8149	8253	}
8150	8254
8151	8255	/boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8164,9 +8268,9 @@
8164	8268
8165	8269	String pigment = Object3D.GetPigment(tex);
8166	8270
8167		- usedtextures.put(pigment, pigment);
	8271	+ usedtextures.add(tex);
8168	8272
8169		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8273	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8170	8274	{
8171	8275	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8172	8276	// System.out.println("; bump = " + bump);
..	..	@@ -8178,7 +8282,7 @@
8178	8282	}
8179	8283
8180	8284	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8181		- BindTexture(pigment, false, resolution);
	8285	+ BindTexture(tex, false, resolution);
8182	8286	}
8183	8287
8184	8288	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8197,9 +8301,9 @@
8197	8301
8198	8302	String bump = Object3D.GetBump(tex);
8199	8303
8200		- usedtextures.put(bump, bump);
	8304	+ usedtextures.add(tex);
8201	8305
8202		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8306	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8203	8307	{
8204	8308	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8205	8309	// System.out.println("; bump = " + bump);
..	..	@@ -8211,7 +8315,7 @@
8211	8315	}
8212	8316
8213	8317	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8214		- BindTexture(bump, true, resolution);
	8318	+ BindTexture(tex, true, resolution);
8215	8319	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8216	8320	}
8217	8321
..	..	@@ -8235,13 +8339,19 @@
8235	8339	return fileExists;
8236	8340	}
8237	8341
8238		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8342	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8239	8343	{
8240		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8344	+ CacheTexture texturecache = null;
8241	8345
8242	8346	if (tex != null)
8243	8347	{
8244		- String texname = tex;
	8348	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8349	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
	8350	+
	8351	+ if (texname.equals("") && texdata == null)
	8352	+ {
	8353	+ return null;
	8354	+ }
8245	8355
8246	8356	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8247	8357
..	..	@@ -8251,19 +8361,46 @@
8251	8361	// else
8252	8362	// if (!texname.startsWith("/"))
8253	8363	// texname = "/Users/nbriere/Textures/" + texname;
8254		- if (!FileExists(tex))
	8364	+ if (!FileExists(texname) && !texname.startsWith("@"))
8255	8365	{
8256	8366	texname = fallbackTextureName;
8257	8367	}
8258	8368
8259	8369	if (CACHETEXTURE)
8260		- texture = textures.get(texname); // TEXTURE CACHE
8261		-
8262		- TextureData texturedata = null;
8263		-
8264		- if (texture == null \|\| texture.resolution < resolution)
8265	8370	{
8266		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8371	+ if (texdata == null)
	8372	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8373	+ else
	8374	+ texturecache = bimtextures.get(texdata);
	8375	+ }
	8376	+
	8377	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8378	+ {
	8379	+ TextureData texturedata = null;
	8380	+
	8381	+ if (texdata != null && textureon)
	8382	+ {
	8383	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8384	+
	8385	+ try
	8386	+ {
	8387	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8388	+ }
	8389	+ catch (Exception e)
	8390	+ {
	8391	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8392	+ }
	8393	+
	8394	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8395	+ bimtextures.put(texdata, texturecache);
	8396	+
	8397	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8398	+
	8399	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8400	+ //bim2 = bim;
	8401	+ }
	8402	+ else
	8403	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8267	8404	{
8268	8405	assert(!bump);
8269	8406	// if (bump)
..	..	@@ -8274,19 +8411,23 @@
8274	8411	// }
8275	8412	// else
8276	8413	// {
8277		- texture = textures.get(tex);
8278		- if (texture == null)
	8414	+ // texturecache = textures.get(texname); // suspicious
	8415	+ if (texturecache == null)
8279	8416	{
8280		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8417	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8281	8418	}
	8419	+ else
	8420	+ new Exception().printStackTrace();
8282	8421	// }
8283	8422	} else
8284		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8423	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8285	8424	{
8286	8425	assert(bump);
8287		- texture = textures.get(tex);
8288		- if (texture == null)
8289		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8426	+ // texturecache = textures.get(texname); // suspicious
	8427	+ if (texturecache == null)
	8428	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8429	+ else
	8430	+ new Exception().printStackTrace();
8290	8431	} else
8291	8432	{
8292	8433	//if (tex.equals("IMMORTAL"))
..	..	@@ -8294,11 +8435,22 @@
8294	8435	// texture = GetResourceTexture("default.png");
8295	8436	//} else
8296	8437	//{
8297		- if (tex.equals("WHITE_NOISE"))
	8438	+ if (texname.endsWith("WHITE_NOISE"))
8298	8439	{
8299		- texture = textures.get(tex);
8300		- if (texture == null)
8301		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8440	+ // texturecache = textures.get(texname); // suspicious
	8441	+ if (texturecache == null)
	8442	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8443	+ else
	8444	+ new Exception().printStackTrace();
	8445	+ } else
	8446	+ {
	8447	+ if (texname.startsWith("@"))
	8448	+ {
	8449	+ // texturecache = textures.get(texname); // suspicious
	8450	+ if (texturecache == null)
	8451	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
	8452	+ else
	8453	+ new Exception().printStackTrace();
8302	8454	} else
8303	8455	{
8304	8456	if (textureon)
..	..	@@ -8357,19 +8509,20 @@
8357	8509	if (texturedata == null)
8358	8510	throw new Exception();
8359	8511
8360		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8512	+ texturecache = new CacheTexture(texturedata,resolution);
8361	8513	//texture = GetTexture(tex, bump);
8362	8514	}
	8515	+ }
8363	8516	}
8364	8517	//}
8365	8518	}
8366	8519
8367		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8520	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8368	8521	{
8369	8522	//return false;
8370	8523
8371	8524	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8372		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8525	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8373	8526	{
8374	8527	// String ext = "_highres";
8375	8528	// if (REDUCETEXTURE)
..	..	@@ -8386,52 +8539,17 @@
8386	8539	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8387	8540	if (!cachefile.exists())
8388	8541	{
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))
	8542	+ //if (texturedata.getWidth() == texturedata.getHeight())
8398	8543	{
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);
	8544	+ BufferedImage rendImage = CreateBim(texturedata);
	8545	+
8429	8546	ImageWriter writer = null;
8430	8547	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8431	8548	if (iter.hasNext()) {
8432	8549	writer = (ImageWriter)iter.next();
8433	8550	}
8434		- float compressionQuality = 0.9f;
	8551	+
	8552	+ float compressionQuality = 0.85f;
8435	8553	try
8436	8554	{
8437	8555	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8448,18 +8566,20 @@
8448	8566	}
8449	8567	}
8450	8568	}
8451		-
	8569	+
	8570	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8571	+
8452	8572	//System.out.println("Texture = " + tex);
8453		- if (textures.containsKey(texname))
	8573	+ if (textures.containsKey(tex))
8454	8574	{
8455		- CacheTexture thetex = textures.get(texname);
	8575	+ CacheTexture thetex = textures.get(tex);
8456	8576	thetex.texture.disable();
8457	8577	thetex.texture.dispose();
8458		- textures.remove(texname);
	8578	+ textures.remove(tex);
8459	8579	}
8460	8580
8461		- texture.texturedata = texturedata;
8462		- textures.put(texname, texture);
	8581	+ //texture.texturedata = texturedata;
	8582	+ textures.put(tex, texturecache);
8463	8583
8464	8584	// newtex = true;
8465	8585	}
..	..	@@ -8475,10 +8595,44 @@
8475	8595	}
8476	8596	}
8477	8597
8478		- return texture;
	8598	+ return texturecache;
8479	8599	}
8480	8600
8481		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	8601	+ static void EmbedTextures(cTexture tex)
	8602	+ {
	8603	+ if (tex.pigmentdata == null)
	8604	+ {
	8605	+ //String texname = Object3D.GetPigment(tex);
	8606	+
	8607	+ CacheTexture texturecache = texturepigment.get(tex);
	8608	+
	8609	+ if (texturecache != null)
	8610	+ {
	8611	+ tex.pw = texturecache.texturedata.getWidth();
	8612	+ tex.ph = texturecache.texturedata.getHeight();
	8613	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8614	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8615	+ ;
	8616	+ //, tex.pw, tex.ph), 0.5f);
	8617	+ }
	8618	+ }
	8619	+
	8620	+ if (tex.bumpdata == null)
	8621	+ {
	8622	+ //String texname = Object3D.GetBump(tex);
	8623	+
	8624	+ CacheTexture texturecache = texturebump.get(tex);
	8625	+
	8626	+ if (texturecache != null)
	8627	+ {
	8628	+ tex.bw = texturecache.texturedata.getWidth();
	8629	+ tex.bh = texturecache.texturedata.getHeight();
	8630	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8631	+ }
	8632	+ }
	8633	+ }
	8634	+
	8635	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8482	8636	{
8483	8637	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8484	8638
..	..	@@ -8496,21 +8650,21 @@
8496	8650	return texture!=null?texture.texture:null;
8497	8651	}
8498	8652
8499		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
	8653	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8500	8654	{
8501	8655	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8502	8656
8503	8657	return texture!=null?texture.texturedata:null;
8504	8658	}
8505	8659
8506		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8660	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8507	8661	{
8508	8662	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8509	8663	{
8510	8664	return false;
8511	8665	}
8512	8666
8513		- boolean newtex = false;
	8667	+ //boolean newtex = false;
8514	8668
8515	8669	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8516	8670
..	..	@@ -8542,9 +8696,75 @@
8542	8696	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8543	8697	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8544	8698
8545		- return newtex;
	8699	+ return true; // Warning: not used.
8546	8700	}
8547	8701
	8702	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8703	+ {
	8704	+ try
	8705	+ {
	8706	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8707	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8708	+ ImageWriter writer = writers.next();
	8709	+
	8710	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8711	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8712	+ param.setCompressionQuality(quality);
	8713	+
	8714	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8715	+ writer.setOutput(ios);
	8716	+ writer.write(null, new IIOImage(image, null, null), param);
	8717	+
	8718	+ byte[] data = baos.toByteArray();
	8719	+ writer.dispose();
	8720	+ return data;
	8721	+ }
	8722	+ catch (Exception e)
	8723	+ {
	8724	+ e.printStackTrace();
	8725	+ return null;
	8726	+ }
	8727	+ }
	8728	+
	8729	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8730	+ {
	8731	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8732	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8733	+ ImageReader reader = writers.next();
	8734	+
	8735	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8736	+
	8737	+ ImageReadParam param = reader.getDefaultReadParam();
	8738	+ param.setDestination(bim);
	8739	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8740	+
	8741	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8742	+ reader.setInput(ios);
	8743	+ BufferedImage bim2 = reader.read(0, param);
	8744	+ reader.dispose();
	8745	+
	8746	+// WritableRaster raster = bim2.getRaster();
	8747	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8748	+// byte[] bytes = data.getData();
	8749	+//
	8750	+// int[] pixels = new int[bytes.length/3];
	8751	+// for (int i=pixels.length; --i>=0;)
	8752	+// {
	8753	+// int i3 = i*3;
	8754	+// pixels[i] = 0xFF;
	8755	+// pixels[i] <<= 8;
	8756	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8757	+// pixels[i] <<= 8;
	8758	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8759	+// pixels[i] <<= 8;
	8760	+// pixels[i] \|= bytes[i3] & 0xFF;
	8761	+// }
	8762	+//
	8763	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8764	+
	8765	+ return bim;
	8766	+ }
	8767	+
8548	8768	ShadowBuffer shadowPBuf;
8549	8769	AntialiasBuffer antialiasPBuf;
8550	8770	int MAXSTACK;
..	..	@@ -8561,10 +8781,12 @@
8561	8781
8562	8782	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8563	8783	MAXSTACK = temp[0];
8564		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8784	+ if (Globals.DEBUG)
	8785	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8565	8786	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8566	8787	MAXSTACK = temp[0];
8567		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8788	+ if (Globals.DEBUG)
	8789	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8568	8790
8569	8791	// Use debug pipeline
8570	8792	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8572,7 +8794,8 @@
8572	8794	gl = drawable.getGL(); //
8573	8795
8574	8796	GL gl3 = getGL();
8575		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8797	+ if (Globals.DEBUG)
	8798	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8576	8799
8577	8800
8578	8801	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8737,7 +8960,7 @@
8737	8960
8738	8961	if (cubemap == null)
8739	8962	{
8740		- LoadEnvy(5);
	8963	+ //LoadEnvy(1);
8741	8964	}
8742	8965
8743	8966	//cubemap.enable();
..	..	@@ -9013,6 +9236,8 @@
9013	9236
9014	9237	void LoadEnvy(int which)
9015	9238	{
	9239	+ assert(false);
	9240	+
9016	9241	String name;
9017	9242	String ext;
9018	9243
..	..	@@ -9024,37 +9249,58 @@
9024	9249	cubemap = null;
9025	9250	return;
9026	9251	case 1:
9027		- name = "cubemaps/box_";
9028		- ext = "png";
	9252	+ name = "cubemaps/rgb/";
	9253	+ ext = "jpg";
9029	9254	reverseUP = false;
9030	9255	break;
9031	9256	case 2:
9032		- name = "cubemaps/uffizi_";
9033		- ext = "png";
9034		- break; // reverseUP = true; break;
	9257	+ name = "cubemaps/uffizi/";
	9258	+ ext = "jpg";
	9259	+ reverseUP = false;
	9260	+ break;
9035	9261	case 3:
9036		- name = "cubemaps/CloudyHills_";
9037		- ext = "tga";
	9262	+ name = "cubemaps/CloudyHills/";
	9263	+ ext = "jpg";
9038	9264	reverseUP = false;
9039	9265	break;
9040	9266	case 4:
9041		- name = "cubemaps/cornell_";
	9267	+ name = "cubemaps/cornell/";
9042	9268	ext = "png";
9043	9269	reverseUP = false;
9044	9270	break;
	9271	+ case 5:
	9272	+ name = "cubemaps/skycube/";
	9273	+ ext = "jpg";
	9274	+ reverseUP = false;
	9275	+ break;
	9276	+ case 6:
	9277	+ name = "cubemaps/SaintLazarusChurch3/";
	9278	+ ext = "jpg";
	9279	+ reverseUP = false;
	9280	+ break;
	9281	+ case 7:
	9282	+ name = "cubemaps/Sodermalmsallen/";
	9283	+ ext = "jpg";
	9284	+ reverseUP = false;
	9285	+ break;
	9286	+ case 8:
	9287	+ name = "cubemaps/Sodermalmsallen2/";
	9288	+ ext = "jpg";
	9289	+ reverseUP = false;
	9290	+ break;
	9291	+ case 9:
	9292	+ name = "cubemaps/UnionSquare/";
	9293	+ ext = "jpg";
	9294	+ reverseUP = false;
	9295	+ break;
9045	9296	default:
9046		- name = "cubemaps/rgb_";
9047		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9297	+ name = "cubemaps/box/";
	9298	+ ext = "png"; /mipmap = true;/
	9299	+ reverseUP = false;
9048	9300	break;
9049	9301	}
9050		-
9051		- try
9052		- {
9053		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9054		- } catch (IOException e)
9055		- {
9056		- throw new RuntimeException(e);
9057		- }
	9302	+
	9303	+ LoadSkybox(name, ext, mipmap);
9058	9304	}
9059	9305
9060	9306	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -9086,8 +9332,12 @@
9086	9332	static double[] model = new double[16];
9087	9333	double[] camera2light = new double[16];
9088	9334	double[] light2camera = new double[16];
9089		- int newenvy = -1;
9090		- boolean envyoff = true; // false;
	9335	+
	9336	+ //int newenvy = -1;
	9337	+ //boolean envyoff = false;
	9338	+
	9339	+ String loadedskyboxname;
	9340	+
9091	9341	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9092	9342	//float[] light0 = { 0,0,0 };
9093	9343	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9505,7 +9755,7 @@
9505	9755
9506	9756	if (renderCamera != lightCamera)
9507	9757	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9508		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9758	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9509	9759
9510	9760	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9511	9761
..	..	@@ -9521,7 +9771,7 @@
9521	9771
9522	9772	if (renderCamera != lightCamera)
9523	9773	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9524		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9774	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9525	9775
9526	9776	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9527	9777
..	..	@@ -9567,10 +9817,12 @@
9567	9817	rati = 1 / rati;
9568	9818	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9569	9819	}
9570		- assert (newenvy == -1);
	9820	+
	9821	+ //assert (newenvy == -1);
	9822	+
9571	9823	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9572	9824	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9573		- DrawSkyBox(gl);
	9825	+ DrawSkyBox(gl, (float)rati);
9574	9826	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9575	9827	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9576	9828	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -10607,7 +10859,7 @@
10607	10859
10608	10860	if (wait)
10609	10861	{
10610		- Sleep(500);
	10862	+ Sleep(200); // blocks everything
10611	10863
10612	10864	wait = false;
10613	10865	}
..	..	@@ -10722,7 +10974,7 @@
10722	10974	// if (parentcam != renderCamera) // not a light
10723	10975	if (cam != lightCamera)
10724	10976	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10725		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10977	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10726	10978
10727	10979	for (int j = 0; j < 4; j++)
10728	10980	{
..	..	@@ -10737,7 +10989,7 @@
10737	10989	// if (parentcam != renderCamera) // not a light
10738	10990	if (cam != lightCamera)
10739	10991	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10740		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	10992	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10741	10993
10742	10994	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10743	10995
..	..	@@ -10823,13 +11075,41 @@
10823	11075	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10824	11076	}
10825	11077
10826		- if (newenvy > -1)
	11078	+// if (newenvy > -1)
	11079	+// {
	11080	+// LoadEnvy(newenvy);
	11081	+// }
	11082	+//
	11083	+// newenvy = -1;
	11084	+
	11085	+ if (object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
10827	11086	{
10828		- LoadEnvy(newenvy);
	11087	+ if (cubemaprgb == null)
	11088	+ {
	11089	+ cubemaprgb = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11090	+ }
	11091	+
	11092	+ cubemap = cubemaprgb;
10829	11093	}
10830		-
10831		- newenvy = -1;
10832		-
	11094	+ else
	11095	+ {
	11096	+ if (object.skyboxname != null)
	11097	+ {
	11098	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11099	+ {
	11100	+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11101	+ loadedskyboxname = object.skyboxname;
	11102	+ }
	11103	+ }
	11104	+ else
	11105	+ {
	11106	+ cubemapcustom = null;
	11107	+ loadedskyboxname = null;
	11108	+ }
	11109	+
	11110	+ cubemap = cubemapcustom;
	11111	+ }
	11112	+
10833	11113	ratio = ((double) getWidth()) / getHeight();
10834	11114	//System.out.println("ratio = " + ratio);
10835	11115
..	..	@@ -10845,7 +11125,7 @@
10845	11125
10846	11126	if (!IsFrozen() && !ambientOcclusion)
10847	11127	{
10848		- DrawSkyBox(gl);
	11128	+ DrawSkyBox(gl, (float)ratio);
10849	11129	}
10850	11130
10851	11131	//if (selection_view == -1)
..	..	@@ -11131,7 +11411,7 @@
11131	11411
11132	11412	// if (cam != lightCamera)
11133	11413	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11134		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11414	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11135	11415	}
11136	11416
11137	11417	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -11290,7 +11570,7 @@
11290	11570	}
11291	11571	}
11292	11572
11293		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11573	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11294	11574	{
11295	11575	//gl.glDepthFunc(GL.GL_LEQUAL);
11296	11576	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11298,24 +11578,21 @@
11298	11578
11299	11579	boolean texon = textureon;
11300	11580
11301		- if (RENDERPROGRAM > 0)
11302		- {
11303		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11304		- textureon = false;
11305		- }
	11581	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11582	+ textureon = false;
	11583	+
11306	11584	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11307	11585	//System.out.println("ALLO");
11308	11586	gl.glColorMask(false, false, false, false);
11309	11587	DrawObject(gl);
11310		- if (RENDERPROGRAM > 0)
11311		- {
11312		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11313		- textureon = texon;
11314		- }
	11588	+
	11589	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11590	+ textureon = texon;
	11591	+
11315	11592	gl.glColorMask(true, true, true, true);
11316	11593
11317	11594	gl.glDepthFunc(GL.GL_EQUAL);
11318		- //gl.glDepthMask(false);
	11595	+ gl.glDepthMask(false);
11319	11596	}
11320	11597
11321	11598	if (false) // DrawMode() == SHADOW)
..	..	@@ -11655,20 +11932,32 @@
11655	11932	ReleaseTextures(DEFAULT_TEXTURES);
11656	11933
11657	11934	if (CLEANCACHE)
11658		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11935	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11659	11936	{
11660		- String tex = e.nextElement();
	11937	+ cTexture tex = e.nextElement();
11661	11938
11662	11939	// System.out.println("Texture --------- " + tex);
11663	11940
11664		- if (tex.equals("WHITE_NOISE"))
	11941	+ if (tex.equals("WHITE_NOISE:"))
11665	11942	continue;
11666	11943
11667		- if (!usedtextures.containsKey(tex))
	11944	+ if (!usedtextures.contains(tex))
11668	11945	{
	11946	+ CacheTexture gettex = texturepigment.get(tex);
11669	11947	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11670		- textures.get(tex).texture.dispose();
11671		- textures.remove(tex);
	11948	+ if (gettex != null)
	11949	+ {
	11950	+ gettex.texture.dispose();
	11951	+ texturepigment.remove(tex);
	11952	+ }
	11953	+
	11954	+ gettex = texturebump.get(tex);
	11955	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11956	+ if (gettex != null)
	11957	+ {
	11958	+ gettex.texture.dispose();
	11959	+ texturebump.remove(tex);
	11960	+ }
11672	11961	}
11673	11962	}
11674	11963	}
..	..	@@ -12196,8 +12485,76 @@
12196	12485
12197	12486	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12198	12487
12199		- String program =
	12488	+ String programmin =
	12489	+ // Min shader
12200	12490	"!!ARBfp1.0\n" +
	12491	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12492	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12493	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12494	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12495	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12496	+ "PARAM light2cam0 = program.env[10];" +
	12497	+ "PARAM light2cam1 = program.env[11];" +
	12498	+ "PARAM light2cam2 = program.env[12];" +
	12499	+ "TEMP temp;" +
	12500	+ "TEMP light;" +
	12501	+ "TEMP ndotl;" +
	12502	+ "TEMP normal;" +
	12503	+ "TEMP depth;" +
	12504	+ "TEMP eye;" +
	12505	+ "TEMP pos;" +
	12506	+
	12507	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12508	+ Normalize("normal") +
	12509	+ "MOV light, state.light[0].position;" +
	12510	+ "DP3 ndotl.x, light, normal;" +
	12511	+
	12512	+ // shadow
	12513	+ "MOV pos, fragment.texcoord[1];" +
	12514	+ "MOV temp, pos;" +
	12515	+ ShadowTextureFetch("depth", "temp", "1") +
	12516	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12517	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12518	+
	12519	+ // No shadow when out of frustum
	12520	+ //"SGE temp.y, depth.z, zero123.y;" +
	12521	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12522	+
	12523	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12524	+
	12525	+ // Backlit
	12526	+ "MOV pos.w, zero123.y;" +
	12527	+ "DP4 eye.x, pos, light2cam0;" +
	12528	+ "DP4 eye.y, pos, light2cam1;" +
	12529	+ "DP4 eye.z, pos, light2cam2;" +
	12530	+ Normalize("eye") +
	12531	+
	12532	+ "DP3 ndotl.y, -eye, normal;" +
	12533	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12534	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12535	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12536	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12537	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12538	+
	12539	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12540	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12541	+
	12542	+ // Pigment
	12543	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12544	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12545	+ "MUL temp, temp, ndotl.x;" +
	12546	+
	12547	+ "MUL temp, temp, zero123.z;" +
	12548	+
	12549	+ //"MUL temp, temp, ndotl.y;" +
	12550	+
	12551	+ "MOV temp.w, zero123.y;" + // reset alpha
	12552	+ "MOV result.color, temp;" +
	12553	+ "END";
	12554	+
	12555	+ String programmax =
	12556	+ "!!ARBfp1.0\n" +
	12557	+
12201	12558	//"OPTION ARB_fragment_program_shadow;" +
12202	12559	"PARAM light2cam0 = program.env[10];" +
12203	12560	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12312,8 +12669,7 @@
12312	12669	"TEMP shininess;" +
12313	12670	"\n" +
12314	12671	"MOV texSamp, one;" +
12315		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12316		-
	12672	+
12317	12673	"MOV mapgrid.x, one2048th.x;" +
12318	12674	"MOV temp, fragment.texcoord[1];" +
12319	12675	/*
..	..	@@ -12334,20 +12690,20 @@
12334	12690	"MUL temp, floor, mapgrid.x;" +
12335	12691	//"TEX depth0, temp, texture[1], 2D;" +
12336	12692	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12337		- TextureFetch("depth0", "temp", "1") +
	12693	+ ShadowTextureFetch("depth0", "temp", "1") +
12338	12694	"") +
12339	12695	"ADD temp.x, temp.x, mapgrid.x;" +
12340	12696	//"TEX depth1, temp, texture[1], 2D;" +
12341	12697	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12342		- TextureFetch("depth1", "temp", "1") +
	12698	+ ShadowTextureFetch("depth1", "temp", "1") +
12343	12699	"") +
12344	12700	"ADD temp.y, temp.y, mapgrid.x;" +
12345	12701	//"TEX depth2, temp, texture[1], 2D;" +
12346		- TextureFetch("depth2", "temp", "1") +
	12702	+ ShadowTextureFetch("depth2", "temp", "1") +
12347	12703	"SUB temp.x, temp.x, mapgrid.x;" +
12348	12704	//"TEX depth3, temp, texture[1], 2D;" +
12349	12705	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12350		- TextureFetch("depth3", "temp", "1") +
	12706	+ ShadowTextureFetch("depth3", "temp", "1") +
12351	12707	"") +
12352	12708	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12353	12709	//"MOV params, material;" +
..	..	@@ -12718,10 +13074,10 @@
12718	13074	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12719	13075	"") +
12720	13076
12721		- // display shadow only (bump == 0)
	13077	+ // display shadow only (fakedepth == 0)
12722	13078	"SUB temp.x, half.x, shadow.x;" +
12723	13079	"MOV temp.y, -params5.z;" + // params6.x;" +
12724		- "SLT temp.z, temp.y, -one2048th.x;" +
	13080	+ "SLT temp.z, temp.y, -c256i.x;" +
12725	13081	"SUB temp.y, one.x, temp.z;" +
12726	13082	"MUL temp.x, temp.x, temp.y;" +
12727	13083	"KIL temp.x;" +
..	..	@@ -13052,6 +13408,13 @@
13052	13408	//once = true;
13053	13409	}
13054	13410
	13411	+ String program = programmax;
	13412	+
	13413	+ if (Globals.MINSHADER)
	13414	+ {
	13415	+ program = programmin;
	13416	+ }
	13417	+
13055	13418	System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13056	13419	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13057	13420	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
..	..	@@ -13145,25 +13508,26 @@
13145	13508	return out;
13146	13509	}
13147	13510
13148		- String TextureFetch(String dest, String src, String unit)
	13511	+ // Also does frustum culling
	13512	+ String ShadowTextureFetch(String dest, String src, String unit)
13149	13513	{
13150	13514	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13151	13515	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13152	13516	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13517	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13518	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13153	13519	"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;" +
	13520	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13521	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13158	13522	//"SWZ buffer, temp, w,w,w,w;";
13159		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13523	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13160	13524	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13161	13525	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13162	13526	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13163		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13527	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13164	13528
13165		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13166		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13529	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13530	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13167	13531	}
13168	13532
13169	13533	String Shadow(String depth, String shadow)
..	..	@@ -13210,7 +13574,7 @@
13210	13574	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13211	13575	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13212	13576
13213		- // No shadow when out of frustrum
	13577	+ // No shadow when out of frustum
13214	13578	"SGE temp.x, " + depth + ".z, one.z;" +
13215	13579	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13216	13580	"";
..	..	@@ -14008,14 +14372,15 @@
14008	14372	drag = false;
14009	14373	//System.out.println("Mouse DOWN");
14010	14374	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);
	14375	+ //ClickInfo info = new ClickInfo();
	14376	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14377	+ object.clickInfo.pane = this;
	14378	+ object.clickInfo.camera = renderCamera;
	14379	+ object.clickInfo.x = x;
	14380	+ object.clickInfo.y = y;
	14381	+ object.clickInfo.modifiers = modifiersex;
	14382	+ editObj = object.doEditClick(//info,
	14383	+ 0);
14019	14384	if (!editObj)
14020	14385	{
14021	14386	hasMarquee = true;
..	..	@@ -14299,9 +14664,9 @@
14299	14664	MODIFIERS \|= COMMAND;
14300	14665	/**/
14301	14666	if((mod&SHIFT) == SHIFT)
14302		- manipCamera.RotatePosition(0, -speed);
14303		- else
14304	14667	manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14668	+ else
	14669	+ manipCamera.RotatePosition(0, -speed);
14305	14670	/**/
14306	14671	if ((mod & SHIFT) == SHIFT)
14307	14672	{
..	..	@@ -14320,9 +14685,9 @@
14320	14685	MODIFIERS \|= COMMAND;
14321	14686	/**/
14322	14687	if((mod&SHIFT) == SHIFT)
14323		- manipCamera.RotatePosition(0, speed);
14324		- else
14325	14688	manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14689	+ else
	14690	+ manipCamera.RotatePosition(0, speed);
14326	14691	/**/
14327	14692	if ((mod & SHIFT) == SHIFT)
14328	14693	{
..	..	@@ -14415,15 +14780,16 @@
14415	14780	if (editObj)
14416	14781	{
14417	14782	drag = true;
14418		- ClickInfo info = new ClickInfo();
14419		- info.bounds.setBounds(0, 0,
	14783	+ //ClickInfo info = new ClickInfo();
	14784	+ object.clickInfo.bounds.setBounds(0, 0,
14420	14785	(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);
	14786	+ object.clickInfo.pane = this;
	14787	+ object.clickInfo.camera = renderCamera;
	14788	+ object.clickInfo.x = x;
	14789	+ object.clickInfo.y = y;
	14790	+ object //.GetWindow().copy
	14791	+ .doEditDrag(//info,
	14792	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14427	14793	} else
14428	14794	{
14429	14795	if (x < startX)
..	..	@@ -14572,24 +14938,27 @@
14572	14938	}
14573	14939	}
14574	14940
	14941	+// ClickInfo clickInfo = new ClickInfo();
	14942	+
14575	14943	public void mouseMoved(MouseEvent e)
14576	14944	{
14577	14945	//System.out.println("mouseMoved: " + e);
14578	14946	if (isRenderer)
14579	14947	return;
14580	14948
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;
	14949	+ // Mouse cursor feedback
	14950	+ object.clickInfo.x = e.getX();
	14951	+ object.clickInfo.y = e.getY();
	14952	+ object.clickInfo.modifiers = e.getModifiersEx();
	14953	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14954	+ object.clickInfo.pane = this;
	14955	+ object.clickInfo.camera = renderCamera;
14588	14956	if (!isRenderer)
14589	14957	{
14590	14958	//ObjEditor editWindow = object.editWindow;
14591	14959	//Object3D copy = editWindow.copy;
14592		- if (object.doEditClick(ci, 0))
	14960	+ if (object.doEditClick(//clickInfo,
	14961	+ 0))
14593	14962	{
14594	14963	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14595	14964	} else
..	..	@@ -14861,7 +15230,8 @@
14861	15230	// break;
14862	15231	case 'T':
14863	15232	CACHETEXTURE ^= true;
14864		- textures.clear();
	15233	+ texturepigment.clear();
	15234	+ texturebump.clear();
14865	15235	// repaint();
14866	15236	break;
14867	15237	case 'Y':
..	..	@@ -15038,20 +15408,24 @@
15038	15408	OCCLUSION_CULLING ^= true;
15039	15409	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
15040	15410	break;
15041		- case '0': envyoff ^= true; repaint(); break;
	15411	+ //case '0': envyoff ^= true; repaint(); break;
15042	15412	case '1':
15043	15413	case '2':
15044	15414	case '3':
15045	15415	case '4':
15046	15416	case '5':
15047		- newenvy = Character.getNumericValue(key);
15048		- repaint();
15049		- break;
15050	15417	case '6':
15051	15418	case '7':
15052	15419	case '8':
15053	15420	case '9':
15054		- BGcolor = (key - '6')/3.f;
	15421	+ if (true) // envyoff)
	15422	+ {
	15423	+ BGcolor = (key - '1')/8.f;
	15424	+ }
	15425	+ else
	15426	+ {
	15427	+ //newenvy = Character.getNumericValue(key);
	15428	+ }
15055	15429	repaint();
15056	15430	break;
15057	15431	case '!':
..	..	@@ -15614,8 +15988,6 @@
15614	15988
15615	15989	int width = getBounds().width;
15616	15990	int height = getBounds().height;
15617		- ClickInfo info = new ClickInfo();
15618		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15619	15991	//Image img = CreateImage(width, height);
15620	15992	//System.out.println("width = " + width + "; height = " + height + "\n");
15621	15993
..	..	@@ -15692,38 +16064,47 @@
15692	16064	}
15693	16065	if (object != null && !hasMarquee)
15694	16066	{
	16067	+ if (object.clickInfo == null)
	16068	+ object.clickInfo = new ClickInfo();
	16069	+ ClickInfo info = object.clickInfo;
	16070	+ //ClickInfo info = new ClickInfo();
	16071	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16072	+
15695	16073	if (isRenderer)
15696	16074	{
15697		- info.flags++;
	16075	+ object.clickInfo.flags++;
15698	16076	double frameAspect = (double) width / (double) height;
15699	16077	if (frameAspect > renderCamera.aspect)
15700	16078	{
15701	16079	int desired = (int) ((double) height * renderCamera.aspect);
15702		- info.bounds.width -= width - desired;
15703		- info.bounds.x += (width - desired) / 2;
	16080	+ object.clickInfo.bounds.width -= width - desired;
	16081	+ object.clickInfo.bounds.x += (width - desired) / 2;
15704	16082	} else
15705	16083	{
15706	16084	int desired = (int) ((double) width / renderCamera.aspect);
15707		- info.bounds.height -= height - desired;
15708		- info.bounds.y += (height - desired) / 2;
	16085	+ object.clickInfo.bounds.height -= height - desired;
	16086	+ object.clickInfo.bounds.y += (height - desired) / 2;
15709	16087	}
15710	16088	}
15711		- info.g = gr;
15712		- info.camera = renderCamera;
	16089	+
	16090	+ object.clickInfo.g = gr;
	16091	+ object.clickInfo.camera = renderCamera;
15713	16092	/*
15714	16093	// Memory intensive (brep.verticescopy)
15715	16094	if (!(object instanceof Composite))
15716	16095	object.draw(info, 0, false); // SLOW :
15717	16096	*/
15718		- if (!isRenderer)
	16097	+ if (!isRenderer) // && drag)
15719	16098	{
	16099	+ Grafreed.Assert(object != null);
	16100	+ Grafreed.Assert(object.selection != null);
15720	16101	if (object.selection.Size() > 0)
15721	16102	{
15722	16103	int hitSomething = object.selection.get(0).hitSomething;
15723	16104
15724		- info.DX = 0;
15725		- info.DY = 0;
15726		- info.W = 1;
	16105	+ object.clickInfo.DX = 0;
	16106	+ object.clickInfo.DY = 0;
	16107	+ object.clickInfo.W = 1;
15727	16108	if (hitSomething == Object3D.hitCenter)
15728	16109	{
15729	16110	info.DX = X;
..	..	@@ -15735,7 +16116,8 @@
15735	16116	info.DY -= info.bounds.height/2;
15736	16117	}
15737	16118
15738		- object.drawEditHandles(info, 0);
	16119	+ object.drawEditHandles(//info,
	16120	+ 0);
15739	16121
15740	16122	if (drag && (X != 0 \|\| Y != 0))
15741	16123	{
..	..	@@ -16234,6 +16616,8 @@
16234	16616	private /static/ boolean firstime;
16235	16617	private /static/ cVector newView = new cVector();
16236	16618	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16619	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16620	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
16237	16621	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16238	16622	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16239	16623	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16246,29 +16630,67 @@
16246	16630	{
16247	16631	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16248	16632
	16633	+ int usedsuf = 0;
	16634	+
16249	16635	for (int i = 0; i < suffixes.length; i++)
16250	16636	{
16251		- String resourceName = basename + suffixes[i] + "." + suffix;
16252		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16253		- mipmapped,
16254		- FileUtil.getFileSuffix(resourceName));
16255		- if (data == null)
	16637	+ String[] suffixe = suffixes;
	16638	+ String[] fallback = suffixes2;
	16639	+ String[] fallfallback = suffixes3;
	16640	+
	16641	+ for (int c=usedsuf; --c>=0;)
16256	16642	{
16257		- throw new IOException("Unable to load texture " + resourceName);
	16643	+// String[] temp = suffixe;
	16644	+// suffixe = fallback;
	16645	+// fallback = fallfallback;
	16646	+// fallfallback = temp;
16258	16647	}
	16648	+
	16649	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16650	+ TextureData data;
	16651	+
	16652	+ try
	16653	+ {
	16654	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16655	+ mipmapped,
	16656	+ FileUtil.getFileSuffix(resourceName));
	16657	+ }
	16658	+ catch (Exception e)
	16659	+ {
	16660	+ try
	16661	+ {
	16662	+ resourceName = basename + fallback[i] + "." + suffix;
	16663	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16664	+ mipmapped,
	16665	+ FileUtil.getFileSuffix(resourceName));
	16666	+ }
	16667	+ catch (Exception e2)
	16668	+ {
	16669	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16670	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16671	+ mipmapped,
	16672	+ FileUtil.getFileSuffix(resourceName));
	16673	+ }
	16674	+ }
	16675	+
16259	16676	//System.out.println("Target = " + targets[i]);
16260	16677	cubemap.updateImage(data, targets[i]);
16261	16678	}
16262	16679
16263	16680	return cubemap;
16264	16681	}
	16682	+
16265	16683	int bigsphere = -1;
16266	16684
16267	16685	float BGcolor = 0.5f;
16268	16686
16269		- private void DrawSkyBox(GL gl)
	16687	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16688	+
	16689	+ private void DrawSkyBox(GL gl, float ratio)
16270	16690	{
16271		- if (envyoff \|\| cubemap == null)
	16691	+ if (//envyoff \|\|
	16692	+ WIREFRAME \|\|
	16693	+ cubemap == null)
16272	16694	{
16273	16695	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16274	16696	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16283,7 +16705,17 @@
16283	16705	// Compensates for ExaminerViewer's modification of modelview matrix
16284	16706	gl.glMatrixMode(GL.GL_MODELVIEW);
16285	16707	gl.glLoadIdentity();
	16708	+ gl.glScalef(1,ratio,1);
16286	16709
	16710	+// colorV[0] = 2;
	16711	+// colorV[1] = 2;
	16712	+// colorV[2] = 2;
	16713	+// colorV[3] = 1;
	16714	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16715	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16716	+//
	16717	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16718	+
16287	16719	//gl.glActiveTexture(GL.GL_TEXTURE1);
16288	16720	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16289	16721
..	..	@@ -16315,6 +16747,7 @@
16315	16747	{
16316	16748	gl.glScalef(1.0f, -1.0f, 1.0f);
16317	16749	}
	16750	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16318	16751	gl.glMultMatrixd(viewrot_1, 0);
16319	16752	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16320	16753	//viewer.updateInverseRotation(gl);
..	..	@@ -16550,6 +16983,14 @@
16550	16983	}
16551	16984	}
16552	16985
	16986	+ private Object3D GetFolder()
	16987	+ {
	16988	+ Object3D folder = object.GetWindow().copy;
	16989	+ if (object.GetWindow().copy.selection.Size() > 0)
	16990	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16991	+ return folder;
	16992	+ }
	16993	+
16553	16994	class SelectBuffer implements GLEventListener
16554	16995	{
16555	16996
..	..	@@ -16565,7 +17006,7 @@
16565	17006	//new Exception().printStackTrace();
16566	17007	System.out.println("select buffer init");
16567	17008	// Use debug pipeline
16568		- drawable.setGL(new DebugGL(drawable.getGL()));
	17009	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16569	17010
16570	17011	GL gl = drawable.getGL();
16571	17012
..	..	@@ -16629,6 +17070,17 @@
16629	17070
16630	17071	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16631	17072
	17073	+ if (PAINTMODE)
	17074	+ {
	17075	+ if (object.GetWindow().copy.selection.Size() > 0)
	17076	+ {
	17077	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17078	+
	17079	+ // Make what you paint not selectable.
	17080	+ paintobj.ResetSelectable();
	17081	+ }
	17082	+ }
	17083	+
16632	17084	//int tmp = selection_view;
16633	17085	//selection_view = -1;
16634	17086	int temp = DrawMode();
..	..	@@ -16640,6 +17092,17 @@
16640	17092	// temp = DEFAULT; // patch for selection debug
16641	17093	Globals.drawMode = temp; // WARNING
16642	17094
	17095	+ if (PAINTMODE)
	17096	+ {
	17097	+ if (object.GetWindow().copy.selection.Size() > 0)
	17098	+ {
	17099	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17100	+
	17101	+ // Revert.
	17102	+ paintobj.RestoreSelectable();
	17103	+ }
	17104	+ }
	17105	+
16643	17106	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16644	17107
16645	17108	// trying different ways of getting the depth info over
..	..	@@ -16745,27 +17208,29 @@
16745	17208	if (!movingcamera && !PAINTMODE)
16746	17209	object.GetWindow().ScreenFitPoint(); // fev 2014
16747	17210
16748		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17211	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16749	17212	{
16750		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16751		-
16752		- Object3D group = new Object3D("inst" + paintcount++);
16753		-
16754		- group.CreateMaterial(); // use a void leaf to select instances
16755		-
16756		- group.add(paintobj); // link
16757		-
16758		- object.GetWindow().SnapObject(group);
16759		-
16760		- Object3D folder = object.GetWindow().copy;
	17213	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16761	17214
16762	17215	if (object.GetWindow().copy.selection.Size() > 0)
16763		- folder = object.GetWindow().copy.selection.elementAt(0);
	17216	+ {
	17217	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16764	17218
16765		- folder.add(group);
16766		-
16767		- object.GetWindow().ResetModel();
16768		- object.GetWindow().refreshContents();
	17219	+ Object3D inst = new Object3D("inst" + paintcount++);
	17220	+
	17221	+ inst.CreateMaterial(); // use a void leaf to select instances
	17222	+
	17223	+ inst.add(paintobj); // link
	17224	+
	17225	+ object.GetWindow().SnapObject(inst);
	17226	+
	17227	+ Object3D folder = paintFolder; // GetFolder();
	17228	+
	17229	+ folder.add(inst);
	17230	+
	17231	+ object.GetWindow().ResetModel();
	17232	+ object.GetWindow().refreshContents();
	17233	+ }
16769	17234	}
16770	17235	else
16771	17236	paintcount = 0;
..	..	@@ -17087,10 +17552,14 @@
17087	17552	gl.glFlush();
17088	17553
17089	17554	/**/
17090		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	17555	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
17091	17556
17092		- float[] pixels = occlusionsizebuffer.array();
	17557	+ float[] depths = occlusiondepthbuffer.array();
17093	17558
	17559	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	17560	+
	17561	+ int[] pixels = selectsizebuffer.array();
	17562	+
17094	17563	double r = 0, g = 0, b = 0;
17095	17564
17096	17565	double count = 0;
..	..	@@ -17101,7 +17570,7 @@
17101	17570
17102	17571	double FACTOR = 1;
17103	17572
17104		- for (int i = 0; i < pixels.length; i++)
	17573	+ for (int i = 0; i < depths.length; i++)
17105	17574	{
17106	17575	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
17107	17576	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -17184,7 +17653,7 @@
17184	17653
17185	17654	double scale = ray.z; // 1; // cos
17186	17655
17187		- float depth = pixels[newindex];
	17656	+ float depth = depths[newindex];
17188	17657
17189	17658	/*
17190	17659	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17381,11 +17850,14 @@
17381	17850	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17382	17851	static IntBuffer bigAAbuffer;
17383	17852	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17384		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	17853	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17385	17854	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17386	17855	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17387	17856	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17388		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17857	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17858	+
	17859	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17860	+
17389	17861	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17390	17862	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17391	17863	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();