~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	{
..	..	@@ -37,7 +41,6 @@
37	41	static boolean[] selectedstack = new boolean[65536];
38	42	static int materialdepth = 0;
39	43
40		- static boolean DEBUG = false;
41	44	static boolean FRUSTUM = false; // still bogus true; // frustum culling
42	45
43	46	// camera change fix
..	..	@@ -45,6 +48,39 @@
45	48	static boolean ABORTED = false;
46	49
47	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	+ }
48	84
49	85	/static/ private boolean CULLFACE = false; // true;
50	86	/static/ boolean NEAREST = false; // true;
..	..	@@ -61,7 +97,7 @@
61	97	//boolean REDUCETEXTURE = true;
62	98	boolean CACHETEXTURE = true;
63	99	boolean CLEANCACHE = false; // true;
64		- boolean MIPMAP = false; // true;
	100	+ boolean MIPMAP = false; // true; // never works...
65	101	boolean COMPRESSTEXTURE = false;
66	102	boolean KOMPACTTEXTURE = false; // true;
67	103	boolean RESIZETEXTURE = false;
..	..	@@ -74,7 +110,9 @@
74	110	//private Mat4f spotlightTransform = new Mat4f();
75	111	//private Mat4f spotlightInverseTransform = new Mat4f();
76	112	static GLContext glcontext = null;
77		- /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;
78	116	boolean reverseUP = false;
79	117	static boolean frozen = false;
80	118	boolean enablebackspace = false; // patch for back buffer refresh
..	..	@@ -137,7 +175,7 @@
137	175	static boolean doublesided = false; // true; // reversed normals are awful for conformance
138	176	boolean anisotropy = true;
139	177	boolean softshadow = true; // slower but better false;
140		- boolean opacityhalo = false;
	178	+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
141	179
142	180	boolean macromode = false;
143	181
..	..	@@ -151,6 +189,19 @@
151	189	}
152	190
153	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	+ }
154	205
155	206	void SetAsGLRenderer(boolean b)
156	207	{
..	..	@@ -170,7 +221,8 @@
170	221
171	222	SetCamera(cam);
172	223
173		- SetLight(new Camera(new cVector(10, 10, -20)));
	224	+ // Warning: not used.
	225	+ SetLight(new Camera(new cVector(15, 10, -20)));
174	226
175	227	object = o;
176	228
..	..	@@ -327,7 +379,7 @@
327	379	cStatic.objectstack[materialdepth++] = obj;
328	380	//System.out.println("material " + material);
329	381	//Applet3D.tracein(this, selected);
330		- display.vector2buffer = obj.projectedVertices;
	382	+ //display.vector2buffer = obj.projectedVertices;
331	383	if (obj instanceof Camera)
332	384	{
333	385	display.options1[0] = material.shift;
..	..	@@ -336,14 +388,28 @@
336	388	display.options1[2] = material.shadowbias;
337	389	display.options1[3] = material.aniso;
338	390	display.options1[4] = material.anisoV;
	391	+// System.out.println("display.options1[0] " + display.options1[0]);
	392	+// System.out.println("display.options1[1] " + display.options1[1]);
	393	+// System.out.println("display.options1[2] " + display.options1[2]);
	394	+// System.out.println("display.options1[3] " + display.options1[3]);
	395	+// System.out.println("display.options1[4] " + display.options1[4]);
339	396	display.options2[0] = material.opacity;
340	397	display.options2[1] = material.diffuse;
341	398	display.options2[2] = material.factor;
	399	+// System.out.println("display.options2[0] " + display.options2[0]);
	400	+// System.out.println("display.options2[1] " + display.options2[1]);
	401	+// System.out.println("display.options2[2] " + display.options2[2]);
342	402
343	403	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	404	+// System.out.println("display.options3[0] " + display.options3[0]);
	405	+// System.out.println("display.options3[1] " + display.options3[1]);
	406	+// System.out.println("display.options3[2] " + display.options3[2]);
344	407	display.options4[0] = material.cameralight/0.2f;
345	408	display.options4[1] = material.subsurface;
346	409	display.options4[2] = material.sheen;
	410	+// System.out.println("display.options4[0] " + display.options4[0]);
	411	+// System.out.println("display.options4[1] " + display.options4[1]);
	412	+// System.out.println("display.options4[2] " + display.options4[2]);
347	413
348	414	// if (display.CURRENTANTIALIAS > 0)
349	415	// display.options3[3] /= 4;
..	..	@@ -359,7 +425,7 @@
359	425	/**/
360	426	} else
361	427	{
362		- DrawMaterial(material, selected);
	428	+ DrawMaterial(material, selected, obj.projectedVertices);
363	429	}
364	430	} else
365	431	{
..	..	@@ -383,8 +449,8 @@
383	449	cStatic.objectstack[materialdepth++] = obj;
384	450	//System.out.println("material " + material);
385	451	//Applet3D.tracein("selected ", selected);
386		- display.vector2buffer = obj.projectedVertices;
387		- display.DrawMaterial(material, selected);
	452	+ //display.vector2buffer = obj.projectedVertices;
	453	+ display.DrawMaterial(material, selected, obj.projectedVertices);
388	454	}
389	455	}
390	456
..	..	@@ -401,8 +467,8 @@
401	467	materialdepth -= 1;
402	468	if (materialdepth > 0)
403	469	{
404		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
405		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	470	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	471	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
406	472	}
407	473	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
408	474	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -422,8 +488,8 @@
422	488	materialdepth -= 1;
423	489	if (materialdepth > 0)
424	490	{
425		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
426		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	491	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	492	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
427	493	}
428	494	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
429	495	//else
..	..	@@ -1434,6 +1500,8 @@
1434	1500	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1435	1501	}
1436	1502
	1503	+ float[] colorV = new float[4];
	1504	+
1437	1505	void SetColor(Object3D obj, Vertex p0)
1438	1506	{
1439	1507	CameraPane display = this;
..	..	@@ -1501,8 +1569,6 @@
1501	1569	{
1502	1570	return;
1503	1571	}
1504		-
1505		- float[] colorV = new float[3];
1506	1572
1507	1573	if (false) // marked)
1508	1574	{
..	..	@@ -1611,7 +1677,7 @@
1611	1677	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1612	1678	}
1613	1679
1614		- void DrawMaterial(cMaterial material, boolean selected)
	1680	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1615	1681	{
1616	1682	CameraPane display = this;
1617	1683	//new Exception().printStackTrace();
..	..	@@ -1646,7 +1712,7 @@
1646	1712	colorV[0] = display.modelParams0[0] * material.diffuse;
1647	1713	colorV[1] = display.modelParams0[1] * material.diffuse;
1648	1714	colorV[2] = display.modelParams0[2] * material.diffuse;
1649		- colorV[3] = material.opacity;
	1715	+ colorV[3] = 1; // material.opacity;
1650	1716
1651	1717	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1652	1718	//System.out.println("Opacity = " + opacity);
..	..	@@ -1754,9 +1820,9 @@
1754	1820	display.modelParams7[2] = 0;
1755	1821	display.modelParams7[3] = 0;
1756	1822
1757		- display.modelParams6[0] = 100; // criss de bug de bump
	1823	+ //display.modelParams6[0] = 100; // criss de bug de bump
1758	1824
1759		- Object3D.cVector2[] extparams = display.vector2buffer;
	1825	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1760	1826	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1761	1827	{
1762	1828	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -2052,7 +2118,7 @@
2052	2118	//System.err.println("Oeil on");
2053	2119	OEIL = true;
2054	2120	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2055		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2121	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2056	2122	//pingthread.StepToTarget(true);
2057	2123	}
2058	2124
..	..	@@ -2267,7 +2333,7 @@
2267	2333
2268	2334	void ToggleDebug()
2269	2335	{
2270		- DEBUG ^= true;
	2336	+ Globals.DEBUG ^= true;
2271	2337	}
2272	2338
2273	2339	void ToggleLookAt()
..	..	@@ -2285,10 +2351,17 @@
2285	2351	HANDLES ^= true;
2286	2352	}
2287	2353
	2354	+ Object3D paintFolder;
	2355	+
2288	2356	void TogglePaint()
2289	2357	{
2290	2358	PAINTMODE ^= true;
2291	2359	paintcount = 0;
	2360	+
	2361	+ if (PAINTMODE)
	2362	+ {
	2363	+ paintFolder = GetFolder();
	2364	+ }
2292	2365	}
2293	2366
2294	2367	void SwapCamera(int a, int b)
..	..	@@ -2385,6 +2458,21 @@
2385	2458	return currentGL;
2386	2459	}
2387	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	+
2388	2476	/**/
2389	2477	class CacheTexture
2390	2478	{
..	..	@@ -2393,28 +2481,31 @@
2393	2481
2394	2482	int resolution;
2395	2483
2396		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2484	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2397	2485	{
2398		- texture = tex;
	2486	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2487	+ texturedata = texdata;
2399	2488	resolution = res;
2400	2489	}
2401	2490	}
2402	2491	/**/
2403	2492
2404	2493	// TEXTURE static Texture texture;
2405		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2406		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2407		- 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	+
2408	2499	int pigmentdepth = 0;
2409	2500	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2410	2501	int bumpdepth = 0;
2411	2502	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2412	2503	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2413	2504	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2414		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2505	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2415	2506	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2416	2507
2417		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2508	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2418	2509	{
2419	2510	TextureData texturedata = null;
2420	2511
..	..	@@ -2433,13 +2524,34 @@
2433	2524	if (bump)
2434	2525	texturedata = ConvertBump(texturedata, false);
2435	2526
2436		- com.sun.opengl.util.texture.Texture texture =
2437		- 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);
2438	2529
2439		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2440		- 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);
2441	2532
2442		- 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;
2443	2555	}
2444	2556
2445	2557	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3512,6 +3624,8 @@
3512	3624
3513	3625	System.out.println("LOADING TEXTURE : " + name);
3514	3626
	3627	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3628	+
3515	3629	//
3516	3630	if (false) // compressbit > 0)
3517	3631	{
..	..	@@ -7910,7 +8024,7 @@
7910	8024	String pigment = Object3D.GetPigment(tex);
7911	8025	String bump = Object3D.GetBump(tex);
7912	8026
7913		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8027	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7914	8028	{
7915	8029	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7916	8030	// System.out.println("; bump = " + bump);
..	..	@@ -7925,8 +8039,8 @@
7925	8039	pigment = null;
7926	8040	}
7927	8041
7928		- ReleaseTexture(bump, true);
7929		- ReleaseTexture(pigment, false);
	8042	+ ReleaseTexture(tex, true);
	8043	+ ReleaseTexture(tex, false);
7930	8044	}
7931	8045
7932	8046	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -7944,7 +8058,7 @@
7944	8058
7945	8059	String pigment = Object3D.GetPigment(tex);
7946	8060
7947		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8061	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7948	8062	{
7949	8063	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7950	8064	// System.out.println("; bump = " + bump);
..	..	@@ -7955,7 +8069,7 @@
7955	8069	pigment = null;
7956	8070	}
7957	8071
7958		- ReleaseTexture(pigment, false);
	8072	+ ReleaseTexture(tex, false);
7959	8073	}
7960	8074
7961	8075	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -7973,7 +8087,7 @@
7973	8087
7974	8088	String bump = Object3D.GetBump(tex);
7975	8089
7976		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8090	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7977	8091	{
7978	8092	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7979	8093	// System.out.println("; bump = " + bump);
..	..	@@ -7984,10 +8098,10 @@
7984	8098	bump = null;
7985	8099	}
7986	8100
7987		- ReleaseTexture(bump, true);
	8101	+ ReleaseTexture(tex, true);
7988	8102	}
7989	8103
7990		- void ReleaseTexture(String tex, boolean bump)
	8104	+ void ReleaseTexture(cTexture tex, boolean bump)
7991	8105	{
7992	8106	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7993	8107	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7998,7 +8112,7 @@
7998	8112	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7999	8113
8000	8114	if (tex != null)
8001		- texture = textures.get(tex);
	8115	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
8002	8116
8003	8117	// //assert( texture != null );
8004	8118	// if (texture == null)
..	..	@@ -8092,47 +8206,50 @@
8092	8206
8093	8207	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8094	8208	{
8095		- if (// DrawMode() != 0 \|\| /tex == null \|\|/
8096		- ambientOcclusion ) // \|\| !textureon)
8097		- {
8098		- return; // false;
8099		- }
8100		-
8101		- if (tex == null)
8102		- {
8103		- BindTexture(null,false,resolution);
8104		- BindTexture(null,true,resolution);
8105		- return;
8106		- }
	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;
8107	8250
8108		- String pigment = Object3D.GetPigment(tex);
8109		- String bump = Object3D.GetBump(tex);
8110		-
8111		- usedtextures.put(pigment, pigment);
8112		- usedtextures.put(bump, bump);
8113		-
8114		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8115		- {
8116		- // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8117		- // System.out.println("; bump = " + bump);
8118		- }
8119		-
8120		- if (bump.equals(""))
8121		- {
8122		- bump = null;
8123		- }
8124		- if (pigment.equals(""))
8125		- {
8126		- pigment = null;
8127		- }
8128		-
8129		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8130		- BindTexture(pigment, false, resolution);
8131		- GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8132		- BindTexture(bump, true, resolution);
8133		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8134		-
8135		- return; // true;
	8251	+ BindPigmentTexture(tex, resolution);
	8252	+ BindBumpTexture(tex, resolution);
8136	8253	}
8137	8254
8138	8255	/boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8151,9 +8268,9 @@
8151	8268
8152	8269	String pigment = Object3D.GetPigment(tex);
8153	8270
8154		- usedtextures.put(pigment, pigment);
	8271	+ usedtextures.add(tex);
8155	8272
8156		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8273	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8157	8274	{
8158	8275	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8159	8276	// System.out.println("; bump = " + bump);
..	..	@@ -8165,7 +8282,7 @@
8165	8282	}
8166	8283
8167	8284	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8168		- BindTexture(pigment, false, resolution);
	8285	+ BindTexture(tex, false, resolution);
8169	8286	}
8170	8287
8171	8288	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8184,9 +8301,9 @@
8184	8301
8185	8302	String bump = Object3D.GetBump(tex);
8186	8303
8187		- usedtextures.put(bump, bump);
	8304	+ usedtextures.add(tex);
8188	8305
8189		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8306	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8190	8307	{
8191	8308	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8192	8309	// System.out.println("; bump = " + bump);
..	..	@@ -8198,7 +8315,7 @@
8198	8315	}
8199	8316
8200	8317	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8201		- BindTexture(bump, true, resolution);
	8318	+ BindTexture(tex, true, resolution);
8202	8319	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8203	8320	}
8204	8321
..	..	@@ -8222,13 +8339,19 @@
8222	8339	return fileExists;
8223	8340	}
8224	8341
8225		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8342	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8226	8343	{
8227		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8344	+ CacheTexture texturecache = null;
8228	8345
8229	8346	if (tex != null)
8230	8347	{
8231		- 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	+ }
8232	8355
8233	8356	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8234	8357
..	..	@@ -8238,19 +8361,46 @@
8238	8361	// else
8239	8362	// if (!texname.startsWith("/"))
8240	8363	// texname = "/Users/nbriere/Textures/" + texname;
8241		- if (!FileExists(tex))
	8364	+ if (!FileExists(texname) && !texname.startsWith("@"))
8242	8365	{
8243	8366	texname = fallbackTextureName;
8244	8367	}
8245	8368
8246	8369	if (CACHETEXTURE)
8247		- texture = textures.get(texname); // TEXTURE CACHE
8248		-
8249		- TextureData texturedata = null;
8250		-
8251		- if (texture == null \|\| texture.resolution < resolution)
8252	8370	{
8253		- 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(""))
8254	8404	{
8255	8405	assert(!bump);
8256	8406	// if (bump)
..	..	@@ -8261,19 +8411,23 @@
8261	8411	// }
8262	8412	// else
8263	8413	// {
8264		- texture = textures.get(tex);
8265		- if (texture == null)
	8414	+ // texturecache = textures.get(texname); // suspicious
	8415	+ if (texturecache == null)
8266	8416	{
8267		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8417	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8268	8418	}
	8419	+ else
	8420	+ new Exception().printStackTrace();
8269	8421	// }
8270	8422	} else
8271		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8423	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8272	8424	{
8273	8425	assert(bump);
8274		- texture = textures.get(tex);
8275		- if (texture == null)
8276		- 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();
8277	8431	} else
8278	8432	{
8279	8433	//if (tex.equals("IMMORTAL"))
..	..	@@ -8281,11 +8435,22 @@
8281	8435	// texture = GetResourceTexture("default.png");
8282	8436	//} else
8283	8437	//{
8284		- if (tex.equals("WHITE_NOISE"))
	8438	+ if (texname.endsWith("WHITE_NOISE"))
8285	8439	{
8286		- texture = textures.get(tex);
8287		- if (texture == null)
8288		- 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();
8289	8454	} else
8290	8455	{
8291	8456	if (textureon)
..	..	@@ -8344,19 +8509,20 @@
8344	8509	if (texturedata == null)
8345	8510	throw new Exception();
8346	8511
8347		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8512	+ texturecache = new CacheTexture(texturedata,resolution);
8348	8513	//texture = GetTexture(tex, bump);
8349	8514	}
	8515	+ }
8350	8516	}
8351	8517	//}
8352	8518	}
8353	8519
8354		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8520	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8355	8521	{
8356	8522	//return false;
8357	8523
8358	8524	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8359		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8525	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8360	8526	{
8361	8527	// String ext = "_highres";
8362	8528	// if (REDUCETEXTURE)
..	..	@@ -8373,52 +8539,17 @@
8373	8539	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8374	8540	if (!cachefile.exists())
8375	8541	{
8376		- // cache to disk
8377		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8378		- //buffers[0].
8379		-
8380		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8381		- int[] pixels = new int[bytebuf.capacity()/3];
8382		-
8383		- // squared size heuristic...
8384		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8542	+ //if (texturedata.getWidth() == texturedata.getHeight())
8385	8543	{
8386		- for (int i=pixels.length; --i>=0;)
8387		- {
8388		- int i3 = i*3;
8389		- pixels[i] = 0xFF;
8390		- pixels[i] <<= 8;
8391		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8392		- pixels[i] <<= 8;
8393		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8394		- pixels[i] <<= 8;
8395		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8396		- }
8397		-
8398		- /*
8399		- int r=0,g=0,b=0,a=0;
8400		- for (int i=0; i<width; i++)
8401		- for (int j=0; j<height; j++)
8402		- {
8403		- int index = j*width+i;
8404		- int p = pixels[index];
8405		- a = ((p>>24) & 0xFF);
8406		- r = ((p>>16) & 0xFF);
8407		- g = ((p>>8) & 0xFF);
8408		- b = (p & 0xFF);
8409		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8410		- }
8411		- /**/
8412		- int width = (int)Math.sqrt(pixels.length); // squared
8413		- int height = width;
8414		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8415		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8544	+ BufferedImage rendImage = CreateBim(texturedata);
	8545	+
8416	8546	ImageWriter writer = null;
8417	8547	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8418	8548	if (iter.hasNext()) {
8419	8549	writer = (ImageWriter)iter.next();
8420	8550	}
8421		- float compressionQuality = 0.9f;
	8551	+
	8552	+ float compressionQuality = 0.85f;
8422	8553	try
8423	8554	{
8424	8555	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8435,18 +8566,20 @@
8435	8566	}
8436	8567	}
8437	8568	}
8438		-
	8569	+
	8570	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8571	+
8439	8572	//System.out.println("Texture = " + tex);
8440		- if (textures.containsKey(texname))
	8573	+ if (textures.containsKey(tex))
8441	8574	{
8442		- CacheTexture thetex = textures.get(texname);
	8575	+ CacheTexture thetex = textures.get(tex);
8443	8576	thetex.texture.disable();
8444	8577	thetex.texture.dispose();
8445		- textures.remove(texname);
	8578	+ textures.remove(tex);
8446	8579	}
8447	8580
8448		- texture.texturedata = texturedata;
8449		- textures.put(texname, texture);
	8581	+ //texture.texturedata = texturedata;
	8582	+ textures.put(tex, texturecache);
8450	8583
8451	8584	// newtex = true;
8452	8585	}
..	..	@@ -8462,10 +8595,44 @@
8462	8595	}
8463	8596	}
8464	8597
8465		- return texture;
	8598	+ return texturecache;
8466	8599	}
8467	8600
8468		- 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
8469	8636	{
8470	8637	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8471	8638
..	..	@@ -8483,21 +8650,21 @@
8483	8650	return texture!=null?texture.texture:null;
8484	8651	}
8485	8652
8486		- 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
8487	8654	{
8488	8655	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8489	8656
8490	8657	return texture!=null?texture.texturedata:null;
8491	8658	}
8492	8659
8493		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8660	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8494	8661	{
8495	8662	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8496	8663	{
8497	8664	return false;
8498	8665	}
8499	8666
8500		- boolean newtex = false;
	8667	+ //boolean newtex = false;
8501	8668
8502	8669	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8503	8670
..	..	@@ -8529,9 +8696,75 @@
8529	8696	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8530	8697	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8531	8698
8532		- return newtex;
	8699	+ return true; // Warning: not used.
8533	8700	}
8534	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	+
8535	8768	ShadowBuffer shadowPBuf;
8536	8769	AntialiasBuffer antialiasPBuf;
8537	8770	int MAXSTACK;
..	..	@@ -8548,10 +8781,12 @@
8548	8781
8549	8782	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8550	8783	MAXSTACK = temp[0];
8551		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8784	+ if (Globals.DEBUG)
	8785	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8552	8786	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8553	8787	MAXSTACK = temp[0];
8554		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8788	+ if (Globals.DEBUG)
	8789	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8555	8790
8556	8791	// Use debug pipeline
8557	8792	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8559,7 +8794,8 @@
8559	8794	gl = drawable.getGL(); //
8560	8795
8561	8796	GL gl3 = getGL();
8562		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8797	+ if (Globals.DEBUG)
	8798	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8563	8799
8564	8800
8565	8801	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8724,7 +8960,7 @@
8724	8960
8725	8961	if (cubemap == null)
8726	8962	{
8727		- LoadEnvy(5);
	8963	+ //LoadEnvy(1);
8728	8964	}
8729	8965
8730	8966	//cubemap.enable();
..	..	@@ -9000,6 +9236,8 @@
9000	9236
9001	9237	void LoadEnvy(int which)
9002	9238	{
	9239	+ assert(false);
	9240	+
9003	9241	String name;
9004	9242	String ext;
9005	9243
..	..	@@ -9011,37 +9249,58 @@
9011	9249	cubemap = null;
9012	9250	return;
9013	9251	case 1:
9014		- name = "cubemaps/box_";
9015		- ext = "png";
	9252	+ name = "cubemaps/rgb/";
	9253	+ ext = "jpg";
9016	9254	reverseUP = false;
9017	9255	break;
9018	9256	case 2:
9019		- name = "cubemaps/uffizi_";
9020		- ext = "png";
9021		- break; // reverseUP = true; break;
	9257	+ name = "cubemaps/uffizi/";
	9258	+ ext = "jpg";
	9259	+ reverseUP = false;
	9260	+ break;
9022	9261	case 3:
9023		- name = "cubemaps/CloudyHills_";
9024		- ext = "tga";
	9262	+ name = "cubemaps/CloudyHills/";
	9263	+ ext = "jpg";
9025	9264	reverseUP = false;
9026	9265	break;
9027	9266	case 4:
9028		- name = "cubemaps/cornell_";
	9267	+ name = "cubemaps/cornell/";
9029	9268	ext = "png";
9030	9269	reverseUP = false;
9031	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;
9032	9296	default:
9033		- name = "cubemaps/rgb_";
9034		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9297	+ name = "cubemaps/box/";
	9298	+ ext = "png"; /mipmap = true;/
	9299	+ reverseUP = false;
9035	9300	break;
9036	9301	}
9037		-
9038		- try
9039		- {
9040		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9041		- } catch (IOException e)
9042		- {
9043		- throw new RuntimeException(e);
9044		- }
	9302	+
	9303	+ LoadSkybox(name, ext, mipmap);
9045	9304	}
9046	9305
9047	9306	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -9073,8 +9332,12 @@
9073	9332	static double[] model = new double[16];
9074	9333	double[] camera2light = new double[16];
9075	9334	double[] light2camera = new double[16];
9076		- int newenvy = -1;
9077		- boolean envyoff = true; // false;
	9335	+
	9336	+ //int newenvy = -1;
	9337	+ //boolean envyoff = false;
	9338	+
	9339	+ String loadedskyboxname;
	9340	+
9078	9341	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9079	9342	//float[] light0 = { 0,0,0 };
9080	9343	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9367,11 +9630,35 @@
9367	9630	jy8[3] = 0.5f;
9368	9631	}
9369	9632
9370		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9633	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9371	9634	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9372	9635	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9373	9636	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9374	9637
	9638	+ void ResetOptions()
	9639	+ {
	9640	+ options1[0] = 100;
	9641	+ options1[1] = 0.025f;
	9642	+ options1[2] = 0.01f;
	9643	+ options1[3] = 0;
	9644	+ options1[4] = 0;
	9645	+
	9646	+ options2[0] = 0;
	9647	+ options2[1] = 0.75f;
	9648	+ options2[2] = 0;
	9649	+ options2[3] = 0;
	9650	+
	9651	+ options3[0] = 1;
	9652	+ options3[1] = 1;
	9653	+ options3[2] = 1;
	9654	+ options3[3] = 0;
	9655	+
	9656	+ options4[0] = 1;
	9657	+ options4[1] = 0;
	9658	+ options4[2] = 1;
	9659	+ options4[3] = 0;
	9660	+ }
	9661	+
9375	9662	static int imagecount = 0; // movie generation
9376	9663
9377	9664	static int jitter = 0;
..	..	@@ -9468,7 +9755,7 @@
9468	9755
9469	9756	if (renderCamera != lightCamera)
9470	9757	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9471		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9758	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9472	9759
9473	9760	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9474	9761
..	..	@@ -9484,7 +9771,7 @@
9484	9771
9485	9772	if (renderCamera != lightCamera)
9486	9773	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9487		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9774	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9488	9775
9489	9776	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9490	9777
..	..	@@ -9530,10 +9817,12 @@
9530	9817	rati = 1 / rati;
9531	9818	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9532	9819	}
9533		- assert (newenvy == -1);
	9820	+
	9821	+ //assert (newenvy == -1);
	9822	+
9534	9823	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9535	9824	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9536		- DrawSkyBox(gl);
	9825	+ DrawSkyBox(gl, (float)rati);
9537	9826	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9538	9827	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9539	9828	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -10482,6 +10771,7 @@
10482	10771	ANTIALIAS = 0;
10483	10772	//System.out.println("RESTART");
10484	10773	AAtimer.restart();
	10774	+ Globals.TIMERRUNNING = true;
10485	10775	}
10486	10776	}
10487	10777	}
..	..	@@ -10549,7 +10839,8 @@
10549	10839	ambientOcclusion = false;
10550	10840	}
10551	10841
10552		- if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
	10842	+ if (//Globals.lighttouched &&
	10843	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10553	10844	{
10554	10845	//if (RENDERSHADOW) // ?
10555	10846	if (!IsFrozen())
..	..	@@ -10568,7 +10859,7 @@
10568	10859
10569	10860	if (wait)
10570	10861	{
10571		- Sleep(500);
	10862	+ Sleep(200); // blocks everything
10572	10863
10573	10864	wait = false;
10574	10865	}
..	..	@@ -10683,7 +10974,7 @@
10683	10974	// if (parentcam != renderCamera) // not a light
10684	10975	if (cam != lightCamera)
10685	10976	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10686		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10977	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10687	10978
10688	10979	for (int j = 0; j < 4; j++)
10689	10980	{
..	..	@@ -10698,7 +10989,7 @@
10698	10989	// if (parentcam != renderCamera) // not a light
10699	10990	if (cam != lightCamera)
10700	10991	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10701		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	10992	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10702	10993
10703	10994	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10704	10995
..	..	@@ -10784,13 +11075,41 @@
10784	11075	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10785	11076	}
10786	11077
10787		- 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"))
10788	11086	{
10789		- LoadEnvy(newenvy);
	11087	+ if (cubemaprgb == null)
	11088	+ {
	11089	+ cubemaprgb = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11090	+ }
	11091	+
	11092	+ cubemap = cubemaprgb;
10790	11093	}
10791		-
10792		- newenvy = -1;
10793		-
	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	+
10794	11113	ratio = ((double) getWidth()) / getHeight();
10795	11114	//System.out.println("ratio = " + ratio);
10796	11115
..	..	@@ -10806,7 +11125,7 @@
10806	11125
10807	11126	if (!IsFrozen() && !ambientOcclusion)
10808	11127	{
10809		- DrawSkyBox(gl);
	11128	+ DrawSkyBox(gl, (float)ratio);
10810	11129	}
10811	11130
10812	11131	//if (selection_view == -1)
..	..	@@ -10989,9 +11308,9 @@
10989	11308
10990	11309	gl.glMatrixMode(GL.GL_MODELVIEW);
10991	11310
10992		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10993		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10994		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11311	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11312	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11313	+gl.glEnable(gl.GL_MULTISAMPLE);
10995	11314	} else
10996	11315	{
10997	11316	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -11002,7 +11321,7 @@
11002	11321	//System.out.println("BLENDING ON");
11003	11322	gl.glEnable(GL.GL_BLEND);
11004	11323	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
11005		-
	11324	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
11006	11325	gl.glMatrixMode(gl.GL_PROJECTION);
11007	11326	gl.glLoadIdentity();
11008	11327
..	..	@@ -11092,7 +11411,7 @@
11092	11411
11093	11412	// if (cam != lightCamera)
11094	11413	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11095		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11414	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11096	11415	}
11097	11416
11098	11417	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -11251,7 +11570,7 @@
11251	11570	}
11252	11571	}
11253	11572
11254		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11573	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11255	11574	{
11256	11575	//gl.glDepthFunc(GL.GL_LEQUAL);
11257	11576	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11259,24 +11578,21 @@
11259	11578
11260	11579	boolean texon = textureon;
11261	11580
11262		- if (RENDERPROGRAM > 0)
11263		- {
11264		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11265		- textureon = false;
11266		- }
	11581	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11582	+ textureon = false;
	11583	+
11267	11584	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11268	11585	//System.out.println("ALLO");
11269	11586	gl.glColorMask(false, false, false, false);
11270	11587	DrawObject(gl);
11271		- if (RENDERPROGRAM > 0)
11272		- {
11273		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11274		- textureon = texon;
11275		- }
	11588	+
	11589	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11590	+ textureon = texon;
	11591	+
11276	11592	gl.glColorMask(true, true, true, true);
11277	11593
11278	11594	gl.glDepthFunc(GL.GL_EQUAL);
11279		- //gl.glDepthMask(false);
	11595	+ gl.glDepthMask(false);
11280	11596	}
11281	11597
11282	11598	if (false) // DrawMode() == SHADOW)
..	..	@@ -11459,15 +11775,36 @@
11459	11775
11460	11776	static boolean zoomonce = false;
11461	11777
	11778	+ static void CreateSelectedPoint()
	11779	+ {
	11780	+ if (selectedpoint == null)
	11781	+ {
	11782	+ debugpointG = new Sphere();
	11783	+ debugpointP = new Sphere();
	11784	+ debugpointC = new Sphere();
	11785	+ debugpointR = new Sphere();
	11786	+
	11787	+ selectedpoint = new Superellipsoid();
	11788	+
	11789	+ for (int i=0; i<8; i++)
	11790	+ {
	11791	+ debugpoints[i] = new Sphere();
	11792	+ }
	11793	+ }
	11794	+ }
	11795	+
11462	11796	void DrawObject(GL gl, boolean draw)
11463	11797	{
	11798	+ // To clear camera values
	11799	+ ResetOptions();
	11800	+
11464	11801	//System.out.println("DRAW OBJECT " + mouseDown);
11465	11802	// DrawMode() = SELECTION;
11466	11803	//GL gl = getGL();
11467	11804	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11468	11805	{
11469	11806	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11470		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11807	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11471	11808	pingthread.StepToTarget(true); // true);
11472	11809	// zoomonce = false;
11473	11810	}
..	..	@@ -11539,8 +11876,9 @@
11539	11876
11540	11877	if (DrawMode() == DEFAULT)
11541	11878	{
11542		- if (DEBUG)
	11879	+ if (Globals.DEBUG)
11543	11880	{
	11881	+ CreateSelectedPoint();
11544	11882	float radius = 0.05f;
11545	11883	if (selectedpoint.radius != radius)
11546	11884	{
..	..	@@ -11594,20 +11932,32 @@
11594	11932	ReleaseTextures(DEFAULT_TEXTURES);
11595	11933
11596	11934	if (CLEANCACHE)
11597		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11935	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11598	11936	{
11599		- String tex = e.nextElement();
	11937	+ cTexture tex = e.nextElement();
11600	11938
11601	11939	// System.out.println("Texture --------- " + tex);
11602	11940
11603		- if (tex.equals("WHITE_NOISE"))
	11941	+ if (tex.equals("WHITE_NOISE:"))
11604	11942	continue;
11605	11943
11606		- if (!usedtextures.containsKey(tex))
	11944	+ if (!usedtextures.contains(tex))
11607	11945	{
	11946	+ CacheTexture gettex = texturepigment.get(tex);
11608	11947	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11609		- textures.get(tex).texture.dispose();
11610		- 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	+ }
11611	11961	}
11612	11962	}
11613	11963	}
..	..	@@ -12027,7 +12377,7 @@
12027	12377	for (int i = tp.size(); --i >= 0;)
12028	12378	{
12029	12379	//for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12030		- LA.xformPos(light, tp.get(i).GlobalTransform(), light);
	12380	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
12031	12381	}
12032	12382
12033	12383
..	..	@@ -12135,8 +12485,76 @@
12135	12485
12136	12486	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12137	12487
12138		- String program =
	12488	+ String programmin =
	12489	+ // Min shader
12139	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	+
12140	12558	//"OPTION ARB_fragment_program_shadow;" +
12141	12559	"PARAM light2cam0 = program.env[10];" +
12142	12560	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12251,8 +12669,7 @@
12251	12669	"TEMP shininess;" +
12252	12670	"\n" +
12253	12671	"MOV texSamp, one;" +
12254		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12255		-
	12672	+
12256	12673	"MOV mapgrid.x, one2048th.x;" +
12257	12674	"MOV temp, fragment.texcoord[1];" +
12258	12675	/*
..	..	@@ -12273,20 +12690,20 @@
12273	12690	"MUL temp, floor, mapgrid.x;" +
12274	12691	//"TEX depth0, temp, texture[1], 2D;" +
12275	12692	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12276		- TextureFetch("depth0", "temp", "1") +
	12693	+ ShadowTextureFetch("depth0", "temp", "1") +
12277	12694	"") +
12278	12695	"ADD temp.x, temp.x, mapgrid.x;" +
12279	12696	//"TEX depth1, temp, texture[1], 2D;" +
12280	12697	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12281		- TextureFetch("depth1", "temp", "1") +
	12698	+ ShadowTextureFetch("depth1", "temp", "1") +
12282	12699	"") +
12283	12700	"ADD temp.y, temp.y, mapgrid.x;" +
12284	12701	//"TEX depth2, temp, texture[1], 2D;" +
12285		- TextureFetch("depth2", "temp", "1") +
	12702	+ ShadowTextureFetch("depth2", "temp", "1") +
12286	12703	"SUB temp.x, temp.x, mapgrid.x;" +
12287	12704	//"TEX depth3, temp, texture[1], 2D;" +
12288	12705	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12289		- TextureFetch("depth3", "temp", "1") +
	12706	+ ShadowTextureFetch("depth3", "temp", "1") +
12290	12707	"") +
12291	12708	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12292	12709	//"MOV params, material;" +
..	..	@@ -12657,10 +13074,10 @@
12657	13074	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12658	13075	"") +
12659	13076
12660		- // display shadow only (bump == 0)
	13077	+ // display shadow only (fakedepth == 0)
12661	13078	"SUB temp.x, half.x, shadow.x;" +
12662	13079	"MOV temp.y, -params5.z;" + // params6.x;" +
12663		- "SLT temp.z, temp.y, -one2048th.x;" +
	13080	+ "SLT temp.z, temp.y, -c256i.x;" +
12664	13081	"SUB temp.y, one.x, temp.z;" +
12665	13082	"MUL temp.x, temp.x, temp.y;" +
12666	13083	"KIL temp.x;" +
..	..	@@ -12991,6 +13408,13 @@
12991	13408	//once = true;
12992	13409	}
12993	13410
	13411	+ String program = programmax;
	13412	+
	13413	+ if (Globals.MINSHADER)
	13414	+ {
	13415	+ program = programmin;
	13416	+ }
	13417	+
12994	13418	System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12995	13419	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12996	13420	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
..	..	@@ -13084,25 +13508,26 @@
13084	13508	return out;
13085	13509	}
13086	13510
13087		- String TextureFetch(String dest, String src, String unit)
	13511	+ // Also does frustum culling
	13512	+ String ShadowTextureFetch(String dest, String src, String unit)
13088	13513	{
13089	13514	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13090	13515	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13091	13516	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13517	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13518	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13092	13519	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13093		- "SLT " + src + ".z, " + src + ".x, one.x;" +
13094		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13095		- "SLT " + src + ".z, " + src + ".y, one.x;" +
13096		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13520	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13521	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13097	13522	//"SWZ buffer, temp, w,w,w,w;";
13098		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13523	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13099	13524	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13100	13525	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13101	13526	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13102		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13527	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13103	13528
13104		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13105		- //"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;";
13106	13531	}
13107	13532
13108	13533	String Shadow(String depth, String shadow)
..	..	@@ -13149,7 +13574,7 @@
13149	13574	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13150	13575	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13151	13576
13152		- // No shadow when out of frustrum
	13577	+ // No shadow when out of frustum
13153	13578	"SGE temp.x, " + depth + ".z, one.z;" +
13154	13579	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13155	13580	"";
..	..	@@ -13297,7 +13722,8 @@
13297	13722	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13298	13723	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13299	13724	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13300		- Object3D.cVector2[] vector2buffer;
	13725	+
	13726	+ //Object3D.cVector2[] vector2buffer;
13301	13727
13302	13728	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13303	13729	// OUT : diff, spec
..	..	@@ -13313,9 +13739,10 @@
13313	13739	"DP3 " + dest + ".z," + "normals," + "eye;" +
13314	13740	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13315	13741	//"MOV " + dest + ".w," + "normal.z;" +
13316		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13317		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13318		- //"MOV " + dest + ".z," + "params2.w;" +
	13742	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13743	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13744	+
	13745	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13319	13746	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13320	13747	"RCP " + dest + ".w," + dest + ".w;" +
13321	13748	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13820,6 +14247,7 @@
13820	14247	else
13821	14248	if (evt.getSource() == AAtimer)
13822	14249	{
	14250	+ Globals.TIMERRUNNING = false;
13823	14251	if (mouseDown)
13824	14252	{
13825	14253	//new Exception().printStackTrace();
..	..	@@ -13879,7 +14307,7 @@
13879	14307
13880	14308	// fev 2014???
13881	14309	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13882		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14310	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13883	14311	pingthread.StepToTarget(true); // true);
13884	14312	}
13885	14313	// if (!LIVE)
..	..	@@ -13894,6 +14322,7 @@
13894	14322	return;
13895	14323
13896	14324	AAtimer.restart(); //
	14325	+ Globals.TIMERRUNNING = true;
13897	14326
13898	14327	// waslive = LIVE;
13899	14328	// LIVE = false;
..	..	@@ -13943,14 +14372,15 @@
13943	14372	drag = false;
13944	14373	//System.out.println("Mouse DOWN");
13945	14374	editObj = false;
13946		- ClickInfo info = new ClickInfo();
13947		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13948		- info.pane = this;
13949		- info.camera = renderCamera;
13950		- info.x = x;
13951		- info.y = y;
13952		- info.modifiers = modifiersex;
13953		- 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);
13954	14384	if (!editObj)
13955	14385	{
13956	14386	hasMarquee = true;
..	..	@@ -14232,12 +14662,12 @@
14232	14662	void GoDown(int mod)
14233	14663	{
14234	14664	MODIFIERS \|= COMMAND;
14235		- /*
	14665	+ /**/
14236	14666	if((mod&SHIFT) == SHIFT)
14237		- manipCamera.RotatePosition(0, -speed);
	14667	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14238	14668	else
14239		- manipCamera.BackForth(0, -speed*delta, getWidth());
14240		- */
	14669	+ manipCamera.RotatePosition(0, -speed);
	14670	+ /**/
14241	14671	if ((mod & SHIFT) == SHIFT)
14242	14672	{
14243	14673	mouseMode = mouseMode; // VR??
..	..	@@ -14253,12 +14683,12 @@
14253	14683	void GoUp(int mod)
14254	14684	{
14255	14685	MODIFIERS \|= COMMAND;
14256		- /*
	14686	+ /**/
14257	14687	if((mod&SHIFT) == SHIFT)
14258		- manipCamera.RotatePosition(0, speed);
	14688	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14259	14689	else
14260		- manipCamera.BackForth(0, speed*delta, getWidth());
14261		- */
	14690	+ manipCamera.RotatePosition(0, speed);
	14691	+ /**/
14262	14692	if ((mod & SHIFT) == SHIFT)
14263	14693	{
14264	14694	mouseMode = mouseMode;
..	..	@@ -14274,12 +14704,12 @@
14274	14704	void GoLeft(int mod)
14275	14705	{
14276	14706	MODIFIERS \|= COMMAND;
14277		- /*
	14707	+ /**/
14278	14708	if((mod&SHIFT) == SHIFT)
14279		- manipCamera.RotatePosition(speed, 0);
14280		- else
14281	14709	manipCamera.Translate(speed*delta, 0, getWidth());
14282		- */
	14710	+ else
	14711	+ manipCamera.RotatePosition(speed, 0);
	14712	+ /**/
14283	14713	if ((mod & SHIFT) == SHIFT)
14284	14714	{
14285	14715	mouseMode = mouseMode;
..	..	@@ -14295,12 +14725,12 @@
14295	14725	void GoRight(int mod)
14296	14726	{
14297	14727	MODIFIERS \|= COMMAND;
14298		- /*
	14728	+ /**/
14299	14729	if((mod&SHIFT) == SHIFT)
14300		- manipCamera.RotatePosition(-speed, 0);
14301		- else
14302	14730	manipCamera.Translate(-speed*delta, 0, getWidth());
14303		- */
	14731	+ else
	14732	+ manipCamera.RotatePosition(-speed, 0);
	14733	+ /**/
14304	14734	if ((mod & SHIFT) == SHIFT)
14305	14735	{
14306	14736	mouseMode = mouseMode;
..	..	@@ -14350,14 +14780,16 @@
14350	14780	if (editObj)
14351	14781	{
14352	14782	drag = true;
14353		- ClickInfo info = new ClickInfo();
14354		- info.bounds.setBounds(0, 0,
	14783	+ //ClickInfo info = new ClickInfo();
	14784	+ object.clickInfo.bounds.setBounds(0, 0,
14355	14785	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14356		- info.pane = this;
14357		- info.camera = renderCamera;
14358		- info.x = x;
14359		- info.y = y;
14360		- object.editWindow.copy.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);
14361	14793	} else
14362	14794	{
14363	14795	if (x < startX)
..	..	@@ -14506,22 +14938,27 @@
14506	14938	}
14507	14939	}
14508	14940
	14941	+// ClickInfo clickInfo = new ClickInfo();
	14942	+
14509	14943	public void mouseMoved(MouseEvent e)
14510	14944	{
14511	14945	//System.out.println("mouseMoved: " + e);
14512	14946	if (isRenderer)
14513	14947	return;
14514	14948
14515		- ClickInfo ci = new ClickInfo();
14516		- ci.x = e.getX();
14517		- ci.y = e.getY();
14518		- ci.modifiers = e.getModifiersEx();
14519		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14520		- ci.pane = this;
14521		- 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;
14522	14956	if (!isRenderer)
14523	14957	{
14524		- if (object.editWindow.copy.doEditClick(ci, 0))
	14958	+ //ObjEditor editWindow = object.editWindow;
	14959	+ //Object3D copy = editWindow.copy;
	14960	+ if (object.doEditClick(//clickInfo,
	14961	+ 0))
14525	14962	{
14526	14963	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14527	14964	} else
..	..	@@ -14536,7 +14973,8 @@
14536	14973	Globals.MOUSEDRAGGED = false;
14537	14974
14538	14975	movingcamera = false;
14539		- X = Y = 0;
	14976	+ X = 0; // getBounds().width/2;
	14977	+ Y = 0; // getBounds().height/2;
14540	14978	//System.out.println("mouseReleased: " + e);
14541	14979	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14542	14980	}
..	..	@@ -14792,7 +15230,8 @@
14792	15230	// break;
14793	15231	case 'T':
14794	15232	CACHETEXTURE ^= true;
14795		- textures.clear();
	15233	+ texturepigment.clear();
	15234	+ texturebump.clear();
14796	15235	// repaint();
14797	15236	break;
14798	15237	case 'Y':
..	..	@@ -14877,7 +15316,9 @@
14877	15316	case 'E' : COMPACT ^= true;
14878	15317	repaint();
14879	15318	break;
14880		- case 'W' : DEBUGHSB ^= true;
	15319	+ case 'W' : // Wide Window (fullscreen)
	15320	+ //DEBUGHSB ^= true;
	15321	+ ObjEditor.theFrame.ToggleFullScreen();
14881	15322	repaint();
14882	15323	break;
14883	15324	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14902,8 +15343,8 @@
14902	15343	RevertCamera();
14903	15344	repaint();
14904	15345	break;
14905		- case 'L':
14906	15346	case 'l':
	15347	+ //case 'L':
14907	15348	if (lightMode)
14908	15349	{
14909	15350	lightMode = false;
..	..	@@ -14967,20 +15408,24 @@
14967	15408	OCCLUSION_CULLING ^= true;
14968	15409	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14969	15410	break;
14970		- case '0': envyoff ^= true; repaint(); break;
	15411	+ //case '0': envyoff ^= true; repaint(); break;
14971	15412	case '1':
14972	15413	case '2':
14973	15414	case '3':
14974	15415	case '4':
14975	15416	case '5':
14976		- newenvy = Character.getNumericValue(key);
14977		- repaint();
14978		- break;
14979	15417	case '6':
14980	15418	case '7':
14981	15419	case '8':
14982	15420	case '9':
14983		- 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	+ }
14984	15429	repaint();
14985	15430	break;
14986	15431	case '!':
..	..	@@ -15046,9 +15491,9 @@
15046	15491	case '_':
15047	15492	kompactbit = 5;
15048	15493	break;
15049		- case '+':
15050		- kompactbit = 6;
15051		- break;
	15494	+// case '+':
	15495	+// kompactbit = 6;
	15496	+// break;
15052	15497	case ' ':
15053	15498	lightMode ^= true;
15054	15499	Globals.lighttouched = true;
..	..	@@ -15060,6 +15505,7 @@
15060	15505	case ESC:
15061	15506	RENDERPROGRAM += 1;
15062	15507	RENDERPROGRAM %= 3;
	15508	+
15063	15509	repaint();
15064	15510	break;
15065	15511	case 'Z':
..	..	@@ -15099,8 +15545,9 @@
15099	15545	case DELETE:
15100	15546	ClearSelection();
15101	15547	break;
15102		- /*
15103	15548	case '+':
	15549	+
	15550	+ /*
15104	15551	//fontsize += 1;
15105	15552	bbzoom *= 2;
15106	15553	repaint();
..	..	@@ -15117,17 +15564,17 @@
15117	15564	case '=':
15118	15565	IncDepth();
15119	15566	//fontsize += 1;
15120		- object.editWindow.refreshContents(true);
	15567	+ object.GetWindow().refreshContents(true);
15121	15568	maskbit = 6;
15122	15569	break;
15123	15570	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
15124	15571	DecDepth();
15125	15572	maskbit = 5;
15126	15573	//if(fontsize > 1) fontsize -= 1;
15127		- if (object.editWindow == null)
15128		- new Exception().printStackTrace();
15129		- else
15130		- object.editWindow.refreshContents(true);
	15574	+// if (object.editWindow == null)
	15575	+// new Exception().printStackTrace();
	15576	+// else
	15577	+ object.GetWindow().refreshContents(true);
15131	15578	break;
15132	15579	case '{':
15133	15580	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15351,7 +15798,7 @@
15351	15798	}
15352	15799	*/
15353	15800
15354		- object.editWindow.EditSelection();
	15801	+ object.GetWindow().EditSelection(false);
15355	15802	}
15356	15803
15357	15804	void SelectParent()
..	..	@@ -15368,10 +15815,10 @@
15368	15815	{
15369	15816	//selectees.remove(i);
15370	15817	System.out.println("select parent of " + elem);
15371		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15818	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15372	15819	} else
15373	15820	{
15374		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15821	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15375	15822	}
15376	15823
15377	15824	first = false;
..	..	@@ -15413,12 +15860,12 @@
15413	15860	for (int j = 0; j < group.children.size(); j++)
15414	15861	{
15415	15862	elem = (Object3D) group.children.elementAt(j);
15416		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15863	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15417	15864	first = false;
15418	15865	}
15419	15866	} else
15420	15867	{
15421		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15868	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15422	15869	}
15423	15870
15424	15871	first = false;
..	..	@@ -15429,21 +15876,21 @@
15429	15876	{
15430	15877	//Composite group = (Composite) object;
15431	15878	Object3D group = object;
15432		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15879	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15433	15880	}
15434	15881
15435	15882	void ResetTransform(int mask)
15436	15883	{
15437	15884	//Composite group = (Composite) object;
15438	15885	Object3D group = object;
15439		- group.editWindow.ResetTransform(mask);
	15886	+ group.GetWindow().ResetTransform(mask);
15440	15887	}
15441	15888
15442	15889	void FlipTransform()
15443	15890	{
15444	15891	//Composite group = (Composite) object;
15445	15892	Object3D group = object;
15446		- group.editWindow.FlipTransform();
	15893	+ group.GetWindow().FlipTransform();
15447	15894	// group.editWindow.ReduceMesh(true);
15448	15895	}
15449	15896
..	..	@@ -15451,7 +15898,7 @@
15451	15898	{
15452	15899	//Composite group = (Composite) object;
15453	15900	Object3D group = object;
15454		- group.editWindow.PrintMemory();
	15901	+ group.GetWindow().PrintMemory();
15455	15902	// group.editWindow.ReduceMesh(true);
15456	15903	}
15457	15904
..	..	@@ -15459,7 +15906,7 @@
15459	15906	{
15460	15907	//Composite group = (Composite) object;
15461	15908	Object3D group = object;
15462		- group.editWindow.ResetCentroid();
	15909	+ group.GetWindow().ResetCentroid();
15463	15910	}
15464	15911
15465	15912	void IncDepth()
..	..	@@ -15541,8 +15988,6 @@
15541	15988
15542	15989	int width = getBounds().width;
15543	15990	int height = getBounds().height;
15544		- ClickInfo info = new ClickInfo();
15545		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15546	15991	//Image img = CreateImage(width, height);
15547	15992	//System.out.println("width = " + width + "; height = " + height + "\n");
15548	15993
..	..	@@ -15619,48 +16064,77 @@
15619	16064	}
15620	16065	if (object != null && !hasMarquee)
15621	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	+
15622	16073	if (isRenderer)
15623	16074	{
15624		- info.flags++;
	16075	+ object.clickInfo.flags++;
15625	16076	double frameAspect = (double) width / (double) height;
15626	16077	if (frameAspect > renderCamera.aspect)
15627	16078	{
15628	16079	int desired = (int) ((double) height * renderCamera.aspect);
15629		- info.bounds.width -= width - desired;
15630		- info.bounds.x += (width - desired) / 2;
	16080	+ object.clickInfo.bounds.width -= width - desired;
	16081	+ object.clickInfo.bounds.x += (width - desired) / 2;
15631	16082	} else
15632	16083	{
15633	16084	int desired = (int) ((double) width / renderCamera.aspect);
15634		- info.bounds.height -= height - desired;
15635		- info.bounds.y += (height - desired) / 2;
	16085	+ object.clickInfo.bounds.height -= height - desired;
	16086	+ object.clickInfo.bounds.y += (height - desired) / 2;
15636	16087	}
15637	16088	}
15638		- info.g = gr;
15639		- info.camera = renderCamera;
	16089	+
	16090	+ object.clickInfo.g = gr;
	16091	+ object.clickInfo.camera = renderCamera;
15640	16092	/*
15641	16093	// Memory intensive (brep.verticescopy)
15642	16094	if (!(object instanceof Composite))
15643	16095	object.draw(info, 0, false); // SLOW :
15644	16096	*/
15645		- if (!isRenderer)
	16097	+ if (!isRenderer) // && drag)
15646	16098	{
15647		- object.drawEditHandles(info, 0);
15648		-
15649		- if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	16099	+ Grafreed.Assert(object != null);
	16100	+ Grafreed.Assert(object.selection != null);
	16101	+ if (object.selection.Size() > 0)
15650	16102	{
15651		- switch (object.selection.get(0).hitSomething)
	16103	+ int hitSomething = object.selection.get(0).hitSomething;
	16104	+
	16105	+ object.clickInfo.DX = 0;
	16106	+ object.clickInfo.DY = 0;
	16107	+ object.clickInfo.W = 1;
	16108	+ if (hitSomething == Object3D.hitCenter)
15652	16109	{
15653		- case Object3D.hitCenter: gr.setColor(Color.pink);
15654		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15655		- break;
15656		- case Object3D.hitRotate: gr.setColor(Color.yellow);
15657		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15658		- break;
15659		- case Object3D.hitScale: gr.setColor(Color.cyan);
15660		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15661		- break;
	16110	+ info.DX = X;
	16111	+ if (X != 0)
	16112	+ info.DX -= info.bounds.width/2;
	16113	+
	16114	+ info.DY = Y;
	16115	+ if (Y != 0)
	16116	+ info.DY -= info.bounds.height/2;
15662	16117	}
15663		-
	16118	+
	16119	+ object.drawEditHandles(//info,
	16120	+ 0);
	16121	+
	16122	+ if (drag && (X != 0 \|\| Y != 0))
	16123	+ {
	16124	+ switch (hitSomething)
	16125	+ {
	16126	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16127	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16128	+ break;
	16129	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16130	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16131	+ break;
	16132	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16133	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16134	+ break;
	16135	+ }
	16136	+
	16137	+ }
15664	16138	}
15665	16139	}
15666	16140	}
..	..	@@ -16142,6 +16616,8 @@
16142	16616	private /static/ boolean firstime;
16143	16617	private /static/ cVector newView = new cVector();
16144	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"};
16145	16621	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16146	16622	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16147	16623	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16154,29 +16630,67 @@
16154	16630	{
16155	16631	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16156	16632
	16633	+ int usedsuf = 0;
	16634	+
16157	16635	for (int i = 0; i < suffixes.length; i++)
16158	16636	{
16159		- String resourceName = basename + suffixes[i] + "." + suffix;
16160		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16161		- mipmapped,
16162		- FileUtil.getFileSuffix(resourceName));
16163		- if (data == null)
	16637	+ String[] suffixe = suffixes;
	16638	+ String[] fallback = suffixes2;
	16639	+ String[] fallfallback = suffixes3;
	16640	+
	16641	+ for (int c=usedsuf; --c>=0;)
16164	16642	{
16165		- throw new IOException("Unable to load texture " + resourceName);
	16643	+// String[] temp = suffixe;
	16644	+// suffixe = fallback;
	16645	+// fallback = fallfallback;
	16646	+// fallfallback = temp;
16166	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	+
16167	16676	//System.out.println("Target = " + targets[i]);
16168	16677	cubemap.updateImage(data, targets[i]);
16169	16678	}
16170	16679
16171	16680	return cubemap;
16172	16681	}
	16682	+
16173	16683	int bigsphere = -1;
16174	16684
16175	16685	float BGcolor = 0.5f;
16176	16686
16177		- private void DrawSkyBox(GL gl)
	16687	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16688	+
	16689	+ private void DrawSkyBox(GL gl, float ratio)
16178	16690	{
16179		- if (envyoff \|\| cubemap == null)
	16691	+ if (//envyoff \|\|
	16692	+ WIREFRAME \|\|
	16693	+ cubemap == null)
16180	16694	{
16181	16695	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16182	16696	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16191,7 +16705,17 @@
16191	16705	// Compensates for ExaminerViewer's modification of modelview matrix
16192	16706	gl.glMatrixMode(GL.GL_MODELVIEW);
16193	16707	gl.glLoadIdentity();
	16708	+ gl.glScalef(1,ratio,1);
16194	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	+
16195	16719	//gl.glActiveTexture(GL.GL_TEXTURE1);
16196	16720	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16197	16721
..	..	@@ -16223,6 +16747,7 @@
16223	16747	{
16224	16748	gl.glScalef(1.0f, -1.0f, 1.0f);
16225	16749	}
	16750	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16226	16751	gl.glMultMatrixd(viewrot_1, 0);
16227	16752	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16228	16753	//viewer.updateInverseRotation(gl);
..	..	@@ -16363,16 +16888,16 @@
16363	16888	cStatic.objectstack[materialdepth++] = checker;
16364	16889	//System.out.println("material " + material);
16365	16890	//Applet3D.tracein(this, selected);
16366		- vector2buffer = checker.projectedVertices;
	16891	+ //vector2buffer = checker.projectedVertices;
16367	16892
16368	16893	//checker.GetMaterial().Draw(this, false); // true);
16369		- DrawMaterial(checker.GetMaterial(), false); // true);
	16894	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16370	16895
16371	16896	materialdepth -= 1;
16372	16897	if (materialdepth > 0)
16373	16898	{
16374		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16375		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16899	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16900	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16376	16901	}
16377	16902	//checker.GetMaterial().opacity = 1f;
16378	16903	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16458,6 +16983,14 @@
16458	16983	}
16459	16984	}
16460	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	+
16461	16994	class SelectBuffer implements GLEventListener
16462	16995	{
16463	16996
..	..	@@ -16473,7 +17006,7 @@
16473	17006	//new Exception().printStackTrace();
16474	17007	System.out.println("select buffer init");
16475	17008	// Use debug pipeline
16476		- drawable.setGL(new DebugGL(drawable.getGL()));
	17009	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16477	17010
16478	17011	GL gl = drawable.getGL();
16479	17012
..	..	@@ -16537,6 +17070,17 @@
16537	17070
16538	17071	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16539	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	+
16540	17084	//int tmp = selection_view;
16541	17085	//selection_view = -1;
16542	17086	int temp = DrawMode();
..	..	@@ -16548,6 +17092,17 @@
16548	17092	// temp = DEFAULT; // patch for selection debug
16549	17093	Globals.drawMode = temp; // WARNING
16550	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	+
16551	17106	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16552	17107
16553	17108	// trying different ways of getting the depth info over
..	..	@@ -16595,6 +17150,8 @@
16595	17150	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16596	17151	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16597	17152	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17153	+
	17154	+ CreateSelectedPoint();
16598	17155
16599	17156	// Will fit the mesh !!!
16600	17157	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16649,29 +17206,31 @@
16649	17206	}
16650	17207
16651	17208	if (!movingcamera && !PAINTMODE)
16652		- object.editWindow.ScreenFitPoint(); // fev 2014
	17209	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16653	17210
16654		- 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)
16655	17212	{
16656		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17213	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16657	17214
16658		- Object3D group = new Object3D("inst" + paintcount++);
	17215	+ if (object.GetWindow().copy.selection.Size() > 0)
	17216	+ {
	17217	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16659	17218
16660		- group.CreateMaterial(); // use a void leaf to select instances
16661		-
16662		- group.add(paintobj); // link
16663		-
16664		- object.editWindow.SnapObject(group);
16665		-
16666		- Object3D folder = object.editWindow.copy;
16667		-
16668		- if (object.editWindow.copy.selection.Size() > 0)
16669		- folder = object.editWindow.copy.selection.elementAt(0);
16670		-
16671		- folder.add(group);
16672		-
16673		- object.editWindow.ResetModel();
16674		- object.editWindow.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	+ }
16675	17234	}
16676	17235	else
16677	17236	paintcount = 0;
..	..	@@ -16710,6 +17269,11 @@
16710	17269	//System.out.println("objects[color] = " + objects[color]);
16711	17270	//objects[color].Select();
16712	17271	indexcount = 0;
	17272	+ ObjEditor window = object.GetWindow();
	17273	+ if (window != null && deselect)
	17274	+ {
	17275	+ window.Select(null, deselect, true);
	17276	+ }
16713	17277	object.Select(color, deselect);
16714	17278	}
16715	17279
..	..	@@ -16988,10 +17552,14 @@
16988	17552	gl.glFlush();
16989	17553
16990	17554	/**/
16991		- 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);
16992	17556
16993		- float[] pixels = occlusionsizebuffer.array();
	17557	+ float[] depths = occlusiondepthbuffer.array();
16994	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	+
16995	17563	double r = 0, g = 0, b = 0;
16996	17564
16997	17565	double count = 0;
..	..	@@ -17002,7 +17570,7 @@
17002	17570
17003	17571	double FACTOR = 1;
17004	17572
17005		- for (int i = 0; i < pixels.length; i++)
	17573	+ for (int i = 0; i < depths.length; i++)
17006	17574	{
17007	17575	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
17008	17576	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -17085,7 +17653,7 @@
17085	17653
17086	17654	double scale = ray.z; // 1; // cos
17087	17655
17088		- float depth = pixels[newindex];
	17656	+ float depth = depths[newindex];
17089	17657
17090	17658	/*
17091	17659	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17235,23 +17803,15 @@
17235	17803	int AAbuffersize = 0;
17236	17804
17237	17805	//double[] selectedpoint = new double[3];
17238		- static Superellipsoid selectedpoint = new Superellipsoid();
	17806	+ static Superellipsoid selectedpoint;
17239	17807	static Sphere previousselectedpoint = null;
17240		- static Sphere debugpointG = new Sphere();
17241		- static Sphere debugpointP = new Sphere();
17242		- static Sphere debugpointC = new Sphere();
17243		- static Sphere debugpointR = new Sphere();
	17808	+ static Sphere debugpointG;
	17809	+ static Sphere debugpointP;
	17810	+ static Sphere debugpointC;
	17811	+ static Sphere debugpointR;
17244	17812
17245	17813	static Sphere debugpoints[] = new Sphere[8];
17246	17814
17247		- static
17248		- {
17249		- for (int i=0; i<8; i++)
17250		- {
17251		- debugpoints[i] = new Sphere();
17252		- }
17253		- }
17254		-
17255	17815	static void InitPoints(float radius)
17256	17816	{
17257	17817	for (int i=0; i<8; i++)
..	..	@@ -17290,11 +17850,14 @@
17290	17850	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17291	17851	static IntBuffer bigAAbuffer;
17292	17852	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17293		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	17853	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17294	17854	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17295	17855	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17296	17856	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17297		- 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	+
17298	17861	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17299	17862	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17300	17863	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();