~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;
..	..	@@ -151,6 +187,18 @@
151	187	}
152	188
153	189	private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	190	+
	191	+ public void LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	192	+ {
	193	+ try
	194	+ {
	195	+ cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	196	+ } catch (IOException e)
	197	+ {
	198	+ System.out.println("NAME = " + name);
	199	+ e.printStackTrace(); // throw new RuntimeException(e);
	200	+ }
	201	+ }
154	202
155	203	void SetAsGLRenderer(boolean b)
156	204	{
..	..	@@ -170,7 +218,8 @@
170	218
171	219	SetCamera(cam);
172	220
173		- SetLight(new Camera(new cVector(10, 10, -20)));
	221	+ // Warning: not used.
	222	+ SetLight(new Camera(new cVector(15, 10, -20)));
174	223
175	224	object = o;
176	225
..	..	@@ -327,7 +376,7 @@
327	376	cStatic.objectstack[materialdepth++] = obj;
328	377	//System.out.println("material " + material);
329	378	//Applet3D.tracein(this, selected);
330		- display.vector2buffer = obj.projectedVertices;
	379	+ //display.vector2buffer = obj.projectedVertices;
331	380	if (obj instanceof Camera)
332	381	{
333	382	display.options1[0] = material.shift;
..	..	@@ -336,14 +385,28 @@
336	385	display.options1[2] = material.shadowbias;
337	386	display.options1[3] = material.aniso;
338	387	display.options1[4] = material.anisoV;
	388	+// System.out.println("display.options1[0] " + display.options1[0]);
	389	+// System.out.println("display.options1[1] " + display.options1[1]);
	390	+// System.out.println("display.options1[2] " + display.options1[2]);
	391	+// System.out.println("display.options1[3] " + display.options1[3]);
	392	+// System.out.println("display.options1[4] " + display.options1[4]);
339	393	display.options2[0] = material.opacity;
340	394	display.options2[1] = material.diffuse;
341	395	display.options2[2] = material.factor;
	396	+// System.out.println("display.options2[0] " + display.options2[0]);
	397	+// System.out.println("display.options2[1] " + display.options2[1]);
	398	+// System.out.println("display.options2[2] " + display.options2[2]);
342	399
343	400	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	401	+// System.out.println("display.options3[0] " + display.options3[0]);
	402	+// System.out.println("display.options3[1] " + display.options3[1]);
	403	+// System.out.println("display.options3[2] " + display.options3[2]);
344	404	display.options4[0] = material.cameralight/0.2f;
345	405	display.options4[1] = material.subsurface;
346	406	display.options4[2] = material.sheen;
	407	+// System.out.println("display.options4[0] " + display.options4[0]);
	408	+// System.out.println("display.options4[1] " + display.options4[1]);
	409	+// System.out.println("display.options4[2] " + display.options4[2]);
347	410
348	411	// if (display.CURRENTANTIALIAS > 0)
349	412	// display.options3[3] /= 4;
..	..	@@ -359,7 +422,7 @@
359	422	/**/
360	423	} else
361	424	{
362		- DrawMaterial(material, selected);
	425	+ DrawMaterial(material, selected, obj.projectedVertices);
363	426	}
364	427	} else
365	428	{
..	..	@@ -383,8 +446,8 @@
383	446	cStatic.objectstack[materialdepth++] = obj;
384	447	//System.out.println("material " + material);
385	448	//Applet3D.tracein("selected ", selected);
386		- display.vector2buffer = obj.projectedVertices;
387		- display.DrawMaterial(material, selected);
	449	+ //display.vector2buffer = obj.projectedVertices;
	450	+ display.DrawMaterial(material, selected, obj.projectedVertices);
388	451	}
389	452	}
390	453
..	..	@@ -401,8 +464,8 @@
401	464	materialdepth -= 1;
402	465	if (materialdepth > 0)
403	466	{
404		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
405		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	467	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	468	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
406	469	}
407	470	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
408	471	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -422,8 +485,8 @@
422	485	materialdepth -= 1;
423	486	if (materialdepth > 0)
424	487	{
425		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
426		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	488	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	489	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
427	490	}
428	491	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
429	492	//else
..	..	@@ -1434,6 +1497,8 @@
1434	1497	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1435	1498	}
1436	1499
	1500	+ float[] colorV = new float[4];
	1501	+
1437	1502	void SetColor(Object3D obj, Vertex p0)
1438	1503	{
1439	1504	CameraPane display = this;
..	..	@@ -1501,8 +1566,6 @@
1501	1566	{
1502	1567	return;
1503	1568	}
1504		-
1505		- float[] colorV = new float[3];
1506	1569
1507	1570	if (false) // marked)
1508	1571	{
..	..	@@ -1611,7 +1674,7 @@
1611	1674	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1612	1675	}
1613	1676
1614		- void DrawMaterial(cMaterial material, boolean selected)
	1677	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1615	1678	{
1616	1679	CameraPane display = this;
1617	1680	//new Exception().printStackTrace();
..	..	@@ -1646,7 +1709,7 @@
1646	1709	colorV[0] = display.modelParams0[0] * material.diffuse;
1647	1710	colorV[1] = display.modelParams0[1] * material.diffuse;
1648	1711	colorV[2] = display.modelParams0[2] * material.diffuse;
1649		- colorV[3] = material.opacity;
	1712	+ colorV[3] = 1; // material.opacity;
1650	1713
1651	1714	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1652	1715	//System.out.println("Opacity = " + opacity);
..	..	@@ -1754,9 +1817,9 @@
1754	1817	display.modelParams7[2] = 0;
1755	1818	display.modelParams7[3] = 0;
1756	1819
1757		- display.modelParams6[0] = 100; // criss de bug de bump
	1820	+ //display.modelParams6[0] = 100; // criss de bug de bump
1758	1821
1759		- Object3D.cVector2[] extparams = display.vector2buffer;
	1822	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1760	1823	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1761	1824	{
1762	1825	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -2052,7 +2115,7 @@
2052	2115	//System.err.println("Oeil on");
2053	2116	OEIL = true;
2054	2117	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2055		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2118	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2056	2119	//pingthread.StepToTarget(true);
2057	2120	}
2058	2121
..	..	@@ -2267,7 +2330,7 @@
2267	2330
2268	2331	void ToggleDebug()
2269	2332	{
2270		- DEBUG ^= true;
	2333	+ Globals.DEBUG ^= true;
2271	2334	}
2272	2335
2273	2336	void ToggleLookAt()
..	..	@@ -2285,10 +2348,17 @@
2285	2348	HANDLES ^= true;
2286	2349	}
2287	2350
	2351	+ Object3D paintFolder;
	2352	+
2288	2353	void TogglePaint()
2289	2354	{
2290	2355	PAINTMODE ^= true;
2291	2356	paintcount = 0;
	2357	+
	2358	+ if (PAINTMODE)
	2359	+ {
	2360	+ paintFolder = GetFolder();
	2361	+ }
2292	2362	}
2293	2363
2294	2364	void SwapCamera(int a, int b)
..	..	@@ -2385,6 +2455,21 @@
2385	2455	return currentGL;
2386	2456	}
2387	2457
	2458	+ static private BufferedImage CreateBim(TextureData texturedata)
	2459	+ {
	2460	+ Grafreed.Assert(texturedata != null);
	2461	+
	2462	+ int width = texturedata.getWidth();
	2463	+ int height = texturedata.getHeight();
	2464	+
	2465	+ Buffer buffer = texturedata.getBuffer();
	2466	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2467	+
	2468	+ byte[] bytes = bytebuf.array();
	2469	+
	2470	+ return CreateBim(bytes, width, height);
	2471	+ }
	2472	+
2388	2473	/**/
2389	2474	class CacheTexture
2390	2475	{
..	..	@@ -2393,28 +2478,31 @@
2393	2478
2394	2479	int resolution;
2395	2480
2396		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2481	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2397	2482	{
2398		- texture = tex;
	2483	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2484	+ texturedata = texdata;
2399	2485	resolution = res;
2400	2486	}
2401	2487	}
2402	2488	/**/
2403	2489
2404	2490	// 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>();
	2491	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2492	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2493	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2494	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2495	+
2408	2496	int pigmentdepth = 0;
2409	2497	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2410	2498	int bumpdepth = 0;
2411	2499	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2412	2500	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2413	2501	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2414		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2502	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2415	2503	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2416	2504
2417		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2505	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2418	2506	{
2419	2507	TextureData texturedata = null;
2420	2508
..	..	@@ -2433,13 +2521,34 @@
2433	2521	if (bump)
2434	2522	texturedata = ConvertBump(texturedata, false);
2435	2523
2436		- com.sun.opengl.util.texture.Texture texture =
2437		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2524	+// com.sun.opengl.util.texture.Texture texture =
	2525	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2438	2526
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);
	2527	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2528	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2441	2529
2442		- return texture;
	2530	+ return texturedata;
	2531	+ }
	2532	+
	2533	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2534	+ {
	2535	+ TextureData texturedata = null;
	2536	+
	2537	+ try
	2538	+ {
	2539	+ texturedata =
	2540	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2541	+ bim,
	2542	+ true);
	2543	+ } catch (Exception e)
	2544	+ {
	2545	+ throw new javax.media.opengl.GLException(e);
	2546	+ }
	2547	+
	2548	+ if (bump)
	2549	+ texturedata = ConvertBump(texturedata, false);
	2550	+
	2551	+ return texturedata;
2443	2552	}
2444	2553
2445	2554	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3512,6 +3621,8 @@
3512	3621
3513	3622	System.out.println("LOADING TEXTURE : " + name);
3514	3623
	3624	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3625	+
3515	3626	//
3516	3627	if (false) // compressbit > 0)
3517	3628	{
..	..	@@ -7910,7 +8021,7 @@
7910	8021	String pigment = Object3D.GetPigment(tex);
7911	8022	String bump = Object3D.GetBump(tex);
7912	8023
7913		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8024	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7914	8025	{
7915	8026	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7916	8027	// System.out.println("; bump = " + bump);
..	..	@@ -7925,8 +8036,8 @@
7925	8036	pigment = null;
7926	8037	}
7927	8038
7928		- ReleaseTexture(bump, true);
7929		- ReleaseTexture(pigment, false);
	8039	+ ReleaseTexture(tex, true);
	8040	+ ReleaseTexture(tex, false);
7930	8041	}
7931	8042
7932	8043	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -7944,7 +8055,7 @@
7944	8055
7945	8056	String pigment = Object3D.GetPigment(tex);
7946	8057
7947		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8058	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7948	8059	{
7949	8060	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7950	8061	// System.out.println("; bump = " + bump);
..	..	@@ -7955,7 +8066,7 @@
7955	8066	pigment = null;
7956	8067	}
7957	8068
7958		- ReleaseTexture(pigment, false);
	8069	+ ReleaseTexture(tex, false);
7959	8070	}
7960	8071
7961	8072	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -7973,7 +8084,7 @@
7973	8084
7974	8085	String bump = Object3D.GetBump(tex);
7975	8086
7976		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8087	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7977	8088	{
7978	8089	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7979	8090	// System.out.println("; bump = " + bump);
..	..	@@ -7984,10 +8095,10 @@
7984	8095	bump = null;
7985	8096	}
7986	8097
7987		- ReleaseTexture(bump, true);
	8098	+ ReleaseTexture(tex, true);
7988	8099	}
7989	8100
7990		- void ReleaseTexture(String tex, boolean bump)
	8101	+ void ReleaseTexture(cTexture tex, boolean bump)
7991	8102	{
7992	8103	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7993	8104	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7998,7 +8109,7 @@
7998	8109	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7999	8110
8000	8111	if (tex != null)
8001		- texture = textures.get(tex);
	8112	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
8002	8113
8003	8114	// //assert( texture != null );
8004	8115	// if (texture == null)
..	..	@@ -8092,47 +8203,50 @@
8092	8203
8093	8204	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8094	8205	{
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		- }
	8206	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8207	+// ambientOcclusion ) // \|\| !textureon)
	8208	+// {
	8209	+// return; // false;
	8210	+// }
	8211	+//
	8212	+// if (tex == null)
	8213	+// {
	8214	+// BindTexture(null,false,resolution);
	8215	+// BindTexture(null,true,resolution);
	8216	+// return;
	8217	+// }
	8218	+//
	8219	+// String pigment = Object3D.GetPigment(tex);
	8220	+// String bump = Object3D.GetBump(tex);
	8221	+//
	8222	+// usedtextures.add(pigment);
	8223	+// usedtextures.add(bump);
	8224	+//
	8225	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8226	+// {
	8227	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8228	+// // System.out.println("; bump = " + bump);
	8229	+// }
	8230	+//
	8231	+// if (bump.equals(""))
	8232	+// {
	8233	+// bump = null;
	8234	+// }
	8235	+// if (pigment.equals(""))
	8236	+// {
	8237	+// pigment = null;
	8238	+// }
	8239	+//
	8240	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8241	+// BindTexture(pigment, false, resolution);
	8242	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8243	+// BindTexture(bump, true, resolution);
	8244	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8245	+//
	8246	+// return; // true;
8107	8247
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;
	8248	+ BindPigmentTexture(tex, resolution);
	8249	+ BindBumpTexture(tex, resolution);
8136	8250	}
8137	8251
8138	8252	/boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8151,9 +8265,9 @@
8151	8265
8152	8266	String pigment = Object3D.GetPigment(tex);
8153	8267
8154		- usedtextures.put(pigment, pigment);
	8268	+ usedtextures.add(tex);
8155	8269
8156		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8270	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8157	8271	{
8158	8272	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8159	8273	// System.out.println("; bump = " + bump);
..	..	@@ -8165,7 +8279,7 @@
8165	8279	}
8166	8280
8167	8281	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8168		- BindTexture(pigment, false, resolution);
	8282	+ BindTexture(tex, false, resolution);
8169	8283	}
8170	8284
8171	8285	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8184,9 +8298,9 @@
8184	8298
8185	8299	String bump = Object3D.GetBump(tex);
8186	8300
8187		- usedtextures.put(bump, bump);
	8301	+ usedtextures.add(tex);
8188	8302
8189		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8303	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8190	8304	{
8191	8305	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8192	8306	// System.out.println("; bump = " + bump);
..	..	@@ -8198,7 +8312,7 @@
8198	8312	}
8199	8313
8200	8314	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8201		- BindTexture(bump, true, resolution);
	8315	+ BindTexture(tex, true, resolution);
8202	8316	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8203	8317	}
8204	8318
..	..	@@ -8222,13 +8336,19 @@
8222	8336	return fileExists;
8223	8337	}
8224	8338
8225		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8339	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8226	8340	{
8227		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8341	+ CacheTexture texturecache = null;
8228	8342
8229	8343	if (tex != null)
8230	8344	{
8231		- String texname = tex;
	8345	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8346	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
	8347	+
	8348	+ if (texname.equals("") && texdata == null)
	8349	+ {
	8350	+ return null;
	8351	+ }
8232	8352
8233	8353	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8234	8354
..	..	@@ -8238,19 +8358,46 @@
8238	8358	// else
8239	8359	// if (!texname.startsWith("/"))
8240	8360	// texname = "/Users/nbriere/Textures/" + texname;
8241		- if (!FileExists(tex))
	8361	+ if (!FileExists(texname))
8242	8362	{
8243	8363	texname = fallbackTextureName;
8244	8364	}
8245	8365
8246	8366	if (CACHETEXTURE)
8247		- texture = textures.get(texname); // TEXTURE CACHE
8248		-
8249		- TextureData texturedata = null;
8250		-
8251		- if (texture == null \|\| texture.resolution < resolution)
8252	8367	{
8253		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8368	+ if (texdata == null)
	8369	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8370	+ else
	8371	+ texturecache = bimtextures.get(texdata);
	8372	+ }
	8373	+
	8374	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8375	+ {
	8376	+ TextureData texturedata = null;
	8377	+
	8378	+ if (texdata != null && textureon)
	8379	+ {
	8380	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8381	+
	8382	+ try
	8383	+ {
	8384	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8385	+ }
	8386	+ catch (Exception e)
	8387	+ {
	8388	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8389	+ }
	8390	+
	8391	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8392	+ bimtextures.put(texdata, texturecache);
	8393	+
	8394	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8395	+
	8396	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8397	+ //bim2 = bim;
	8398	+ }
	8399	+ else
	8400	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8254	8401	{
8255	8402	assert(!bump);
8256	8403	// if (bump)
..	..	@@ -8261,19 +8408,23 @@
8261	8408	// }
8262	8409	// else
8263	8410	// {
8264		- texture = textures.get(tex);
8265		- if (texture == null)
	8411	+ // texturecache = textures.get(texname); // suspicious
	8412	+ if (texturecache == null)
8266	8413	{
8267		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8414	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8268	8415	}
	8416	+ else
	8417	+ new Exception().printStackTrace();
8269	8418	// }
8270	8419	} else
8271		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8420	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8272	8421	{
8273	8422	assert(bump);
8274		- texture = textures.get(tex);
8275		- if (texture == null)
8276		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8423	+ // texturecache = textures.get(texname); // suspicious
	8424	+ if (texturecache == null)
	8425	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8426	+ else
	8427	+ new Exception().printStackTrace();
8277	8428	} else
8278	8429	{
8279	8430	//if (tex.equals("IMMORTAL"))
..	..	@@ -8281,11 +8432,13 @@
8281	8432	// texture = GetResourceTexture("default.png");
8282	8433	//} else
8283	8434	//{
8284		- if (tex.equals("WHITE_NOISE"))
	8435	+ if (texname.endsWith("WHITE_NOISE"))
8285	8436	{
8286		- texture = textures.get(tex);
8287		- if (texture == null)
8288		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8437	+ // texturecache = textures.get(texname); // suspicious
	8438	+ if (texturecache == null)
	8439	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8440	+ else
	8441	+ new Exception().printStackTrace();
8289	8442	} else
8290	8443	{
8291	8444	if (textureon)
..	..	@@ -8344,19 +8497,19 @@
8344	8497	if (texturedata == null)
8345	8498	throw new Exception();
8346	8499
8347		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8500	+ texturecache = new CacheTexture(texturedata,resolution);
8348	8501	//texture = GetTexture(tex, bump);
8349	8502	}
8350	8503	}
8351	8504	//}
8352	8505	}
8353	8506
8354		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8507	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8355	8508	{
8356	8509	//return false;
8357	8510
8358	8511	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8359		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8512	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8360	8513	{
8361	8514	// String ext = "_highres";
8362	8515	// if (REDUCETEXTURE)
..	..	@@ -8373,52 +8526,17 @@
8373	8526	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8374	8527	if (!cachefile.exists())
8375	8528	{
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))
	8529	+ //if (texturedata.getWidth() == texturedata.getHeight())
8385	8530	{
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);
	8531	+ BufferedImage rendImage = CreateBim(texturedata);
	8532	+
8416	8533	ImageWriter writer = null;
8417	8534	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8418	8535	if (iter.hasNext()) {
8419	8536	writer = (ImageWriter)iter.next();
8420	8537	}
8421		- float compressionQuality = 0.9f;
	8538	+
	8539	+ float compressionQuality = 0.85f;
8422	8540	try
8423	8541	{
8424	8542	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8435,18 +8553,20 @@
8435	8553	}
8436	8554	}
8437	8555	}
8438		-
	8556	+
	8557	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8558	+
8439	8559	//System.out.println("Texture = " + tex);
8440		- if (textures.containsKey(texname))
	8560	+ if (textures.containsKey(tex))
8441	8561	{
8442		- CacheTexture thetex = textures.get(texname);
	8562	+ CacheTexture thetex = textures.get(tex);
8443	8563	thetex.texture.disable();
8444	8564	thetex.texture.dispose();
8445		- textures.remove(texname);
	8565	+ textures.remove(tex);
8446	8566	}
8447	8567
8448		- texture.texturedata = texturedata;
8449		- textures.put(texname, texture);
	8568	+ //texture.texturedata = texturedata;
	8569	+ textures.put(tex, texturecache);
8450	8570
8451	8571	// newtex = true;
8452	8572	}
..	..	@@ -8462,10 +8582,44 @@
8462	8582	}
8463	8583	}
8464	8584
8465		- return texture;
	8585	+ return texturecache;
8466	8586	}
8467	8587
8468		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	8588	+ static void EmbedTextures(cTexture tex)
	8589	+ {
	8590	+ if (tex.pigmentdata == null)
	8591	+ {
	8592	+ //String texname = Object3D.GetPigment(tex);
	8593	+
	8594	+ CacheTexture texturecache = texturepigment.get(tex);
	8595	+
	8596	+ if (texturecache != null)
	8597	+ {
	8598	+ tex.pw = texturecache.texturedata.getWidth();
	8599	+ tex.ph = texturecache.texturedata.getHeight();
	8600	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8601	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8602	+ ;
	8603	+ //, tex.pw, tex.ph), 0.5f);
	8604	+ }
	8605	+ }
	8606	+
	8607	+ if (tex.bumpdata == null)
	8608	+ {
	8609	+ //String texname = Object3D.GetBump(tex);
	8610	+
	8611	+ CacheTexture texturecache = texturebump.get(tex);
	8612	+
	8613	+ if (texturecache != null)
	8614	+ {
	8615	+ tex.bw = texturecache.texturedata.getWidth();
	8616	+ tex.bh = texturecache.texturedata.getHeight();
	8617	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8618	+ }
	8619	+ }
	8620	+ }
	8621	+
	8622	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8469	8623	{
8470	8624	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8471	8625
..	..	@@ -8483,21 +8637,21 @@
8483	8637	return texture!=null?texture.texture:null;
8484	8638	}
8485	8639
8486		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
	8640	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8487	8641	{
8488	8642	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8489	8643
8490	8644	return texture!=null?texture.texturedata:null;
8491	8645	}
8492	8646
8493		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8647	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8494	8648	{
8495	8649	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8496	8650	{
8497	8651	return false;
8498	8652	}
8499	8653
8500		- boolean newtex = false;
	8654	+ //boolean newtex = false;
8501	8655
8502	8656	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8503	8657
..	..	@@ -8529,9 +8683,75 @@
8529	8683	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8530	8684	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8531	8685
8532		- return newtex;
	8686	+ return true; // Warning: not used.
8533	8687	}
8534	8688
	8689	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8690	+ {
	8691	+ try
	8692	+ {
	8693	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8694	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8695	+ ImageWriter writer = writers.next();
	8696	+
	8697	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8698	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8699	+ param.setCompressionQuality(quality);
	8700	+
	8701	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8702	+ writer.setOutput(ios);
	8703	+ writer.write(null, new IIOImage(image, null, null), param);
	8704	+
	8705	+ byte[] data = baos.toByteArray();
	8706	+ writer.dispose();
	8707	+ return data;
	8708	+ }
	8709	+ catch (Exception e)
	8710	+ {
	8711	+ e.printStackTrace();
	8712	+ return null;
	8713	+ }
	8714	+ }
	8715	+
	8716	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8717	+ {
	8718	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8719	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8720	+ ImageReader reader = writers.next();
	8721	+
	8722	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8723	+
	8724	+ ImageReadParam param = reader.getDefaultReadParam();
	8725	+ param.setDestination(bim);
	8726	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8727	+
	8728	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8729	+ reader.setInput(ios);
	8730	+ BufferedImage bim2 = reader.read(0, param);
	8731	+ reader.dispose();
	8732	+
	8733	+// WritableRaster raster = bim2.getRaster();
	8734	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8735	+// byte[] bytes = data.getData();
	8736	+//
	8737	+// int[] pixels = new int[bytes.length/3];
	8738	+// for (int i=pixels.length; --i>=0;)
	8739	+// {
	8740	+// int i3 = i*3;
	8741	+// pixels[i] = 0xFF;
	8742	+// pixels[i] <<= 8;
	8743	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8744	+// pixels[i] <<= 8;
	8745	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8746	+// pixels[i] <<= 8;
	8747	+// pixels[i] \|= bytes[i3] & 0xFF;
	8748	+// }
	8749	+//
	8750	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8751	+
	8752	+ return bim;
	8753	+ }
	8754	+
8535	8755	ShadowBuffer shadowPBuf;
8536	8756	AntialiasBuffer antialiasPBuf;
8537	8757	int MAXSTACK;
..	..	@@ -8724,7 +8944,7 @@
8724	8944
8725	8945	if (cubemap == null)
8726	8946	{
8727		- LoadEnvy(5);
	8947	+ //LoadEnvy(1);
8728	8948	}
8729	8949
8730	8950	//cubemap.enable();
..	..	@@ -9011,37 +9231,58 @@
9011	9231	cubemap = null;
9012	9232	return;
9013	9233	case 1:
9014		- name = "cubemaps/box_";
9015		- ext = "png";
	9234	+ name = "cubemaps/rgb/";
	9235	+ ext = "jpg";
9016	9236	reverseUP = false;
9017	9237	break;
9018	9238	case 2:
9019		- name = "cubemaps/uffizi_";
9020		- ext = "png";
9021		- break; // reverseUP = true; break;
	9239	+ name = "cubemaps/uffizi/";
	9240	+ ext = "jpg";
	9241	+ reverseUP = false;
	9242	+ break;
9022	9243	case 3:
9023		- name = "cubemaps/CloudyHills_";
9024		- ext = "tga";
	9244	+ name = "cubemaps/CloudyHills/";
	9245	+ ext = "jpg";
9025	9246	reverseUP = false;
9026	9247	break;
9027	9248	case 4:
9028		- name = "cubemaps/cornell_";
	9249	+ name = "cubemaps/cornell/";
9029	9250	ext = "png";
9030	9251	reverseUP = false;
9031	9252	break;
	9253	+ case 5:
	9254	+ name = "cubemaps/skycube/";
	9255	+ ext = "jpg";
	9256	+ reverseUP = false;
	9257	+ break;
	9258	+ case 6:
	9259	+ name = "cubemaps/SaintLazarusChurch3/";
	9260	+ ext = "jpg";
	9261	+ reverseUP = false;
	9262	+ break;
	9263	+ case 7:
	9264	+ name = "cubemaps/Sodermalmsallen/";
	9265	+ ext = "jpg";
	9266	+ reverseUP = false;
	9267	+ break;
	9268	+ case 8:
	9269	+ name = "cubemaps/Sodermalmsallen2/";
	9270	+ ext = "jpg";
	9271	+ reverseUP = false;
	9272	+ break;
	9273	+ case 9:
	9274	+ name = "cubemaps/UnionSquare/";
	9275	+ ext = "jpg";
	9276	+ reverseUP = false;
	9277	+ break;
9032	9278	default:
9033		- name = "cubemaps/rgb_";
9034		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9279	+ name = "cubemaps/box/";
	9280	+ ext = "png"; /mipmap = true;/
	9281	+ reverseUP = false;
9035	9282	break;
9036	9283	}
9037		-
9038		- try
9039		- {
9040		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9041		- } catch (IOException e)
9042		- {
9043		- throw new RuntimeException(e);
9044		- }
	9284	+
	9285	+ LoadSkybox(name, ext, mipmap);
9045	9286	}
9046	9287
9047	9288	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -9073,8 +9314,12 @@
9073	9314	static double[] model = new double[16];
9074	9315	double[] camera2light = new double[16];
9075	9316	double[] light2camera = new double[16];
9076		- int newenvy = -1;
9077		- boolean envyoff = true; // false;
	9317	+
	9318	+ //int newenvy = -1;
	9319	+ //boolean envyoff = false;
	9320	+
	9321	+ String loadedskyboxname;
	9322	+
9078	9323	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9079	9324	//float[] light0 = { 0,0,0 };
9080	9325	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9367,11 +9612,35 @@
9367	9612	jy8[3] = 0.5f;
9368	9613	}
9369	9614
9370		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9615	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9371	9616	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9372	9617	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9373	9618	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9374	9619
	9620	+ void ResetOptions()
	9621	+ {
	9622	+ options1[0] = 100;
	9623	+ options1[1] = 0.025f;
	9624	+ options1[2] = 0.01f;
	9625	+ options1[3] = 0;
	9626	+ options1[4] = 0;
	9627	+
	9628	+ options2[0] = 0;
	9629	+ options2[1] = 0.75f;
	9630	+ options2[2] = 0;
	9631	+ options2[3] = 0;
	9632	+
	9633	+ options3[0] = 1;
	9634	+ options3[1] = 1;
	9635	+ options3[2] = 1;
	9636	+ options3[3] = 0;
	9637	+
	9638	+ options4[0] = 1;
	9639	+ options4[1] = 0;
	9640	+ options4[2] = 1;
	9641	+ options4[3] = 0;
	9642	+ }
	9643	+
9375	9644	static int imagecount = 0; // movie generation
9376	9645
9377	9646	static int jitter = 0;
..	..	@@ -9468,7 +9737,7 @@
9468	9737
9469	9738	if (renderCamera != lightCamera)
9470	9739	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9471		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9740	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9472	9741
9473	9742	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9474	9743
..	..	@@ -9484,7 +9753,7 @@
9484	9753
9485	9754	if (renderCamera != lightCamera)
9486	9755	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9487		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9756	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9488	9757
9489	9758	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9490	9759
..	..	@@ -9530,10 +9799,12 @@
9530	9799	rati = 1 / rati;
9531	9800	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9532	9801	}
9533		- assert (newenvy == -1);
	9802	+
	9803	+ //assert (newenvy == -1);
	9804	+
9534	9805	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9535	9806	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9536		- DrawSkyBox(gl);
	9807	+ DrawSkyBox(gl, (float)rati);
9537	9808	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9538	9809	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9539	9810	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -10482,6 +10753,7 @@
10482	10753	ANTIALIAS = 0;
10483	10754	//System.out.println("RESTART");
10484	10755	AAtimer.restart();
	10756	+ Globals.TIMERRUNNING = true;
10485	10757	}
10486	10758	}
10487	10759	}
..	..	@@ -10549,7 +10821,8 @@
10549	10821	ambientOcclusion = false;
10550	10822	}
10551	10823
10552		- if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
	10824	+ if (//Globals.lighttouched &&
	10825	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10553	10826	{
10554	10827	//if (RENDERSHADOW) // ?
10555	10828	if (!IsFrozen())
..	..	@@ -10683,7 +10956,7 @@
10683	10956	// if (parentcam != renderCamera) // not a light
10684	10957	if (cam != lightCamera)
10685	10958	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10686		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10959	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10687	10960
10688	10961	for (int j = 0; j < 4; j++)
10689	10962	{
..	..	@@ -10698,7 +10971,7 @@
10698	10971	// if (parentcam != renderCamera) // not a light
10699	10972	if (cam != lightCamera)
10700	10973	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10701		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	10974	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10702	10975
10703	10976	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10704	10977
..	..	@@ -10784,13 +11057,27 @@
10784	11057	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10785	11058	}
10786	11059
10787		- if (newenvy > -1)
	11060	+// if (newenvy > -1)
	11061	+// {
	11062	+// LoadEnvy(newenvy);
	11063	+// }
	11064	+//
	11065	+// newenvy = -1;
	11066	+
	11067	+ if (object.skyboxname != null)
10788	11068	{
10789		- LoadEnvy(newenvy);
	11069	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11070	+ {
	11071	+ LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11072	+ loadedskyboxname = object.skyboxname;
	11073	+ }
10790	11074	}
10791		-
10792		- newenvy = -1;
10793		-
	11075	+ else
	11076	+ {
	11077	+ cubemap = null;
	11078	+ loadedskyboxname = null;
	11079	+ }
	11080	+
10794	11081	ratio = ((double) getWidth()) / getHeight();
10795	11082	//System.out.println("ratio = " + ratio);
10796	11083
..	..	@@ -10806,7 +11093,7 @@
10806	11093
10807	11094	if (!IsFrozen() && !ambientOcclusion)
10808	11095	{
10809		- DrawSkyBox(gl);
	11096	+ DrawSkyBox(gl, (float)ratio);
10810	11097	}
10811	11098
10812	11099	//if (selection_view == -1)
..	..	@@ -10989,9 +11276,9 @@
10989	11276
10990	11277	gl.glMatrixMode(GL.GL_MODELVIEW);
10991	11278
10992		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10993		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10994		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11279	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11280	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11281	+gl.glEnable(gl.GL_MULTISAMPLE);
10995	11282	} else
10996	11283	{
10997	11284	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -11002,7 +11289,7 @@
11002	11289	//System.out.println("BLENDING ON");
11003	11290	gl.glEnable(GL.GL_BLEND);
11004	11291	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
11005		-
	11292	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
11006	11293	gl.glMatrixMode(gl.GL_PROJECTION);
11007	11294	gl.glLoadIdentity();
11008	11295
..	..	@@ -11251,7 +11538,7 @@
11251	11538	}
11252	11539	}
11253	11540
11254		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11541	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11255	11542	{
11256	11543	//gl.glDepthFunc(GL.GL_LEQUAL);
11257	11544	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11259,24 +11546,21 @@
11259	11546
11260	11547	boolean texon = textureon;
11261	11548
11262		- if (RENDERPROGRAM > 0)
11263		- {
11264		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11265		- textureon = false;
11266		- }
	11549	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11550	+ textureon = false;
	11551	+
11267	11552	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11268	11553	//System.out.println("ALLO");
11269	11554	gl.glColorMask(false, false, false, false);
11270	11555	DrawObject(gl);
11271		- if (RENDERPROGRAM > 0)
11272		- {
11273		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11274		- textureon = texon;
11275		- }
	11556	+
	11557	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11558	+ textureon = texon;
	11559	+
11276	11560	gl.glColorMask(true, true, true, true);
11277	11561
11278	11562	gl.glDepthFunc(GL.GL_EQUAL);
11279		- //gl.glDepthMask(false);
	11563	+ gl.glDepthMask(false);
11280	11564	}
11281	11565
11282	11566	if (false) // DrawMode() == SHADOW)
..	..	@@ -11459,15 +11743,36 @@
11459	11743
11460	11744	static boolean zoomonce = false;
11461	11745
	11746	+ static void CreateSelectedPoint()
	11747	+ {
	11748	+ if (selectedpoint == null)
	11749	+ {
	11750	+ debugpointG = new Sphere();
	11751	+ debugpointP = new Sphere();
	11752	+ debugpointC = new Sphere();
	11753	+ debugpointR = new Sphere();
	11754	+
	11755	+ selectedpoint = new Superellipsoid();
	11756	+
	11757	+ for (int i=0; i<8; i++)
	11758	+ {
	11759	+ debugpoints[i] = new Sphere();
	11760	+ }
	11761	+ }
	11762	+ }
	11763	+
11462	11764	void DrawObject(GL gl, boolean draw)
11463	11765	{
	11766	+ // To clear camera values
	11767	+ ResetOptions();
	11768	+
11464	11769	//System.out.println("DRAW OBJECT " + mouseDown);
11465	11770	// DrawMode() = SELECTION;
11466	11771	//GL gl = getGL();
11467	11772	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11468	11773	{
11469	11774	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11470		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11775	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11471	11776	pingthread.StepToTarget(true); // true);
11472	11777	// zoomonce = false;
11473	11778	}
..	..	@@ -11539,8 +11844,9 @@
11539	11844
11540	11845	if (DrawMode() == DEFAULT)
11541	11846	{
11542		- if (DEBUG)
	11847	+ if (Globals.DEBUG)
11543	11848	{
	11849	+ CreateSelectedPoint();
11544	11850	float radius = 0.05f;
11545	11851	if (selectedpoint.radius != radius)
11546	11852	{
..	..	@@ -11594,20 +11900,32 @@
11594	11900	ReleaseTextures(DEFAULT_TEXTURES);
11595	11901
11596	11902	if (CLEANCACHE)
11597		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11903	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11598	11904	{
11599		- String tex = e.nextElement();
	11905	+ cTexture tex = e.nextElement();
11600	11906
11601	11907	// System.out.println("Texture --------- " + tex);
11602	11908
11603		- if (tex.equals("WHITE_NOISE"))
	11909	+ if (tex.equals("WHITE_NOISE:"))
11604	11910	continue;
11605	11911
11606		- if (!usedtextures.containsKey(tex))
	11912	+ if (!usedtextures.contains(tex))
11607	11913	{
	11914	+ CacheTexture gettex = texturepigment.get(tex);
11608	11915	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11609		- textures.get(tex).texture.dispose();
11610		- textures.remove(tex);
	11916	+ if (gettex != null)
	11917	+ {
	11918	+ gettex.texture.dispose();
	11919	+ texturepigment.remove(tex);
	11920	+ }
	11921	+
	11922	+ gettex = texturebump.get(tex);
	11923	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11924	+ if (gettex != null)
	11925	+ {
	11926	+ gettex.texture.dispose();
	11927	+ texturebump.remove(tex);
	11928	+ }
11611	11929	}
11612	11930	}
11613	11931	}
..	..	@@ -12027,7 +12345,7 @@
12027	12345	for (int i = tp.size(); --i >= 0;)
12028	12346	{
12029	12347	//for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12030		- LA.xformPos(light, tp.get(i).GlobalTransform(), light);
	12348	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
12031	12349	}
12032	12350
12033	12351
..	..	@@ -12135,8 +12453,76 @@
12135	12453
12136	12454	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12137	12455
12138		- String program =
	12456	+ String programmin =
	12457	+ // Min shader
12139	12458	"!!ARBfp1.0\n" +
	12459	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12460	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12461	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12462	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12463	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12464	+ "PARAM light2cam0 = program.env[10];" +
	12465	+ "PARAM light2cam1 = program.env[11];" +
	12466	+ "PARAM light2cam2 = program.env[12];" +
	12467	+ "TEMP temp;" +
	12468	+ "TEMP light;" +
	12469	+ "TEMP ndotl;" +
	12470	+ "TEMP normal;" +
	12471	+ "TEMP depth;" +
	12472	+ "TEMP eye;" +
	12473	+ "TEMP pos;" +
	12474	+
	12475	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12476	+ Normalize("normal") +
	12477	+ "MOV light, state.light[0].position;" +
	12478	+ "DP3 ndotl.x, light, normal;" +
	12479	+
	12480	+ // shadow
	12481	+ "MOV pos, fragment.texcoord[1];" +
	12482	+ "MOV temp, pos;" +
	12483	+ ShadowTextureFetch("depth", "temp", "1") +
	12484	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12485	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12486	+
	12487	+ // No shadow when out of frustum
	12488	+ //"SGE temp.y, depth.z, zero123.y;" +
	12489	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12490	+
	12491	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12492	+
	12493	+ // Backlit
	12494	+ "MOV pos.w, zero123.y;" +
	12495	+ "DP4 eye.x, pos, light2cam0;" +
	12496	+ "DP4 eye.y, pos, light2cam1;" +
	12497	+ "DP4 eye.z, pos, light2cam2;" +
	12498	+ Normalize("eye") +
	12499	+
	12500	+ "DP3 ndotl.y, -eye, normal;" +
	12501	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12502	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12503	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12504	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12505	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12506	+
	12507	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12508	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12509	+
	12510	+ // Pigment
	12511	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12512	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12513	+ "MUL temp, temp, ndotl.x;" +
	12514	+
	12515	+ "MUL temp, temp, zero123.z;" +
	12516	+
	12517	+ //"MUL temp, temp, ndotl.y;" +
	12518	+
	12519	+ "MOV temp.w, zero123.y;" + // reset alpha
	12520	+ "MOV result.color, temp;" +
	12521	+ "END";
	12522	+
	12523	+ String programmax =
	12524	+ "!!ARBfp1.0\n" +
	12525	+
12140	12526	//"OPTION ARB_fragment_program_shadow;" +
12141	12527	"PARAM light2cam0 = program.env[10];" +
12142	12528	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12251,8 +12637,7 @@
12251	12637	"TEMP shininess;" +
12252	12638	"\n" +
12253	12639	"MOV texSamp, one;" +
12254		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12255		-
	12640	+
12256	12641	"MOV mapgrid.x, one2048th.x;" +
12257	12642	"MOV temp, fragment.texcoord[1];" +
12258	12643	/*
..	..	@@ -12273,20 +12658,20 @@
12273	12658	"MUL temp, floor, mapgrid.x;" +
12274	12659	//"TEX depth0, temp, texture[1], 2D;" +
12275	12660	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12276		- TextureFetch("depth0", "temp", "1") +
	12661	+ ShadowTextureFetch("depth0", "temp", "1") +
12277	12662	"") +
12278	12663	"ADD temp.x, temp.x, mapgrid.x;" +
12279	12664	//"TEX depth1, temp, texture[1], 2D;" +
12280	12665	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12281		- TextureFetch("depth1", "temp", "1") +
	12666	+ ShadowTextureFetch("depth1", "temp", "1") +
12282	12667	"") +
12283	12668	"ADD temp.y, temp.y, mapgrid.x;" +
12284	12669	//"TEX depth2, temp, texture[1], 2D;" +
12285		- TextureFetch("depth2", "temp", "1") +
	12670	+ ShadowTextureFetch("depth2", "temp", "1") +
12286	12671	"SUB temp.x, temp.x, mapgrid.x;" +
12287	12672	//"TEX depth3, temp, texture[1], 2D;" +
12288	12673	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12289		- TextureFetch("depth3", "temp", "1") +
	12674	+ ShadowTextureFetch("depth3", "temp", "1") +
12290	12675	"") +
12291	12676	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12292	12677	//"MOV params, material;" +
..	..	@@ -12657,10 +13042,10 @@
12657	13042	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12658	13043	"") +
12659	13044
12660		- // display shadow only (bump == 0)
	13045	+ // display shadow only (fakedepth == 0)
12661	13046	"SUB temp.x, half.x, shadow.x;" +
12662	13047	"MOV temp.y, -params5.z;" + // params6.x;" +
12663		- "SLT temp.z, temp.y, -one2048th.x;" +
	13048	+ "SLT temp.z, temp.y, -c256i.x;" +
12664	13049	"SUB temp.y, one.x, temp.z;" +
12665	13050	"MUL temp.x, temp.x, temp.y;" +
12666	13051	"KIL temp.x;" +
..	..	@@ -12991,6 +13376,13 @@
12991	13376	//once = true;
12992	13377	}
12993	13378
	13379	+ String program = programmax;
	13380	+
	13381	+ if (Globals.MINSHADER)
	13382	+ {
	13383	+ program = programmin;
	13384	+ }
	13385	+
12994	13386	System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12995	13387	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12996	13388	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
..	..	@@ -13084,25 +13476,26 @@
13084	13476	return out;
13085	13477	}
13086	13478
13087		- String TextureFetch(String dest, String src, String unit)
	13479	+ // Also does frustum culling
	13480	+ String ShadowTextureFetch(String dest, String src, String unit)
13088	13481	{
13089	13482	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13090	13483	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13091	13484	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13485	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13486	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13092	13487	"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;" +
	13488	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13489	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13097	13490	//"SWZ buffer, temp, w,w,w,w;";
13098		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13491	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13099	13492	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13100	13493	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13101	13494	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13102		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13495	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13103	13496
13104		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13105		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13497	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13498	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13106	13499	}
13107	13500
13108	13501	String Shadow(String depth, String shadow)
..	..	@@ -13149,7 +13542,7 @@
13149	13542	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13150	13543	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13151	13544
13152		- // No shadow when out of frustrum
	13545	+ // No shadow when out of frustum
13153	13546	"SGE temp.x, " + depth + ".z, one.z;" +
13154	13547	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13155	13548	"";
..	..	@@ -13297,7 +13690,8 @@
13297	13690	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13298	13691	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13299	13692	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13300		- Object3D.cVector2[] vector2buffer;
	13693	+
	13694	+ //Object3D.cVector2[] vector2buffer;
13301	13695
13302	13696	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13303	13697	// OUT : diff, spec
..	..	@@ -13313,9 +13707,10 @@
13313	13707	"DP3 " + dest + ".z," + "normals," + "eye;" +
13314	13708	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13315	13709	//"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;" +
	13710	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13711	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13712	+
	13713	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13319	13714	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13320	13715	"RCP " + dest + ".w," + dest + ".w;" +
13321	13716	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13820,6 +14215,7 @@
13820	14215	else
13821	14216	if (evt.getSource() == AAtimer)
13822	14217	{
	14218	+ Globals.TIMERRUNNING = false;
13823	14219	if (mouseDown)
13824	14220	{
13825	14221	//new Exception().printStackTrace();
..	..	@@ -13879,7 +14275,7 @@
13879	14275
13880	14276	// fev 2014???
13881	14277	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13882		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14278	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13883	14279	pingthread.StepToTarget(true); // true);
13884	14280	}
13885	14281	// if (!LIVE)
..	..	@@ -13894,6 +14290,7 @@
13894	14290	return;
13895	14291
13896	14292	AAtimer.restart(); //
	14293	+ Globals.TIMERRUNNING = true;
13897	14294
13898	14295	// waslive = LIVE;
13899	14296	// LIVE = false;
..	..	@@ -13943,14 +14340,15 @@
13943	14340	drag = false;
13944	14341	//System.out.println("Mouse DOWN");
13945	14342	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);
	14343	+ //ClickInfo info = new ClickInfo();
	14344	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14345	+ object.clickInfo.pane = this;
	14346	+ object.clickInfo.camera = renderCamera;
	14347	+ object.clickInfo.x = x;
	14348	+ object.clickInfo.y = y;
	14349	+ object.clickInfo.modifiers = modifiersex;
	14350	+ editObj = object.doEditClick(//info,
	14351	+ 0);
13954	14352	if (!editObj)
13955	14353	{
13956	14354	hasMarquee = true;
..	..	@@ -14232,12 +14630,12 @@
14232	14630	void GoDown(int mod)
14233	14631	{
14234	14632	MODIFIERS \|= COMMAND;
14235		- /*
	14633	+ /**/
14236	14634	if((mod&SHIFT) == SHIFT)
14237	14635	manipCamera.RotatePosition(0, -speed);
14238	14636	else
14239		- manipCamera.BackForth(0, -speed*delta, getWidth());
14240		- */
	14637	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14638	+ /**/
14241	14639	if ((mod & SHIFT) == SHIFT)
14242	14640	{
14243	14641	mouseMode = mouseMode; // VR??
..	..	@@ -14253,12 +14651,12 @@
14253	14651	void GoUp(int mod)
14254	14652	{
14255	14653	MODIFIERS \|= COMMAND;
14256		- /*
	14654	+ /**/
14257	14655	if((mod&SHIFT) == SHIFT)
14258	14656	manipCamera.RotatePosition(0, speed);
14259	14657	else
14260		- manipCamera.BackForth(0, speed*delta, getWidth());
14261		- */
	14658	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14659	+ /**/
14262	14660	if ((mod & SHIFT) == SHIFT)
14263	14661	{
14264	14662	mouseMode = mouseMode;
..	..	@@ -14274,12 +14672,12 @@
14274	14672	void GoLeft(int mod)
14275	14673	{
14276	14674	MODIFIERS \|= COMMAND;
14277		- /*
	14675	+ /**/
14278	14676	if((mod&SHIFT) == SHIFT)
14279		- manipCamera.RotatePosition(speed, 0);
14280		- else
14281	14677	manipCamera.Translate(speed*delta, 0, getWidth());
14282		- */
	14678	+ else
	14679	+ manipCamera.RotatePosition(speed, 0);
	14680	+ /**/
14283	14681	if ((mod & SHIFT) == SHIFT)
14284	14682	{
14285	14683	mouseMode = mouseMode;
..	..	@@ -14295,12 +14693,12 @@
14295	14693	void GoRight(int mod)
14296	14694	{
14297	14695	MODIFIERS \|= COMMAND;
14298		- /*
	14696	+ /**/
14299	14697	if((mod&SHIFT) == SHIFT)
14300		- manipCamera.RotatePosition(-speed, 0);
14301		- else
14302	14698	manipCamera.Translate(-speed*delta, 0, getWidth());
14303		- */
	14699	+ else
	14700	+ manipCamera.RotatePosition(-speed, 0);
	14701	+ /**/
14304	14702	if ((mod & SHIFT) == SHIFT)
14305	14703	{
14306	14704	mouseMode = mouseMode;
..	..	@@ -14350,14 +14748,16 @@
14350	14748	if (editObj)
14351	14749	{
14352	14750	drag = true;
14353		- ClickInfo info = new ClickInfo();
14354		- info.bounds.setBounds(0, 0,
	14751	+ //ClickInfo info = new ClickInfo();
	14752	+ object.clickInfo.bounds.setBounds(0, 0,
14355	14753	(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);
	14754	+ object.clickInfo.pane = this;
	14755	+ object.clickInfo.camera = renderCamera;
	14756	+ object.clickInfo.x = x;
	14757	+ object.clickInfo.y = y;
	14758	+ object //.GetWindow().copy
	14759	+ .doEditDrag(//info,
	14760	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14361	14761	} else
14362	14762	{
14363	14763	if (x < startX)
..	..	@@ -14506,22 +14906,27 @@
14506	14906	}
14507	14907	}
14508	14908
	14909	+// ClickInfo clickInfo = new ClickInfo();
	14910	+
14509	14911	public void mouseMoved(MouseEvent e)
14510	14912	{
14511	14913	//System.out.println("mouseMoved: " + e);
14512	14914	if (isRenderer)
14513	14915	return;
14514	14916
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;
	14917	+ // Mouse cursor feedback
	14918	+ object.clickInfo.x = e.getX();
	14919	+ object.clickInfo.y = e.getY();
	14920	+ object.clickInfo.modifiers = e.getModifiersEx();
	14921	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14922	+ object.clickInfo.pane = this;
	14923	+ object.clickInfo.camera = renderCamera;
14522	14924	if (!isRenderer)
14523	14925	{
14524		- if (object.editWindow.copy.doEditClick(ci, 0))
	14926	+ //ObjEditor editWindow = object.editWindow;
	14927	+ //Object3D copy = editWindow.copy;
	14928	+ if (object.doEditClick(//clickInfo,
	14929	+ 0))
14525	14930	{
14526	14931	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14527	14932	} else
..	..	@@ -14536,7 +14941,8 @@
14536	14941	Globals.MOUSEDRAGGED = false;
14537	14942
14538	14943	movingcamera = false;
14539		- X = Y = 0;
	14944	+ X = 0; // getBounds().width/2;
	14945	+ Y = 0; // getBounds().height/2;
14540	14946	//System.out.println("mouseReleased: " + e);
14541	14947	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14542	14948	}
..	..	@@ -14792,7 +15198,8 @@
14792	15198	// break;
14793	15199	case 'T':
14794	15200	CACHETEXTURE ^= true;
14795		- textures.clear();
	15201	+ texturepigment.clear();
	15202	+ texturebump.clear();
14796	15203	// repaint();
14797	15204	break;
14798	15205	case 'Y':
..	..	@@ -14877,7 +15284,9 @@
14877	15284	case 'E' : COMPACT ^= true;
14878	15285	repaint();
14879	15286	break;
14880		- case 'W' : DEBUGHSB ^= true;
	15287	+ case 'W' : // Wide Window (fullscreen)
	15288	+ //DEBUGHSB ^= true;
	15289	+ ObjEditor.theFrame.ToggleFullScreen();
14881	15290	repaint();
14882	15291	break;
14883	15292	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14902,8 +15311,8 @@
14902	15311	RevertCamera();
14903	15312	repaint();
14904	15313	break;
14905		- case 'L':
14906	15314	case 'l':
	15315	+ //case 'L':
14907	15316	if (lightMode)
14908	15317	{
14909	15318	lightMode = false;
..	..	@@ -14967,20 +15376,24 @@
14967	15376	OCCLUSION_CULLING ^= true;
14968	15377	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14969	15378	break;
14970		- case '0': envyoff ^= true; repaint(); break;
	15379	+ //case '0': envyoff ^= true; repaint(); break;
14971	15380	case '1':
14972	15381	case '2':
14973	15382	case '3':
14974	15383	case '4':
14975	15384	case '5':
14976		- newenvy = Character.getNumericValue(key);
14977		- repaint();
14978		- break;
14979	15385	case '6':
14980	15386	case '7':
14981	15387	case '8':
14982	15388	case '9':
14983		- BGcolor = (key - '6')/3.f;
	15389	+ if (true) // envyoff)
	15390	+ {
	15391	+ BGcolor = (key - '1')/8.f;
	15392	+ }
	15393	+ else
	15394	+ {
	15395	+ //newenvy = Character.getNumericValue(key);
	15396	+ }
14984	15397	repaint();
14985	15398	break;
14986	15399	case '!':
..	..	@@ -15046,9 +15459,9 @@
15046	15459	case '_':
15047	15460	kompactbit = 5;
15048	15461	break;
15049		- case '+':
15050		- kompactbit = 6;
15051		- break;
	15462	+// case '+':
	15463	+// kompactbit = 6;
	15464	+// break;
15052	15465	case ' ':
15053	15466	lightMode ^= true;
15054	15467	Globals.lighttouched = true;
..	..	@@ -15060,6 +15473,7 @@
15060	15473	case ESC:
15061	15474	RENDERPROGRAM += 1;
15062	15475	RENDERPROGRAM %= 3;
	15476	+
15063	15477	repaint();
15064	15478	break;
15065	15479	case 'Z':
..	..	@@ -15099,8 +15513,9 @@
15099	15513	case DELETE:
15100	15514	ClearSelection();
15101	15515	break;
15102		- /*
15103	15516	case '+':
	15517	+
	15518	+ /*
15104	15519	//fontsize += 1;
15105	15520	bbzoom *= 2;
15106	15521	repaint();
..	..	@@ -15117,17 +15532,17 @@
15117	15532	case '=':
15118	15533	IncDepth();
15119	15534	//fontsize += 1;
15120		- object.editWindow.refreshContents(true);
	15535	+ object.GetWindow().refreshContents(true);
15121	15536	maskbit = 6;
15122	15537	break;
15123	15538	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
15124	15539	DecDepth();
15125	15540	maskbit = 5;
15126	15541	//if(fontsize > 1) fontsize -= 1;
15127		- if (object.editWindow == null)
15128		- new Exception().printStackTrace();
15129		- else
15130		- object.editWindow.refreshContents(true);
	15542	+// if (object.editWindow == null)
	15543	+// new Exception().printStackTrace();
	15544	+// else
	15545	+ object.GetWindow().refreshContents(true);
15131	15546	break;
15132	15547	case '{':
15133	15548	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15351,7 +15766,7 @@
15351	15766	}
15352	15767	*/
15353	15768
15354		- object.editWindow.EditSelection();
	15769	+ object.GetWindow().EditSelection(false);
15355	15770	}
15356	15771
15357	15772	void SelectParent()
..	..	@@ -15368,10 +15783,10 @@
15368	15783	{
15369	15784	//selectees.remove(i);
15370	15785	System.out.println("select parent of " + elem);
15371		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15786	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15372	15787	} else
15373	15788	{
15374		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15789	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15375	15790	}
15376	15791
15377	15792	first = false;
..	..	@@ -15413,12 +15828,12 @@
15413	15828	for (int j = 0; j < group.children.size(); j++)
15414	15829	{
15415	15830	elem = (Object3D) group.children.elementAt(j);
15416		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15831	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15417	15832	first = false;
15418	15833	}
15419	15834	} else
15420	15835	{
15421		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15836	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15422	15837	}
15423	15838
15424	15839	first = false;
..	..	@@ -15429,21 +15844,21 @@
15429	15844	{
15430	15845	//Composite group = (Composite) object;
15431	15846	Object3D group = object;
15432		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15847	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15433	15848	}
15434	15849
15435	15850	void ResetTransform(int mask)
15436	15851	{
15437	15852	//Composite group = (Composite) object;
15438	15853	Object3D group = object;
15439		- group.editWindow.ResetTransform(mask);
	15854	+ group.GetWindow().ResetTransform(mask);
15440	15855	}
15441	15856
15442	15857	void FlipTransform()
15443	15858	{
15444	15859	//Composite group = (Composite) object;
15445	15860	Object3D group = object;
15446		- group.editWindow.FlipTransform();
	15861	+ group.GetWindow().FlipTransform();
15447	15862	// group.editWindow.ReduceMesh(true);
15448	15863	}
15449	15864
..	..	@@ -15451,7 +15866,7 @@
15451	15866	{
15452	15867	//Composite group = (Composite) object;
15453	15868	Object3D group = object;
15454		- group.editWindow.PrintMemory();
	15869	+ group.GetWindow().PrintMemory();
15455	15870	// group.editWindow.ReduceMesh(true);
15456	15871	}
15457	15872
..	..	@@ -15459,7 +15874,7 @@
15459	15874	{
15460	15875	//Composite group = (Composite) object;
15461	15876	Object3D group = object;
15462		- group.editWindow.ResetCentroid();
	15877	+ group.GetWindow().ResetCentroid();
15463	15878	}
15464	15879
15465	15880	void IncDepth()
..	..	@@ -15541,8 +15956,6 @@
15541	15956
15542	15957	int width = getBounds().width;
15543	15958	int height = getBounds().height;
15544		- ClickInfo info = new ClickInfo();
15545		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15546	15959	//Image img = CreateImage(width, height);
15547	15960	//System.out.println("width = " + width + "; height = " + height + "\n");
15548	15961
..	..	@@ -15619,48 +16032,77 @@
15619	16032	}
15620	16033	if (object != null && !hasMarquee)
15621	16034	{
	16035	+ if (object.clickInfo == null)
	16036	+ object.clickInfo = new ClickInfo();
	16037	+ ClickInfo info = object.clickInfo;
	16038	+ //ClickInfo info = new ClickInfo();
	16039	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16040	+
15622	16041	if (isRenderer)
15623	16042	{
15624		- info.flags++;
	16043	+ object.clickInfo.flags++;
15625	16044	double frameAspect = (double) width / (double) height;
15626	16045	if (frameAspect > renderCamera.aspect)
15627	16046	{
15628	16047	int desired = (int) ((double) height * renderCamera.aspect);
15629		- info.bounds.width -= width - desired;
15630		- info.bounds.x += (width - desired) / 2;
	16048	+ object.clickInfo.bounds.width -= width - desired;
	16049	+ object.clickInfo.bounds.x += (width - desired) / 2;
15631	16050	} else
15632	16051	{
15633	16052	int desired = (int) ((double) width / renderCamera.aspect);
15634		- info.bounds.height -= height - desired;
15635		- info.bounds.y += (height - desired) / 2;
	16053	+ object.clickInfo.bounds.height -= height - desired;
	16054	+ object.clickInfo.bounds.y += (height - desired) / 2;
15636	16055	}
15637	16056	}
15638		- info.g = gr;
15639		- info.camera = renderCamera;
	16057	+
	16058	+ object.clickInfo.g = gr;
	16059	+ object.clickInfo.camera = renderCamera;
15640	16060	/*
15641	16061	// Memory intensive (brep.verticescopy)
15642	16062	if (!(object instanceof Composite))
15643	16063	object.draw(info, 0, false); // SLOW :
15644	16064	*/
15645		- if (!isRenderer)
	16065	+ if (!isRenderer) // && drag)
15646	16066	{
15647		- object.drawEditHandles(info, 0);
15648		-
15649		- if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	16067	+ Grafreed.Assert(object != null);
	16068	+ Grafreed.Assert(object.selection != null);
	16069	+ if (object.selection.Size() > 0)
15650	16070	{
15651		- switch (object.selection.get(0).hitSomething)
	16071	+ int hitSomething = object.selection.get(0).hitSomething;
	16072	+
	16073	+ object.clickInfo.DX = 0;
	16074	+ object.clickInfo.DY = 0;
	16075	+ object.clickInfo.W = 1;
	16076	+ if (hitSomething == Object3D.hitCenter)
15652	16077	{
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;
	16078	+ info.DX = X;
	16079	+ if (X != 0)
	16080	+ info.DX -= info.bounds.width/2;
	16081	+
	16082	+ info.DY = Y;
	16083	+ if (Y != 0)
	16084	+ info.DY -= info.bounds.height/2;
15662	16085	}
15663		-
	16086	+
	16087	+ object.drawEditHandles(//info,
	16088	+ 0);
	16089	+
	16090	+ if (drag && (X != 0 \|\| Y != 0))
	16091	+ {
	16092	+ switch (hitSomething)
	16093	+ {
	16094	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16095	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16096	+ break;
	16097	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16098	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16099	+ break;
	16100	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16101	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16102	+ break;
	16103	+ }
	16104	+
	16105	+ }
15664	16106	}
15665	16107	}
15666	16108	}
..	..	@@ -16142,6 +16584,8 @@
16142	16584	private /static/ boolean firstime;
16143	16585	private /static/ cVector newView = new cVector();
16144	16586	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16587	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16588	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
16145	16589	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16146	16590	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16147	16591	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16154,29 +16598,66 @@
16154	16598	{
16155	16599	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16156	16600
	16601	+ int usedsuf = 0;
	16602	+
16157	16603	for (int i = 0; i < suffixes.length; i++)
16158	16604	{
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)
	16605	+ String[] suffixe = suffixes;
	16606	+ String[] fallback = suffixes2;
	16607	+ String[] fallfallback = suffixes3;
	16608	+
	16609	+ for (int c=usedsuf; --c>=0;)
16164	16610	{
16165		- throw new IOException("Unable to load texture " + resourceName);
	16611	+// String[] temp = suffixe;
	16612	+// suffixe = fallback;
	16613	+// fallback = fallfallback;
	16614	+// fallfallback = temp;
16166	16615	}
	16616	+
	16617	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16618	+ TextureData data;
	16619	+
	16620	+ try
	16621	+ {
	16622	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16623	+ mipmapped,
	16624	+ FileUtil.getFileSuffix(resourceName));
	16625	+ }
	16626	+ catch (Exception e)
	16627	+ {
	16628	+ try
	16629	+ {
	16630	+ resourceName = basename + fallback[i] + "." + suffix;
	16631	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16632	+ mipmapped,
	16633	+ FileUtil.getFileSuffix(resourceName));
	16634	+ }
	16635	+ catch (Exception e2)
	16636	+ {
	16637	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16638	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16639	+ mipmapped,
	16640	+ FileUtil.getFileSuffix(resourceName));
	16641	+ }
	16642	+ }
	16643	+
16167	16644	//System.out.println("Target = " + targets[i]);
16168	16645	cubemap.updateImage(data, targets[i]);
16169	16646	}
16170	16647
16171	16648	return cubemap;
16172	16649	}
	16650	+
16173	16651	int bigsphere = -1;
16174	16652
16175	16653	float BGcolor = 0.5f;
16176	16654
16177		- private void DrawSkyBox(GL gl)
	16655	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16656	+
	16657	+ private void DrawSkyBox(GL gl, float ratio)
16178	16658	{
16179		- if (envyoff \|\| cubemap == null)
	16659	+ if (//envyoff \|\|
	16660	+ cubemap == null)
16180	16661	{
16181	16662	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16182	16663	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16191,7 +16672,17 @@
16191	16672	// Compensates for ExaminerViewer's modification of modelview matrix
16192	16673	gl.glMatrixMode(GL.GL_MODELVIEW);
16193	16674	gl.glLoadIdentity();
	16675	+ gl.glScalef(1,ratio,1);
16194	16676
	16677	+// colorV[0] = 2;
	16678	+// colorV[1] = 2;
	16679	+// colorV[2] = 2;
	16680	+// colorV[3] = 1;
	16681	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16682	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16683	+//
	16684	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16685	+
16195	16686	//gl.glActiveTexture(GL.GL_TEXTURE1);
16196	16687	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16197	16688
..	..	@@ -16223,6 +16714,7 @@
16223	16714	{
16224	16715	gl.glScalef(1.0f, -1.0f, 1.0f);
16225	16716	}
	16717	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16226	16718	gl.glMultMatrixd(viewrot_1, 0);
16227	16719	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16228	16720	//viewer.updateInverseRotation(gl);
..	..	@@ -16363,16 +16855,16 @@
16363	16855	cStatic.objectstack[materialdepth++] = checker;
16364	16856	//System.out.println("material " + material);
16365	16857	//Applet3D.tracein(this, selected);
16366		- vector2buffer = checker.projectedVertices;
	16858	+ //vector2buffer = checker.projectedVertices;
16367	16859
16368	16860	//checker.GetMaterial().Draw(this, false); // true);
16369		- DrawMaterial(checker.GetMaterial(), false); // true);
	16861	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16370	16862
16371	16863	materialdepth -= 1;
16372	16864	if (materialdepth > 0)
16373	16865	{
16374		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16375		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16866	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16867	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16376	16868	}
16377	16869	//checker.GetMaterial().opacity = 1f;
16378	16870	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16458,6 +16950,14 @@
16458	16950	}
16459	16951	}
16460	16952
	16953	+ private Object3D GetFolder()
	16954	+ {
	16955	+ Object3D folder = object.GetWindow().copy;
	16956	+ if (object.GetWindow().copy.selection.Size() > 0)
	16957	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16958	+ return folder;
	16959	+ }
	16960	+
16461	16961	class SelectBuffer implements GLEventListener
16462	16962	{
16463	16963
..	..	@@ -16473,7 +16973,7 @@
16473	16973	//new Exception().printStackTrace();
16474	16974	System.out.println("select buffer init");
16475	16975	// Use debug pipeline
16476		- drawable.setGL(new DebugGL(drawable.getGL()));
	16976	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16477	16977
16478	16978	GL gl = drawable.getGL();
16479	16979
..	..	@@ -16537,6 +17037,17 @@
16537	17037
16538	17038	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16539	17039
	17040	+ if (PAINTMODE)
	17041	+ {
	17042	+ if (object.GetWindow().copy.selection.Size() > 0)
	17043	+ {
	17044	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17045	+
	17046	+ // Make what you paint not selectable.
	17047	+ paintobj.ResetSelectable();
	17048	+ }
	17049	+ }
	17050	+
16540	17051	//int tmp = selection_view;
16541	17052	//selection_view = -1;
16542	17053	int temp = DrawMode();
..	..	@@ -16548,6 +17059,17 @@
16548	17059	// temp = DEFAULT; // patch for selection debug
16549	17060	Globals.drawMode = temp; // WARNING
16550	17061
	17062	+ if (PAINTMODE)
	17063	+ {
	17064	+ if (object.GetWindow().copy.selection.Size() > 0)
	17065	+ {
	17066	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17067	+
	17068	+ // Revert.
	17069	+ paintobj.RestoreSelectable();
	17070	+ }
	17071	+ }
	17072	+
16551	17073	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16552	17074
16553	17075	// trying different ways of getting the depth info over
..	..	@@ -16595,6 +17117,8 @@
16595	17117	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16596	17118	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16597	17119	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17120	+
	17121	+ CreateSelectedPoint();
16598	17122
16599	17123	// Will fit the mesh !!!
16600	17124	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16649,29 +17173,31 @@
16649	17173	}
16650	17174
16651	17175	if (!movingcamera && !PAINTMODE)
16652		- object.editWindow.ScreenFitPoint(); // fev 2014
	17176	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16653	17177
16654		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17178	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16655	17179	{
16656		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17180	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16657	17181
16658		- Object3D group = new Object3D("inst" + paintcount++);
	17182	+ if (object.GetWindow().copy.selection.Size() > 0)
	17183	+ {
	17184	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16659	17185
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();
	17186	+ Object3D inst = new Object3D("inst" + paintcount++);
	17187	+
	17188	+ inst.CreateMaterial(); // use a void leaf to select instances
	17189	+
	17190	+ inst.add(paintobj); // link
	17191	+
	17192	+ object.GetWindow().SnapObject(inst);
	17193	+
	17194	+ Object3D folder = paintFolder; // GetFolder();
	17195	+
	17196	+ folder.add(inst);
	17197	+
	17198	+ object.GetWindow().ResetModel();
	17199	+ object.GetWindow().refreshContents();
	17200	+ }
16675	17201	}
16676	17202	else
16677	17203	paintcount = 0;
..	..	@@ -16710,6 +17236,11 @@
16710	17236	//System.out.println("objects[color] = " + objects[color]);
16711	17237	//objects[color].Select();
16712	17238	indexcount = 0;
	17239	+ ObjEditor window = object.GetWindow();
	17240	+ if (window != null && deselect)
	17241	+ {
	17242	+ window.Select(null, deselect, true);
	17243	+ }
16713	17244	object.Select(color, deselect);
16714	17245	}
16715	17246
..	..	@@ -17235,23 +17766,15 @@
17235	17766	int AAbuffersize = 0;
17236	17767
17237	17768	//double[] selectedpoint = new double[3];
17238		- static Superellipsoid selectedpoint = new Superellipsoid();
	17769	+ static Superellipsoid selectedpoint;
17239	17770	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();
	17771	+ static Sphere debugpointG;
	17772	+ static Sphere debugpointP;
	17773	+ static Sphere debugpointC;
	17774	+ static Sphere debugpointR;
17244	17775
17245	17776	static Sphere debugpoints[] = new Sphere[8];
17246	17777
17247		- static
17248		- {
17249		- for (int i=0; i<8; i++)
17250		- {
17251		- debugpoints[i] = new Sphere();
17252		- }
17253		- }
17254		-
17255	17778	static void InitPoints(float radius)
17256	17779	{
17257	17780	for (int i=0; i<8; i++)