~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
..	..	@@ -464,10 +527,12 @@
464	527	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
465	528	{
466	529	//gl.glBegin(gl.GL_TRIANGLES);
467		- boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	530	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	531	+ // TEST LIVE NORMALS && !obj.dontselect
	532	+ ;
468	533	if (!hasnorm)
469	534	{
470		- // System.out.println("FUCK!!");
	535	+ // System.out.println("Mesh normal");
471	536	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
472	537	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
473	538	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1192,10 +1257,12 @@
1192	1257	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1193	1258	}
1194	1259	}
	1260	+
1195	1261	if (flipV)
1196	1262	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1197	1263	else
1198	1264	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1265	+
1199	1266	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1200	1267	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1201	1268
..	..	@@ -1215,10 +1282,12 @@
1215	1282	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1216	1283	}
1217	1284	}
	1285	+
1218	1286	if (flipV)
1219	1287	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1220	1288	else
1221	1289	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1290	+
1222	1291	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1223	1292	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1224	1293
..	..	@@ -1246,8 +1315,10 @@
1246	1315	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1247	1316	else
1248	1317	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1318	+
1249	1319	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1250	1320	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1321	+
1251	1322	count2 += 2;
1252	1323	count3 += 3;
1253	1324	}
..	..	@@ -1426,6 +1497,8 @@
1426	1497	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1427	1498	}
1428	1499
	1500	+ float[] colorV = new float[4];
	1501	+
1429	1502	void SetColor(Object3D obj, Vertex p0)
1430	1503	{
1431	1504	CameraPane display = this;
..	..	@@ -1493,8 +1566,6 @@
1493	1566	{
1494	1567	return;
1495	1568	}
1496		-
1497		- float[] colorV = new float[3];
1498	1569
1499	1570	if (false) // marked)
1500	1571	{
..	..	@@ -1603,7 +1674,7 @@
1603	1674	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1604	1675	}
1605	1676
1606		- void DrawMaterial(cMaterial material, boolean selected)
	1677	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1607	1678	{
1608	1679	CameraPane display = this;
1609	1680	//new Exception().printStackTrace();
..	..	@@ -1638,7 +1709,7 @@
1638	1709	colorV[0] = display.modelParams0[0] * material.diffuse;
1639	1710	colorV[1] = display.modelParams0[1] * material.diffuse;
1640	1711	colorV[2] = display.modelParams0[2] * material.diffuse;
1641		- colorV[3] = material.opacity;
	1712	+ colorV[3] = 1; // material.opacity;
1642	1713
1643	1714	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1644	1715	//System.out.println("Opacity = " + opacity);
..	..	@@ -1746,9 +1817,9 @@
1746	1817	display.modelParams7[2] = 0;
1747	1818	display.modelParams7[3] = 0;
1748	1819
1749		- display.modelParams6[0] = 100; // criss de bug de bump
	1820	+ //display.modelParams6[0] = 100; // criss de bug de bump
1750	1821
1751		- Object3D.cVector2[] extparams = display.vector2buffer;
	1822	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1752	1823	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1753	1824	{
1754	1825	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1890,7 +1961,7 @@
1890	1961	void PushMatrix(double[][] matrix)
1891	1962	{
1892	1963	// GrafreeD.tracein(matrix);
1893		- PushMatrix(matrix,1);
	1964	+ PushMatrix(matrix, 1);
1894	1965	}
1895	1966
1896	1967	void PushMatrix()
..	..	@@ -2044,7 +2115,7 @@
2044	2115	//System.err.println("Oeil on");
2045	2116	OEIL = true;
2046	2117	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2047		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2118	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2048	2119	//pingthread.StepToTarget(true);
2049	2120	}
2050	2121
..	..	@@ -2259,7 +2330,7 @@
2259	2330
2260	2331	void ToggleDebug()
2261	2332	{
2262		- DEBUG ^= true;
	2333	+ Globals.DEBUG ^= true;
2263	2334	}
2264	2335
2265	2336	void ToggleLookAt()
..	..	@@ -2277,10 +2348,17 @@
2277	2348	HANDLES ^= true;
2278	2349	}
2279	2350
	2351	+ Object3D paintFolder;
	2352	+
2280	2353	void TogglePaint()
2281	2354	{
2282	2355	PAINTMODE ^= true;
2283	2356	paintcount = 0;
	2357	+
	2358	+ if (PAINTMODE)
	2359	+ {
	2360	+ paintFolder = GetFolder();
	2361	+ }
2284	2362	}
2285	2363
2286	2364	void SwapCamera(int a, int b)
..	..	@@ -2377,6 +2455,21 @@
2377	2455	return currentGL;
2378	2456	}
2379	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	+
2380	2473	/**/
2381	2474	class CacheTexture
2382	2475	{
..	..	@@ -2385,28 +2478,31 @@
2385	2478
2386	2479	int resolution;
2387	2480
2388		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2481	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2389	2482	{
2390		- texture = tex;
	2483	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2484	+ texturedata = texdata;
2391	2485	resolution = res;
2392	2486	}
2393	2487	}
2394	2488	/**/
2395	2489
2396	2490	// TEXTURE static Texture texture;
2397		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2398		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2399		- 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	+
2400	2496	int pigmentdepth = 0;
2401	2497	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2402	2498	int bumpdepth = 0;
2403	2499	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2404	2500	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2405	2501	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2406		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2502	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2407	2503	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2408	2504
2409		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2505	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2410	2506	{
2411	2507	TextureData texturedata = null;
2412	2508
..	..	@@ -2425,13 +2521,34 @@
2425	2521	if (bump)
2426	2522	texturedata = ConvertBump(texturedata, false);
2427	2523
2428		- com.sun.opengl.util.texture.Texture texture =
2429		- 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);
2430	2526
2431		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2432		- 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);
2433	2529
2434		- 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;
2435	2552	}
2436	2553
2437	2554	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3504,6 +3621,8 @@
3504	3621
3505	3622	System.out.println("LOADING TEXTURE : " + name);
3506	3623
	3624	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3625	+
3507	3626	//
3508	3627	if (false) // compressbit > 0)
3509	3628	{
..	..	@@ -7902,7 +8021,7 @@
7902	8021	String pigment = Object3D.GetPigment(tex);
7903	8022	String bump = Object3D.GetBump(tex);
7904	8023
7905		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8024	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7906	8025	{
7907	8026	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7908	8027	// System.out.println("; bump = " + bump);
..	..	@@ -7917,11 +8036,69 @@
7917	8036	pigment = null;
7918	8037	}
7919	8038
7920		- ReleaseTexture(bump, true);
7921		- ReleaseTexture(pigment, false);
	8039	+ ReleaseTexture(tex, true);
	8040	+ ReleaseTexture(tex, false);
7922	8041	}
7923	8042
7924		- void ReleaseTexture(String tex, boolean bump)
	8043	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8044	+ {
	8045	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8046	+ {
	8047	+ return;
	8048	+ }
	8049	+
	8050	+ if (tex == null)
	8051	+ {
	8052	+ ReleaseTexture(null, false);
	8053	+ return;
	8054	+ }
	8055	+
	8056	+ String pigment = Object3D.GetPigment(tex);
	8057	+
	8058	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8059	+ {
	8060	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8061	+ // System.out.println("; bump = " + bump);
	8062	+ }
	8063	+
	8064	+ if (pigment.equals(""))
	8065	+ {
	8066	+ pigment = null;
	8067	+ }
	8068	+
	8069	+ ReleaseTexture(tex, false);
	8070	+ }
	8071	+
	8072	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8073	+ {
	8074	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8075	+ {
	8076	+ return;
	8077	+ }
	8078	+
	8079	+ if (tex == null)
	8080	+ {
	8081	+ ReleaseTexture(null, true);
	8082	+ return;
	8083	+ }
	8084	+
	8085	+ String bump = Object3D.GetBump(tex);
	8086	+
	8087	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8088	+ {
	8089	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8090	+ // System.out.println("; bump = " + bump);
	8091	+ }
	8092	+
	8093	+ if (bump.equals(""))
	8094	+ {
	8095	+ bump = null;
	8096	+ }
	8097	+
	8098	+ ReleaseTexture(tex, true);
	8099	+ }
	8100	+
	8101	+ void ReleaseTexture(cTexture tex, boolean bump)
7925	8102	{
7926	8103	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7927	8104	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7932,7 +8109,7 @@
7932	8109	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7933	8110
7934	8111	if (tex != null)
7935		- texture = textures.get(tex);
	8112	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7936	8113
7937	8114	// //assert( texture != null );
7938	8115	// if (texture == null)
..	..	@@ -8026,6 +8203,54 @@
8026	8203
8027	8204	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8028	8205	{
	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;
	8247	+
	8248	+ BindPigmentTexture(tex, resolution);
	8249	+ BindBumpTexture(tex, resolution);
	8250	+ }
	8251	+
	8252	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8253	+ {
8029	8254	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8030	8255	ambientOcclusion ) // \|\| !textureon)
8031	8256	{
..	..	@@ -8035,17 +8260,47 @@
8035	8260	if (tex == null)
8036	8261	{
8037	8262	BindTexture(null,false,resolution);
8038		- BindTexture(null,true,resolution);
8039	8263	return;
8040	8264	}
8041	8265
8042	8266	String pigment = Object3D.GetPigment(tex);
	8267	+
	8268	+ usedtextures.add(tex);
	8269	+
	8270	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8271	+ {
	8272	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8273	+ // System.out.println("; bump = " + bump);
	8274	+ }
	8275	+
	8276	+ if (pigment.equals(""))
	8277	+ {
	8278	+ pigment = null;
	8279	+ }
	8280	+
	8281	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8282	+ BindTexture(tex, false, resolution);
	8283	+ }
	8284	+
	8285	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8286	+ {
	8287	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8288	+ ambientOcclusion ) // \|\| !textureon)
	8289	+ {
	8290	+ return; // false;
	8291	+ }
	8292	+
	8293	+ if (tex == null)
	8294	+ {
	8295	+ BindTexture(null,true,resolution);
	8296	+ return;
	8297	+ }
	8298	+
8043	8299	String bump = Object3D.GetBump(tex);
8044	8300
8045		- usedtextures.put(pigment, pigment);
8046		- usedtextures.put(bump, bump);
	8301	+ usedtextures.add(tex);
8047	8302
8048		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8303	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8049	8304	{
8050	8305	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8051	8306	// System.out.println("; bump = " + bump);
..	..	@@ -8055,18 +8310,10 @@
8055	8310	{
8056	8311	bump = null;
8057	8312	}
8058		- if (pigment.equals(""))
8059		- {
8060		- pigment = null;
8061		- }
8062	8313
8063		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8064		- BindTexture(pigment, false, resolution);
8065	8314	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8066		- BindTexture(bump, true, resolution);
	8315	+ BindTexture(tex, true, resolution);
8067	8316	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8068		-
8069		- return; // true;
8070	8317	}
8071	8318
8072	8319	java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
..	..	@@ -8089,13 +8336,19 @@
8089	8336	return fileExists;
8090	8337	}
8091	8338
8092		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8339	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8093	8340	{
8094		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8341	+ CacheTexture texturecache = null;
8095	8342
8096	8343	if (tex != null)
8097	8344	{
8098		- 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	+ }
8099	8352
8100	8353	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8101	8354
..	..	@@ -8105,19 +8358,46 @@
8105	8358	// else
8106	8359	// if (!texname.startsWith("/"))
8107	8360	// texname = "/Users/nbriere/Textures/" + texname;
8108		- if (!FileExists(tex))
	8361	+ if (!FileExists(texname) && !texname.startsWith("@"))
8109	8362	{
8110	8363	texname = fallbackTextureName;
8111	8364	}
8112	8365
8113	8366	if (CACHETEXTURE)
8114		- texture = textures.get(texname); // TEXTURE CACHE
8115		-
8116		- TextureData texturedata = null;
8117		-
8118		- if (texture == null \|\| texture.resolution < resolution)
8119	8367	{
8120		- 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(""))
8121	8401	{
8122	8402	assert(!bump);
8123	8403	// if (bump)
..	..	@@ -8128,19 +8408,23 @@
8128	8408	// }
8129	8409	// else
8130	8410	// {
8131		- texture = textures.get(tex);
8132		- if (texture == null)
	8411	+ // texturecache = textures.get(texname); // suspicious
	8412	+ if (texturecache == null)
8133	8413	{
8134		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8414	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8135	8415	}
	8416	+ else
	8417	+ new Exception().printStackTrace();
8136	8418	// }
8137	8419	} else
8138		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8420	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8139	8421	{
8140	8422	assert(bump);
8141		- texture = textures.get(tex);
8142		- if (texture == null)
8143		- 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();
8144	8428	} else
8145	8429	{
8146	8430	//if (tex.equals("IMMORTAL"))
..	..	@@ -8148,11 +8432,22 @@
8148	8432	// texture = GetResourceTexture("default.png");
8149	8433	//} else
8150	8434	//{
8151		- if (tex.equals("WHITE_NOISE"))
	8435	+ if (texname.endsWith("WHITE_NOISE"))
8152	8436	{
8153		- texture = textures.get(tex);
8154		- if (texture == null)
8155		- 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();
	8442	+ } else
	8443	+ {
	8444	+ if (texname.startsWith("@"))
	8445	+ {
	8446	+ // texturecache = textures.get(texname); // suspicious
	8447	+ if (texturecache == null)
	8448	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
	8449	+ else
	8450	+ new Exception().printStackTrace();
8156	8451	} else
8157	8452	{
8158	8453	if (textureon)
..	..	@@ -8211,19 +8506,20 @@
8211	8506	if (texturedata == null)
8212	8507	throw new Exception();
8213	8508
8214		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8509	+ texturecache = new CacheTexture(texturedata,resolution);
8215	8510	//texture = GetTexture(tex, bump);
8216	8511	}
	8512	+ }
8217	8513	}
8218	8514	//}
8219	8515	}
8220	8516
8221		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8517	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8222	8518	{
8223	8519	//return false;
8224	8520
8225	8521	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8226		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8522	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8227	8523	{
8228	8524	// String ext = "_highres";
8229	8525	// if (REDUCETEXTURE)
..	..	@@ -8240,52 +8536,17 @@
8240	8536	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8241	8537	if (!cachefile.exists())
8242	8538	{
8243		- // cache to disk
8244		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8245		- //buffers[0].
8246		-
8247		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8248		- int[] pixels = new int[bytebuf.capacity()/3];
8249		-
8250		- // squared size heuristic...
8251		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8539	+ //if (texturedata.getWidth() == texturedata.getHeight())
8252	8540	{
8253		- for (int i=pixels.length; --i>=0;)
8254		- {
8255		- int i3 = i*3;
8256		- pixels[i] = 0xFF;
8257		- pixels[i] <<= 8;
8258		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8259		- pixels[i] <<= 8;
8260		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8261		- pixels[i] <<= 8;
8262		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8263		- }
8264		-
8265		- /*
8266		- int r=0,g=0,b=0,a=0;
8267		- for (int i=0; i<width; i++)
8268		- for (int j=0; j<height; j++)
8269		- {
8270		- int index = j*width+i;
8271		- int p = pixels[index];
8272		- a = ((p>>24) & 0xFF);
8273		- r = ((p>>16) & 0xFF);
8274		- g = ((p>>8) & 0xFF);
8275		- b = (p & 0xFF);
8276		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8277		- }
8278		- /**/
8279		- int width = (int)Math.sqrt(pixels.length); // squared
8280		- int height = width;
8281		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8282		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8541	+ BufferedImage rendImage = CreateBim(texturedata);
	8542	+
8283	8543	ImageWriter writer = null;
8284	8544	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8285	8545	if (iter.hasNext()) {
8286	8546	writer = (ImageWriter)iter.next();
8287	8547	}
8288		- float compressionQuality = 0.9f;
	8548	+
	8549	+ float compressionQuality = 0.85f;
8289	8550	try
8290	8551	{
8291	8552	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8302,18 +8563,20 @@
8302	8563	}
8303	8564	}
8304	8565	}
8305		-
	8566	+
	8567	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8568	+
8306	8569	//System.out.println("Texture = " + tex);
8307		- if (textures.containsKey(texname))
	8570	+ if (textures.containsKey(tex))
8308	8571	{
8309		- CacheTexture thetex = textures.get(texname);
	8572	+ CacheTexture thetex = textures.get(tex);
8310	8573	thetex.texture.disable();
8311	8574	thetex.texture.dispose();
8312		- textures.remove(texname);
	8575	+ textures.remove(tex);
8313	8576	}
8314	8577
8315		- texture.texturedata = texturedata;
8316		- textures.put(texname, texture);
	8578	+ //texture.texturedata = texturedata;
	8579	+ textures.put(tex, texturecache);
8317	8580
8318	8581	// newtex = true;
8319	8582	}
..	..	@@ -8329,10 +8592,44 @@
8329	8592	}
8330	8593	}
8331	8594
8332		- return texture;
	8595	+ return texturecache;
8333	8596	}
8334	8597
8335		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	8598	+ static void EmbedTextures(cTexture tex)
	8599	+ {
	8600	+ if (tex.pigmentdata == null)
	8601	+ {
	8602	+ //String texname = Object3D.GetPigment(tex);
	8603	+
	8604	+ CacheTexture texturecache = texturepigment.get(tex);
	8605	+
	8606	+ if (texturecache != null)
	8607	+ {
	8608	+ tex.pw = texturecache.texturedata.getWidth();
	8609	+ tex.ph = texturecache.texturedata.getHeight();
	8610	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8611	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8612	+ ;
	8613	+ //, tex.pw, tex.ph), 0.5f);
	8614	+ }
	8615	+ }
	8616	+
	8617	+ if (tex.bumpdata == null)
	8618	+ {
	8619	+ //String texname = Object3D.GetBump(tex);
	8620	+
	8621	+ CacheTexture texturecache = texturebump.get(tex);
	8622	+
	8623	+ if (texturecache != null)
	8624	+ {
	8625	+ tex.bw = texturecache.texturedata.getWidth();
	8626	+ tex.bh = texturecache.texturedata.getHeight();
	8627	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8628	+ }
	8629	+ }
	8630	+ }
	8631	+
	8632	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8336	8633	{
8337	8634	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8338	8635
..	..	@@ -8350,21 +8647,21 @@
8350	8647	return texture!=null?texture.texture:null;
8351	8648	}
8352	8649
8353		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
	8650	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8354	8651	{
8355	8652	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8356	8653
8357	8654	return texture!=null?texture.texturedata:null;
8358	8655	}
8359	8656
8360		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8657	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8361	8658	{
8362	8659	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8363	8660	{
8364	8661	return false;
8365	8662	}
8366	8663
8367		- boolean newtex = false;
	8664	+ //boolean newtex = false;
8368	8665
8369	8666	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8370	8667
..	..	@@ -8396,9 +8693,75 @@
8396	8693	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8397	8694	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8398	8695
8399		- return newtex;
	8696	+ return true; // Warning: not used.
8400	8697	}
8401	8698
	8699	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8700	+ {
	8701	+ try
	8702	+ {
	8703	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8704	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8705	+ ImageWriter writer = writers.next();
	8706	+
	8707	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8708	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8709	+ param.setCompressionQuality(quality);
	8710	+
	8711	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8712	+ writer.setOutput(ios);
	8713	+ writer.write(null, new IIOImage(image, null, null), param);
	8714	+
	8715	+ byte[] data = baos.toByteArray();
	8716	+ writer.dispose();
	8717	+ return data;
	8718	+ }
	8719	+ catch (Exception e)
	8720	+ {
	8721	+ e.printStackTrace();
	8722	+ return null;
	8723	+ }
	8724	+ }
	8725	+
	8726	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8727	+ {
	8728	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8729	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8730	+ ImageReader reader = writers.next();
	8731	+
	8732	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8733	+
	8734	+ ImageReadParam param = reader.getDefaultReadParam();
	8735	+ param.setDestination(bim);
	8736	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8737	+
	8738	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8739	+ reader.setInput(ios);
	8740	+ BufferedImage bim2 = reader.read(0, param);
	8741	+ reader.dispose();
	8742	+
	8743	+// WritableRaster raster = bim2.getRaster();
	8744	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8745	+// byte[] bytes = data.getData();
	8746	+//
	8747	+// int[] pixels = new int[bytes.length/3];
	8748	+// for (int i=pixels.length; --i>=0;)
	8749	+// {
	8750	+// int i3 = i*3;
	8751	+// pixels[i] = 0xFF;
	8752	+// pixels[i] <<= 8;
	8753	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8754	+// pixels[i] <<= 8;
	8755	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8756	+// pixels[i] <<= 8;
	8757	+// pixels[i] \|= bytes[i3] & 0xFF;
	8758	+// }
	8759	+//
	8760	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8761	+
	8762	+ return bim;
	8763	+ }
	8764	+
8402	8765	ShadowBuffer shadowPBuf;
8403	8766	AntialiasBuffer antialiasPBuf;
8404	8767	int MAXSTACK;
..	..	@@ -8591,7 +8954,7 @@
8591	8954
8592	8955	if (cubemap == null)
8593	8956	{
8594		- LoadEnvy(5);
	8957	+ //LoadEnvy(1);
8595	8958	}
8596	8959
8597	8960	//cubemap.enable();
..	..	@@ -8878,37 +9241,58 @@
8878	9241	cubemap = null;
8879	9242	return;
8880	9243	case 1:
8881		- name = "cubemaps/box_";
8882		- ext = "png";
	9244	+ name = "cubemaps/rgb/";
	9245	+ ext = "jpg";
8883	9246	reverseUP = false;
8884	9247	break;
8885	9248	case 2:
8886		- name = "cubemaps/uffizi_";
8887		- ext = "png";
8888		- break; // reverseUP = true; break;
	9249	+ name = "cubemaps/uffizi/";
	9250	+ ext = "jpg";
	9251	+ reverseUP = false;
	9252	+ break;
8889	9253	case 3:
8890		- name = "cubemaps/CloudyHills_";
8891		- ext = "tga";
	9254	+ name = "cubemaps/CloudyHills/";
	9255	+ ext = "jpg";
8892	9256	reverseUP = false;
8893	9257	break;
8894	9258	case 4:
8895		- name = "cubemaps/cornell_";
	9259	+ name = "cubemaps/cornell/";
8896	9260	ext = "png";
8897	9261	reverseUP = false;
8898	9262	break;
	9263	+ case 5:
	9264	+ name = "cubemaps/skycube/";
	9265	+ ext = "jpg";
	9266	+ reverseUP = false;
	9267	+ break;
	9268	+ case 6:
	9269	+ name = "cubemaps/SaintLazarusChurch3/";
	9270	+ ext = "jpg";
	9271	+ reverseUP = false;
	9272	+ break;
	9273	+ case 7:
	9274	+ name = "cubemaps/Sodermalmsallen/";
	9275	+ ext = "jpg";
	9276	+ reverseUP = false;
	9277	+ break;
	9278	+ case 8:
	9279	+ name = "cubemaps/Sodermalmsallen2/";
	9280	+ ext = "jpg";
	9281	+ reverseUP = false;
	9282	+ break;
	9283	+ case 9:
	9284	+ name = "cubemaps/UnionSquare/";
	9285	+ ext = "jpg";
	9286	+ reverseUP = false;
	9287	+ break;
8899	9288	default:
8900		- name = "cubemaps/rgb_";
8901		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9289	+ name = "cubemaps/box/";
	9290	+ ext = "png"; /mipmap = true;/
	9291	+ reverseUP = false;
8902	9292	break;
8903	9293	}
8904		-
8905		- try
8906		- {
8907		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
8908		- } catch (IOException e)
8909		- {
8910		- throw new RuntimeException(e);
8911		- }
	9294	+
	9295	+ LoadSkybox(name, ext, mipmap);
8912	9296	}
8913	9297
8914	9298	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -8940,8 +9324,12 @@
8940	9324	static double[] model = new double[16];
8941	9325	double[] camera2light = new double[16];
8942	9326	double[] light2camera = new double[16];
8943		- int newenvy = -1;
8944		- boolean envyoff = true; // false;
	9327	+
	9328	+ //int newenvy = -1;
	9329	+ //boolean envyoff = false;
	9330	+
	9331	+ String loadedskyboxname;
	9332	+
8945	9333	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
8946	9334	//float[] light0 = { 0,0,0 };
8947	9335	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9234,11 +9622,35 @@
9234	9622	jy8[3] = 0.5f;
9235	9623	}
9236	9624
9237		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9625	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9238	9626	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9239	9627	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9240	9628	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9241	9629
	9630	+ void ResetOptions()
	9631	+ {
	9632	+ options1[0] = 100;
	9633	+ options1[1] = 0.025f;
	9634	+ options1[2] = 0.01f;
	9635	+ options1[3] = 0;
	9636	+ options1[4] = 0;
	9637	+
	9638	+ options2[0] = 0;
	9639	+ options2[1] = 0.75f;
	9640	+ options2[2] = 0;
	9641	+ options2[3] = 0;
	9642	+
	9643	+ options3[0] = 1;
	9644	+ options3[1] = 1;
	9645	+ options3[2] = 1;
	9646	+ options3[3] = 0;
	9647	+
	9648	+ options4[0] = 1;
	9649	+ options4[1] = 0;
	9650	+ options4[2] = 1;
	9651	+ options4[3] = 0;
	9652	+ }
	9653	+
9242	9654	static int imagecount = 0; // movie generation
9243	9655
9244	9656	static int jitter = 0;
..	..	@@ -9397,10 +9809,12 @@
9397	9809	rati = 1 / rati;
9398	9810	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9399	9811	}
9400		- assert (newenvy == -1);
	9812	+
	9813	+ //assert (newenvy == -1);
	9814	+
9401	9815	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9402	9816	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9403		- DrawSkyBox(gl);
	9817	+ DrawSkyBox(gl, (float)rati);
9404	9818	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9405	9819	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9406	9820	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -10349,6 +10763,7 @@
10349	10763	ANTIALIAS = 0;
10350	10764	//System.out.println("RESTART");
10351	10765	AAtimer.restart();
	10766	+ Globals.TIMERRUNNING = true;
10352	10767	}
10353	10768	}
10354	10769	}
..	..	@@ -10416,7 +10831,8 @@
10416	10831	ambientOcclusion = false;
10417	10832	}
10418	10833
10419		- if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
	10834	+ if (//Globals.lighttouched &&
	10835	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10420	10836	{
10421	10837	//if (RENDERSHADOW) // ?
10422	10838	if (!IsFrozen())
..	..	@@ -10435,7 +10851,7 @@
10435	10851
10436	10852	if (wait)
10437	10853	{
10438		- Sleep(500);
	10854	+ Sleep(200); // blocks everything
10439	10855
10440	10856	wait = false;
10441	10857	}
..	..	@@ -10651,13 +11067,27 @@
10651	11067	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10652	11068	}
10653	11069
10654		- if (newenvy > -1)
	11070	+// if (newenvy > -1)
	11071	+// {
	11072	+// LoadEnvy(newenvy);
	11073	+// }
	11074	+//
	11075	+// newenvy = -1;
	11076	+
	11077	+ if (object.skyboxname != null)
10655	11078	{
10656		- LoadEnvy(newenvy);
	11079	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11080	+ {
	11081	+ LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11082	+ loadedskyboxname = object.skyboxname;
	11083	+ }
10657	11084	}
10658		-
10659		- newenvy = -1;
10660		-
	11085	+ else
	11086	+ {
	11087	+ cubemap = null;
	11088	+ loadedskyboxname = null;
	11089	+ }
	11090	+
10661	11091	ratio = ((double) getWidth()) / getHeight();
10662	11092	//System.out.println("ratio = " + ratio);
10663	11093
..	..	@@ -10673,7 +11103,7 @@
10673	11103
10674	11104	if (!IsFrozen() && !ambientOcclusion)
10675	11105	{
10676		- DrawSkyBox(gl);
	11106	+ DrawSkyBox(gl, (float)ratio);
10677	11107	}
10678	11108
10679	11109	//if (selection_view == -1)
..	..	@@ -10856,9 +11286,9 @@
10856	11286
10857	11287	gl.glMatrixMode(GL.GL_MODELVIEW);
10858	11288
10859		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10860		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10861		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11289	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11290	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11291	+gl.glEnable(gl.GL_MULTISAMPLE);
10862	11292	} else
10863	11293	{
10864	11294	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10869,7 +11299,7 @@
10869	11299	//System.out.println("BLENDING ON");
10870	11300	gl.glEnable(GL.GL_BLEND);
10871	11301	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10872		-
	11302	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10873	11303	gl.glMatrixMode(gl.GL_PROJECTION);
10874	11304	gl.glLoadIdentity();
10875	11305
..	..	@@ -10981,7 +11411,7 @@
10981	11411	{
10982	11412	if (cam != lightCamera)
10983	11413	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10984		- LA.xformDir(light0, parentcam.GlobalTransformInv(), light0); // may 2013
	11414	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10985	11415	}
10986	11416
10987	11417	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11118,7 +11548,7 @@
11118	11548	}
11119	11549	}
11120	11550
11121		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11551	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11122	11552	{
11123	11553	//gl.glDepthFunc(GL.GL_LEQUAL);
11124	11554	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11126,24 +11556,21 @@
11126	11556
11127	11557	boolean texon = textureon;
11128	11558
11129		- if (RENDERPROGRAM > 0)
11130		- {
11131		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11132		- textureon = false;
11133		- }
	11559	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11560	+ textureon = false;
	11561	+
11134	11562	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11135	11563	//System.out.println("ALLO");
11136	11564	gl.glColorMask(false, false, false, false);
11137	11565	DrawObject(gl);
11138		- if (RENDERPROGRAM > 0)
11139		- {
11140		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11141		- textureon = texon;
11142		- }
	11566	+
	11567	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11568	+ textureon = texon;
	11569	+
11143	11570	gl.glColorMask(true, true, true, true);
11144	11571
11145	11572	gl.glDepthFunc(GL.GL_EQUAL);
11146		- //gl.glDepthMask(false);
	11573	+ gl.glDepthMask(false);
11147	11574	}
11148	11575
11149	11576	if (false) // DrawMode() == SHADOW)
..	..	@@ -11326,15 +11753,36 @@
11326	11753
11327	11754	static boolean zoomonce = false;
11328	11755
	11756	+ static void CreateSelectedPoint()
	11757	+ {
	11758	+ if (selectedpoint == null)
	11759	+ {
	11760	+ debugpointG = new Sphere();
	11761	+ debugpointP = new Sphere();
	11762	+ debugpointC = new Sphere();
	11763	+ debugpointR = new Sphere();
	11764	+
	11765	+ selectedpoint = new Superellipsoid();
	11766	+
	11767	+ for (int i=0; i<8; i++)
	11768	+ {
	11769	+ debugpoints[i] = new Sphere();
	11770	+ }
	11771	+ }
	11772	+ }
	11773	+
11329	11774	void DrawObject(GL gl, boolean draw)
11330	11775	{
	11776	+ // To clear camera values
	11777	+ ResetOptions();
	11778	+
11331	11779	//System.out.println("DRAW OBJECT " + mouseDown);
11332	11780	// DrawMode() = SELECTION;
11333	11781	//GL gl = getGL();
11334	11782	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11335	11783	{
11336	11784	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11337		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11785	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11338	11786	pingthread.StepToTarget(true); // true);
11339	11787	// zoomonce = false;
11340	11788	}
..	..	@@ -11406,8 +11854,9 @@
11406	11854
11407	11855	if (DrawMode() == DEFAULT)
11408	11856	{
11409		- if (DEBUG)
	11857	+ if (Globals.DEBUG)
11410	11858	{
	11859	+ CreateSelectedPoint();
11411	11860	float radius = 0.05f;
11412	11861	if (selectedpoint.radius != radius)
11413	11862	{
..	..	@@ -11461,20 +11910,32 @@
11461	11910	ReleaseTextures(DEFAULT_TEXTURES);
11462	11911
11463	11912	if (CLEANCACHE)
11464		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11913	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11465	11914	{
11466		- String tex = e.nextElement();
	11915	+ cTexture tex = e.nextElement();
11467	11916
11468	11917	// System.out.println("Texture --------- " + tex);
11469	11918
11470		- if (tex.equals("WHITE_NOISE"))
	11919	+ if (tex.equals("WHITE_NOISE:"))
11471	11920	continue;
11472	11921
11473		- if (!usedtextures.containsKey(tex))
	11922	+ if (!usedtextures.contains(tex))
11474	11923	{
	11924	+ CacheTexture gettex = texturepigment.get(tex);
11475	11925	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11476		- textures.get(tex).texture.dispose();
11477		- textures.remove(tex);
	11926	+ if (gettex != null)
	11927	+ {
	11928	+ gettex.texture.dispose();
	11929	+ texturepigment.remove(tex);
	11930	+ }
	11931	+
	11932	+ gettex = texturebump.get(tex);
	11933	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11934	+ if (gettex != null)
	11935	+ {
	11936	+ gettex.texture.dispose();
	11937	+ texturebump.remove(tex);
	11938	+ }
11478	11939	}
11479	11940	}
11480	11941	}
..	..	@@ -11912,7 +12373,7 @@
11912	12373	}
11913	12374
11914	12375	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11915		- LA.xformPos(light, parentcam.GlobalTransformInv(), light); // may 2013
	12376	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11916	12377
11917	12378	LA.xformPos(light, renderCamera.toScreen, light);
11918	12379
..	..	@@ -12002,8 +12463,76 @@
12002	12463
12003	12464	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12004	12465
12005		- String program =
	12466	+ String programmin =
	12467	+ // Min shader
12006	12468	"!!ARBfp1.0\n" +
	12469	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12470	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12471	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12472	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12473	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12474	+ "PARAM light2cam0 = program.env[10];" +
	12475	+ "PARAM light2cam1 = program.env[11];" +
	12476	+ "PARAM light2cam2 = program.env[12];" +
	12477	+ "TEMP temp;" +
	12478	+ "TEMP light;" +
	12479	+ "TEMP ndotl;" +
	12480	+ "TEMP normal;" +
	12481	+ "TEMP depth;" +
	12482	+ "TEMP eye;" +
	12483	+ "TEMP pos;" +
	12484	+
	12485	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12486	+ Normalize("normal") +
	12487	+ "MOV light, state.light[0].position;" +
	12488	+ "DP3 ndotl.x, light, normal;" +
	12489	+
	12490	+ // shadow
	12491	+ "MOV pos, fragment.texcoord[1];" +
	12492	+ "MOV temp, pos;" +
	12493	+ ShadowTextureFetch("depth", "temp", "1") +
	12494	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12495	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12496	+
	12497	+ // No shadow when out of frustum
	12498	+ //"SGE temp.y, depth.z, zero123.y;" +
	12499	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12500	+
	12501	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12502	+
	12503	+ // Backlit
	12504	+ "MOV pos.w, zero123.y;" +
	12505	+ "DP4 eye.x, pos, light2cam0;" +
	12506	+ "DP4 eye.y, pos, light2cam1;" +
	12507	+ "DP4 eye.z, pos, light2cam2;" +
	12508	+ Normalize("eye") +
	12509	+
	12510	+ "DP3 ndotl.y, -eye, normal;" +
	12511	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12512	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12513	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12514	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12515	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12516	+
	12517	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12518	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12519	+
	12520	+ // Pigment
	12521	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12522	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12523	+ "MUL temp, temp, ndotl.x;" +
	12524	+
	12525	+ "MUL temp, temp, zero123.z;" +
	12526	+
	12527	+ //"MUL temp, temp, ndotl.y;" +
	12528	+
	12529	+ "MOV temp.w, zero123.y;" + // reset alpha
	12530	+ "MOV result.color, temp;" +
	12531	+ "END";
	12532	+
	12533	+ String programmax =
	12534	+ "!!ARBfp1.0\n" +
	12535	+
12007	12536	//"OPTION ARB_fragment_program_shadow;" +
12008	12537	"PARAM light2cam0 = program.env[10];" +
12009	12538	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12118,8 +12647,7 @@
12118	12647	"TEMP shininess;" +
12119	12648	"\n" +
12120	12649	"MOV texSamp, one;" +
12121		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12122		-
	12650	+
12123	12651	"MOV mapgrid.x, one2048th.x;" +
12124	12652	"MOV temp, fragment.texcoord[1];" +
12125	12653	/*
..	..	@@ -12140,20 +12668,20 @@
12140	12668	"MUL temp, floor, mapgrid.x;" +
12141	12669	//"TEX depth0, temp, texture[1], 2D;" +
12142	12670	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12143		- TextureFetch("depth0", "temp", "1") +
	12671	+ ShadowTextureFetch("depth0", "temp", "1") +
12144	12672	"") +
12145	12673	"ADD temp.x, temp.x, mapgrid.x;" +
12146	12674	//"TEX depth1, temp, texture[1], 2D;" +
12147	12675	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12148		- TextureFetch("depth1", "temp", "1") +
	12676	+ ShadowTextureFetch("depth1", "temp", "1") +
12149	12677	"") +
12150	12678	"ADD temp.y, temp.y, mapgrid.x;" +
12151	12679	//"TEX depth2, temp, texture[1], 2D;" +
12152		- TextureFetch("depth2", "temp", "1") +
	12680	+ ShadowTextureFetch("depth2", "temp", "1") +
12153	12681	"SUB temp.x, temp.x, mapgrid.x;" +
12154	12682	//"TEX depth3, temp, texture[1], 2D;" +
12155	12683	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12156		- TextureFetch("depth3", "temp", "1") +
	12684	+ ShadowTextureFetch("depth3", "temp", "1") +
12157	12685	"") +
12158	12686	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12159	12687	//"MOV params, material;" +
..	..	@@ -12524,10 +13052,10 @@
12524	13052	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12525	13053	"") +
12526	13054
12527		- // display shadow only (bump == 0)
	13055	+ // display shadow only (fakedepth == 0)
12528	13056	"SUB temp.x, half.x, shadow.x;" +
12529	13057	"MOV temp.y, -params5.z;" + // params6.x;" +
12530		- "SLT temp.z, temp.y, -one2048th.x;" +
	13058	+ "SLT temp.z, temp.y, -c256i.x;" +
12531	13059	"SUB temp.y, one.x, temp.z;" +
12532	13060	"MUL temp.x, temp.x, temp.y;" +
12533	13061	"KIL temp.x;" +
..	..	@@ -12858,6 +13386,13 @@
12858	13386	//once = true;
12859	13387	}
12860	13388
	13389	+ String program = programmax;
	13390	+
	13391	+ if (Globals.MINSHADER)
	13392	+ {
	13393	+ program = programmin;
	13394	+ }
	13395	+
12861	13396	System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12862	13397	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12863	13398	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
..	..	@@ -12951,25 +13486,26 @@
12951	13486	return out;
12952	13487	}
12953	13488
12954		- String TextureFetch(String dest, String src, String unit)
	13489	+ // Also does frustum culling
	13490	+ String ShadowTextureFetch(String dest, String src, String unit)
12955	13491	{
12956	13492	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12957	13493	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12958	13494	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13495	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13496	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12959	13497	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12960		- "SLT " + src + ".z, " + src + ".x, one.x;" +
12961		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12962		- "SLT " + src + ".z, " + src + ".y, one.x;" +
12963		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13498	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13499	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12964	13500	//"SWZ buffer, temp, w,w,w,w;";
12965		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13501	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12966	13502	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12967	13503	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12968	13504	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12969		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13505	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12970	13506
12971		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12972		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13507	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13508	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12973	13509	}
12974	13510
12975	13511	String Shadow(String depth, String shadow)
..	..	@@ -13016,7 +13552,7 @@
13016	13552	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13017	13553	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13018	13554
13019		- // No shadow when out of frustrum
	13555	+ // No shadow when out of frustum
13020	13556	"SGE temp.x, " + depth + ".z, one.z;" +
13021	13557	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13022	13558	"";
..	..	@@ -13164,7 +13700,8 @@
13164	13700	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13165	13701	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13166	13702	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13167		- Object3D.cVector2[] vector2buffer;
	13703	+
	13704	+ //Object3D.cVector2[] vector2buffer;
13168	13705
13169	13706	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13170	13707	// OUT : diff, spec
..	..	@@ -13180,9 +13717,10 @@
13180	13717	"DP3 " + dest + ".z," + "normals," + "eye;" +
13181	13718	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13182	13719	//"MOV " + dest + ".w," + "normal.z;" +
13183		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13184		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13185		- //"MOV " + dest + ".z," + "params2.w;" +
	13720	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13721	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13722	+
	13723	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13186	13724	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13187	13725	"RCP " + dest + ".w," + dest + ".w;" +
13188	13726	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13687,6 +14225,7 @@
13687	14225	else
13688	14226	if (evt.getSource() == AAtimer)
13689	14227	{
	14228	+ Globals.TIMERRUNNING = false;
13690	14229	if (mouseDown)
13691	14230	{
13692	14231	//new Exception().printStackTrace();
..	..	@@ -13746,7 +14285,7 @@
13746	14285
13747	14286	// fev 2014???
13748	14287	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13749		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14288	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13750	14289	pingthread.StepToTarget(true); // true);
13751	14290	}
13752	14291	// if (!LIVE)
..	..	@@ -13761,6 +14300,7 @@
13761	14300	return;
13762	14301
13763	14302	AAtimer.restart(); //
	14303	+ Globals.TIMERRUNNING = true;
13764	14304
13765	14305	// waslive = LIVE;
13766	14306	// LIVE = false;
..	..	@@ -13810,14 +14350,15 @@
13810	14350	drag = false;
13811	14351	//System.out.println("Mouse DOWN");
13812	14352	editObj = false;
13813		- ClickInfo info = new ClickInfo();
13814		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13815		- info.pane = this;
13816		- info.camera = renderCamera;
13817		- info.x = x;
13818		- info.y = y;
13819		- info.modifiers = modifiersex;
13820		- editObj = object.doEditClick(info, 0);
	14353	+ //ClickInfo info = new ClickInfo();
	14354	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14355	+ object.clickInfo.pane = this;
	14356	+ object.clickInfo.camera = renderCamera;
	14357	+ object.clickInfo.x = x;
	14358	+ object.clickInfo.y = y;
	14359	+ object.clickInfo.modifiers = modifiersex;
	14360	+ editObj = object.doEditClick(//info,
	14361	+ 0);
13821	14362	if (!editObj)
13822	14363	{
13823	14364	hasMarquee = true;
..	..	@@ -13833,6 +14374,8 @@
13833	14374
13834	14375	public void mouseDragged(MouseEvent e)
13835	14376	{
	14377	+ Globals.MOUSEDRAGGED = true;
	14378	+
13836	14379	//System.out.println("mouseDragged: " + e);
13837	14380	if (isRenderer)
13838	14381	movingcamera = true;
..	..	@@ -14097,12 +14640,12 @@
14097	14640	void GoDown(int mod)
14098	14641	{
14099	14642	MODIFIERS \|= COMMAND;
14100		- /*
	14643	+ /**/
14101	14644	if((mod&SHIFT) == SHIFT)
14102		- manipCamera.RotatePosition(0, -speed);
	14645	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14103	14646	else
14104		- manipCamera.BackForth(0, -speed*delta, getWidth());
14105		- */
	14647	+ manipCamera.RotatePosition(0, -speed);
	14648	+ /**/
14106	14649	if ((mod & SHIFT) == SHIFT)
14107	14650	{
14108	14651	mouseMode = mouseMode; // VR??
..	..	@@ -14118,12 +14661,12 @@
14118	14661	void GoUp(int mod)
14119	14662	{
14120	14663	MODIFIERS \|= COMMAND;
14121		- /*
	14664	+ /**/
14122	14665	if((mod&SHIFT) == SHIFT)
14123		- manipCamera.RotatePosition(0, speed);
	14666	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14124	14667	else
14125		- manipCamera.BackForth(0, speed*delta, getWidth());
14126		- */
	14668	+ manipCamera.RotatePosition(0, speed);
	14669	+ /**/
14127	14670	if ((mod & SHIFT) == SHIFT)
14128	14671	{
14129	14672	mouseMode = mouseMode;
..	..	@@ -14139,12 +14682,12 @@
14139	14682	void GoLeft(int mod)
14140	14683	{
14141	14684	MODIFIERS \|= COMMAND;
14142		- /*
	14685	+ /**/
14143	14686	if((mod&SHIFT) == SHIFT)
14144		- manipCamera.RotatePosition(speed, 0);
14145		- else
14146	14687	manipCamera.Translate(speed*delta, 0, getWidth());
14147		- */
	14688	+ else
	14689	+ manipCamera.RotatePosition(speed, 0);
	14690	+ /**/
14148	14691	if ((mod & SHIFT) == SHIFT)
14149	14692	{
14150	14693	mouseMode = mouseMode;
..	..	@@ -14160,12 +14703,12 @@
14160	14703	void GoRight(int mod)
14161	14704	{
14162	14705	MODIFIERS \|= COMMAND;
14163		- /*
	14706	+ /**/
14164	14707	if((mod&SHIFT) == SHIFT)
14165		- manipCamera.RotatePosition(-speed, 0);
14166		- else
14167	14708	manipCamera.Translate(-speed*delta, 0, getWidth());
14168		- */
	14709	+ else
	14710	+ manipCamera.RotatePosition(-speed, 0);
	14711	+ /**/
14169	14712	if ((mod & SHIFT) == SHIFT)
14170	14713	{
14171	14714	mouseMode = mouseMode;
..	..	@@ -14215,14 +14758,16 @@
14215	14758	if (editObj)
14216	14759	{
14217	14760	drag = true;
14218		- ClickInfo info = new ClickInfo();
14219		- info.bounds.setBounds(0, 0,
	14761	+ //ClickInfo info = new ClickInfo();
	14762	+ object.clickInfo.bounds.setBounds(0, 0,
14220	14763	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14221		- info.pane = this;
14222		- info.camera = renderCamera;
14223		- info.x = x;
14224		- info.y = y;
14225		- object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	14764	+ object.clickInfo.pane = this;
	14765	+ object.clickInfo.camera = renderCamera;
	14766	+ object.clickInfo.x = x;
	14767	+ object.clickInfo.y = y;
	14768	+ object //.GetWindow().copy
	14769	+ .doEditDrag(//info,
	14770	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14226	14771	} else
14227	14772	{
14228	14773	if (x < startX)
..	..	@@ -14371,22 +14916,27 @@
14371	14916	}
14372	14917	}
14373	14918
	14919	+// ClickInfo clickInfo = new ClickInfo();
	14920	+
14374	14921	public void mouseMoved(MouseEvent e)
14375	14922	{
14376	14923	//System.out.println("mouseMoved: " + e);
14377	14924	if (isRenderer)
14378	14925	return;
14379	14926
14380		- ClickInfo ci = new ClickInfo();
14381		- ci.x = e.getX();
14382		- ci.y = e.getY();
14383		- ci.modifiers = e.getModifiersEx();
14384		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14385		- ci.pane = this;
14386		- ci.camera = renderCamera;
	14927	+ // Mouse cursor feedback
	14928	+ object.clickInfo.x = e.getX();
	14929	+ object.clickInfo.y = e.getY();
	14930	+ object.clickInfo.modifiers = e.getModifiersEx();
	14931	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14932	+ object.clickInfo.pane = this;
	14933	+ object.clickInfo.camera = renderCamera;
14387	14934	if (!isRenderer)
14388	14935	{
14389		- if (object.editWindow.copy.doEditClick(ci, 0))
	14936	+ //ObjEditor editWindow = object.editWindow;
	14937	+ //Object3D copy = editWindow.copy;
	14938	+ if (object.doEditClick(//clickInfo,
	14939	+ 0))
14390	14940	{
14391	14941	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14392	14942	} else
..	..	@@ -14398,8 +14948,11 @@
14398	14948
14399	14949	public void mouseReleased(MouseEvent e)
14400	14950	{
	14951	+ Globals.MOUSEDRAGGED = false;
	14952	+
14401	14953	movingcamera = false;
14402		- X = Y = 0;
	14954	+ X = 0; // getBounds().width/2;
	14955	+ Y = 0; // getBounds().height/2;
14403	14956	//System.out.println("mouseReleased: " + e);
14404	14957	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14405	14958	}
..	..	@@ -14655,7 +15208,8 @@
14655	15208	// break;
14656	15209	case 'T':
14657	15210	CACHETEXTURE ^= true;
14658		- textures.clear();
	15211	+ texturepigment.clear();
	15212	+ texturebump.clear();
14659	15213	// repaint();
14660	15214	break;
14661	15215	case 'Y':
..	..	@@ -14740,7 +15294,9 @@
14740	15294	case 'E' : COMPACT ^= true;
14741	15295	repaint();
14742	15296	break;
14743		- case 'W' : DEBUGHSB ^= true;
	15297	+ case 'W' : // Wide Window (fullscreen)
	15298	+ //DEBUGHSB ^= true;
	15299	+ ObjEditor.theFrame.ToggleFullScreen();
14744	15300	repaint();
14745	15301	break;
14746	15302	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14765,8 +15321,8 @@
14765	15321	RevertCamera();
14766	15322	repaint();
14767	15323	break;
14768		- case 'L':
14769	15324	case 'l':
	15325	+ //case 'L':
14770	15326	if (lightMode)
14771	15327	{
14772	15328	lightMode = false;
..	..	@@ -14830,20 +15386,24 @@
14830	15386	OCCLUSION_CULLING ^= true;
14831	15387	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14832	15388	break;
14833		- case '0': envyoff ^= true; repaint(); break;
	15389	+ //case '0': envyoff ^= true; repaint(); break;
14834	15390	case '1':
14835	15391	case '2':
14836	15392	case '3':
14837	15393	case '4':
14838	15394	case '5':
14839		- newenvy = Character.getNumericValue(key);
14840		- repaint();
14841		- break;
14842	15395	case '6':
14843	15396	case '7':
14844	15397	case '8':
14845	15398	case '9':
14846		- BGcolor = (key - '6')/3.f;
	15399	+ if (true) // envyoff)
	15400	+ {
	15401	+ BGcolor = (key - '1')/8.f;
	15402	+ }
	15403	+ else
	15404	+ {
	15405	+ //newenvy = Character.getNumericValue(key);
	15406	+ }
14847	15407	repaint();
14848	15408	break;
14849	15409	case '!':
..	..	@@ -14909,9 +15469,9 @@
14909	15469	case '_':
14910	15470	kompactbit = 5;
14911	15471	break;
14912		- case '+':
14913		- kompactbit = 6;
14914		- break;
	15472	+// case '+':
	15473	+// kompactbit = 6;
	15474	+// break;
14915	15475	case ' ':
14916	15476	lightMode ^= true;
14917	15477	Globals.lighttouched = true;
..	..	@@ -14923,6 +15483,7 @@
14923	15483	case ESC:
14924	15484	RENDERPROGRAM += 1;
14925	15485	RENDERPROGRAM %= 3;
	15486	+
14926	15487	repaint();
14927	15488	break;
14928	15489	case 'Z':
..	..	@@ -14962,8 +15523,9 @@
14962	15523	case DELETE:
14963	15524	ClearSelection();
14964	15525	break;
14965		- /*
14966	15526	case '+':
	15527	+
	15528	+ /*
14967	15529	//fontsize += 1;
14968	15530	bbzoom *= 2;
14969	15531	repaint();
..	..	@@ -14980,17 +15542,17 @@
14980	15542	case '=':
14981	15543	IncDepth();
14982	15544	//fontsize += 1;
14983		- object.editWindow.refreshContents(true);
	15545	+ object.GetWindow().refreshContents(true);
14984	15546	maskbit = 6;
14985	15547	break;
14986	15548	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14987	15549	DecDepth();
14988	15550	maskbit = 5;
14989	15551	//if(fontsize > 1) fontsize -= 1;
14990		- if (object.editWindow == null)
14991		- new Exception().printStackTrace();
14992		- else
14993		- object.editWindow.refreshContents(true);
	15552	+// if (object.editWindow == null)
	15553	+// new Exception().printStackTrace();
	15554	+// else
	15555	+ object.GetWindow().refreshContents(true);
14994	15556	break;
14995	15557	case '{':
14996	15558	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15214,7 +15776,7 @@
15214	15776	}
15215	15777	*/
15216	15778
15217		- object.editWindow.EditSelection();
	15779	+ object.GetWindow().EditSelection(false);
15218	15780	}
15219	15781
15220	15782	void SelectParent()
..	..	@@ -15231,10 +15793,10 @@
15231	15793	{
15232	15794	//selectees.remove(i);
15233	15795	System.out.println("select parent of " + elem);
15234		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15796	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15235	15797	} else
15236	15798	{
15237		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15799	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15238	15800	}
15239	15801
15240	15802	first = false;
..	..	@@ -15276,12 +15838,12 @@
15276	15838	for (int j = 0; j < group.children.size(); j++)
15277	15839	{
15278	15840	elem = (Object3D) group.children.elementAt(j);
15279		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15841	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15280	15842	first = false;
15281	15843	}
15282	15844	} else
15283	15845	{
15284		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15846	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15285	15847	}
15286	15848
15287	15849	first = false;
..	..	@@ -15292,21 +15854,21 @@
15292	15854	{
15293	15855	//Composite group = (Composite) object;
15294	15856	Object3D group = object;
15295		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15857	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15296	15858	}
15297	15859
15298	15860	void ResetTransform(int mask)
15299	15861	{
15300	15862	//Composite group = (Composite) object;
15301	15863	Object3D group = object;
15302		- group.editWindow.ResetTransform(mask);
	15864	+ group.GetWindow().ResetTransform(mask);
15303	15865	}
15304	15866
15305	15867	void FlipTransform()
15306	15868	{
15307	15869	//Composite group = (Composite) object;
15308	15870	Object3D group = object;
15309		- group.editWindow.FlipTransform();
	15871	+ group.GetWindow().FlipTransform();
15310	15872	// group.editWindow.ReduceMesh(true);
15311	15873	}
15312	15874
..	..	@@ -15314,7 +15876,7 @@
15314	15876	{
15315	15877	//Composite group = (Composite) object;
15316	15878	Object3D group = object;
15317		- group.editWindow.PrintMemory();
	15879	+ group.GetWindow().PrintMemory();
15318	15880	// group.editWindow.ReduceMesh(true);
15319	15881	}
15320	15882
..	..	@@ -15322,7 +15884,7 @@
15322	15884	{
15323	15885	//Composite group = (Composite) object;
15324	15886	Object3D group = object;
15325		- group.editWindow.ResetCentroid();
	15887	+ group.GetWindow().ResetCentroid();
15326	15888	}
15327	15889
15328	15890	void IncDepth()
..	..	@@ -15404,8 +15966,6 @@
15404	15966
15405	15967	int width = getBounds().width;
15406	15968	int height = getBounds().height;
15407		- ClickInfo info = new ClickInfo();
15408		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15409	15969	//Image img = CreateImage(width, height);
15410	15970	//System.out.println("width = " + width + "; height = " + height + "\n");
15411	15971
..	..	@@ -15482,43 +16042,77 @@
15482	16042	}
15483	16043	if (object != null && !hasMarquee)
15484	16044	{
	16045	+ if (object.clickInfo == null)
	16046	+ object.clickInfo = new ClickInfo();
	16047	+ ClickInfo info = object.clickInfo;
	16048	+ //ClickInfo info = new ClickInfo();
	16049	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16050	+
15485	16051	if (isRenderer)
15486	16052	{
15487		- info.flags++;
	16053	+ object.clickInfo.flags++;
15488	16054	double frameAspect = (double) width / (double) height;
15489	16055	if (frameAspect > renderCamera.aspect)
15490	16056	{
15491	16057	int desired = (int) ((double) height * renderCamera.aspect);
15492		- info.bounds.width -= width - desired;
15493		- info.bounds.x += (width - desired) / 2;
	16058	+ object.clickInfo.bounds.width -= width - desired;
	16059	+ object.clickInfo.bounds.x += (width - desired) / 2;
15494	16060	} else
15495	16061	{
15496	16062	int desired = (int) ((double) width / renderCamera.aspect);
15497		- info.bounds.height -= height - desired;
15498		- info.bounds.y += (height - desired) / 2;
	16063	+ object.clickInfo.bounds.height -= height - desired;
	16064	+ object.clickInfo.bounds.y += (height - desired) / 2;
15499	16065	}
15500	16066	}
15501		- info.g = gr;
15502		- info.camera = renderCamera;
	16067	+
	16068	+ object.clickInfo.g = gr;
	16069	+ object.clickInfo.camera = renderCamera;
15503	16070	/*
15504	16071	// Memory intensive (brep.verticescopy)
15505	16072	if (!(object instanceof Composite))
15506	16073	object.draw(info, 0, false); // SLOW :
15507	16074	*/
15508		- if (!isRenderer)
	16075	+ if (!isRenderer) // && drag)
15509	16076	{
15510		- object.drawEditHandles(info, 0);
15511		-
15512		- if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	16077	+ Grafreed.Assert(object != null);
	16078	+ Grafreed.Assert(object.selection != null);
	16079	+ if (object.selection.Size() > 0)
15513	16080	{
15514		- switch (object.selection.get(0).hitSomething)
	16081	+ int hitSomething = object.selection.get(0).hitSomething;
	16082	+
	16083	+ object.clickInfo.DX = 0;
	16084	+ object.clickInfo.DY = 0;
	16085	+ object.clickInfo.W = 1;
	16086	+ if (hitSomething == Object3D.hitCenter)
15515	16087	{
15516		- case Object3D.hitCenter: gr.setColor(Color.pink); break;
15517		- case Object3D.hitRotate: gr.setColor(Color.green); break;
15518		- case Object3D.hitScale: gr.setColor(Color.cyan); break;
	16088	+ info.DX = X;
	16089	+ if (X != 0)
	16090	+ info.DX -= info.bounds.width/2;
	16091	+
	16092	+ info.DY = Y;
	16093	+ if (Y != 0)
	16094	+ info.DY -= info.bounds.height/2;
15519	16095	}
15520		-
15521		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16096	+
	16097	+ object.drawEditHandles(//info,
	16098	+ 0);
	16099	+
	16100	+ if (drag && (X != 0 \|\| Y != 0))
	16101	+ {
	16102	+ switch (hitSomething)
	16103	+ {
	16104	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16105	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16106	+ break;
	16107	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16108	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16109	+ break;
	16110	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16111	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16112	+ break;
	16113	+ }
	16114	+
	16115	+ }
15522	16116	}
15523	16117	}
15524	16118	}
..	..	@@ -16000,6 +16594,8 @@
16000	16594	private /static/ boolean firstime;
16001	16595	private /static/ cVector newView = new cVector();
16002	16596	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16597	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16598	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
16003	16599	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16004	16600	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16005	16601	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16012,29 +16608,66 @@
16012	16608	{
16013	16609	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16014	16610
	16611	+ int usedsuf = 0;
	16612	+
16015	16613	for (int i = 0; i < suffixes.length; i++)
16016	16614	{
16017		- String resourceName = basename + suffixes[i] + "." + suffix;
16018		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16019		- mipmapped,
16020		- FileUtil.getFileSuffix(resourceName));
16021		- if (data == null)
	16615	+ String[] suffixe = suffixes;
	16616	+ String[] fallback = suffixes2;
	16617	+ String[] fallfallback = suffixes3;
	16618	+
	16619	+ for (int c=usedsuf; --c>=0;)
16022	16620	{
16023		- throw new IOException("Unable to load texture " + resourceName);
	16621	+// String[] temp = suffixe;
	16622	+// suffixe = fallback;
	16623	+// fallback = fallfallback;
	16624	+// fallfallback = temp;
16024	16625	}
	16626	+
	16627	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16628	+ TextureData data;
	16629	+
	16630	+ try
	16631	+ {
	16632	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16633	+ mipmapped,
	16634	+ FileUtil.getFileSuffix(resourceName));
	16635	+ }
	16636	+ catch (Exception e)
	16637	+ {
	16638	+ try
	16639	+ {
	16640	+ resourceName = basename + fallback[i] + "." + suffix;
	16641	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16642	+ mipmapped,
	16643	+ FileUtil.getFileSuffix(resourceName));
	16644	+ }
	16645	+ catch (Exception e2)
	16646	+ {
	16647	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16648	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16649	+ mipmapped,
	16650	+ FileUtil.getFileSuffix(resourceName));
	16651	+ }
	16652	+ }
	16653	+
16025	16654	//System.out.println("Target = " + targets[i]);
16026	16655	cubemap.updateImage(data, targets[i]);
16027	16656	}
16028	16657
16029	16658	return cubemap;
16030	16659	}
	16660	+
16031	16661	int bigsphere = -1;
16032	16662
16033	16663	float BGcolor = 0.5f;
16034	16664
16035		- private void DrawSkyBox(GL gl)
	16665	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16666	+
	16667	+ private void DrawSkyBox(GL gl, float ratio)
16036	16668	{
16037		- if (envyoff \|\| cubemap == null)
	16669	+ if (//envyoff \|\|
	16670	+ cubemap == null)
16038	16671	{
16039	16672	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16040	16673	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16049,7 +16682,17 @@
16049	16682	// Compensates for ExaminerViewer's modification of modelview matrix
16050	16683	gl.glMatrixMode(GL.GL_MODELVIEW);
16051	16684	gl.glLoadIdentity();
	16685	+ gl.glScalef(1,ratio,1);
16052	16686
	16687	+// colorV[0] = 2;
	16688	+// colorV[1] = 2;
	16689	+// colorV[2] = 2;
	16690	+// colorV[3] = 1;
	16691	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16692	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16693	+//
	16694	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16695	+
16053	16696	//gl.glActiveTexture(GL.GL_TEXTURE1);
16054	16697	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16055	16698
..	..	@@ -16081,6 +16724,7 @@
16081	16724	{
16082	16725	gl.glScalef(1.0f, -1.0f, 1.0f);
16083	16726	}
	16727	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16084	16728	gl.glMultMatrixd(viewrot_1, 0);
16085	16729	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16086	16730	//viewer.updateInverseRotation(gl);
..	..	@@ -16221,16 +16865,16 @@
16221	16865	cStatic.objectstack[materialdepth++] = checker;
16222	16866	//System.out.println("material " + material);
16223	16867	//Applet3D.tracein(this, selected);
16224		- vector2buffer = checker.projectedVertices;
	16868	+ //vector2buffer = checker.projectedVertices;
16225	16869
16226	16870	//checker.GetMaterial().Draw(this, false); // true);
16227		- DrawMaterial(checker.GetMaterial(), false); // true);
	16871	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16228	16872
16229	16873	materialdepth -= 1;
16230	16874	if (materialdepth > 0)
16231	16875	{
16232		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16233		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16876	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16877	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16234	16878	}
16235	16879	//checker.GetMaterial().opacity = 1f;
16236	16880	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16316,6 +16960,14 @@
16316	16960	}
16317	16961	}
16318	16962
	16963	+ private Object3D GetFolder()
	16964	+ {
	16965	+ Object3D folder = object.GetWindow().copy;
	16966	+ if (object.GetWindow().copy.selection.Size() > 0)
	16967	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16968	+ return folder;
	16969	+ }
	16970	+
16319	16971	class SelectBuffer implements GLEventListener
16320	16972	{
16321	16973
..	..	@@ -16331,7 +16983,7 @@
16331	16983	//new Exception().printStackTrace();
16332	16984	System.out.println("select buffer init");
16333	16985	// Use debug pipeline
16334		- drawable.setGL(new DebugGL(drawable.getGL()));
	16986	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16335	16987
16336	16988	GL gl = drawable.getGL();
16337	16989
..	..	@@ -16395,6 +17047,17 @@
16395	17047
16396	17048	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16397	17049
	17050	+ if (PAINTMODE)
	17051	+ {
	17052	+ if (object.GetWindow().copy.selection.Size() > 0)
	17053	+ {
	17054	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17055	+
	17056	+ // Make what you paint not selectable.
	17057	+ paintobj.ResetSelectable();
	17058	+ }
	17059	+ }
	17060	+
16398	17061	//int tmp = selection_view;
16399	17062	//selection_view = -1;
16400	17063	int temp = DrawMode();
..	..	@@ -16406,6 +17069,17 @@
16406	17069	// temp = DEFAULT; // patch for selection debug
16407	17070	Globals.drawMode = temp; // WARNING
16408	17071
	17072	+ if (PAINTMODE)
	17073	+ {
	17074	+ if (object.GetWindow().copy.selection.Size() > 0)
	17075	+ {
	17076	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17077	+
	17078	+ // Revert.
	17079	+ paintobj.RestoreSelectable();
	17080	+ }
	17081	+ }
	17082	+
16409	17083	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16410	17084
16411	17085	// trying different ways of getting the depth info over
..	..	@@ -16453,6 +17127,8 @@
16453	17127	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16454	17128	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16455	17129	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17130	+
	17131	+ CreateSelectedPoint();
16456	17132
16457	17133	// Will fit the mesh !!!
16458	17134	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16507,29 +17183,31 @@
16507	17183	}
16508	17184
16509	17185	if (!movingcamera && !PAINTMODE)
16510		- object.editWindow.ScreenFitPoint(); // fev 2014
	17186	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16511	17187
16512		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17188	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16513	17189	{
16514		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17190	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16515	17191
16516		- Object3D group = new Object3D("inst" + paintcount++);
	17192	+ if (object.GetWindow().copy.selection.Size() > 0)
	17193	+ {
	17194	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16517	17195
16518		- group.CreateMaterial(); // use a void leaf to select instances
16519		-
16520		- group.add(paintobj); // link
16521		-
16522		- object.editWindow.SnapObject(group);
16523		-
16524		- Object3D folder = object.editWindow.copy;
16525		-
16526		- if (object.editWindow.copy.selection.Size() > 0)
16527		- folder = object.editWindow.copy.selection.elementAt(0);
16528		-
16529		- folder.add(group);
16530		-
16531		- object.editWindow.ResetModel();
16532		- object.editWindow.refreshContents();
	17196	+ Object3D inst = new Object3D("inst" + paintcount++);
	17197	+
	17198	+ inst.CreateMaterial(); // use a void leaf to select instances
	17199	+
	17200	+ inst.add(paintobj); // link
	17201	+
	17202	+ object.GetWindow().SnapObject(inst);
	17203	+
	17204	+ Object3D folder = paintFolder; // GetFolder();
	17205	+
	17206	+ folder.add(inst);
	17207	+
	17208	+ object.GetWindow().ResetModel();
	17209	+ object.GetWindow().refreshContents();
	17210	+ }
16533	17211	}
16534	17212	else
16535	17213	paintcount = 0;
..	..	@@ -16568,6 +17246,11 @@
16568	17246	//System.out.println("objects[color] = " + objects[color]);
16569	17247	//objects[color].Select();
16570	17248	indexcount = 0;
	17249	+ ObjEditor window = object.GetWindow();
	17250	+ if (window != null && deselect)
	17251	+ {
	17252	+ window.Select(null, deselect, true);
	17253	+ }
16571	17254	object.Select(color, deselect);
16572	17255	}
16573	17256
..	..	@@ -17093,23 +17776,15 @@
17093	17776	int AAbuffersize = 0;
17094	17777
17095	17778	//double[] selectedpoint = new double[3];
17096		- static Superellipsoid selectedpoint = new Superellipsoid();
	17779	+ static Superellipsoid selectedpoint;
17097	17780	static Sphere previousselectedpoint = null;
17098		- static Sphere debugpointG = new Sphere();
17099		- static Sphere debugpointP = new Sphere();
17100		- static Sphere debugpointC = new Sphere();
17101		- static Sphere debugpointR = new Sphere();
	17781	+ static Sphere debugpointG;
	17782	+ static Sphere debugpointP;
	17783	+ static Sphere debugpointC;
	17784	+ static Sphere debugpointR;
17102	17785
17103	17786	static Sphere debugpoints[] = new Sphere[8];
17104	17787
17105		- static
17106		- {
17107		- for (int i=0; i<8; i++)
17108		- {
17109		- debugpoints[i] = new Sphere();
17110		- }
17111		- }
17112		-
17113	17788	static void InitPoints(float radius)
17114	17789	{
17115	17790	for (int i=0; i<8; i++)