~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -18,7 +18,10 @@
18	18	import javax.imageio.ImageIO;
19	19	import javax.imageio.ImageWriteParam;
20	20	import javax.imageio.ImageWriter;
	21	+import javax.imageio.ImageReadParam;
	22	+import javax.imageio.ImageReader;
21	23	import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
	24	+import javax.imageio.stream.ImageInputStream;
22	25	import javax.imageio.stream.ImageOutputStream;
23	26	import javax.imageio.ImageWriteParam;
24	27
..	..	@@ -30,6 +33,7 @@
30	33	import java.nio.*;
31	34
32	35	import gleem.linalg.Mat4f;
	36	+import javax.imageio.ImageTypeSpecifier;
33	37
34	38	class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	39	{
..	..	@@ -37,7 +41,6 @@
37	41	static boolean[] selectedstack = new boolean[65536];
38	42	static int materialdepth = 0;
39	43
40		- static boolean DEBUG = false;
41	44	static boolean FRUSTUM = false; // still bogus true; // frustum culling
42	45
43	46	// camera change fix
..	..	@@ -45,6 +48,39 @@
45	48	static boolean ABORTED = false;
46	49
47	50	static int STEP = 1;
	51	+
	52	+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
	53	+ {
	54	+ int[] pixels = new int[bytes.length/3];
	55	+ for (int i=pixels.length; --i>=0;)
	56	+ {
	57	+ int i3 = i*3;
	58	+ pixels[i] = 0xFF;
	59	+ pixels[i] <<= 8;
	60	+ pixels[i] \|= bytes[i3+2] & 0xFF;
	61	+ pixels[i] <<= 8;
	62	+ pixels[i] \|= bytes[i3+1] & 0xFF;
	63	+ pixels[i] <<= 8;
	64	+ pixels[i] \|= bytes[i3] & 0xFF;
	65	+ }
	66	+ /*
	67	+ int r=0,g=0,b=0,a=0;
	68	+ for (int i=0; i<width; i++)
	69	+ for (int j=0; j<height; j++)
	70	+ {
	71	+ int index = j*width+i;
	72	+ int p = pixels[index];
	73	+ a = ((p>>24) & 0xFF);
	74	+ r = ((p>>16) & 0xFF);
	75	+ g = ((p>>8) & 0xFF);
	76	+ b = (p & 0xFF);
	77	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	78	+ }
	79	+ /**/
	80	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	81	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	82	+ return rendImage;
	83	+ }
48	84
49	85	/static/ private boolean CULLFACE = false; // true;
50	86	/static/ boolean NEAREST = false; // true;
..	..	@@ -61,7 +97,7 @@
61	97	//boolean REDUCETEXTURE = true;
62	98	boolean CACHETEXTURE = true;
63	99	boolean CLEANCACHE = false; // true;
64		- boolean MIPMAP = false; // true;
	100	+ boolean MIPMAP = false; // true; // never works...
65	101	boolean COMPRESSTEXTURE = false;
66	102	boolean KOMPACTTEXTURE = false; // true;
67	103	boolean RESIZETEXTURE = false;
..	..	@@ -74,7 +110,11 @@
74	110	//private Mat4f spotlightTransform = new Mat4f();
75	111	//private Mat4f spotlightInverseTransform = new Mat4f();
76	112	static GLContext glcontext = null;
77		- /static/ com.sun.opengl.util.texture.Texture cubemap;
	113	+ /static/ com.sun.opengl.util.texture.Texture cubemap; // Either custom or rgb
	114	+ /static/ com.sun.opengl.util.texture.Texture cubemapcustom;
	115	+ /static/ com.sun.opengl.util.texture.Texture cubemaprgb;
	116	+ boolean transformMode;
	117	+
78	118	boolean reverseUP = false;
79	119	static boolean frozen = false;
80	120	boolean enablebackspace = false; // patch for back buffer refresh
..	..	@@ -128,7 +168,7 @@
128	168
129	169
130	170	// OPTIONS
131		- boolean Skinshader = true;
	171	+ boolean Skinshader = false; // true;
132	172	boolean cameraLight = false;
133	173	boolean UVdebug = false;
134	174	boolean Udebug = false;
..	..	@@ -137,7 +177,7 @@
137	177	static boolean doublesided = false; // true; // reversed normals are awful for conformance
138	178	boolean anisotropy = true;
139	179	boolean softshadow = true; // slower but better false;
140		- boolean opacityhalo = false;
	180	+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
141	181
142	182	boolean macromode = false;
143	183
..	..	@@ -151,6 +191,19 @@
151	191	}
152	192
153	193	private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	194	+
	195	+ public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	196	+ {
	197	+ try
	198	+ {
	199	+ return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	200	+ } catch (IOException e)
	201	+ {
	202	+ System.out.println("NAME = " + name);
	203	+ e.printStackTrace(); // throw new RuntimeException(e);
	204	+ return null;
	205	+ }
	206	+ }
154	207
155	208	void SetAsGLRenderer(boolean b)
156	209	{
..	..	@@ -170,7 +223,8 @@
170	223
171	224	SetCamera(cam);
172	225
173		- SetLight(new Camera(new cVector(10, 10, -20)));
	226	+ // Warning: not used.
	227	+ SetLight(new Camera(new cVector(15, 10, -20)));
174	228
175	229	object = o;
176	230
..	..	@@ -327,7 +381,7 @@
327	381	cStatic.objectstack[materialdepth++] = obj;
328	382	//System.out.println("material " + material);
329	383	//Applet3D.tracein(this, selected);
330		- display.vector2buffer = obj.projectedVertices;
	384	+ //display.vector2buffer = obj.projectedVertices;
331	385	if (obj instanceof Camera)
332	386	{
333	387	display.options1[0] = material.shift;
..	..	@@ -336,14 +390,28 @@
336	390	display.options1[2] = material.shadowbias;
337	391	display.options1[3] = material.aniso;
338	392	display.options1[4] = material.anisoV;
	393	+// System.out.println("display.options1[0] " + display.options1[0]);
	394	+// System.out.println("display.options1[1] " + display.options1[1]);
	395	+// System.out.println("display.options1[2] " + display.options1[2]);
	396	+// System.out.println("display.options1[3] " + display.options1[3]);
	397	+// System.out.println("display.options1[4] " + display.options1[4]);
339	398	display.options2[0] = material.opacity;
340	399	display.options2[1] = material.diffuse;
341	400	display.options2[2] = material.factor;
	401	+// System.out.println("display.options2[0] " + display.options2[0]);
	402	+// System.out.println("display.options2[1] " + display.options2[1]);
	403	+// System.out.println("display.options2[2] " + display.options2[2]);
342	404
343	405	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	406	+// System.out.println("display.options3[0] " + display.options3[0]);
	407	+// System.out.println("display.options3[1] " + display.options3[1]);
	408	+// System.out.println("display.options3[2] " + display.options3[2]);
344	409	display.options4[0] = material.cameralight/0.2f;
345	410	display.options4[1] = material.subsurface;
346	411	display.options4[2] = material.sheen;
	412	+// System.out.println("display.options4[0] " + display.options4[0]);
	413	+// System.out.println("display.options4[1] " + display.options4[1]);
	414	+// System.out.println("display.options4[2] " + display.options4[2]);
347	415
348	416	// if (display.CURRENTANTIALIAS > 0)
349	417	// display.options3[3] /= 4;
..	..	@@ -359,7 +427,7 @@
359	427	/**/
360	428	} else
361	429	{
362		- DrawMaterial(material, selected);
	430	+ DrawMaterial(material, selected, obj.projectedVertices);
363	431	}
364	432	} else
365	433	{
..	..	@@ -383,8 +451,8 @@
383	451	cStatic.objectstack[materialdepth++] = obj;
384	452	//System.out.println("material " + material);
385	453	//Applet3D.tracein("selected ", selected);
386		- display.vector2buffer = obj.projectedVertices;
387		- display.DrawMaterial(material, selected);
	454	+ //display.vector2buffer = obj.projectedVertices;
	455	+ display.DrawMaterial(material, selected, obj.projectedVertices);
388	456	}
389	457	}
390	458
..	..	@@ -401,8 +469,8 @@
401	469	materialdepth -= 1;
402	470	if (materialdepth > 0)
403	471	{
404		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
405		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	472	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	473	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
406	474	}
407	475	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
408	476	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -422,8 +490,8 @@
422	490	materialdepth -= 1;
423	491	if (materialdepth > 0)
424	492	{
425		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
426		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	493	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	494	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
427	495	}
428	496	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
429	497	//else
..	..	@@ -474,7 +542,8 @@
474	542	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
475	543	LA.vecCross(obj.v0, obj.v1, obj.v2);
476	544	LA.vecNormalize(obj.v2);
477		- gl.glNormal3f((float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
	545	+
	546	+ SetGLNormal(gl, (float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
478	547	}
479	548
480	549	// P
..	..	@@ -496,7 +565,7 @@
496	565	y += ny * obj.NORMALPUSH;
497	566	z += nz * obj.NORMALPUSH;
498	567
499		- gl.glNormal3f(nx, ny, nz);
	568	+ SetGLNormal(gl, nx, ny, nz);
500	569	}
501	570	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
502	571	SetColor(obj, pv);
..	..	@@ -528,7 +597,7 @@
528	597	y += ny * obj.NORMALPUSH;
529	598	z += nz * obj.NORMALPUSH;
530	599
531		- gl.glNormal3f(nx, ny, nz);
	600	+ SetGLNormal(gl, nx, ny, nz);
532	601	}
533	602	//System.out.println("vertexq = " + qv.s + ", " + qv.t);
534	603	// boolean locked = false;
..	..	@@ -576,7 +645,7 @@
576	645	y += ny * obj.NORMALPUSH;
577	646	z += nz * obj.NORMALPUSH;
578	647
579		- gl.glNormal3f(nx, ny, nz);
	648	+ SetGLNormal(gl, nx, ny, nz);
580	649	}
581	650
582	651	// if ((dot&4) == 0)
..	..	@@ -1182,10 +1251,10 @@
1182	1251	{
1183	1252	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1184	1253	{
1185		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1254	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1186	1255	} else
1187	1256	{
1188		- gl.glNormal3f(0, 0, 1);
	1257	+ SetGLNormal(gl, 0, 0, 1);
1189	1258	}
1190	1259
1191	1260	if (c != null)
..	..	@@ -1209,10 +1278,10 @@
1209	1278	{
1210	1279	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1211	1280	{
1212		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1281	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1213	1282	} else
1214	1283	{
1215		- gl.glNormal3f(0, 0, 1);
	1284	+ SetGLNormal(gl, 0, 0, 1);
1216	1285	}
1217	1286	if (c != null)
1218	1287	{
..	..	@@ -1237,10 +1306,10 @@
1237	1306	{
1238	1307	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1239	1308	{
1240		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1309	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1241	1310	} else
1242	1311	{
1243		- gl.glNormal3f(0, 0, 1);
	1312	+ SetGLNormal(gl, 0, 0, 1);
1244	1313	}
1245	1314	if (c != null)
1246	1315	{
..	..	@@ -1422,7 +1491,7 @@
1422	1491	{
1423	1492	if (!selectmode)
1424	1493	{
1425		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1494	+ SetGLNormal(gl, (float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
1426	1495	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
1427	1496
1428	1497	if (flipV)
..	..	@@ -1434,6 +1503,8 @@
1434	1503	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1435	1504	}
1436	1505
	1506	+ float[] colorV = new float[4];
	1507	+
1437	1508	void SetColor(Object3D obj, Vertex p0)
1438	1509	{
1439	1510	CameraPane display = this;
..	..	@@ -1501,8 +1572,6 @@
1501	1572	{
1502	1573	return;
1503	1574	}
1504		-
1505		- float[] colorV = new float[3];
1506	1575
1507	1576	if (false) // marked)
1508	1577	{
..	..	@@ -1611,7 +1680,7 @@
1611	1680	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1612	1681	}
1613	1682
1614		- void DrawMaterial(cMaterial material, boolean selected)
	1683	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1615	1684	{
1616	1685	CameraPane display = this;
1617	1686	//new Exception().printStackTrace();
..	..	@@ -1646,7 +1715,7 @@
1646	1715	colorV[0] = display.modelParams0[0] * material.diffuse;
1647	1716	colorV[1] = display.modelParams0[1] * material.diffuse;
1648	1717	colorV[2] = display.modelParams0[2] * material.diffuse;
1649		- colorV[3] = material.opacity;
	1718	+ colorV[3] = 1; // material.opacity;
1650	1719
1651	1720	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1652	1721	//System.out.println("Opacity = " + opacity);
..	..	@@ -1751,12 +1820,12 @@
1751	1820
1752	1821	display.modelParams7[0] = 0;
1753	1822	display.modelParams7[1] = 1000;
1754		- display.modelParams7[2] = 0;
	1823	+ display.modelParams7[2] = material.parallax;
1755	1824	display.modelParams7[3] = 0;
1756	1825
1757		- display.modelParams6[0] = 100; // criss de bug de bump
	1826	+ //display.modelParams6[0] = 100; // criss de bug de bump
1758	1827
1759		- Object3D.cVector2[] extparams = display.vector2buffer;
	1828	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1760	1829	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1761	1830	{
1762	1831	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1984,9 +2053,9 @@
1984	2053	switch(viewcode)
1985	2054	{
1986	2055	case 0: return "main";
1987		- case 1: return "one";
1988		- case 2: return "two";
1989		- case 3: return "three";
	2056	+ case 1: return "Red";
	2057	+ case 2: return "Green";
	2058	+ case 3: return "Blue";
1990	2059	case 4: return "light";
1991	2060	}
1992	2061
..	..	@@ -2052,7 +2121,7 @@
2052	2121	//System.err.println("Oeil on");
2053	2122	OEIL = true;
2054	2123	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2055		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2124	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2056	2125	//pingthread.StepToTarget(true);
2057	2126	}
2058	2127
..	..	@@ -2267,7 +2336,7 @@
2267	2336
2268	2337	void ToggleDebug()
2269	2338	{
2270		- DEBUG ^= true;
	2339	+ Globals.DEBUG ^= true;
2271	2340	}
2272	2341
2273	2342	void ToggleLookAt()
..	..	@@ -2285,10 +2354,17 @@
2285	2354	HANDLES ^= true;
2286	2355	}
2287	2356
	2357	+ Object3D paintFolder;
	2358	+
2288	2359	void TogglePaint()
2289	2360	{
2290	2361	PAINTMODE ^= true;
2291	2362	paintcount = 0;
	2363	+
	2364	+ if (PAINTMODE)
	2365	+ {
	2366	+ paintFolder = GetFolder();
	2367	+ }
2292	2368	}
2293	2369
2294	2370	void SwapCamera(int a, int b)
..	..	@@ -2385,6 +2461,33 @@
2385	2461	return currentGL;
2386	2462	}
2387	2463
	2464	+ static private BufferedImage CreateBim(TextureData texturedata)
	2465	+ {
	2466	+ Grafreed.Assert(texturedata != null);
	2467	+
	2468	+ int width = texturedata.getWidth();
	2469	+ int height = texturedata.getHeight();
	2470	+
	2471	+ Buffer buffer = texturedata.getBuffer();
	2472	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2473	+
	2474	+ byte[] bytes = bytebuf.array();
	2475	+
	2476	+ return CreateBim(bytes, width, height);
	2477	+ }
	2478	+
	2479	+ private void SetGLNormal(javax.media.opengl.GL gl, float nx, float ny, float nz)
	2480	+ {
	2481	+ gl.glNormal3f(nx, ny, nz);
	2482	+
	2483	+ if (ny > 0.9 \|\| ny < -0.9)
	2484	+ // Ground or ceiling
	2485	+ gl.glVertexAttrib3f(4, 1, 0, 0);
	2486	+ else
	2487	+ // Walls
	2488	+ gl.glVertexAttrib3f(4, 0, 1, 0);
	2489	+ }
	2490	+
2388	2491	/**/
2389	2492	class CacheTexture
2390	2493	{
..	..	@@ -2393,28 +2496,31 @@
2393	2496
2394	2497	int resolution;
2395	2498
2396		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2499	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2397	2500	{
2398		- texture = tex;
	2501	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2502	+ texturedata = texdata;
2399	2503	resolution = res;
2400	2504	}
2401	2505	}
2402	2506	/**/
2403	2507
2404	2508	// 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>();
	2509	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2510	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2511	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2512	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2513	+
2408	2514	int pigmentdepth = 0;
2409	2515	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2410	2516	int bumpdepth = 0;
2411	2517	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2412	2518	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2413	2519	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2414		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2520	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2415	2521	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2416	2522
2417		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2523	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2418	2524	{
2419	2525	TextureData texturedata = null;
2420	2526
..	..	@@ -2424,7 +2530,7 @@
2424	2530	com.sun.opengl.util.texture.TextureIO.newTextureData(
2425	2531	getClass().getClassLoader().getResourceAsStream(name),
2426	2532	true,
2427		- com.sun.opengl.util.texture.TextureIO.PNG);
	2533	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
2428	2534	} catch (java.io.IOException e)
2429	2535	{
2430	2536	throw new javax.media.opengl.GLException(e);
..	..	@@ -2433,13 +2539,34 @@
2433	2539	if (bump)
2434	2540	texturedata = ConvertBump(texturedata, false);
2435	2541
2436		- com.sun.opengl.util.texture.Texture texture =
2437		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2542	+// com.sun.opengl.util.texture.Texture texture =
	2543	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2438	2544
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);
	2545	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2546	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2441	2547
2442		- return texture;
	2548	+ return texturedata;
	2549	+ }
	2550	+
	2551	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2552	+ {
	2553	+ TextureData texturedata = null;
	2554	+
	2555	+ try
	2556	+ {
	2557	+ texturedata =
	2558	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2559	+ bim,
	2560	+ true);
	2561	+ } catch (Exception e)
	2562	+ {
	2563	+ throw new javax.media.opengl.GLException(e);
	2564	+ }
	2565	+
	2566	+ if (bump)
	2567	+ texturedata = ConvertBump(texturedata, false);
	2568	+
	2569	+ return texturedata;
2443	2570	}
2444	2571
2445	2572	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3512,6 +3639,8 @@
3512	3639
3513	3640	System.out.println("LOADING TEXTURE : " + name);
3514	3641
	3642	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3643	+
3515	3644	//
3516	3645	if (false) // compressbit > 0)
3517	3646	{
..	..	@@ -7910,7 +8039,7 @@
7910	8039	String pigment = Object3D.GetPigment(tex);
7911	8040	String bump = Object3D.GetBump(tex);
7912	8041
7913		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8042	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7914	8043	{
7915	8044	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7916	8045	// System.out.println("; bump = " + bump);
..	..	@@ -7925,8 +8054,8 @@
7925	8054	pigment = null;
7926	8055	}
7927	8056
7928		- ReleaseTexture(bump, true);
7929		- ReleaseTexture(pigment, false);
	8057	+ ReleaseTexture(tex, true);
	8058	+ ReleaseTexture(tex, false);
7930	8059	}
7931	8060
7932	8061	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -7944,7 +8073,7 @@
7944	8073
7945	8074	String pigment = Object3D.GetPigment(tex);
7946	8075
7947		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8076	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7948	8077	{
7949	8078	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7950	8079	// System.out.println("; bump = " + bump);
..	..	@@ -7955,7 +8084,7 @@
7955	8084	pigment = null;
7956	8085	}
7957	8086
7958		- ReleaseTexture(pigment, false);
	8087	+ ReleaseTexture(tex, false);
7959	8088	}
7960	8089
7961	8090	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -7973,7 +8102,7 @@
7973	8102
7974	8103	String bump = Object3D.GetBump(tex);
7975	8104
7976		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8105	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7977	8106	{
7978	8107	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7979	8108	// System.out.println("; bump = " + bump);
..	..	@@ -7984,10 +8113,10 @@
7984	8113	bump = null;
7985	8114	}
7986	8115
7987		- ReleaseTexture(bump, true);
	8116	+ ReleaseTexture(tex, true);
7988	8117	}
7989	8118
7990		- void ReleaseTexture(String tex, boolean bump)
	8119	+ void ReleaseTexture(cTexture tex, boolean bump)
7991	8120	{
7992	8121	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7993	8122	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7998,7 +8127,7 @@
7998	8127	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7999	8128
8000	8129	if (tex != null)
8001		- texture = textures.get(tex);
	8130	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
8002	8131
8003	8132	// //assert( texture != null );
8004	8133	// if (texture == null)
..	..	@@ -8092,47 +8221,50 @@
8092	8221
8093	8222	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8094	8223	{
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		- }
	8224	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8225	+// ambientOcclusion ) // \|\| !textureon)
	8226	+// {
	8227	+// return; // false;
	8228	+// }
	8229	+//
	8230	+// if (tex == null)
	8231	+// {
	8232	+// BindTexture(null,false,resolution);
	8233	+// BindTexture(null,true,resolution);
	8234	+// return;
	8235	+// }
	8236	+//
	8237	+// String pigment = Object3D.GetPigment(tex);
	8238	+// String bump = Object3D.GetBump(tex);
	8239	+//
	8240	+// usedtextures.add(pigment);
	8241	+// usedtextures.add(bump);
	8242	+//
	8243	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8244	+// {
	8245	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8246	+// // System.out.println("; bump = " + bump);
	8247	+// }
	8248	+//
	8249	+// if (bump.equals(""))
	8250	+// {
	8251	+// bump = null;
	8252	+// }
	8253	+// if (pigment.equals(""))
	8254	+// {
	8255	+// pigment = null;
	8256	+// }
	8257	+//
	8258	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8259	+// BindTexture(pigment, false, resolution);
	8260	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8261	+// BindTexture(bump, true, resolution);
	8262	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8263	+//
	8264	+// return; // true;
8107	8265
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;
	8266	+ BindPigmentTexture(tex, resolution);
	8267	+ BindBumpTexture(tex, resolution);
8136	8268	}
8137	8269
8138	8270	/boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8151,9 +8283,9 @@
8151	8283
8152	8284	String pigment = Object3D.GetPigment(tex);
8153	8285
8154		- usedtextures.put(pigment, pigment);
	8286	+ usedtextures.add(tex);
8155	8287
8156		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8288	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8157	8289	{
8158	8290	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8159	8291	// System.out.println("; bump = " + bump);
..	..	@@ -8165,7 +8297,7 @@
8165	8297	}
8166	8298
8167	8299	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8168		- BindTexture(pigment, false, resolution);
	8300	+ BindTexture(tex, false, resolution);
8169	8301	}
8170	8302
8171	8303	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8184,9 +8316,9 @@
8184	8316
8185	8317	String bump = Object3D.GetBump(tex);
8186	8318
8187		- usedtextures.put(bump, bump);
	8319	+ usedtextures.add(tex);
8188	8320
8189		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8321	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8190	8322	{
8191	8323	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8192	8324	// System.out.println("; bump = " + bump);
..	..	@@ -8198,7 +8330,7 @@
8198	8330	}
8199	8331
8200	8332	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8201		- BindTexture(bump, true, resolution);
	8333	+ BindTexture(tex, true, resolution);
8202	8334	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8203	8335	}
8204	8336
..	..	@@ -8222,13 +8354,19 @@
8222	8354	return fileExists;
8223	8355	}
8224	8356
8225		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8357	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8226	8358	{
8227		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8359	+ CacheTexture texturecache = null;
8228	8360
8229	8361	if (tex != null)
8230	8362	{
8231		- String texname = tex;
	8363	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8364	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
	8365	+
	8366	+ if (texname.equals("") && texdata == null)
	8367	+ {
	8368	+ return null;
	8369	+ }
8232	8370
8233	8371	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8234	8372
..	..	@@ -8238,19 +8376,46 @@
8238	8376	// else
8239	8377	// if (!texname.startsWith("/"))
8240	8378	// texname = "/Users/nbriere/Textures/" + texname;
8241		- if (!FileExists(tex))
	8379	+ if (!FileExists(texname) && !texname.startsWith("@"))
8242	8380	{
8243	8381	texname = fallbackTextureName;
8244	8382	}
8245	8383
8246	8384	if (CACHETEXTURE)
8247		- texture = textures.get(texname); // TEXTURE CACHE
8248		-
8249		- TextureData texturedata = null;
8250		-
8251		- if (texture == null \|\| texture.resolution < resolution)
8252	8385	{
8253		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8386	+ if (texdata == null)
	8387	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8388	+ else
	8389	+ texturecache = bimtextures.get(texdata);
	8390	+ }
	8391	+
	8392	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8393	+ {
	8394	+ TextureData texturedata = null;
	8395	+
	8396	+ if (texdata != null && textureon)
	8397	+ {
	8398	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8399	+
	8400	+ try
	8401	+ {
	8402	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8403	+ }
	8404	+ catch (Exception e)
	8405	+ {
	8406	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8407	+ }
	8408	+
	8409	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8410	+ bimtextures.put(texdata, texturecache);
	8411	+
	8412	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8413	+
	8414	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8415	+ //bim2 = bim;
	8416	+ }
	8417	+ else
	8418	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8254	8419	{
8255	8420	assert(!bump);
8256	8421	// if (bump)
..	..	@@ -8261,19 +8426,23 @@
8261	8426	// }
8262	8427	// else
8263	8428	// {
8264		- texture = textures.get(tex);
8265		- if (texture == null)
	8429	+ // texturecache = textures.get(texname); // suspicious
	8430	+ if (texturecache == null)
8266	8431	{
8267		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8432	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8268	8433	}
	8434	+ else
	8435	+ new Exception().printStackTrace();
8269	8436	// }
8270	8437	} else
8271		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8438	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8272	8439	{
8273	8440	assert(bump);
8274		- texture = textures.get(tex);
8275		- if (texture == null)
8276		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8441	+ // texturecache = textures.get(texname); // suspicious
	8442	+ if (texturecache == null)
	8443	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8444	+ else
	8445	+ new Exception().printStackTrace();
8277	8446	} else
8278	8447	{
8279	8448	//if (tex.equals("IMMORTAL"))
..	..	@@ -8281,11 +8450,22 @@
8281	8450	// texture = GetResourceTexture("default.png");
8282	8451	//} else
8283	8452	//{
8284		- if (tex.equals("WHITE_NOISE"))
	8453	+ if (texname.endsWith("WHITE_NOISE"))
8285	8454	{
8286		- texture = textures.get(tex);
8287		- if (texture == null)
8288		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8455	+ // texturecache = textures.get(texname); // suspicious
	8456	+ if (texturecache == null)
	8457	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8458	+ else
	8459	+ new Exception().printStackTrace();
	8460	+ } else
	8461	+ {
	8462	+ if (texname.startsWith("@"))
	8463	+ {
	8464	+ // texturecache = textures.get(texname); // suspicious
	8465	+ if (texturecache == null)
	8466	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
	8467	+ else
	8468	+ new Exception().printStackTrace();
8289	8469	} else
8290	8470	{
8291	8471	if (textureon)
..	..	@@ -8344,19 +8524,20 @@
8344	8524	if (texturedata == null)
8345	8525	throw new Exception();
8346	8526
8347		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8527	+ texturecache = new CacheTexture(texturedata,resolution);
8348	8528	//texture = GetTexture(tex, bump);
8349	8529	}
	8530	+ }
8350	8531	}
8351	8532	//}
8352	8533	}
8353	8534
8354		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8535	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8355	8536	{
8356	8537	//return false;
8357	8538
8358	8539	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8359		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8540	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8360	8541	{
8361	8542	// String ext = "_highres";
8362	8543	// if (REDUCETEXTURE)
..	..	@@ -8373,52 +8554,17 @@
8373	8554	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8374	8555	if (!cachefile.exists())
8375	8556	{
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))
	8557	+ //if (texturedata.getWidth() == texturedata.getHeight())
8385	8558	{
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);
	8559	+ BufferedImage rendImage = CreateBim(texturedata);
	8560	+
8416	8561	ImageWriter writer = null;
8417	8562	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8418	8563	if (iter.hasNext()) {
8419	8564	writer = (ImageWriter)iter.next();
8420	8565	}
8421		- float compressionQuality = 0.9f;
	8566	+
	8567	+ float compressionQuality = 0.85f;
8422	8568	try
8423	8569	{
8424	8570	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8435,18 +8581,20 @@
8435	8581	}
8436	8582	}
8437	8583	}
8438		-
	8584	+
	8585	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8586	+
8439	8587	//System.out.println("Texture = " + tex);
8440		- if (textures.containsKey(texname))
	8588	+ if (textures.containsKey(tex))
8441	8589	{
8442		- CacheTexture thetex = textures.get(texname);
	8590	+ CacheTexture thetex = textures.get(tex);
8443	8591	thetex.texture.disable();
8444	8592	thetex.texture.dispose();
8445		- textures.remove(texname);
	8593	+ textures.remove(tex);
8446	8594	}
8447	8595
8448		- texture.texturedata = texturedata;
8449		- textures.put(texname, texture);
	8596	+ //texture.texturedata = texturedata;
	8597	+ textures.put(tex, texturecache);
8450	8598
8451	8599	// newtex = true;
8452	8600	}
..	..	@@ -8462,10 +8610,44 @@
8462	8610	}
8463	8611	}
8464	8612
8465		- return texture;
	8613	+ return texturecache;
8466	8614	}
8467	8615
8468		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	8616	+ static void EmbedTextures(cTexture tex)
	8617	+ {
	8618	+ if (tex.pigmentdata == null)
	8619	+ {
	8620	+ //String texname = Object3D.GetPigment(tex);
	8621	+
	8622	+ CacheTexture texturecache = texturepigment.get(tex);
	8623	+
	8624	+ if (texturecache != null)
	8625	+ {
	8626	+ tex.pw = texturecache.texturedata.getWidth();
	8627	+ tex.ph = texturecache.texturedata.getHeight();
	8628	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8629	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8630	+ ;
	8631	+ //, tex.pw, tex.ph), 0.5f);
	8632	+ }
	8633	+ }
	8634	+
	8635	+ if (tex.bumpdata == null)
	8636	+ {
	8637	+ //String texname = Object3D.GetBump(tex);
	8638	+
	8639	+ CacheTexture texturecache = texturebump.get(tex);
	8640	+
	8641	+ if (texturecache != null)
	8642	+ {
	8643	+ tex.bw = texturecache.texturedata.getWidth();
	8644	+ tex.bh = texturecache.texturedata.getHeight();
	8645	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8646	+ }
	8647	+ }
	8648	+ }
	8649	+
	8650	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8469	8651	{
8470	8652	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8471	8653
..	..	@@ -8483,21 +8665,21 @@
8483	8665	return texture!=null?texture.texture:null;
8484	8666	}
8485	8667
8486		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
	8668	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8487	8669	{
8488	8670	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8489	8671
8490	8672	return texture!=null?texture.texturedata:null;
8491	8673	}
8492	8674
8493		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8675	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8494	8676	{
8495	8677	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8496	8678	{
8497	8679	return false;
8498	8680	}
8499	8681
8500		- boolean newtex = false;
	8682	+ //boolean newtex = false;
8501	8683
8502	8684	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8503	8685
..	..	@@ -8529,9 +8711,75 @@
8529	8711	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8530	8712	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8531	8713
8532		- return newtex;
	8714	+ return true; // Warning: not used.
8533	8715	}
8534	8716
	8717	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8718	+ {
	8719	+ try
	8720	+ {
	8721	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8722	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8723	+ ImageWriter writer = writers.next();
	8724	+
	8725	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8726	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8727	+ param.setCompressionQuality(quality);
	8728	+
	8729	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8730	+ writer.setOutput(ios);
	8731	+ writer.write(null, new IIOImage(image, null, null), param);
	8732	+
	8733	+ byte[] data = baos.toByteArray();
	8734	+ writer.dispose();
	8735	+ return data;
	8736	+ }
	8737	+ catch (Exception e)
	8738	+ {
	8739	+ e.printStackTrace();
	8740	+ return null;
	8741	+ }
	8742	+ }
	8743	+
	8744	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8745	+ {
	8746	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8747	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8748	+ ImageReader reader = writers.next();
	8749	+
	8750	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8751	+
	8752	+ ImageReadParam param = reader.getDefaultReadParam();
	8753	+ param.setDestination(bim);
	8754	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8755	+
	8756	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8757	+ reader.setInput(ios);
	8758	+ BufferedImage bim2 = reader.read(0, param);
	8759	+ reader.dispose();
	8760	+
	8761	+// WritableRaster raster = bim2.getRaster();
	8762	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8763	+// byte[] bytes = data.getData();
	8764	+//
	8765	+// int[] pixels = new int[bytes.length/3];
	8766	+// for (int i=pixels.length; --i>=0;)
	8767	+// {
	8768	+// int i3 = i*3;
	8769	+// pixels[i] = 0xFF;
	8770	+// pixels[i] <<= 8;
	8771	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8772	+// pixels[i] <<= 8;
	8773	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8774	+// pixels[i] <<= 8;
	8775	+// pixels[i] \|= bytes[i3] & 0xFF;
	8776	+// }
	8777	+//
	8778	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8779	+
	8780	+ return bim;
	8781	+ }
	8782	+
8535	8783	ShadowBuffer shadowPBuf;
8536	8784	AntialiasBuffer antialiasPBuf;
8537	8785	int MAXSTACK;
..	..	@@ -8548,10 +8796,12 @@
8548	8796
8549	8797	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8550	8798	MAXSTACK = temp[0];
8551		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8552	8801	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8553	8802	MAXSTACK = temp[0];
8554		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8803	+ if (Globals.DEBUG)
	8804	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8555	8805
8556	8806	// Use debug pipeline
8557	8807	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8559,7 +8809,8 @@
8559	8809	gl = drawable.getGL(); //
8560	8810
8561	8811	GL gl3 = getGL();
8562		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8812	+ if (Globals.DEBUG)
	8813	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8563	8814
8564	8815
8565	8816	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8724,7 +8975,7 @@
8724	8975
8725	8976	if (cubemap == null)
8726	8977	{
8727		- LoadEnvy(5);
	8978	+ //LoadEnvy(1);
8728	8979	}
8729	8980
8730	8981	//cubemap.enable();
..	..	@@ -9000,6 +9251,8 @@
9000	9251
9001	9252	void LoadEnvy(int which)
9002	9253	{
	9254	+ assert(false);
	9255	+
9003	9256	String name;
9004	9257	String ext;
9005	9258
..	..	@@ -9011,37 +9264,58 @@
9011	9264	cubemap = null;
9012	9265	return;
9013	9266	case 1:
9014		- name = "cubemaps/box_";
9015		- ext = "png";
	9267	+ name = "cubemaps/rgb/";
	9268	+ ext = "jpg";
9016	9269	reverseUP = false;
9017	9270	break;
9018	9271	case 2:
9019		- name = "cubemaps/uffizi_";
9020		- ext = "png";
9021		- break; // reverseUP = true; break;
	9272	+ name = "cubemaps/uffizi/";
	9273	+ ext = "jpg";
	9274	+ reverseUP = false;
	9275	+ break;
9022	9276	case 3:
9023		- name = "cubemaps/CloudyHills_";
9024		- ext = "tga";
	9277	+ name = "cubemaps/CloudyHills/";
	9278	+ ext = "jpg";
9025	9279	reverseUP = false;
9026	9280	break;
9027	9281	case 4:
9028		- name = "cubemaps/cornell_";
	9282	+ name = "cubemaps/cornell/";
9029	9283	ext = "png";
9030	9284	reverseUP = false;
9031	9285	break;
	9286	+ case 5:
	9287	+ name = "cubemaps/skycube/";
	9288	+ ext = "jpg";
	9289	+ reverseUP = false;
	9290	+ break;
	9291	+ case 6:
	9292	+ name = "cubemaps/SaintLazarusChurch3/";
	9293	+ ext = "jpg";
	9294	+ reverseUP = false;
	9295	+ break;
	9296	+ case 7:
	9297	+ name = "cubemaps/Sodermalmsallen/";
	9298	+ ext = "jpg";
	9299	+ reverseUP = false;
	9300	+ break;
	9301	+ case 8:
	9302	+ name = "cubemaps/Sodermalmsallen2/";
	9303	+ ext = "jpg";
	9304	+ reverseUP = false;
	9305	+ break;
	9306	+ case 9:
	9307	+ name = "cubemaps/UnionSquare/";
	9308	+ ext = "jpg";
	9309	+ reverseUP = false;
	9310	+ break;
9032	9311	default:
9033		- name = "cubemaps/rgb_";
9034		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9312	+ name = "cubemaps/box/";
	9313	+ ext = "png"; /mipmap = true;/
	9314	+ reverseUP = false;
9035	9315	break;
9036	9316	}
9037		-
9038		- try
9039		- {
9040		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9041		- } catch (IOException e)
9042		- {
9043		- throw new RuntimeException(e);
9044		- }
	9317	+
	9318	+ LoadSkybox(name, ext, mipmap);
9045	9319	}
9046	9320
9047	9321	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -9073,8 +9347,12 @@
9073	9347	static double[] model = new double[16];
9074	9348	double[] camera2light = new double[16];
9075	9349	double[] light2camera = new double[16];
9076		- int newenvy = -1;
9077		- boolean envyoff = true; // false;
	9350	+
	9351	+ //int newenvy = -1;
	9352	+ //boolean envyoff = false;
	9353	+
	9354	+ String loadedskyboxname;
	9355	+
9078	9356	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9079	9357	//float[] light0 = { 0,0,0 };
9080	9358	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9367,11 +9645,35 @@
9367	9645	jy8[3] = 0.5f;
9368	9646	}
9369	9647
9370		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9648	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9371	9649	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9372	9650	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9373	9651	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9374	9652
	9653	+ void ResetOptions()
	9654	+ {
	9655	+ options1[0] = 100;
	9656	+ options1[1] = 0.025f;
	9657	+ options1[2] = 0.01f;
	9658	+ options1[3] = 0;
	9659	+ options1[4] = 0;
	9660	+
	9661	+ options2[0] = 0;
	9662	+ options2[1] = 0.75f;
	9663	+ options2[2] = 0;
	9664	+ options2[3] = 0;
	9665	+
	9666	+ options3[0] = 1;
	9667	+ options3[1] = 1;
	9668	+ options3[2] = 1;
	9669	+ options3[3] = 0;
	9670	+
	9671	+ options4[0] = 1;
	9672	+ options4[1] = 0;
	9673	+ options4[2] = 1;
	9674	+ options4[3] = 0;
	9675	+ }
	9676	+
9375	9677	static int imagecount = 0; // movie generation
9376	9678
9377	9679	static int jitter = 0;
..	..	@@ -9468,7 +9770,7 @@
9468	9770
9469	9771	if (renderCamera != lightCamera)
9470	9772	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9471		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9773	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9472	9774
9473	9775	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9474	9776
..	..	@@ -9484,7 +9786,7 @@
9484	9786
9485	9787	if (renderCamera != lightCamera)
9486	9788	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9487		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9789	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9488	9790
9489	9791	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9490	9792
..	..	@@ -9530,10 +9832,12 @@
9530	9832	rati = 1 / rati;
9531	9833	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9532	9834	}
9533		- assert (newenvy == -1);
	9835	+
	9836	+ //assert (newenvy == -1);
	9837	+
9534	9838	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9535	9839	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9536		- DrawSkyBox(gl);
	9840	+ DrawSkyBox(gl, (float)rati);
9537	9841	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9538	9842	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9539	9843	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -10399,9 +10703,18 @@
10399	10703	static boolean init = false;
10400	10704
10401	10705	double[][] matrix = LA.newMatrix();
	10706	+
	10707	+ // This is to refresh the UI of the material panel.
	10708	+ ObjEditor patchMaterial;
10402	10709
10403	10710	public void display(GLAutoDrawable drawable)
10404	10711	{
	10712	+ if (patchMaterial.patchMaterial)
	10713	+ {
	10714	+ patchMaterial.patchMaterial = false;
	10715	+ patchMaterial.objectPanel.setSelectedIndex(1);
	10716	+ }
	10717	+
10405	10718	if (Grafreed.savesound && Grafreed.hassound)
10406	10719	{
10407	10720	Grafreed.wav.save();
..	..	@@ -10482,6 +10795,7 @@
10482	10795	ANTIALIAS = 0;
10483	10796	//System.out.println("RESTART");
10484	10797	AAtimer.restart();
	10798	+ Globals.TIMERRUNNING = true;
10485	10799	}
10486	10800	}
10487	10801	}
..	..	@@ -10549,7 +10863,8 @@
10549	10863	ambientOcclusion = false;
10550	10864	}
10551	10865
10552		- if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
	10866	+ if (//Globals.lighttouched &&
	10867	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10553	10868	{
10554	10869	//if (RENDERSHADOW) // ?
10555	10870	if (!IsFrozen())
..	..	@@ -10568,7 +10883,7 @@
10568	10883
10569	10884	if (wait)
10570	10885	{
10571		- Sleep(500);
	10886	+ Sleep(200); // blocks everything
10572	10887
10573	10888	wait = false;
10574	10889	}
..	..	@@ -10683,7 +10998,7 @@
10683	10998	// if (parentcam != renderCamera) // not a light
10684	10999	if (cam != lightCamera)
10685	11000	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10686		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	11001	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10687	11002
10688	11003	for (int j = 0; j < 4; j++)
10689	11004	{
..	..	@@ -10698,7 +11013,7 @@
10698	11013	// if (parentcam != renderCamera) // not a light
10699	11014	if (cam != lightCamera)
10700	11015	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10701		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	11016	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10702	11017
10703	11018	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10704	11019
..	..	@@ -10784,13 +11099,43 @@
10784	11099	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10785	11100	}
10786	11101
10787		- if (newenvy > -1)
	11102	+// if (newenvy > -1)
	11103	+// {
	11104	+// LoadEnvy(newenvy);
	11105	+// }
	11106	+//
	11107	+// newenvy = -1;
	11108	+
	11109	+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
10788	11110	{
10789		- LoadEnvy(newenvy);
	11111	+ if (cubemaprgb == null)
	11112	+ {
	11113	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11114	+ }
	11115	+
	11116	+ cubemap = cubemaprgb;
10790	11117	}
10791		-
10792		- newenvy = -1;
10793		-
	11118	+ else
	11119	+ {
	11120	+ if (object.skyboxname != null)
	11121	+ {
	11122	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11123	+ {
	11124	+ if (cubemap != null && cubemap != cubemaprgb)
	11125	+ cubemap.dispose();
	11126	+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11127	+ loadedskyboxname = object.skyboxname;
	11128	+ }
	11129	+ }
	11130	+ else
	11131	+ {
	11132	+ cubemapcustom = null;
	11133	+ loadedskyboxname = null;
	11134	+ }
	11135	+
	11136	+ cubemap = cubemapcustom;
	11137	+ }
	11138	+
10794	11139	ratio = ((double) getWidth()) / getHeight();
10795	11140	//System.out.println("ratio = " + ratio);
10796	11141
..	..	@@ -10806,7 +11151,7 @@
10806	11151
10807	11152	if (!IsFrozen() && !ambientOcclusion)
10808	11153	{
10809		- DrawSkyBox(gl);
	11154	+ DrawSkyBox(gl, (float)ratio);
10810	11155	}
10811	11156
10812	11157	//if (selection_view == -1)
..	..	@@ -10989,9 +11334,9 @@
10989	11334
10990	11335	gl.glMatrixMode(GL.GL_MODELVIEW);
10991	11336
10992		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10993		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10994		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11337	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11338	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11339	+gl.glEnable(gl.GL_MULTISAMPLE);
10995	11340	} else
10996	11341	{
10997	11342	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -11002,7 +11347,7 @@
11002	11347	//System.out.println("BLENDING ON");
11003	11348	gl.glEnable(GL.GL_BLEND);
11004	11349	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
11005		-
	11350	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
11006	11351	gl.glMatrixMode(gl.GL_PROJECTION);
11007	11352	gl.glLoadIdentity();
11008	11353
..	..	@@ -11092,7 +11437,7 @@
11092	11437
11093	11438	// if (cam != lightCamera)
11094	11439	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11095		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11440	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11096	11441	}
11097	11442
11098	11443	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -11251,7 +11596,7 @@
11251	11596	}
11252	11597	}
11253	11598
11254		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11599	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11255	11600	{
11256	11601	//gl.glDepthFunc(GL.GL_LEQUAL);
11257	11602	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11259,24 +11604,21 @@
11259	11604
11260	11605	boolean texon = textureon;
11261	11606
11262		- if (RENDERPROGRAM > 0)
11263		- {
11264		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11265		- textureon = false;
11266		- }
	11607	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11608	+ textureon = false;
	11609	+
11267	11610	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11268	11611	//System.out.println("ALLO");
11269	11612	gl.glColorMask(false, false, false, false);
11270	11613	DrawObject(gl);
11271		- if (RENDERPROGRAM > 0)
11272		- {
11273		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11274		- textureon = texon;
11275		- }
	11614	+
	11615	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11616	+ textureon = texon;
	11617	+
11276	11618	gl.glColorMask(true, true, true, true);
11277	11619
11278	11620	gl.glDepthFunc(GL.GL_EQUAL);
11279		- //gl.glDepthMask(false);
	11621	+ gl.glDepthMask(false);
11280	11622	}
11281	11623
11282	11624	if (false) // DrawMode() == SHADOW)
..	..	@@ -11459,15 +11801,36 @@
11459	11801
11460	11802	static boolean zoomonce = false;
11461	11803
	11804	+ static void CreateSelectedPoint()
	11805	+ {
	11806	+ if (selectedpoint == null)
	11807	+ {
	11808	+ debugpointG = new Sphere();
	11809	+ debugpointP = new Sphere();
	11810	+ debugpointC = new Sphere();
	11811	+ debugpointR = new Sphere();
	11812	+
	11813	+ selectedpoint = new Superellipsoid();
	11814	+
	11815	+ for (int i=0; i<8; i++)
	11816	+ {
	11817	+ debugpoints[i] = new Sphere();
	11818	+ }
	11819	+ }
	11820	+ }
	11821	+
11462	11822	void DrawObject(GL gl, boolean draw)
11463	11823	{
	11824	+ // To clear camera values
	11825	+ ResetOptions();
	11826	+
11464	11827	//System.out.println("DRAW OBJECT " + mouseDown);
11465	11828	// DrawMode() = SELECTION;
11466	11829	//GL gl = getGL();
11467	11830	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11468	11831	{
11469	11832	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11470		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11833	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11471	11834	pingthread.StepToTarget(true); // true);
11472	11835	// zoomonce = false;
11473	11836	}
..	..	@@ -11539,8 +11902,9 @@
11539	11902
11540	11903	if (DrawMode() == DEFAULT)
11541	11904	{
11542		- if (DEBUG)
	11905	+ if (Globals.DEBUG)
11543	11906	{
	11907	+ CreateSelectedPoint();
11544	11908	float radius = 0.05f;
11545	11909	if (selectedpoint.radius != radius)
11546	11910	{
..	..	@@ -11594,20 +11958,32 @@
11594	11958	ReleaseTextures(DEFAULT_TEXTURES);
11595	11959
11596	11960	if (CLEANCACHE)
11597		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11961	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11598	11962	{
11599		- String tex = e.nextElement();
	11963	+ cTexture tex = e.nextElement();
11600	11964
11601	11965	// System.out.println("Texture --------- " + tex);
11602	11966
11603		- if (tex.equals("WHITE_NOISE"))
	11967	+ if (tex.equals("WHITE_NOISE:"))
11604	11968	continue;
11605	11969
11606		- if (!usedtextures.containsKey(tex))
	11970	+ if (!usedtextures.contains(tex))
11607	11971	{
	11972	+ CacheTexture gettex = texturepigment.get(tex);
11608	11973	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11609		- textures.get(tex).texture.dispose();
11610		- textures.remove(tex);
	11974	+ if (gettex != null)
	11975	+ {
	11976	+ gettex.texture.dispose();
	11977	+ texturepigment.remove(tex);
	11978	+ }
	11979	+
	11980	+ gettex = texturebump.get(tex);
	11981	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11982	+ if (gettex != null)
	11983	+ {
	11984	+ gettex.texture.dispose();
	11985	+ texturebump.remove(tex);
	11986	+ }
11611	11987	}
11612	11988	}
11613	11989	}
..	..	@@ -12027,7 +12403,7 @@
12027	12403	for (int i = tp.size(); --i >= 0;)
12028	12404	{
12029	12405	//for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12030		- LA.xformPos(light, tp.get(i).GlobalTransform(), light);
	12406	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
12031	12407	}
12032	12408
12033	12409
..	..	@@ -12135,8 +12511,76 @@
12135	12511
12136	12512	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12137	12513
12138		- String program =
	12514	+ String programmin =
	12515	+ // Min shader
12139	12516	"!!ARBfp1.0\n" +
	12517	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12518	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12519	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12520	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12521	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12522	+ "PARAM light2cam0 = program.env[10];" +
	12523	+ "PARAM light2cam1 = program.env[11];" +
	12524	+ "PARAM light2cam2 = program.env[12];" +
	12525	+ "TEMP temp;" +
	12526	+ "TEMP light;" +
	12527	+ "TEMP ndotl;" +
	12528	+ "TEMP normal;" +
	12529	+ "TEMP depth;" +
	12530	+ "TEMP eye;" +
	12531	+ "TEMP pos;" +
	12532	+
	12533	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12534	+ Normalize("normal") +
	12535	+ "MOV light, state.light[0].position;" +
	12536	+ "DP3 ndotl.x, light, normal;" +
	12537	+
	12538	+ // shadow
	12539	+ "MOV pos, fragment.texcoord[1];" +
	12540	+ "MOV temp, pos;" +
	12541	+ ShadowTextureFetch("depth", "temp", "1") +
	12542	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12543	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12544	+
	12545	+ // No shadow when out of frustum
	12546	+ //"SGE temp.y, depth.z, zero123.y;" +
	12547	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12548	+
	12549	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12550	+
	12551	+ // Backlit
	12552	+ "MOV pos.w, zero123.y;" +
	12553	+ "DP4 eye.x, pos, light2cam0;" +
	12554	+ "DP4 eye.y, pos, light2cam1;" +
	12555	+ "DP4 eye.z, pos, light2cam2;" +
	12556	+ Normalize("eye") +
	12557	+
	12558	+ "DP3 ndotl.y, -eye, normal;" +
	12559	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12560	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12561	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12562	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12563	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12564	+
	12565	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12566	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12567	+
	12568	+ // Pigment
	12569	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12570	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12571	+ "MUL temp, temp, ndotl.x;" +
	12572	+
	12573	+ "MUL temp, temp, zero123.z;" +
	12574	+
	12575	+ //"MUL temp, temp, ndotl.y;" +
	12576	+
	12577	+ "MOV temp.w, zero123.y;" + // reset alpha
	12578	+ "MOV result.color, temp;" +
	12579	+ "END";
	12580	+
	12581	+ String programmax =
	12582	+ "!!ARBfp1.0\n" +
	12583	+
12140	12584	//"OPTION ARB_fragment_program_shadow;" +
12141	12585	"PARAM light2cam0 = program.env[10];" +
12142	12586	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12162,7 +12606,7 @@
12162	12606	"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
12163	12607	"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
12164	12608	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12165		- "PARAM params7 = program.env[7];" + // noise power, opacity power
	12609	+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
12166	12610	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
12167	12611	"PARAM options1 = program.env[62];" + // fog rgb color
12168	12612	"PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
..	..	@@ -12251,8 +12695,7 @@
12251	12695	"TEMP shininess;" +
12252	12696	"\n" +
12253	12697	"MOV texSamp, one;" +
12254		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12255		-
	12698	+
12256	12699	"MOV mapgrid.x, one2048th.x;" +
12257	12700	"MOV temp, fragment.texcoord[1];" +
12258	12701	/*
..	..	@@ -12273,20 +12716,20 @@
12273	12716	"MUL temp, floor, mapgrid.x;" +
12274	12717	//"TEX depth0, temp, texture[1], 2D;" +
12275	12718	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12276		- TextureFetch("depth0", "temp", "1") +
	12719	+ ShadowTextureFetch("depth0", "temp", "1") +
12277	12720	"") +
12278	12721	"ADD temp.x, temp.x, mapgrid.x;" +
12279	12722	//"TEX depth1, temp, texture[1], 2D;" +
12280	12723	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12281		- TextureFetch("depth1", "temp", "1") +
	12724	+ ShadowTextureFetch("depth1", "temp", "1") +
12282	12725	"") +
12283	12726	"ADD temp.y, temp.y, mapgrid.x;" +
12284	12727	//"TEX depth2, temp, texture[1], 2D;" +
12285		- TextureFetch("depth2", "temp", "1") +
	12728	+ ShadowTextureFetch("depth2", "temp", "1") +
12286	12729	"SUB temp.x, temp.x, mapgrid.x;" +
12287	12730	//"TEX depth3, temp, texture[1], 2D;" +
12288	12731	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12289		- TextureFetch("depth3", "temp", "1") +
	12732	+ ShadowTextureFetch("depth3", "temp", "1") +
12290	12733	"") +
12291	12734	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12292	12735	//"MOV params, material;" +
..	..	@@ -12408,7 +12851,7 @@
12408	12851	"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
12409	12852	// mar 2013 ??? "KIL alpha.a;" +
12410	12853	"MOV alpha, texSamp.aaaa;" + // y;" +
12411		- "KIL alpha.a;" +
	12854	+ "KIL alpha.a;" + // not sure with parallax mapping
12412	12855	/*
12413	12856	"MUL temp.xy, temp, two;" +
12414	12857	"TXB bump, temp, texture[0], 2D;" +
..	..	@@ -12494,11 +12937,6 @@
12494	12937	"SUB bump0, bump0, half;" +
12495	12938	"ADD bump, bump, bump0;" +
12496	12939
12497		- "MOV temp.x, texSamp.a;" +
12498		- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12499		- //"LRP texSamp0, params5.x, texSamp0, one;" +
12500		- "MOV texSamp.a, temp.x;" +
12501		-
12502	12940	// double-sided
12503	12941	/**/
12504	12942	(doublesided?"DP3 temp.z, normal, eye;" +
..	..	@@ -12515,19 +12953,62 @@
12515	12953	"MOV normald, normal;" +
12516	12954	"MOV normals, normal;" +
12517	12955
	12956	+ "MOV temp, fragment.texcoord[4];" +
	12957	+
12518	12958	// UV base
12519	12959	//"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
12520	12960	//"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
12521	12961	//"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12522		- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12523		- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12524		- "DP3 UP.z,state.matrix.texture[7].row[2],Y;" +
	12962	+ "DP3 UP.x,state.matrix.texture[7].row[0],temp;" +
	12963	+ "DP3 UP.y,state.matrix.texture[7].row[1],temp;" +
	12964	+ "DP3 UP.z,state.matrix.texture[7].row[2],temp;" +
	12965	+ Normalize("UP") +
	12966	+
12525	12967	"XPD V, normal, UP;" +
12526	12968	Normalize("V") +
12527	12969	"XPD U, V, normal;" +
12528	12970	Normalize("U") +
12529	12971
12530	12972	// parallax mapping
	12973	+
	12974	+ "DP3 temp2.x, V, eye;" +
	12975	+ "DP3 temp2.y, U, eye;" +
	12976	+ "DP3 temp2.z, normal, eye;" +
	12977	+ "RCP temp2.z, temp2.z;" +
	12978	+
	12979	+ "DP3 temp2.w, texSamp, texSamp;" + // Height
	12980	+ "RSQ temp2.w, temp2.w;" +
	12981	+ "RCP temp2.w, temp2.w;" +
	12982	+
	12983	+ "SUB temp2.w, temp2.w, half;" +
	12984	+// "SGE temp.x, temp2.w, eps.x;" +
	12985	+// "MUL temp2.w, temp2.w, temp.x;" +
	12986	+
	12987	+ //"MOV texSamp, U;" +
	12988	+
	12989	+ "MUL temp2.z, temp2.z, temp2.w;" +
	12990	+ "MUL temp2.z, temp2.z, params7.z;" + // parallax
	12991	+
	12992	+ "MUL temp2, temp2, temp2.z;" +
	12993	+
	12994	+ "MOV temp, fragment.texcoord[0];" +
	12995	+
	12996	+ "SUB temp, temp, temp2;" +
	12997	+
	12998	+ "TEX temp, temp, texture[0], 2D;" +
	12999	+ "POW temp.a, temp.a, params6.w;" + // punch through
	13000	+
	13001	+ "ADD texSamp, temp, texSamp;" +
	13002	+ "MUL texSamp.xyz, half, texSamp;" +
	13003	+
	13004	+ "MOV alpha, texSamp.aaaa;" +
	13005	+
	13006	+// parallax mapping
	13007	+
	13008	+ "MOV temp.x, texSamp.a;" +
	13009	+ "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
	13010	+ //"LRP texSamp0, params5.x, texSamp0, one;" +
	13011	+ "MOV texSamp.a, temp.x;" +
12531	13012
12532	13013	//"MOV temp, fragment.texcoord[0];" +
12533	13014	//
..	..	@@ -12657,10 +13138,10 @@
12657	13138	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12658	13139	"") +
12659	13140
12660		- // display shadow only (bump == 0)
	13141	+ // display shadow only (fakedepth == 0)
12661	13142	"SUB temp.x, half.x, shadow.x;" +
12662	13143	"MOV temp.y, -params5.z;" + // params6.x;" +
12663		- "SLT temp.z, temp.y, -one2048th.x;" +
	13144	+ "SLT temp.z, temp.y, -c256i.x;" +
12664	13145	"SUB temp.y, one.x, temp.z;" +
12665	13146	"MUL temp.x, temp.x, temp.y;" +
12666	13147	"KIL temp.x;" +
..	..	@@ -12991,8 +13472,19 @@
12991	13472	//once = true;
12992	13473	}
12993	13474
12994		- System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12995		- System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13475	+ String program = programmax;
	13476	+
	13477	+ if (Globals.MINSHADER)
	13478	+ {
	13479	+ program = programmin;
	13480	+ }
	13481	+
	13482	+ if (Globals.DEBUG)
	13483	+ {
	13484	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
	13485	+ System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13486	+ }
	13487	+
12996	13488	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12997	13489
12998	13490	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13039,7 +13531,8 @@
13039	13531	"\n" +
13040	13532	"END\n";
13041	13533
13042		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13534	+ if (Globals.DEBUG)
	13535	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13043	13536	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13044	13537
13045	13538	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13084,25 +13577,26 @@
13084	13577	return out;
13085	13578	}
13086	13579
13087		- String TextureFetch(String dest, String src, String unit)
	13580	+ // Also does frustum culling
	13581	+ String ShadowTextureFetch(String dest, String src, String unit)
13088	13582	{
13089	13583	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13090	13584	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13091	13585	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13586	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13587	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13092	13588	"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;" +
	13589	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13590	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13097	13591	//"SWZ buffer, temp, w,w,w,w;";
13098		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13592	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13099	13593	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13100	13594	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13101	13595	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13102		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13596	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13103	13597
13104		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13105		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13598	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13599	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13106	13600	}
13107	13601
13108	13602	String Shadow(String depth, String shadow)
..	..	@@ -13149,7 +13643,7 @@
13149	13643	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13150	13644	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13151	13645
13152		- // No shadow when out of frustrum
	13646	+ // No shadow when out of frustum
13153	13647	"SGE temp.x, " + depth + ".z, one.z;" +
13154	13648	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13155	13649	"";
..	..	@@ -13296,8 +13790,9 @@
13296	13790	/static/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
13297	13791	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13298	13792	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13299		- /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13300		- Object3D.cVector2[] vector2buffer;
	13793	+ /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
	13794	+
	13795	+ //Object3D.cVector2[] vector2buffer;
13301	13796
13302	13797	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13303	13798	// OUT : diff, spec
..	..	@@ -13313,9 +13808,10 @@
13313	13808	"DP3 " + dest + ".z," + "normals," + "eye;" +
13314	13809	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13315	13810	//"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;" +
	13811	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13812	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13813	+
	13814	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13319	13815	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13320	13816	"RCP " + dest + ".w," + dest + ".w;" +
13321	13817	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13461,7 +13957,7 @@
13461	13957	"PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
13462	13958	"PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
13463	13959	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13464		- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
	13960	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
13465	13961	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
13466	13962	"PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
13467	13963	//"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
..	..	@@ -13522,7 +14018,7 @@
13522	14018	"DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
13523	14019	"DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
13524	14020	"DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13525		- //"MOV result.texcoord, vertex.texcoord;" +
	14021	+ //"MOV result.texcoord, vertex.fogcoord;" +
13526	14022	"MOV result.texcoord, temp;" +
13527	14023	// border fade
13528	14024	"MOV result.texcoord[3], vertex.texcoord;" +
..	..	@@ -13569,7 +14065,9 @@
13569	14065
13570	14066	//"ADD temp.z, temp.z, one;" +
13571	14067
13572		- "MOV result.color, temp;"
	14068	+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
	14069	+
	14070	+ "MOV result.color, temp;" // Normal
13573	14071	: "MOV result.color, vertex.color;") +
13574	14072	((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
13575	14073	: "") +
..	..	@@ -13820,6 +14318,7 @@
13820	14318	else
13821	14319	if (evt.getSource() == AAtimer)
13822	14320	{
	14321	+ Globals.TIMERRUNNING = false;
13823	14322	if (mouseDown)
13824	14323	{
13825	14324	//new Exception().printStackTrace();
..	..	@@ -13879,7 +14378,7 @@
13879	14378
13880	14379	// fev 2014???
13881	14380	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13882		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14381	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13883	14382	pingthread.StepToTarget(true); // true);
13884	14383	}
13885	14384	// if (!LIVE)
..	..	@@ -13894,6 +14393,7 @@
13894	14393	return;
13895	14394
13896	14395	AAtimer.restart(); //
	14396	+ Globals.TIMERRUNNING = true;
13897	14397
13898	14398	// waslive = LIVE;
13899	14399	// LIVE = false;
..	..	@@ -13943,14 +14443,15 @@
13943	14443	drag = false;
13944	14444	//System.out.println("Mouse DOWN");
13945	14445	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);
	14446	+ //ClickInfo info = new ClickInfo();
	14447	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14448	+ object.clickInfo.pane = this;
	14449	+ object.clickInfo.camera = renderCamera;
	14450	+ object.clickInfo.x = x;
	14451	+ object.clickInfo.y = y;
	14452	+ object.clickInfo.modifiers = modifiersex;
	14453	+ editObj = object.doEditClick(//info,
	14454	+ 0);
13954	14455	if (!editObj)
13955	14456	{
13956	14457	hasMarquee = true;
..	..	@@ -14232,12 +14733,18 @@
14232	14733	void GoDown(int mod)
14233	14734	{
14234	14735	MODIFIERS \|= COMMAND;
14235		- /*
	14736	+ boolean isVR = (mouseMode&VR)!=0;
	14737	+ /**/
14236	14738	if((mod&SHIFT) == SHIFT)
14237		- manipCamera.RotatePosition(0, -speed);
	14739	+ {
	14740	+ if (isVR)
	14741	+ manipCamera.RotateInterest(0, -speed);
	14742	+ else
	14743	+ manipCamera.RotatePosition(0, -speed);
	14744	+ }
14238	14745	else
14239		- manipCamera.BackForth(0, -speed*delta, getWidth());
14240		- */
	14746	+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
	14747	+ /**/
14241	14748	if ((mod & SHIFT) == SHIFT)
14242	14749	{
14243	14750	mouseMode = mouseMode; // VR??
..	..	@@ -14246,6 +14753,8 @@
14246	14753	mouseMode \|= BACKFORTH;
14247	14754	}
14248	14755
	14756	+ targetLookAt.set(manipCamera.lookAt);
	14757	+
14249	14758	//prevX = X = anchorX;
14250	14759	prevY = Y = anchorY - (int) (renderCamera.Distance());
14251	14760	}
..	..	@@ -14253,12 +14762,19 @@
14253	14762	void GoUp(int mod)
14254	14763	{
14255	14764	MODIFIERS \|= COMMAND;
14256		- /*
	14765	+ /**/
	14766	+ boolean isVR = (mouseMode&VR)!=0;
	14767	+
14257	14768	if((mod&SHIFT) == SHIFT)
14258		- manipCamera.RotatePosition(0, speed);
	14769	+ {
	14770	+ if (isVR)
	14771	+ manipCamera.RotateInterest(0, speed);
	14772	+ else
	14773	+ manipCamera.RotatePosition(0, speed);
	14774	+ }
14259	14775	else
14260		- manipCamera.BackForth(0, speed*delta, getWidth());
14261		- */
	14776	+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
	14777	+ /**/
14262	14778	if ((mod & SHIFT) == SHIFT)
14263	14779	{
14264	14780	mouseMode = mouseMode;
..	..	@@ -14267,6 +14783,8 @@
14267	14783	mouseMode \|= BACKFORTH;
14268	14784	}
14269	14785
	14786	+ targetLookAt.set(manipCamera.lookAt);
	14787	+
14270	14788	//prevX = X = anchorX;
14271	14789	prevY = Y = anchorY + (int) (renderCamera.Distance());
14272	14790	}
..	..	@@ -14274,12 +14792,17 @@
14274	14792	void GoLeft(int mod)
14275	14793	{
14276	14794	MODIFIERS \|= COMMAND;
14277		- /*
	14795	+ /**/
14278	14796	if((mod&SHIFT) == SHIFT)
14279		- manipCamera.RotatePosition(speed, 0);
	14797	+ manipCamera.Translate(speed*delta, 0, getWidth());
14280	14798	else
14281		- manipCamera.Translate(speed*delta, 0, getWidth());
14282		- */
	14799	+ {
	14800	+ if ((mouseMode&VR)!=0)
	14801	+ manipCamera.RotateInterest(-speed, 0);
	14802	+ else
	14803	+ manipCamera.RotatePosition(speed, 0);
	14804	+ }
	14805	+ /**/
14283	14806	if ((mod & SHIFT) == SHIFT)
14284	14807	{
14285	14808	mouseMode = mouseMode;
..	..	@@ -14288,6 +14811,8 @@
14288	14811	mouseMode \|= ROTATE;
14289	14812	} // TRANSLATE;
14290	14813
	14814	+ targetLookAt.set(manipCamera.lookAt);
	14815	+
14291	14816	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
14292	14817	prevY = Y = anchorY;
14293	14818	}
..	..	@@ -14295,12 +14820,18 @@
14295	14820	void GoRight(int mod)
14296	14821	{
14297	14822	MODIFIERS \|= COMMAND;
14298		- /*
	14823	+ /**/
14299	14824	if((mod&SHIFT) == SHIFT)
14300		- manipCamera.RotatePosition(-speed, 0);
	14825	+ manipCamera.Translate(-speed*delta, 0, getWidth());
14301	14826	else
14302		- manipCamera.Translate(-speed*delta, 0, getWidth());
14303		- */
	14827	+ {
	14828	+ if ((mouseMode&VR)!=0)
	14829	+ manipCamera.RotateInterest(speed, 0);
	14830	+ else
	14831	+ manipCamera.RotatePosition(-speed, 0);
	14832	+ }
	14833	+
	14834	+ /**/
14304	14835	if ((mod & SHIFT) == SHIFT)
14305	14836	{
14306	14837	mouseMode = mouseMode;
..	..	@@ -14309,6 +14840,8 @@
14309	14840	mouseMode \|= ROTATE;
14310	14841	} // TRANSLATE;
14311	14842
	14843	+ targetLookAt.set(manipCamera.lookAt);
	14844	+
14312	14845	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
14313	14846	prevY = Y = anchorY;
14314	14847	}
..	..	@@ -14350,14 +14883,16 @@
14350	14883	if (editObj)
14351	14884	{
14352	14885	drag = true;
14353		- ClickInfo info = new ClickInfo();
14354		- info.bounds.setBounds(0, 0,
	14886	+ //ClickInfo info = new ClickInfo();
	14887	+ object.clickInfo.bounds.setBounds(0, 0,
14355	14888	(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);
	14889	+ object.clickInfo.pane = this;
	14890	+ object.clickInfo.camera = renderCamera;
	14891	+ object.clickInfo.x = x;
	14892	+ object.clickInfo.y = y;
	14893	+ object //.GetWindow().copy
	14894	+ .doEditDrag(//info,
	14895	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14361	14896	} else
14362	14897	{
14363	14898	if (x < startX)
..	..	@@ -14506,22 +15041,27 @@
14506	15041	}
14507	15042	}
14508	15043
	15044	+// ClickInfo clickInfo = new ClickInfo();
	15045	+
14509	15046	public void mouseMoved(MouseEvent e)
14510	15047	{
14511	15048	//System.out.println("mouseMoved: " + e);
14512	15049	if (isRenderer)
14513	15050	return;
14514	15051
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;
	15052	+ // Mouse cursor feedback
	15053	+ object.clickInfo.x = e.getX();
	15054	+ object.clickInfo.y = e.getY();
	15055	+ object.clickInfo.modifiers = e.getModifiersEx();
	15056	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	15057	+ object.clickInfo.pane = this;
	15058	+ object.clickInfo.camera = renderCamera;
14522	15059	if (!isRenderer)
14523	15060	{
14524		- if (object.editWindow.copy.doEditClick(ci, 0))
	15061	+ //ObjEditor editWindow = object.editWindow;
	15062	+ //Object3D copy = editWindow.copy;
	15063	+ if (object.doEditClick(//clickInfo,
	15064	+ 0))
14525	15065	{
14526	15066	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14527	15067	} else
..	..	@@ -14536,7 +15076,8 @@
14536	15076	Globals.MOUSEDRAGGED = false;
14537	15077
14538	15078	movingcamera = false;
14539		- X = Y = 0;
	15079	+ X = 0; // getBounds().width/2;
	15080	+ Y = 0; // getBounds().height/2;
14540	15081	//System.out.println("mouseReleased: " + e);
14541	15082	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14542	15083	}
..	..	@@ -14792,7 +15333,8 @@
14792	15333	// break;
14793	15334	case 'T':
14794	15335	CACHETEXTURE ^= true;
14795		- textures.clear();
	15336	+ texturepigment.clear();
	15337	+ texturebump.clear();
14796	15338	// repaint();
14797	15339	break;
14798	15340	case 'Y':
..	..	@@ -14802,8 +15344,8 @@
14802	15344	case 'K':
14803	15345	KOMPACTTEXTURE ^= true;
14804	15346	//textures.clear();
14805		- break;
14806		- case 'P': // Texture Projection macros
	15347	+ // break;
	15348	+ //case 'P': // Texture Projection macros
14807	15349	// SAVETEXTURE ^= true;
14808	15350	macromode = true;
14809	15351	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -14877,7 +15419,9 @@
14877	15419	case 'E' : COMPACT ^= true;
14878	15420	repaint();
14879	15421	break;
14880		- case 'W' : DEBUGHSB ^= true;
	15422	+ case 'W' : // Wide Window (fullscreen)
	15423	+ //DEBUGHSB ^= true;
	15424	+ ObjEditor.theFrame.ToggleFullScreen();
14881	15425	repaint();
14882	15426	break;
14883	15427	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14902,8 +15446,8 @@
14902	15446	RevertCamera();
14903	15447	repaint();
14904	15448	break;
14905		- case 'L':
14906	15449	case 'l':
	15450	+ //case 'L':
14907	15451	if (lightMode)
14908	15452	{
14909	15453	lightMode = false;
..	..	@@ -14922,7 +15466,7 @@
14922	15466	targetLookAt.set(manipCamera.lookAt);
14923	15467	repaint();
14924	15468	break;
14925		- case 'p':
	15469	+ case 'P': // p':
14926	15470	// c'est quoi ca au juste? spherical ^= true;
14927	15471	Skinshader ^= true; programInitialized = false;
14928	15472	repaint();
..	..	@@ -14967,20 +15511,24 @@
14967	15511	OCCLUSION_CULLING ^= true;
14968	15512	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14969	15513	break;
14970		- case '0': envyoff ^= true; repaint(); break;
	15514	+ //case '0': envyoff ^= true; repaint(); break;
14971	15515	case '1':
14972	15516	case '2':
14973	15517	case '3':
14974	15518	case '4':
14975	15519	case '5':
14976		- newenvy = Character.getNumericValue(key);
14977		- repaint();
14978		- break;
14979	15520	case '6':
14980	15521	case '7':
14981	15522	case '8':
14982	15523	case '9':
14983		- BGcolor = (key - '6')/3.f;
	15524	+ if (true) // envyoff)
	15525	+ {
	15526	+ BGcolor = (key - '1')/8.f;
	15527	+ }
	15528	+ else
	15529	+ {
	15530	+ //newenvy = Character.getNumericValue(key);
	15531	+ }
14984	15532	repaint();
14985	15533	break;
14986	15534	case '!':
..	..	@@ -15046,9 +15594,9 @@
15046	15594	case '_':
15047	15595	kompactbit = 5;
15048	15596	break;
15049		- case '+':
15050		- kompactbit = 6;
15051		- break;
	15597	+// case '+':
	15598	+// kompactbit = 6;
	15599	+// break;
15052	15600	case ' ':
15053	15601	lightMode ^= true;
15054	15602	Globals.lighttouched = true;
..	..	@@ -15060,6 +15608,7 @@
15060	15608	case ESC:
15061	15609	RENDERPROGRAM += 1;
15062	15610	RENDERPROGRAM %= 3;
	15611	+
15063	15612	repaint();
15064	15613	break;
15065	15614	case 'Z':
..	..	@@ -15099,8 +15648,9 @@
15099	15648	case DELETE:
15100	15649	ClearSelection();
15101	15650	break;
15102		- /*
15103	15651	case '+':
	15652	+
	15653	+ /*
15104	15654	//fontsize += 1;
15105	15655	bbzoom *= 2;
15106	15656	repaint();
..	..	@@ -15117,17 +15667,17 @@
15117	15667	case '=':
15118	15668	IncDepth();
15119	15669	//fontsize += 1;
15120		- object.editWindow.refreshContents(true);
	15670	+ object.GetWindow().refreshContents(true);
15121	15671	maskbit = 6;
15122	15672	break;
15123	15673	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
15124	15674	DecDepth();
15125	15675	maskbit = 5;
15126	15676	//if(fontsize > 1) fontsize -= 1;
15127		- if (object.editWindow == null)
15128		- new Exception().printStackTrace();
15129		- else
15130		- object.editWindow.refreshContents(true);
	15677	+// if (object.editWindow == null)
	15678	+// new Exception().printStackTrace();
	15679	+// else
	15680	+ object.GetWindow().refreshContents(true);
15131	15681	break;
15132	15682	case '{':
15133	15683	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15351,7 +15901,7 @@
15351	15901	}
15352	15902	*/
15353	15903
15354		- object.editWindow.EditSelection();
	15904	+ object.GetWindow().EditSelection(false);
15355	15905	}
15356	15906
15357	15907	void SelectParent()
..	..	@@ -15368,10 +15918,10 @@
15368	15918	{
15369	15919	//selectees.remove(i);
15370	15920	System.out.println("select parent of " + elem);
15371		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15921	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15372	15922	} else
15373	15923	{
15374		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15924	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15375	15925	}
15376	15926
15377	15927	first = false;
..	..	@@ -15413,12 +15963,12 @@
15413	15963	for (int j = 0; j < group.children.size(); j++)
15414	15964	{
15415	15965	elem = (Object3D) group.children.elementAt(j);
15416		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15966	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15417	15967	first = false;
15418	15968	}
15419	15969	} else
15420	15970	{
15421		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15971	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15422	15972	}
15423	15973
15424	15974	first = false;
..	..	@@ -15429,21 +15979,21 @@
15429	15979	{
15430	15980	//Composite group = (Composite) object;
15431	15981	Object3D group = object;
15432		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15982	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15433	15983	}
15434	15984
15435	15985	void ResetTransform(int mask)
15436	15986	{
15437	15987	//Composite group = (Composite) object;
15438	15988	Object3D group = object;
15439		- group.editWindow.ResetTransform(mask);
	15989	+ group.GetWindow().ResetTransform(mask);
15440	15990	}
15441	15991
15442	15992	void FlipTransform()
15443	15993	{
15444	15994	//Composite group = (Composite) object;
15445	15995	Object3D group = object;
15446		- group.editWindow.FlipTransform();
	15996	+ group.GetWindow().FlipTransform();
15447	15997	// group.editWindow.ReduceMesh(true);
15448	15998	}
15449	15999
..	..	@@ -15451,7 +16001,7 @@
15451	16001	{
15452	16002	//Composite group = (Composite) object;
15453	16003	Object3D group = object;
15454		- group.editWindow.PrintMemory();
	16004	+ group.GetWindow().PrintMemory();
15455	16005	// group.editWindow.ReduceMesh(true);
15456	16006	}
15457	16007
..	..	@@ -15459,7 +16009,7 @@
15459	16009	{
15460	16010	//Composite group = (Composite) object;
15461	16011	Object3D group = object;
15462		- group.editWindow.ResetCentroid();
	16012	+ group.GetWindow().ResetCentroid();
15463	16013	}
15464	16014
15465	16015	void IncDepth()
..	..	@@ -15541,8 +16091,6 @@
15541	16091
15542	16092	int width = getBounds().width;
15543	16093	int height = getBounds().height;
15544		- ClickInfo info = new ClickInfo();
15545		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15546	16094	//Image img = CreateImage(width, height);
15547	16095	//System.out.println("width = " + width + "; height = " + height + "\n");
15548	16096
..	..	@@ -15619,48 +16167,77 @@
15619	16167	}
15620	16168	if (object != null && !hasMarquee)
15621	16169	{
	16170	+ if (object.clickInfo == null)
	16171	+ object.clickInfo = new ClickInfo();
	16172	+ ClickInfo info = object.clickInfo;
	16173	+ //ClickInfo info = new ClickInfo();
	16174	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16175	+
15622	16176	if (isRenderer)
15623	16177	{
15624		- info.flags++;
	16178	+ object.clickInfo.flags++;
15625	16179	double frameAspect = (double) width / (double) height;
15626	16180	if (frameAspect > renderCamera.aspect)
15627	16181	{
15628	16182	int desired = (int) ((double) height * renderCamera.aspect);
15629		- info.bounds.width -= width - desired;
15630		- info.bounds.x += (width - desired) / 2;
	16183	+ object.clickInfo.bounds.width -= width - desired;
	16184	+ object.clickInfo.bounds.x += (width - desired) / 2;
15631	16185	} else
15632	16186	{
15633	16187	int desired = (int) ((double) width / renderCamera.aspect);
15634		- info.bounds.height -= height - desired;
15635		- info.bounds.y += (height - desired) / 2;
	16188	+ object.clickInfo.bounds.height -= height - desired;
	16189	+ object.clickInfo.bounds.y += (height - desired) / 2;
15636	16190	}
15637	16191	}
15638		- info.g = gr;
15639		- info.camera = renderCamera;
	16192	+
	16193	+ object.clickInfo.g = gr;
	16194	+ object.clickInfo.camera = renderCamera;
15640	16195	/*
15641	16196	// Memory intensive (brep.verticescopy)
15642	16197	if (!(object instanceof Composite))
15643	16198	object.draw(info, 0, false); // SLOW :
15644	16199	*/
15645		- if (!isRenderer)
	16200	+ if (!isRenderer) // && drag)
15646	16201	{
15647		- object.drawEditHandles(info, 0);
15648		-
15649		- if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	16202	+ Grafreed.Assert(object != null);
	16203	+ Grafreed.Assert(object.selection != null);
	16204	+ if (object.selection.Size() > 0)
15650	16205	{
15651		- switch (object.selection.get(0).hitSomething)
	16206	+ int hitSomething = object.selection.get(0).hitSomething;
	16207	+
	16208	+ object.clickInfo.DX = 0;
	16209	+ object.clickInfo.DY = 0;
	16210	+ object.clickInfo.W = 1;
	16211	+ if (hitSomething == Object3D.hitCenter)
15652	16212	{
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;
	16213	+ info.DX = X;
	16214	+ if (X != 0)
	16215	+ info.DX -= info.bounds.width/2;
	16216	+
	16217	+ info.DY = Y;
	16218	+ if (Y != 0)
	16219	+ info.DY -= info.bounds.height/2;
15662	16220	}
15663		-
	16221	+
	16222	+ object.drawEditHandles(//info,
	16223	+ 0);
	16224	+
	16225	+ if (drag && (X != 0 \|\| Y != 0))
	16226	+ {
	16227	+ switch (hitSomething)
	16228	+ {
	16229	+ case Object3D.hitCenter: gr.setColor(Color.white);
	16230	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16231	+ break;
	16232	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16233	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16234	+ break;
	16235	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16236	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16237	+ break;
	16238	+ }
	16239	+
	16240	+ }
15664	16241	}
15665	16242	}
15666	16243	}
..	..	@@ -15675,7 +16252,7 @@
15675	16252	if (hasMarquee)
15676	16253	{
15677	16254	gr.setXORMode(Color.white);
15678		- gr.setColor(Color.red);
	16255	+ gr.setColor(Color.white);
15679	16256	if (!firstime)
15680	16257	{
15681	16258	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -16142,6 +16719,8 @@
16142	16719	private /static/ boolean firstime;
16143	16720	private /static/ cVector newView = new cVector();
16144	16721	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16722	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16723	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
16145	16724	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16146	16725	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16147	16726	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16154,29 +16733,67 @@
16154	16733	{
16155	16734	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16156	16735
	16736	+ int usedsuf = 0;
	16737	+
16157	16738	for (int i = 0; i < suffixes.length; i++)
16158	16739	{
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)
	16740	+ String[] suffixe = suffixes;
	16741	+ String[] fallback = suffixes2;
	16742	+ String[] fallfallback = suffixes3;
	16743	+
	16744	+ for (int c=usedsuf; --c>=0;)
16164	16745	{
16165		- throw new IOException("Unable to load texture " + resourceName);
	16746	+// String[] temp = suffixe;
	16747	+// suffixe = fallback;
	16748	+// fallback = fallfallback;
	16749	+// fallfallback = temp;
16166	16750	}
	16751	+
	16752	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16753	+ TextureData data;
	16754	+
	16755	+ try
	16756	+ {
	16757	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16758	+ mipmapped,
	16759	+ FileUtil.getFileSuffix(resourceName));
	16760	+ }
	16761	+ catch (Exception e)
	16762	+ {
	16763	+ try
	16764	+ {
	16765	+ resourceName = basename + fallback[i] + "." + suffix;
	16766	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16767	+ mipmapped,
	16768	+ FileUtil.getFileSuffix(resourceName));
	16769	+ }
	16770	+ catch (Exception e2)
	16771	+ {
	16772	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16773	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16774	+ mipmapped,
	16775	+ FileUtil.getFileSuffix(resourceName));
	16776	+ }
	16777	+ }
	16778	+
16167	16779	//System.out.println("Target = " + targets[i]);
16168	16780	cubemap.updateImage(data, targets[i]);
16169	16781	}
16170	16782
16171	16783	return cubemap;
16172	16784	}
	16785	+
16173	16786	int bigsphere = -1;
16174	16787
16175	16788	float BGcolor = 0.5f;
16176	16789
16177		- private void DrawSkyBox(GL gl)
	16790	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16791	+
	16792	+ private void DrawSkyBox(GL gl, float ratio)
16178	16793	{
16179		- if (envyoff \|\| cubemap == null)
	16794	+ if (//envyoff \|\|
	16795	+ WIREFRAME \|\|
	16796	+ cubemap == null)
16180	16797	{
16181	16798	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16182	16799	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16191,7 +16808,17 @@
16191	16808	// Compensates for ExaminerViewer's modification of modelview matrix
16192	16809	gl.glMatrixMode(GL.GL_MODELVIEW);
16193	16810	gl.glLoadIdentity();
	16811	+ gl.glScalef(1,ratio,1);
16194	16812
	16813	+// colorV[0] = 2;
	16814	+// colorV[1] = 2;
	16815	+// colorV[2] = 2;
	16816	+// colorV[3] = 1;
	16817	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16818	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16819	+//
	16820	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16821	+
16195	16822	//gl.glActiveTexture(GL.GL_TEXTURE1);
16196	16823	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16197	16824
..	..	@@ -16223,6 +16850,7 @@
16223	16850	{
16224	16851	gl.glScalef(1.0f, -1.0f, 1.0f);
16225	16852	}
	16853	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16226	16854	gl.glMultMatrixd(viewrot_1, 0);
16227	16855	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16228	16856	//viewer.updateInverseRotation(gl);
..	..	@@ -16263,7 +16891,8 @@
16263	16891	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16264	16892
16265	16893	cubemap.disable();
16266		- ////cubemap.unbind();
	16894	+ //cubemap.dispose();
	16895	+
16267	16896	if (CULLFACE)
16268	16897	{
16269	16898	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16319,7 +16948,7 @@
16319	16948	gl.glScalef(1.0f, -1.0f, 1.0f);
16320	16949	}
16321	16950
16322		- gl.glNormal3f(0.0f, 0.0f, 1.0f);
	16951	+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
16323	16952
16324	16953	float step = 2; // 0.1666f; //0.25f;
16325	16954	float stepv = 2; // step * 1652 / 998;
..	..	@@ -16363,16 +16992,16 @@
16363	16992	cStatic.objectstack[materialdepth++] = checker;
16364	16993	//System.out.println("material " + material);
16365	16994	//Applet3D.tracein(this, selected);
16366		- vector2buffer = checker.projectedVertices;
	16995	+ //vector2buffer = checker.projectedVertices;
16367	16996
16368	16997	//checker.GetMaterial().Draw(this, false); // true);
16369		- DrawMaterial(checker.GetMaterial(), false); // true);
	16998	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16370	16999
16371	17000	materialdepth -= 1;
16372	17001	if (materialdepth > 0)
16373	17002	{
16374		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16375		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	17003	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	17004	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16376	17005	}
16377	17006	//checker.GetMaterial().opacity = 1f;
16378	17007	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16458,6 +17087,14 @@
16458	17087	}
16459	17088	}
16460	17089
	17090	+ private Object3D GetFolder()
	17091	+ {
	17092	+ Object3D folder = object.GetWindow().copy;
	17093	+ if (object.GetWindow().copy.selection.Size() > 0)
	17094	+ folder = object.GetWindow().copy.selection.elementAt(0);
	17095	+ return folder;
	17096	+ }
	17097	+
16461	17098	class SelectBuffer implements GLEventListener
16462	17099	{
16463	17100
..	..	@@ -16473,7 +17110,7 @@
16473	17110	//new Exception().printStackTrace();
16474	17111	System.out.println("select buffer init");
16475	17112	// Use debug pipeline
16476		- drawable.setGL(new DebugGL(drawable.getGL()));
	17113	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16477	17114
16478	17115	GL gl = drawable.getGL();
16479	17116
..	..	@@ -16537,6 +17174,17 @@
16537	17174
16538	17175	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16539	17176
	17177	+ if (PAINTMODE)
	17178	+ {
	17179	+ if (object.GetWindow().copy.selection.Size() > 0)
	17180	+ {
	17181	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17182	+
	17183	+ // Make what you paint not selectable.
	17184	+ paintobj.ResetSelectable();
	17185	+ }
	17186	+ }
	17187	+
16540	17188	//int tmp = selection_view;
16541	17189	//selection_view = -1;
16542	17190	int temp = DrawMode();
..	..	@@ -16548,6 +17196,17 @@
16548	17196	// temp = DEFAULT; // patch for selection debug
16549	17197	Globals.drawMode = temp; // WARNING
16550	17198
	17199	+ if (PAINTMODE)
	17200	+ {
	17201	+ if (object.GetWindow().copy.selection.Size() > 0)
	17202	+ {
	17203	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17204	+
	17205	+ // Revert.
	17206	+ paintobj.RestoreSelectable();
	17207	+ }
	17208	+ }
	17209	+
16551	17210	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16552	17211
16553	17212	// trying different ways of getting the depth info over
..	..	@@ -16595,6 +17254,8 @@
16595	17254	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16596	17255	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16597	17256	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17257	+
	17258	+ CreateSelectedPoint();
16598	17259
16599	17260	// Will fit the mesh !!!
16600	17261	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16649,29 +17310,31 @@
16649	17310	}
16650	17311
16651	17312	if (!movingcamera && !PAINTMODE)
16652		- object.editWindow.ScreenFitPoint(); // fev 2014
	17313	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16653	17314
16654		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17315	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16655	17316	{
16656		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17317	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16657	17318
16658		- Object3D group = new Object3D("inst" + paintcount++);
	17319	+ if (object.GetWindow().copy.selection.Size() > 0)
	17320	+ {
	17321	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16659	17322
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();
	17323	+ Object3D inst = new Object3D("inst" + paintcount++);
	17324	+
	17325	+ inst.CreateMaterial(); // use a void leaf to select instances
	17326	+
	17327	+ inst.add(paintobj); // link
	17328	+
	17329	+ object.GetWindow().SnapObject(inst);
	17330	+
	17331	+ Object3D folder = paintFolder; // GetFolder();
	17332	+
	17333	+ folder.add(inst);
	17334	+
	17335	+ object.GetWindow().ResetModel();
	17336	+ object.GetWindow().refreshContents();
	17337	+ }
16675	17338	}
16676	17339	else
16677	17340	paintcount = 0;
..	..	@@ -16710,6 +17373,11 @@
16710	17373	//System.out.println("objects[color] = " + objects[color]);
16711	17374	//objects[color].Select();
16712	17375	indexcount = 0;
	17376	+ ObjEditor window = object.GetWindow();
	17377	+ if (window != null && deselect)
	17378	+ {
	17379	+ window.Select(null, deselect, true);
	17380	+ }
16713	17381	object.Select(color, deselect);
16714	17382	}
16715	17383
..	..	@@ -16760,6 +17428,7 @@
16760	17428
16761	17429	public void init(GLAutoDrawable drawable)
16762	17430	{
	17431	+ if (Globals.DEBUG)
16763	17432	System.out.println("shadow buffer init");
16764	17433
16765	17434	GL gl = drawable.getGL();
..	..	@@ -16988,10 +17657,14 @@
16988	17657	gl.glFlush();
16989	17658
16990	17659	/**/
16991		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	17660	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
16992	17661
16993		- float[] pixels = occlusionsizebuffer.array();
	17662	+ float[] depths = occlusiondepthbuffer.array();
16994	17663
	17664	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	17665	+
	17666	+ int[] pixels = selectsizebuffer.array();
	17667	+
16995	17668	double r = 0, g = 0, b = 0;
16996	17669
16997	17670	double count = 0;
..	..	@@ -17002,7 +17675,7 @@
17002	17675
17003	17676	double FACTOR = 1;
17004	17677
17005		- for (int i = 0; i < pixels.length; i++)
	17678	+ for (int i = 0; i < depths.length; i++)
17006	17679	{
17007	17680	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
17008	17681	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -17085,7 +17758,7 @@
17085	17758
17086	17759	double scale = ray.z; // 1; // cos
17087	17760
17088		- float depth = pixels[newindex];
	17761	+ float depth = depths[newindex];
17089	17762
17090	17763	/*
17091	17764	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17235,23 +17908,15 @@
17235	17908	int AAbuffersize = 0;
17236	17909
17237	17910	//double[] selectedpoint = new double[3];
17238		- static Superellipsoid selectedpoint = new Superellipsoid();
	17911	+ static Superellipsoid selectedpoint;
17239	17912	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();
	17913	+ static Sphere debugpointG;
	17914	+ static Sphere debugpointP;
	17915	+ static Sphere debugpointC;
	17916	+ static Sphere debugpointR;
17244	17917
17245	17918	static Sphere debugpoints[] = new Sphere[8];
17246	17919
17247		- static
17248		- {
17249		- for (int i=0; i<8; i++)
17250		- {
17251		- debugpoints[i] = new Sphere();
17252		- }
17253		- }
17254		-
17255	17920	static void InitPoints(float radius)
17256	17921	{
17257	17922	for (int i=0; i<8; i++)
..	..	@@ -17290,11 +17955,14 @@
17290	17955	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17291	17956	static IntBuffer bigAAbuffer;
17292	17957	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17293		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	17958	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17294	17959	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17295	17960	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17296	17961	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17297		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17962	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17963	+
	17964	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17965	+
17298	17966	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17299	17967	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17300	17968	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();