~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;
..	..	@@ -56,14 +92,12 @@
56	92	static int CURRENTANTIALIAS = 0; // 1;
57	93	/static/ boolean RENDERSHADOW = true;
58	94	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59		- static boolean ANIMATION = false;
60		- static String filename;
61	95
62	96	boolean DISPLAYTEXT = false;
63	97	//boolean REDUCETEXTURE = true;
64	98	boolean CACHETEXTURE = true;
65	99	boolean CLEANCACHE = false; // true;
66		- boolean MIPMAP = false; // true;
	100	+ boolean MIPMAP = false; // true; // never works...
67	101	boolean COMPRESSTEXTURE = false;
68	102	boolean KOMPACTTEXTURE = false; // true;
69	103	boolean RESIZETEXTURE = false;
..	..	@@ -86,7 +120,7 @@
86	120	static boolean FULLSCREEN = false;
87	121	static boolean SUPPORT = true;
88	122	static boolean INERTIA = true;
89		-static boolean FAST = true; // false;
	123	+static boolean FAST = false;
90	124	static boolean SLOWPOSE = false;
91	125	static boolean FOOTCONTACT = true;
92	126
..	..	@@ -108,7 +142,7 @@
108	142	static boolean OEIL = true;
109	143	static boolean OEILONCE = false; // do oeilon then oeiloff
110	144	static boolean LOOKAT = true;
111		-static boolean RANDOM = true; // false;
	145	+static boolean SWITCH = true; // false;
112	146	static boolean HANDLES = false; // selection doesn't work!!
113	147	static boolean PAINTMODE = false;
114	148
..	..	@@ -151,6 +185,8 @@
151	185	defaultcaps.setAccumBlueBits(16);
152	186	defaultcaps.setAccumAlphaBits(16);
153	187	}
	188	+
	189	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
154	190
155	191	void SetAsGLRenderer(boolean b)
156	192	{
..	..	@@ -327,7 +363,7 @@
327	363	cStatic.objectstack[materialdepth++] = obj;
328	364	//System.out.println("material " + material);
329	365	//Applet3D.tracein(this, selected);
330		- display.vector2buffer = obj.projectedVertices;
	366	+ //display.vector2buffer = obj.projectedVertices;
331	367	if (obj instanceof Camera)
332	368	{
333	369	display.options1[0] = material.shift;
..	..	@@ -336,14 +372,28 @@
336	372	display.options1[2] = material.shadowbias;
337	373	display.options1[3] = material.aniso;
338	374	display.options1[4] = material.anisoV;
	375	+// System.out.println("display.options1[0] " + display.options1[0]);
	376	+// System.out.println("display.options1[1] " + display.options1[1]);
	377	+// System.out.println("display.options1[2] " + display.options1[2]);
	378	+// System.out.println("display.options1[3] " + display.options1[3]);
	379	+// System.out.println("display.options1[4] " + display.options1[4]);
339	380	display.options2[0] = material.opacity;
340	381	display.options2[1] = material.diffuse;
341	382	display.options2[2] = material.factor;
	383	+// System.out.println("display.options2[0] " + display.options2[0]);
	384	+// System.out.println("display.options2[1] " + display.options2[1]);
	385	+// System.out.println("display.options2[2] " + display.options2[2]);
342	386
343	387	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	388	+// System.out.println("display.options3[0] " + display.options3[0]);
	389	+// System.out.println("display.options3[1] " + display.options3[1]);
	390	+// System.out.println("display.options3[2] " + display.options3[2]);
344	391	display.options4[0] = material.cameralight/0.2f;
345	392	display.options4[1] = material.subsurface;
346	393	display.options4[2] = material.sheen;
	394	+// System.out.println("display.options4[0] " + display.options4[0]);
	395	+// System.out.println("display.options4[1] " + display.options4[1]);
	396	+// System.out.println("display.options4[2] " + display.options4[2]);
347	397
348	398	// if (display.CURRENTANTIALIAS > 0)
349	399	// display.options3[3] /= 4;
..	..	@@ -359,7 +409,7 @@
359	409	/**/
360	410	} else
361	411	{
362		- DrawMaterial(material, selected);
	412	+ DrawMaterial(material, selected, obj.projectedVertices);
363	413	}
364	414	} else
365	415	{
..	..	@@ -383,8 +433,8 @@
383	433	cStatic.objectstack[materialdepth++] = obj;
384	434	//System.out.println("material " + material);
385	435	//Applet3D.tracein("selected ", selected);
386		- display.vector2buffer = obj.projectedVertices;
387		- display.DrawMaterial(material, selected);
	436	+ //display.vector2buffer = obj.projectedVertices;
	437	+ display.DrawMaterial(material, selected, obj.projectedVertices);
388	438	}
389	439	}
390	440
..	..	@@ -401,8 +451,8 @@
401	451	materialdepth -= 1;
402	452	if (materialdepth > 0)
403	453	{
404		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
405		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	454	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	455	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
406	456	}
407	457	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
408	458	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -422,8 +472,8 @@
422	472	materialdepth -= 1;
423	473	if (materialdepth > 0)
424	474	{
425		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
426		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	475	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	476	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
427	477	}
428	478	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
429	479	//else
..	..	@@ -464,10 +514,12 @@
464	514	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
465	515	{
466	516	//gl.glBegin(gl.GL_TRIANGLES);
467		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	517	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	518	+ // TEST LIVE NORMALS && !obj.dontselect
	519	+ ;
468	520	if (!hasnorm)
469	521	{
470		- // System.out.println("FUCK!!");
	522	+ // System.out.println("Mesh normal");
471	523	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
472	524	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
473	525	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1192,10 +1244,12 @@
1192	1244	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1193	1245	}
1194	1246	}
	1247	+
1195	1248	if (flipV)
1196	1249	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1197	1250	else
1198	1251	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1252	+
1199	1253	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1200	1254	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1201	1255
..	..	@@ -1215,10 +1269,12 @@
1215	1269	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1216	1270	}
1217	1271	}
	1272	+
1218	1273	if (flipV)
1219	1274	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1220	1275	else
1221	1276	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1277	+
1222	1278	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1223	1279	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1224	1280
..	..	@@ -1246,8 +1302,10 @@
1246	1302	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1247	1303	else
1248	1304	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1305	+
1249	1306	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1250	1307	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1308	+
1251	1309	count2 += 2;
1252	1310	count3 += 3;
1253	1311	}
..	..	@@ -1603,7 +1661,7 @@
1603	1661	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1604	1662	}
1605	1663
1606		- void DrawMaterial(cMaterial material, boolean selected)
	1664	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1607	1665	{
1608	1666	CameraPane display = this;
1609	1667	//new Exception().printStackTrace();
..	..	@@ -1630,7 +1688,7 @@
1630	1688
1631	1689	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1632	1690
1633		- float[] colorV = GrafreeD.colorV;
	1691	+ float[] colorV = Grafreed.colorV;
1634	1692
1635	1693	/**/
1636	1694	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1638,7 +1696,7 @@
1638	1696	colorV[0] = display.modelParams0[0] * material.diffuse;
1639	1697	colorV[1] = display.modelParams0[1] * material.diffuse;
1640	1698	colorV[2] = display.modelParams0[2] * material.diffuse;
1641		- colorV[3] = material.opacity;
	1699	+ colorV[3] = 1; // material.opacity;
1642	1700
1643	1701	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1644	1702	//System.out.println("Opacity = " + opacity);
..	..	@@ -1746,9 +1804,9 @@
1746	1804	display.modelParams7[2] = 0;
1747	1805	display.modelParams7[3] = 0;
1748	1806
1749		- display.modelParams6[0] = 100; // criss de bug de bump
	1807	+ //display.modelParams6[0] = 100; // criss de bug de bump
1750	1808
1751		- Object3D.cVector2[] extparams = display.vector2buffer;
	1809	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1752	1810	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1753	1811	{
1754	1812	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1890,7 +1948,7 @@
1890	1948	void PushMatrix(double[][] matrix)
1891	1949	{
1892	1950	// GrafreeD.tracein(matrix);
1893		- PushMatrix(matrix,1);
	1951	+ PushMatrix(matrix, 1);
1894	1952	}
1895	1953
1896	1954	void PushMatrix()
..	..	@@ -2044,7 +2102,7 @@
2044	2102	//System.err.println("Oeil on");
2045	2103	OEIL = true;
2046	2104	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2047		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2105	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2048	2106	//pingthread.StepToTarget(true);
2049	2107	}
2050	2108
..	..	@@ -2142,7 +2200,7 @@
2142	2200	System.err.println("LIVE = " + Globals.isLIVE());
2143	2201
2144	2202	if (!Globals.isLIVE()) // save sound
2145		- GrafreeD.savesound = true; // wav.save();
	2203	+ Grafreed.savesound = true; // wav.save();
2146	2204	// else
2147	2205	repaint(); // start loop // may 2013
2148	2206	}
..	..	@@ -2259,7 +2317,7 @@
2259	2317
2260	2318	void ToggleDebug()
2261	2319	{
2262		- DEBUG ^= true;
	2320	+ Globals.DEBUG ^= true;
2263	2321	}
2264	2322
2265	2323	void ToggleLookAt()
..	..	@@ -2267,9 +2325,9 @@
2267	2325	LOOKAT ^= true;
2268	2326	}
2269	2327
2270		- void ToggleRandom()
	2328	+ void ToggleSwitch()
2271	2329	{
2272		- RANDOM ^= true;
	2330	+ SWITCH ^= true;
2273	2331	}
2274	2332
2275	2333	void ToggleHandles()
..	..	@@ -2277,10 +2335,17 @@
2277	2335	HANDLES ^= true;
2278	2336	}
2279	2337
	2338	+ Object3D paintFolder;
	2339	+
2280	2340	void TogglePaint()
2281	2341	{
2282	2342	PAINTMODE ^= true;
2283	2343	paintcount = 0;
	2344	+
	2345	+ if (PAINTMODE)
	2346	+ {
	2347	+ paintFolder = GetFolder();
	2348	+ }
2284	2349	}
2285	2350
2286	2351	void SwapCamera(int a, int b)
..	..	@@ -2376,7 +2441,22 @@
2376	2441	{
2377	2442	return currentGL;
2378	2443	}
2379		-
	2444	+
	2445	+ static private BufferedImage CreateBim(TextureData texturedata)
	2446	+ {
	2447	+ Grafreed.Assert(texturedata != null);
	2448	+
	2449	+ int width = texturedata.getWidth();
	2450	+ int height = texturedata.getHeight();
	2451	+
	2452	+ Buffer buffer = texturedata.getBuffer();
	2453	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2454	+
	2455	+ byte[] bytes = bytebuf.array();
	2456	+
	2457	+ return CreateBim(bytes, width, height);
	2458	+ }
	2459	+
2380	2460	/**/
2381	2461	class CacheTexture
2382	2462	{
..	..	@@ -2385,28 +2465,31 @@
2385	2465
2386	2466	int resolution;
2387	2467
2388		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2468	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2389	2469	{
2390		- texture = tex;
	2470	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2471	+ texturedata = texdata;
2391	2472	resolution = res;
2392	2473	}
2393	2474	}
2394	2475	/**/
2395	2476
2396	2477	// TEXTURE static Texture texture;
2397		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2398		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2399		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2478	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2479	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2480	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2481	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2482	+
2400	2483	int pigmentdepth = 0;
2401	2484	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2402	2485	int bumpdepth = 0;
2403	2486	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2404	2487	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2405	2488	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2406		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2489	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2407	2490	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2408	2491
2409		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2492	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2410	2493	{
2411	2494	TextureData texturedata = null;
2412	2495
..	..	@@ -2425,13 +2508,34 @@
2425	2508	if (bump)
2426	2509	texturedata = ConvertBump(texturedata, false);
2427	2510
2428		- com.sun.opengl.util.texture.Texture texture =
2429		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2511	+// com.sun.opengl.util.texture.Texture texture =
	2512	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2430	2513
2431		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2432		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2514	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2515	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2433	2516
2434		- return texture;
	2517	+ return texturedata;
	2518	+ }
	2519	+
	2520	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2521	+ {
	2522	+ TextureData texturedata = null;
	2523	+
	2524	+ try
	2525	+ {
	2526	+ texturedata =
	2527	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2528	+ bim,
	2529	+ true);
	2530	+ } catch (Exception e)
	2531	+ {
	2532	+ throw new javax.media.opengl.GLException(e);
	2533	+ }
	2534	+
	2535	+ if (bump)
	2536	+ texturedata = ConvertBump(texturedata, false);
	2537	+
	2538	+ return texturedata;
2435	2539	}
2436	2540
2437	2541	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3504,6 +3608,8 @@
3504	3608
3505	3609	System.out.println("LOADING TEXTURE : " + name);
3506	3610
	3611	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3612	+
3507	3613	//
3508	3614	if (false) // compressbit > 0)
3509	3615	{
..	..	@@ -7902,7 +8008,7 @@
7902	8008	String pigment = Object3D.GetPigment(tex);
7903	8009	String bump = Object3D.GetBump(tex);
7904	8010
7905		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8011	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7906	8012	{
7907	8013	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7908	8014	// System.out.println("; bump = " + bump);
..	..	@@ -7917,11 +8023,69 @@
7917	8023	pigment = null;
7918	8024	}
7919	8025
7920		- ReleaseTexture(bump, true);
7921		- ReleaseTexture(pigment, false);
	8026	+ ReleaseTexture(tex, true);
	8027	+ ReleaseTexture(tex, false);
7922	8028	}
7923	8029
7924		- void ReleaseTexture(String tex, boolean bump)
	8030	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8031	+ {
	8032	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8033	+ {
	8034	+ return;
	8035	+ }
	8036	+
	8037	+ if (tex == null)
	8038	+ {
	8039	+ ReleaseTexture(null, false);
	8040	+ return;
	8041	+ }
	8042	+
	8043	+ String pigment = Object3D.GetPigment(tex);
	8044	+
	8045	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8046	+ {
	8047	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8048	+ // System.out.println("; bump = " + bump);
	8049	+ }
	8050	+
	8051	+ if (pigment.equals(""))
	8052	+ {
	8053	+ pigment = null;
	8054	+ }
	8055	+
	8056	+ ReleaseTexture(tex, false);
	8057	+ }
	8058	+
	8059	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8060	+ {
	8061	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8062	+ {
	8063	+ return;
	8064	+ }
	8065	+
	8066	+ if (tex == null)
	8067	+ {
	8068	+ ReleaseTexture(null, true);
	8069	+ return;
	8070	+ }
	8071	+
	8072	+ String bump = Object3D.GetBump(tex);
	8073	+
	8074	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8075	+ {
	8076	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8077	+ // System.out.println("; bump = " + bump);
	8078	+ }
	8079	+
	8080	+ if (bump.equals(""))
	8081	+ {
	8082	+ bump = null;
	8083	+ }
	8084	+
	8085	+ ReleaseTexture(tex, true);
	8086	+ }
	8087	+
	8088	+ void ReleaseTexture(cTexture tex, boolean bump)
7925	8089	{
7926	8090	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7927	8091	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7932,7 +8096,7 @@
7932	8096	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7933	8097
7934	8098	if (tex != null)
7935		- texture = textures.get(tex);
	8099	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7936	8100
7937	8101	// //assert( texture != null );
7938	8102	// if (texture == null)
..	..	@@ -8024,7 +8188,55 @@
8024	8188	}
8025	8189	}
8026	8190
8027		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8191	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	8192	+ {
	8193	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8194	+// ambientOcclusion ) // \|\| !textureon)
	8195	+// {
	8196	+// return; // false;
	8197	+// }
	8198	+//
	8199	+// if (tex == null)
	8200	+// {
	8201	+// BindTexture(null,false,resolution);
	8202	+// BindTexture(null,true,resolution);
	8203	+// return;
	8204	+// }
	8205	+//
	8206	+// String pigment = Object3D.GetPigment(tex);
	8207	+// String bump = Object3D.GetBump(tex);
	8208	+//
	8209	+// usedtextures.add(pigment);
	8210	+// usedtextures.add(bump);
	8211	+//
	8212	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8213	+// {
	8214	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8215	+// // System.out.println("; bump = " + bump);
	8216	+// }
	8217	+//
	8218	+// if (bump.equals(""))
	8219	+// {
	8220	+// bump = null;
	8221	+// }
	8222	+// if (pigment.equals(""))
	8223	+// {
	8224	+// pigment = null;
	8225	+// }
	8226	+//
	8227	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8228	+// BindTexture(pigment, false, resolution);
	8229	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8230	+// BindTexture(bump, true, resolution);
	8231	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8232	+//
	8233	+// return; // true;
	8234	+
	8235	+ BindPigmentTexture(tex, resolution);
	8236	+ BindBumpTexture(tex, resolution);
	8237	+ }
	8238	+
	8239	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8028	8240	{
8029	8241	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8030	8242	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8035,17 +8247,47 @@
8035	8247	if (tex == null)
8036	8248	{
8037	8249	BindTexture(null,false,resolution);
8038		- BindTexture(null,true,resolution);
8039	8250	return;
8040	8251	}
8041	8252
8042	8253	String pigment = Object3D.GetPigment(tex);
	8254	+
	8255	+ usedtextures.add(tex);
	8256	+
	8257	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8258	+ {
	8259	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8260	+ // System.out.println("; bump = " + bump);
	8261	+ }
	8262	+
	8263	+ if (pigment.equals(""))
	8264	+ {
	8265	+ pigment = null;
	8266	+ }
	8267	+
	8268	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8269	+ BindTexture(tex, false, resolution);
	8270	+ }
	8271	+
	8272	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8273	+ {
	8274	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8275	+ ambientOcclusion ) // \|\| !textureon)
	8276	+ {
	8277	+ return; // false;
	8278	+ }
	8279	+
	8280	+ if (tex == null)
	8281	+ {
	8282	+ BindTexture(null,true,resolution);
	8283	+ return;
	8284	+ }
	8285	+
8043	8286	String bump = Object3D.GetBump(tex);
8044	8287
8045		- usedtextures.put(pigment, pigment);
8046		- usedtextures.put(bump, bump);
	8288	+ usedtextures.add(tex);
8047	8289
8048		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8290	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8049	8291	{
8050	8292	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8051	8293	// System.out.println("; bump = " + bump);
..	..	@@ -8055,43 +8297,94 @@
8055	8297	{
8056	8298	bump = null;
8057	8299	}
8058		- if (pigment.equals(""))
8059		- {
8060		- pigment = null;
8061		- }
8062	8300
8063		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8064		- BindTexture(pigment, false, resolution);
8065	8301	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8066		- BindTexture(bump, true, resolution);
	8302	+ BindTexture(tex, true, resolution);
8067	8303	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8068		-
8069		- return; // true;
8070	8304	}
8071	8305
8072		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8306	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8307	+
	8308	+ private boolean FileExists(String tex)
8073	8309	{
8074		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8310	+ if (missingTextures.contains(tex))
	8311	+ {
	8312	+ return false;
	8313	+ }
	8314	+
	8315	+ boolean fileExists = new File(tex).exists();
	8316	+
	8317	+ if (!fileExists)
	8318	+ {
	8319	+ // If file exists, the "new File()" is not executed sgain
	8320	+ missingTextures.add(tex);
	8321	+ }
	8322	+
	8323	+ return fileExists;
	8324	+ }
	8325	+
	8326	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8327	+ {
	8328	+ CacheTexture texturecache = null;
8075	8329
8076	8330	if (tex != null)
8077	8331	{
8078		- String texname = tex;
	8332	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8333	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
8079	8334
8080		- String[] split = tex.split("Textures");
8081		- if (split.length > 1)
8082		- texname = "/Users/nbriere/Textures" + split[split.length-1];
8083		- else
8084		- if (!texname.startsWith("/"))
8085		- texname = "/Users/nbriere/Textures/" + texname;
	8335	+ if (texname.equals("") && texdata == null)
	8336	+ {
	8337	+ return null;
	8338	+ }
	8339	+
	8340	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8341	+
	8342	+// String[] split = tex.split("Textures");
	8343	+// if (split.length > 1)
	8344	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8345	+// else
	8346	+// if (!texname.startsWith("/"))
	8347	+// texname = "/Users/nbriere/Textures/" + texname;
	8348	+ if (!FileExists(texname))
	8349	+ {
	8350	+ texname = fallbackTextureName;
	8351	+ }
8086	8352
8087	8353	if (CACHETEXTURE)
8088		- texture = textures.get(texname); // TEXTURE CACHE
8089		-
8090		- TextureData texturedata = null;
8091		-
8092		- if (texture == null \|\| texture.resolution < resolution)
8093	8354	{
8094		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8355	+ if (texdata == null)
	8356	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8357	+ else
	8358	+ texturecache = bimtextures.get(texdata);
	8359	+ }
	8360	+
	8361	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8362	+ {
	8363	+ TextureData texturedata = null;
	8364	+
	8365	+ if (texdata != null && textureon)
	8366	+ {
	8367	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8368	+
	8369	+ try
	8370	+ {
	8371	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8372	+ }
	8373	+ catch (Exception e)
	8374	+ {
	8375	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8376	+ }
	8377	+
	8378	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8379	+ bimtextures.put(texdata, texturecache);
	8380	+
	8381	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8382	+
	8383	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8384	+ //bim2 = bim;
	8385	+ }
	8386	+ else
	8387	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8095	8388	{
8096	8389	assert(!bump);
8097	8390	// if (bump)
..	..	@@ -8102,19 +8395,23 @@
8102	8395	// }
8103	8396	// else
8104	8397	// {
8105		- texture = textures.get(tex);
8106		- if (texture == null)
	8398	+ // texturecache = textures.get(texname); // suspicious
	8399	+ if (texturecache == null)
8107	8400	{
8108		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8401	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8109	8402	}
	8403	+ else
	8404	+ new Exception().printStackTrace();
8110	8405	// }
8111	8406	} else
8112		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8407	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8113	8408	{
8114	8409	assert(bump);
8115		- texture = textures.get(tex);
8116		- if (texture == null)
8117		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8410	+ // texturecache = textures.get(texname); // suspicious
	8411	+ if (texturecache == null)
	8412	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8413	+ else
	8414	+ new Exception().printStackTrace();
8118	8415	} else
8119	8416	{
8120	8417	//if (tex.equals("IMMORTAL"))
..	..	@@ -8122,11 +8419,13 @@
8122	8419	// texture = GetResourceTexture("default.png");
8123	8420	//} else
8124	8421	//{
8125		- if (tex.equals("WHITE_NOISE"))
	8422	+ if (texname.endsWith("WHITE_NOISE"))
8126	8423	{
8127		- texture = textures.get(tex);
8128		- if (texture == null)
8129		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8424	+ // texturecache = textures.get(texname); // suspicious
	8425	+ if (texturecache == null)
	8426	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8427	+ else
	8428	+ new Exception().printStackTrace();
8130	8429	} else
8131	8430	{
8132	8431	if (textureon)
..	..	@@ -8151,7 +8450,7 @@
8151	8450	}
8152	8451
8153	8452	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8154		- if (!new File(cachename).exists())
	8453	+ if (!FileExists(cachename))
8155	8454	cachename = texname;
8156	8455	else
8157	8456	processbump = false; // don't process bump map again
..	..	@@ -8173,7 +8472,7 @@
8173	8472	}
8174	8473
8175	8474	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8176		- if (!new File(cachename).exists())
	8475	+ if (!FileExists(cachename))
8177	8476	cachename = texname;
8178	8477	else
8179	8478	processbump = false; // don't process bump map again
..	..	@@ -8182,20 +8481,22 @@
8182	8481	texturedata = GetFileTexture(cachename, processbump, resolution);
8183	8482
8184	8483
8185		- if (texturedata != null)
8186		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8484	+ if (texturedata == null)
	8485	+ throw new Exception();
	8486	+
	8487	+ texturecache = new CacheTexture(texturedata,resolution);
8187	8488	//texture = GetTexture(tex, bump);
8188	8489	}
8189	8490	}
8190	8491	//}
8191	8492	}
8192	8493
8193		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8494	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8194	8495	{
8195	8496	//return false;
8196	8497
8197	8498	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8198		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8499	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8199	8500	{
8200	8501	// String ext = "_highres";
8201	8502	// if (REDUCETEXTURE)
..	..	@@ -8212,52 +8513,17 @@
8212	8513	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8213	8514	if (!cachefile.exists())
8214	8515	{
8215		- // cache to disk
8216		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8217		- //buffers[0].
8218		-
8219		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8220		- int[] pixels = new int[bytebuf.capacity()/3];
8221		-
8222		- // squared size heuristic...
8223		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8516	+ //if (texturedata.getWidth() == texturedata.getHeight())
8224	8517	{
8225		- for (int i=pixels.length; --i>=0;)
8226		- {
8227		- int i3 = i*3;
8228		- pixels[i] = 0xFF;
8229		- pixels[i] <<= 8;
8230		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8231		- pixels[i] <<= 8;
8232		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8233		- pixels[i] <<= 8;
8234		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8235		- }
8236		-
8237		- /*
8238		- int r=0,g=0,b=0,a=0;
8239		- for (int i=0; i<width; i++)
8240		- for (int j=0; j<height; j++)
8241		- {
8242		- int index = j*width+i;
8243		- int p = pixels[index];
8244		- a = ((p>>24) & 0xFF);
8245		- r = ((p>>16) & 0xFF);
8246		- g = ((p>>8) & 0xFF);
8247		- b = (p & 0xFF);
8248		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8249		- }
8250		- /**/
8251		- int width = (int)Math.sqrt(pixels.length); // squared
8252		- int height = width;
8253		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8254		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8518	+ BufferedImage rendImage = CreateBim(texturedata);
	8519	+
8255	8520	ImageWriter writer = null;
8256	8521	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8257	8522	if (iter.hasNext()) {
8258	8523	writer = (ImageWriter)iter.next();
8259	8524	}
8260		- float compressionQuality = 0.9f;
	8525	+
	8526	+ float compressionQuality = 0.85f;
8261	8527	try
8262	8528	{
8263	8529	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8274,18 +8540,20 @@
8274	8540	}
8275	8541	}
8276	8542	}
8277		-
	8543	+
	8544	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8545	+
8278	8546	//System.out.println("Texture = " + tex);
8279		- if (textures.containsKey(texname))
	8547	+ if (textures.containsKey(tex))
8280	8548	{
8281		- CacheTexture thetex = textures.get(texname);
	8549	+ CacheTexture thetex = textures.get(tex);
8282	8550	thetex.texture.disable();
8283	8551	thetex.texture.dispose();
8284		- textures.remove(texname);
	8552	+ textures.remove(tex);
8285	8553	}
8286	8554
8287		- texture.texturedata = texturedata;
8288		- textures.put(texname, texture);
	8555	+ //texture.texturedata = texturedata;
	8556	+ textures.put(tex, texturecache);
8289	8557
8290	8558	// newtex = true;
8291	8559	}
..	..	@@ -8301,10 +8569,44 @@
8301	8569	}
8302	8570	}
8303	8571
8304		- return texture;
	8572	+ return texturecache;
8305	8573	}
8306	8574
8307		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8575	+ static void EmbedTextures(cTexture tex)
	8576	+ {
	8577	+ if (tex.pigmentdata == null)
	8578	+ {
	8579	+ //String texname = Object3D.GetPigment(tex);
	8580	+
	8581	+ CacheTexture texturecache = texturepigment.get(tex);
	8582	+
	8583	+ if (texturecache != null)
	8584	+ {
	8585	+ tex.pw = texturecache.texturedata.getWidth();
	8586	+ tex.ph = texturecache.texturedata.getHeight();
	8587	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8588	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8589	+ ;
	8590	+ //, tex.pw, tex.ph), 0.5f);
	8591	+ }
	8592	+ }
	8593	+
	8594	+ if (tex.bumpdata == null)
	8595	+ {
	8596	+ //String texname = Object3D.GetBump(tex);
	8597	+
	8598	+ CacheTexture texturecache = texturebump.get(tex);
	8599	+
	8600	+ if (texturecache != null)
	8601	+ {
	8602	+ tex.bw = texturecache.texturedata.getWidth();
	8603	+ tex.bh = texturecache.texturedata.getHeight();
	8604	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8605	+ }
	8606	+ }
	8607	+ }
	8608	+
	8609	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8308	8610	{
8309	8611	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8310	8612
..	..	@@ -8322,21 +8624,21 @@
8322	8624	return texture!=null?texture.texture:null;
8323	8625	}
8324	8626
8325		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8627	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8326	8628	{
8327	8629	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8328	8630
8329	8631	return texture!=null?texture.texturedata:null;
8330	8632	}
8331	8633
8332		- boolean BindTexture(String tex, boolean bump, int resolution)
	8634	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8333	8635	{
8334	8636	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8335	8637	{
8336	8638	return false;
8337	8639	}
8338	8640
8339		- boolean newtex = false;
	8641	+ //boolean newtex = false;
8340	8642
8341	8643	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8342	8644
..	..	@@ -8368,9 +8670,75 @@
8368	8670	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8369	8671	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8370	8672
8371		- return newtex;
	8673	+ return true; // Warning: not used.
8372	8674	}
8373	8675
	8676	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8677	+ {
	8678	+ try
	8679	+ {
	8680	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8681	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8682	+ ImageWriter writer = writers.next();
	8683	+
	8684	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8685	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8686	+ param.setCompressionQuality(quality);
	8687	+
	8688	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8689	+ writer.setOutput(ios);
	8690	+ writer.write(null, new IIOImage(image, null, null), param);
	8691	+
	8692	+ byte[] data = baos.toByteArray();
	8693	+ writer.dispose();
	8694	+ return data;
	8695	+ }
	8696	+ catch (Exception e)
	8697	+ {
	8698	+ e.printStackTrace();
	8699	+ return null;
	8700	+ }
	8701	+ }
	8702	+
	8703	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8704	+ {
	8705	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8706	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8707	+ ImageReader reader = writers.next();
	8708	+
	8709	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8710	+
	8711	+ ImageReadParam param = reader.getDefaultReadParam();
	8712	+ param.setDestination(bim);
	8713	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8714	+
	8715	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8716	+ reader.setInput(ios);
	8717	+ BufferedImage bim2 = reader.read(0, param);
	8718	+ reader.dispose();
	8719	+
	8720	+// WritableRaster raster = bim2.getRaster();
	8721	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8722	+// byte[] bytes = data.getData();
	8723	+//
	8724	+// int[] pixels = new int[bytes.length/3];
	8725	+// for (int i=pixels.length; --i>=0;)
	8726	+// {
	8727	+// int i3 = i*3;
	8728	+// pixels[i] = 0xFF;
	8729	+// pixels[i] <<= 8;
	8730	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8731	+// pixels[i] <<= 8;
	8732	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8733	+// pixels[i] <<= 8;
	8734	+// pixels[i] \|= bytes[i3] & 0xFF;
	8735	+// }
	8736	+//
	8737	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8738	+
	8739	+ return bim;
	8740	+ }
	8741	+
8374	8742	ShadowBuffer shadowPBuf;
8375	8743	AntialiasBuffer antialiasPBuf;
8376	8744	int MAXSTACK;
..	..	@@ -9206,11 +9574,35 @@
9206	9574	jy8[3] = 0.5f;
9207	9575	}
9208	9576
9209		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9577	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9210	9578	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9211	9579	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9212	9580	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9213	9581
	9582	+ void ResetOptions()
	9583	+ {
	9584	+ options1[0] = 100;
	9585	+ options1[1] = 0.025f;
	9586	+ options1[2] = 0.01f;
	9587	+ options1[3] = 0;
	9588	+ options1[4] = 0;
	9589	+
	9590	+ options2[0] = 0;
	9591	+ options2[1] = 0.75f;
	9592	+ options2[2] = 0;
	9593	+ options2[3] = 0;
	9594	+
	9595	+ options3[0] = 1;
	9596	+ options3[1] = 1;
	9597	+ options3[2] = 1;
	9598	+ options3[3] = 0;
	9599	+
	9600	+ options4[0] = 1;
	9601	+ options4[1] = 0;
	9602	+ options4[2] = 1;
	9603	+ options4[3] = 0;
	9604	+ }
	9605	+
9214	9606	static int imagecount = 0; // movie generation
9215	9607
9216	9608	static int jitter = 0;
..	..	@@ -9306,8 +9698,8 @@
9306	9698	assert (parentcam != renderCamera);
9307	9699
9308	9700	if (renderCamera != lightCamera)
9309		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9310		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9701	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9702	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9311	9703
9312	9704	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9313	9705
..	..	@@ -9322,8 +9714,8 @@
9322	9714	LA.matCopy(renderCamera.fromScreen, matrix);
9323	9715
9324	9716	if (renderCamera != lightCamera)
9325		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9326		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9717	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9718	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9327	9719
9328	9720	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9329	9721
..	..	@@ -9395,7 +9787,7 @@
9395	9787	//gl.glFlush();
9396	9788	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9397	9789
9398		- if (ANIMATION && ABORTED)
	9790	+ if (Globals.ANIMATION && ABORTED)
9399	9791	{
9400	9792	System.err.println(" ABORTED FRAME");
9401	9793	break;
..	..	@@ -9425,7 +9817,7 @@
9425	9817	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9426	9818
9427	9819	// save image
9428		- if (ANIMATION && !ABORTED)
	9820	+ if (Globals.ANIMATION && !ABORTED)
9429	9821	{
9430	9822	VPwidth = viewport[2];
9431	9823	VPheight = viewport[3];
..	..	@@ -9536,11 +9928,11 @@
9536	9928
9537	9929	// imagecount++;
9538	9930
9539		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9931	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9540	9932
9541	9933	if (!BOXMODE)
9542	9934	{
9543		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9935	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9544	9936	}
9545	9937
9546	9938	if (!BOXMODE)
..	..	@@ -9578,7 +9970,7 @@
9578	9970	ABORTED = false;
9579	9971	}
9580	9972	else
9581		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9973	+ Grafreed.wav.cursor += 735 * ACSIZE;
9582	9974
9583	9975	if (false)
9584	9976	{
..	..	@@ -10241,11 +10633,11 @@
10241	10633
10242	10634	public void display(GLAutoDrawable drawable)
10243	10635	{
10244		- if (GrafreeD.savesound && GrafreeD.hassound)
	10636	+ if (Grafreed.savesound && Grafreed.hassound)
10245	10637	{
10246		- GrafreeD.wav.save();
10247		- GrafreeD.savesound = false;
10248		- GrafreeD.hassound = false;
	10638	+ Grafreed.wav.save();
	10639	+ Grafreed.savesound = false;
	10640	+ Grafreed.hassound = false;
10249	10641	}
10250	10642	// if (DEBUG_SELECTION)
10251	10643	// {
..	..	@@ -10321,6 +10713,7 @@
10321	10713	ANTIALIAS = 0;
10322	10714	//System.out.println("RESTART");
10323	10715	AAtimer.restart();
	10716	+ Globals.TIMERRUNNING = true;
10324	10717	}
10325	10718	}
10326	10719	}
..	..	@@ -10375,7 +10768,7 @@
10375	10768	Object3D theobject = object;
10376	10769	Object3D theparent = object.parent;
10377	10770	object.parent = null;
10378		- object = (Object3D)GrafreeD.clone(object);
	10771	+ object = (Object3D)Grafreed.clone(object);
10379	10772	object.Stripify();
10380	10773	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10381	10774	theobject.PreprocessOcclusion(this);
..	..	@@ -10388,13 +10781,14 @@
10388	10781	ambientOcclusion = false;
10389	10782	}
10390	10783
10391		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10784	+ if (//Globals.lighttouched &&
	10785	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10392	10786	{
10393	10787	//if (RENDERSHADOW) // ?
10394	10788	if (!IsFrozen())
10395	10789	{
10396	10790	// dec 2012
10397		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10791	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10398	10792	{
10399	10793	Globals.framecount++;
10400	10794	shadowbuffer.display();
..	..	@@ -10521,8 +10915,8 @@
10521	10915
10522	10916	// if (parentcam != renderCamera) // not a light
10523	10917	if (cam != lightCamera)
10524		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10525		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10918	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10919	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10526	10920
10527	10921	for (int j = 0; j < 4; j++)
10528	10922	{
..	..	@@ -10536,8 +10930,8 @@
10536	10930
10537	10931	// if (parentcam != renderCamera) // not a light
10538	10932	if (cam != lightCamera)
10539		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10540		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10933	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10934	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10541	10935
10542	10936	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10543	10937
..	..	@@ -10796,7 +11190,16 @@
10796	11190	// Bump noise
10797	11191	gl.glActiveTexture(GL.GL_TEXTURE6);
10798	11192	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10799		- BindTexture(NOISE_TEXTURE, false, 2);
	11193	+
	11194	+ try
	11195	+ {
	11196	+ BindTexture(NOISE_TEXTURE, false, 2);
	11197	+ }
	11198	+ catch (Exception e)
	11199	+ {
	11200	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11201	+ }
	11202	+
10800	11203
10801	11204	gl.glActiveTexture(GL.GL_TEXTURE0);
10802	11205	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10819,9 +11222,9 @@
10819	11222
10820	11223	gl.glMatrixMode(GL.GL_MODELVIEW);
10821	11224
10822		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10823		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10824		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11225	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11226	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11227	+gl.glEnable(gl.GL_MULTISAMPLE);
10825	11228	} else
10826	11229	{
10827	11230	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10832,7 +11235,7 @@
10832	11235	//System.out.println("BLENDING ON");
10833	11236	gl.glEnable(GL.GL_BLEND);
10834	11237	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10835		-
	11238	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10836	11239	gl.glMatrixMode(gl.GL_PROJECTION);
10837	11240	gl.glLoadIdentity();
10838	11241
..	..	@@ -10921,8 +11324,8 @@
10921	11324	System.err.println("parentcam != renderCamera");
10922	11325
10923	11326	// if (cam != lightCamera)
10924		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10925		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11327	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11328	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10926	11329	}
10927	11330
10928	11331	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10943,8 +11346,8 @@
10943	11346	if (true) // TODO
10944	11347	{
10945	11348	if (cam != lightCamera)
10946		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10947		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11349	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11350	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10948	11351	}
10949	11352
10950	11353	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11081,7 +11484,7 @@
11081	11484	}
11082	11485	}
11083	11486
11084		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11487	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11085	11488	{
11086	11489	//gl.glDepthFunc(GL.GL_LEQUAL);
11087	11490	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11089,24 +11492,21 @@
11089	11492
11090	11493	boolean texon = textureon;
11091	11494
11092		- if (RENDERPROGRAM > 0)
11093		- {
11094		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11095		- textureon = false;
11096		- }
	11495	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11496	+ textureon = false;
	11497	+
11097	11498	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11098	11499	//System.out.println("ALLO");
11099	11500	gl.glColorMask(false, false, false, false);
11100	11501	DrawObject(gl);
11101		- if (RENDERPROGRAM > 0)
11102		- {
11103		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11104		- textureon = texon;
11105		- }
	11502	+
	11503	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11504	+ textureon = texon;
	11505	+
11106	11506	gl.glColorMask(true, true, true, true);
11107	11507
11108	11508	gl.glDepthFunc(GL.GL_EQUAL);
11109		- //gl.glDepthMask(false);
	11509	+ gl.glDepthMask(false);
11110	11510	}
11111	11511
11112	11512	if (false) // DrawMode() == SHADOW)
..	..	@@ -11260,8 +11660,14 @@
11260	11660	{
11261	11661	renderpass++;
11262	11662	// System.out.println("Draw object... ");
	11663	+ STEP = 1;
11263	11664	if (FAST) // in case there is no script
11264		- STEP = 16;
	11665	+ STEP = 8;
	11666	+
	11667	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11668	+ {
	11669	+ STEP *= 4;
	11670	+ }
11265	11671
11266	11672	//object.FullInvariants();
11267	11673
..	..	@@ -11275,23 +11681,44 @@
11275	11681	e.printStackTrace();
11276	11682	}
11277	11683
11278		- if (GrafreeD.RENDERME > 0)
11279		- GrafreeD.RENDERME--; // mechante magouille
	11684	+ if (Grafreed.RENDERME > 0)
	11685	+ Grafreed.RENDERME--; // mechante magouille
11280	11686
11281	11687	Globals.ONESTEP = false;
11282	11688	}
11283	11689
11284	11690	static boolean zoomonce = false;
11285	11691
	11692	+ static void CreateSelectedPoint()
	11693	+ {
	11694	+ if (selectedpoint == null)
	11695	+ {
	11696	+ debugpointG = new Sphere();
	11697	+ debugpointP = new Sphere();
	11698	+ debugpointC = new Sphere();
	11699	+ debugpointR = new Sphere();
	11700	+
	11701	+ selectedpoint = new Superellipsoid();
	11702	+
	11703	+ for (int i=0; i<8; i++)
	11704	+ {
	11705	+ debugpoints[i] = new Sphere();
	11706	+ }
	11707	+ }
	11708	+ }
	11709	+
11286	11710	void DrawObject(GL gl, boolean draw)
11287	11711	{
	11712	+ // To clear camera values
	11713	+ ResetOptions();
	11714	+
11288	11715	//System.out.println("DRAW OBJECT " + mouseDown);
11289	11716	// DrawMode() = SELECTION;
11290	11717	//GL gl = getGL();
11291	11718	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11292	11719	{
11293	11720	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11294		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11721	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11295	11722	pingthread.StepToTarget(true); // true);
11296	11723	// zoomonce = false;
11297	11724	}
..	..	@@ -11346,7 +11773,14 @@
11346	11773
11347	11774	usedtextures.clear();
11348	11775
11349		- BindTextures(DEFAULT_TEXTURES, 2);
	11776	+ try
	11777	+ {
	11778	+ BindTextures(DEFAULT_TEXTURES, 2);
	11779	+ }
	11780	+ catch (Exception e)
	11781	+ {
	11782	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11783	+ }
11350	11784	}
11351	11785	//System.out.println("--> " + stackdepth);
11352	11786	// GrafreeD.traceon();
..	..	@@ -11356,8 +11790,9 @@
11356	11790
11357	11791	if (DrawMode() == DEFAULT)
11358	11792	{
11359		- if (DEBUG)
	11793	+ if (Globals.DEBUG)
11360	11794	{
	11795	+ CreateSelectedPoint();
11361	11796	float radius = 0.05f;
11362	11797	if (selectedpoint.radius != radius)
11363	11798	{
..	..	@@ -11411,20 +11846,32 @@
11411	11846	ReleaseTextures(DEFAULT_TEXTURES);
11412	11847
11413	11848	if (CLEANCACHE)
11414		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11849	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11415	11850	{
11416		- String tex = e.nextElement();
	11851	+ cTexture tex = e.nextElement();
11417	11852
11418	11853	// System.out.println("Texture --------- " + tex);
11419	11854
11420		- if (tex.equals("WHITE_NOISE"))
	11855	+ if (tex.equals("WHITE_NOISE:"))
11421	11856	continue;
11422	11857
11423		- if (!usedtextures.containsKey(tex))
	11858	+ if (!usedtextures.contains(tex))
11424	11859	{
	11860	+ CacheTexture gettex = texturepigment.get(tex);
11425	11861	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11426		- textures.get(tex).texture.dispose();
11427		- textures.remove(tex);
	11862	+ if (gettex != null)
	11863	+ {
	11864	+ gettex.texture.dispose();
	11865	+ texturepigment.remove(tex);
	11866	+ }
	11867	+
	11868	+ gettex = texturebump.get(tex);
	11869	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11870	+ if (gettex != null)
	11871	+ {
	11872	+ gettex.texture.dispose();
	11873	+ texturebump.remove(tex);
	11874	+ }
11428	11875	}
11429	11876	}
11430	11877	}
..	..	@@ -11437,7 +11884,14 @@
11437	11884	if (checker != null && DrawMode() == DEFAULT)
11438	11885	{
11439	11886	//BindTexture(IMMORTAL_TEXTURE);
11440		- BindTextures(checker.GetTextures(), checker.texres);
	11887	+ try
	11888	+ {
	11889	+ BindTextures(checker.GetTextures(), checker.texres);
	11890	+ }
	11891	+ catch (Exception e)
	11892	+ {
	11893	+ System.err.println("FAILED: " + checker.GetTextures());
	11894	+ }
11441	11895	// NEAREST
11442	11896	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11443	11897	DrawChecker(gl);
..	..	@@ -11519,7 +11973,7 @@
11519	11973	return;
11520	11974	}
11521	11975
11522		- String string = obj.GetToolTip();
	11976	+ String string = obj.toString(); //.GetToolTip();
11523	11977
11524	11978	GL gl = GetGL();
11525	11979
..	..	@@ -11836,8 +12290,8 @@
11836	12290	//obj.TransformToWorld(light, light);
11837	12291	for (int i = tp.size(); --i >= 0;)
11838	12292	{
11839		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11840		- LA.xformPos(light, tp.get(i).toParent, light);
	12293	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12294	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11841	12295	}
11842	12296
11843	12297
..	..	@@ -11854,8 +12308,8 @@
11854	12308	parentcam = cameras[0];
11855	12309	}
11856	12310
11857		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11858		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12311	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12312	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11859	12313
11860	12314	LA.xformPos(light, renderCamera.toScreen, light);
11861	12315
..	..	@@ -12469,8 +12923,8 @@
12469	12923
12470	12924	// display shadow only (bump == 0)
12471	12925	"SUB temp.x, half.x, shadow.x;" +
12472		- "MOV temp.y, -params6.x;" +
12473		- "SLT temp.z, temp.y, zero.x;" +
	12926	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12927	+ "SLT temp.z, temp.y, -one2048th.x;" +
12474	12928	"SUB temp.y, one.x, temp.z;" +
12475	12929	"MUL temp.x, temp.x, temp.y;" +
12476	12930	"KIL temp.x;" +
..	..	@@ -12599,8 +13053,10 @@
12599	13053	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12600	13054
12601	13055	"SUB temp.x, one.x, ndotl.x;" +
12602		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
12603		- "ADD temp.y, one.y, options2.y;" + // sursurface
	13056	+ // Tuning for default skin
	13057	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	13058	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	13059	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12604	13060	"MUL temp.x, temp.x, temp.y;" +
12605	13061
12606	13062	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12748,7 +13204,7 @@
12748	13204	"MUL final.y, fragment.texcoord[0].x, c256;" +
12749	13205	"FLR final.x, final.y;" +
12750	13206	"SUB final.y, final.y, final.x;" +
12751		- //"MUL final.x, final.x, c256i;" +
	13207	+ "MUL final.x, final.x, c256i;" +
12752	13208	"MOV final.z, zero.x;" +
12753	13209	"MOV final.a, one.w;":""
12754	13210	) +
..	..	@@ -12756,7 +13212,7 @@
12756	13212	"MUL final.y, fragment.texcoord[0].y, c256;" +
12757	13213	"FLR final.x, final.y;" +
12758	13214	"SUB final.y, final.y, final.x;" +
12759		- //"MUL final.x, final.x, c256i;" +
	13215	+ "MUL final.x, final.x, c256i;" +
12760	13216	"MOV final.z, zero.x;" +
12761	13217	"MOV final.a, one.w;":""
12762	13218	) +
..	..	@@ -12799,7 +13255,7 @@
12799	13255	//once = true;
12800	13256	}
12801	13257
12802		- System.out.print("Program #" + mode + "; length = " + program.length());
	13258	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12803	13259	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12804	13260	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12805	13261
..	..	@@ -12932,12 +13388,16 @@
12932	13388
12933	13389	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12934	13390	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13391	+
	13392	+ // Compare fragment depth in light space with shadowmap.
12935	13393	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12936	13394	"SGE temp.y, temp.x, zero.x;" +
12937		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13395	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13396	+
	13397	+ // Reverse comparison
12938	13398	"SUB temp.x, one.x, temp.x;" +
12939	13399	"MUL " + shadow + ".x, temp.x, temp.y;" +
12940		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13400	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12941	13401	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12942	13402
12943	13403	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12951,6 +13411,10 @@
12951	13411	// No shadow for backface
12952	13412	"DP3 temp.x, normal, lightd;" +
12953	13413	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13414	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13415	+
	13416	+ // No shadow when out of frustrum
	13417	+ "SGE temp.x, " + depth + ".z, one.z;" +
12954	13418	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12955	13419	"";
12956	13420	}
..	..	@@ -13097,7 +13561,8 @@
13097	13561	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13098	13562	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13099	13563	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13100		- Object3D.cVector2[] vector2buffer;
	13564	+
	13565	+ //Object3D.cVector2[] vector2buffer;
13101	13566
13102	13567	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13103	13568	// OUT : diff, spec
..	..	@@ -13113,9 +13578,10 @@
13113	13578	"DP3 " + dest + ".z," + "normals," + "eye;" +
13114	13579	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13115	13580	//"MOV " + dest + ".w," + "normal.z;" +
13116		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13117		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13118		- //"MOV " + dest + ".z," + "params2.w;" +
	13581	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13582	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13583	+
	13584	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13119	13585	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13120	13586	"RCP " + dest + ".w," + dest + ".w;" +
13121	13587	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13509,7 +13975,7 @@
13509	13975	public void mousePressed(MouseEvent e)
13510	13976	{
13511	13977	//System.out.println("mousePressed: " + e);
13512		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13978	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13513	13979	}
13514	13980
13515	13981	static long prevtime = 0;
..	..	@@ -13585,8 +14051,8 @@
13585	14051	// mode \|= META;
13586	14052	//}
13587	14053
13588		- SetMouseMode(WHEEL \| e.getModifiersEx());
13589		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14054	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14055	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13590	14056	anchorX = ax;
13591	14057	anchorY = ay;
13592	14058	prevX = px;
..	..	@@ -13620,6 +14086,7 @@
13620	14086	else
13621	14087	if (evt.getSource() == AAtimer)
13622	14088	{
	14089	+ Globals.TIMERRUNNING = false;
13623	14090	if (mouseDown)
13624	14091	{
13625	14092	//new Exception().printStackTrace();
..	..	@@ -13645,6 +14112,10 @@
13645	14112	// LIVE = waslive;
13646	14113	// wasliveok = true;
13647	14114	// waslive = false;
	14115	+
	14116	+ // May 2019 Forget it:
	14117	+ if (true)
	14118	+ return;
13648	14119
13649	14120	// source == timer
13650	14121	if (mouseDown)
..	..	@@ -13675,7 +14146,7 @@
13675	14146
13676	14147	// fev 2014???
13677	14148	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13678		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14149	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13679	14150	pingthread.StepToTarget(true); // true);
13680	14151	}
13681	14152	// if (!LIVE)
..	..	@@ -13684,12 +14155,13 @@
13684	14155
13685	14156	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13686	14157
13687		- void clickStart(int x, int y, int modifiers)
	14158	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13688	14159	{
13689	14160	if (!wasliveok)
13690	14161	return;
13691	14162
13692	14163	AAtimer.restart(); //
	14164	+ Globals.TIMERRUNNING = true;
13693	14165
13694	14166	// waslive = LIVE;
13695	14167	// LIVE = false;
..	..	@@ -13701,7 +14173,7 @@
13701	14173	// touched = true; // main DL
13702	14174	if (isRenderer)
13703	14175	{
13704		- SetMouseMode(modifiers);
	14176	+ SetMouseMode(modifiers, modifiersex);
13705	14177	}
13706	14178
13707	14179	selectX = anchorX = x;
..	..	@@ -13714,7 +14186,7 @@
13714	14186	clicked = true;
13715	14187	hold = false;
13716	14188
13717		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14189	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13718	14190	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13719	14191	{
13720	14192	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13745,7 +14217,7 @@
13745	14217	info.camera = renderCamera;
13746	14218	info.x = x;
13747	14219	info.y = y;
13748		- info.modifiers = modifiers;
	14220	+ info.modifiers = modifiersex;
13749	14221	editObj = object.doEditClick(info, 0);
13750	14222	if (!editObj)
13751	14223	{
..	..	@@ -13762,9 +14234,12 @@
13762	14234
13763	14235	public void mouseDragged(MouseEvent e)
13764	14236	{
	14237	+ Globals.MOUSEDRAGGED = true;
	14238	+
13765	14239	//System.out.println("mouseDragged: " + e);
13766	14240	if (isRenderer)
13767	14241	movingcamera = true;
	14242	+
13768	14243	//if (drawing)
13769	14244	//return;
13770	14245	if ((e.getModifiersEx() & CTRL) != 0
..	..	@@ -13774,7 +14249,7 @@
13774	14249	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13775	14250	}
13776	14251	else
13777		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14252	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13778	14253
13779	14254	//try { Thread.sleep(1); } catch (Exception ex) {}
13780	14255	}
..	..	@@ -14011,7 +14486,7 @@
14011	14486	{
14012	14487	Globals.lighttouched = true;
14013	14488	}
14014		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14489	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14015	14490	}
14016	14491	//else
14017	14492	}
..	..	@@ -14025,12 +14500,12 @@
14025	14500	void GoDown(int mod)
14026	14501	{
14027	14502	MODIFIERS \|= COMMAND;
14028		- /*
	14503	+ /**/
14029	14504	if((mod&SHIFT) == SHIFT)
14030	14505	manipCamera.RotatePosition(0, -speed);
14031	14506	else
14032		- manipCamera.BackForth(0, -speed*delta, getWidth());
14033		- */
	14507	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14508	+ /**/
14034	14509	if ((mod & SHIFT) == SHIFT)
14035	14510	{
14036	14511	mouseMode = mouseMode; // VR??
..	..	@@ -14046,12 +14521,12 @@
14046	14521	void GoUp(int mod)
14047	14522	{
14048	14523	MODIFIERS \|= COMMAND;
14049		- /*
	14524	+ /**/
14050	14525	if((mod&SHIFT) == SHIFT)
14051	14526	manipCamera.RotatePosition(0, speed);
14052	14527	else
14053		- manipCamera.BackForth(0, speed*delta, getWidth());
14054		- */
	14528	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14529	+ /**/
14055	14530	if ((mod & SHIFT) == SHIFT)
14056	14531	{
14057	14532	mouseMode = mouseMode;
..	..	@@ -14067,12 +14542,12 @@
14067	14542	void GoLeft(int mod)
14068	14543	{
14069	14544	MODIFIERS \|= COMMAND;
14070		- /*
	14545	+ /**/
14071	14546	if((mod&SHIFT) == SHIFT)
14072		- manipCamera.RotatePosition(speed, 0);
14073		- else
14074	14547	manipCamera.Translate(speed*delta, 0, getWidth());
14075		- */
	14548	+ else
	14549	+ manipCamera.RotatePosition(speed, 0);
	14550	+ /**/
14076	14551	if ((mod & SHIFT) == SHIFT)
14077	14552	{
14078	14553	mouseMode = mouseMode;
..	..	@@ -14088,12 +14563,12 @@
14088	14563	void GoRight(int mod)
14089	14564	{
14090	14565	MODIFIERS \|= COMMAND;
14091		- /*
	14566	+ /**/
14092	14567	if((mod&SHIFT) == SHIFT)
14093		- manipCamera.RotatePosition(-speed, 0);
14094		- else
14095	14568	manipCamera.Translate(-speed*delta, 0, getWidth());
14096		- */
	14569	+ else
	14570	+ manipCamera.RotatePosition(-speed, 0);
	14571	+ /**/
14097	14572	if ((mod & SHIFT) == SHIFT)
14098	14573	{
14099	14574	mouseMode = mouseMode;
..	..	@@ -14111,7 +14586,7 @@
14111	14586	int X, Y;
14112	14587	boolean SX, SY;
14113	14588
14114		- void drag(int x, int y, int modifiers)
	14589	+ void drag(int x, int y, int modifiers, int modifiersex)
14115	14590	{
14116	14591	if (IsFrozen())
14117	14592	{
..	..	@@ -14120,17 +14595,17 @@
14120	14595
14121	14596	drag = true; // NEW
14122	14597
14123		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14598	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14124	14599
14125	14600	X = x;
14126	14601	Y = y;
14127	14602	// floating state for animation
14128		- MODIFIERS = modifiers;
14129		- modifiers &= ~1024;
	14603	+ MODIFIERS = modifiersex;
	14604	+ modifiersex &= ~1024;
14130	14605	if (false) // modifiers != 0)
14131	14606	{
14132	14607	//new Exception().printStackTrace();
14133		- System.out.println("mouseDragged: " + modifiers);
	14608	+ System.out.println("mouseDragged: " + modifiersex);
14134	14609	System.out.println("SHIFT = " + SHIFT);
14135	14610	System.out.println("CONTROL = " + COMMAND);
14136	14611	System.out.println("META = " + META);
..	..	@@ -14150,7 +14625,8 @@
14150	14625	info.camera = renderCamera;
14151	14626	info.x = x;
14152	14627	info.y = y;
14153		- object.editWindow.copy.doEditDrag(info);
	14628	+ object.GetWindow().copy
	14629	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14154	14630	} else
14155	14631	{
14156	14632	if (x < startX)
..	..	@@ -14314,7 +14790,9 @@
14314	14790	ci.camera = renderCamera;
14315	14791	if (!isRenderer)
14316	14792	{
14317		- if (object.editWindow.copy.doEditClick(ci, 0))
	14793	+ //ObjEditor editWindow = object.editWindow;
	14794	+ //Object3D copy = editWindow.copy;
	14795	+ if (object.doEditClick(ci, 0))
14318	14796	{
14319	14797	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14320	14798	} else
..	..	@@ -14326,7 +14804,11 @@
14326	14804
14327	14805	public void mouseReleased(MouseEvent e)
14328	14806	{
	14807	+ Globals.MOUSEDRAGGED = false;
	14808	+
14329	14809	movingcamera = false;
	14810	+ X = 0; // getBounds().width/2;
	14811	+ Y = 0; // getBounds().height/2;
14330	14812	//System.out.println("mouseReleased: " + e);
14331	14813	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14332	14814	}
..	..	@@ -14349,9 +14831,9 @@
14349	14831	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14350	14832	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14351	14833
14352		- if (control \|\| command \|\| IsFrozen())
	14834	+// No delay if (control \|\| command \|\| IsFrozen())
14353	14835	timeout = true;
14354		- else
	14836	+// ?? May 2019 else
14355	14837	// timer.setDelay((modifiers & 128) != 0?0:350);
14356	14838	mouseDown = false;
14357	14839	if (!control && !command) // june 2013
..	..	@@ -14461,7 +14943,7 @@
14461	14943	System.out.println("keyReleased: " + e);
14462	14944	}
14463	14945
14464		- void SetMouseMode(int modifiers)
	14946	+ void SetMouseMode(int modifiers, int modifiersex)
14465	14947	{
14466	14948	//System.out.println("SetMouseMode = " + modifiers);
14467	14949	//modifiers &= ~1024;
..	..	@@ -14473,25 +14955,25 @@
14473	14955	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14474	14956	// return;
14475	14957	//System.out.println("SetMode = " + modifiers);
14476		- if ((modifiers & WHEEL) == WHEEL)
	14958	+ if ((modifiersex & WHEEL) == WHEEL)
14477	14959	{
14478	14960	mouseMode \|= ZOOM;
14479	14961	}
14480	14962
14481	14963	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14482		- if (capsLocked \|\| (modifiers & META) == META)
	14964	+ if (capsLocked) // \|\| (modifiers & META) == META)
14483	14965	{
14484	14966	mouseMode \|= VR; // BACKFORTH;
14485	14967	}
14486		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14968	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14487	14969	{
14488	14970	mouseMode \|= SELECT;
14489	14971	}
14490		- if ((modifiers & COMMAND) == COMMAND)
	14972	+ if ((modifiersex & COMMAND) == COMMAND)
14491	14973	{
14492	14974	mouseMode \|= SELECT;
14493	14975	}
14494		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14976	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14495	14977	{
14496	14978	mouseMode &= ~VR;
14497	14979	mouseMode \|= TRANSLATE;
..	..	@@ -14520,7 +15002,7 @@
14520	15002
14521	15003	if (isRenderer) //
14522	15004	{
14523		- SetMouseMode(modifiers);
	15005	+ SetMouseMode(0, modifiers);
14524	15006	}
14525	15007
14526	15008	Globals.theRenderer.keyPressed(key);
..	..	@@ -14582,7 +15064,8 @@
14582	15064	// break;
14583	15065	case 'T':
14584	15066	CACHETEXTURE ^= true;
14585		- textures.clear();
	15067	+ texturepigment.clear();
	15068	+ texturebump.clear();
14586	15069	// repaint();
14587	15070	break;
14588	15071	case 'Y':
..	..	@@ -14667,7 +15150,9 @@
14667	15150	case 'E' : COMPACT ^= true;
14668	15151	repaint();
14669	15152	break;
14670		- case 'W' : DEBUGHSB ^= true;
	15153	+ case 'W' : // Wide Window (fullscreen)
	15154	+ //DEBUGHSB ^= true;
	15155	+ ObjEditor.theFrame.ToggleFullScreen();
14671	15156	repaint();
14672	15157	break;
14673	15158	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14692,8 +15177,8 @@
14692	15177	RevertCamera();
14693	15178	repaint();
14694	15179	break;
14695		- case 'L':
14696	15180	case 'l':
	15181	+ //case 'L':
14697	15182	if (lightMode)
14698	15183	{
14699	15184	lightMode = false;
..	..	@@ -14836,9 +15321,9 @@
14836	15321	case '_':
14837	15322	kompactbit = 5;
14838	15323	break;
14839		- case '+':
14840		- kompactbit = 6;
14841		- break;
	15324	+// case '+':
	15325	+// kompactbit = 6;
	15326	+// break;
14842	15327	case ' ':
14843	15328	lightMode ^= true;
14844	15329	Globals.lighttouched = true;
..	..	@@ -14850,13 +15335,14 @@
14850	15335	case ESC:
14851	15336	RENDERPROGRAM += 1;
14852	15337	RENDERPROGRAM %= 3;
	15338	+
14853	15339	repaint();
14854	15340	break;
14855	15341	case 'Z':
14856	15342	//RESIZETEXTURE ^= true;
14857	15343	//break;
14858	15344	case 'z':
14859		- RENDERSHADOW ^= true;
	15345	+ Globals.RENDERSHADOW ^= true;
14860	15346	Globals.lighttouched = true;
14861	15347	repaint();
14862	15348	break;
..	..	@@ -14889,8 +15375,9 @@
14889	15375	case DELETE:
14890	15376	ClearSelection();
14891	15377	break;
14892		- /*
14893	15378	case '+':
	15379	+
	15380	+ /*
14894	15381	//fontsize += 1;
14895	15382	bbzoom *= 2;
14896	15383	repaint();
..	..	@@ -14907,17 +15394,17 @@
14907	15394	case '=':
14908	15395	IncDepth();
14909	15396	//fontsize += 1;
14910		- object.editWindow.refreshContents(true);
	15397	+ object.GetWindow().refreshContents(true);
14911	15398	maskbit = 6;
14912	15399	break;
14913	15400	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14914	15401	DecDepth();
14915	15402	maskbit = 5;
14916	15403	//if(fontsize > 1) fontsize -= 1;
14917		- if (object.editWindow == null)
14918		- new Exception().printStackTrace();
14919		- else
14920		- object.editWindow.refreshContents(true);
	15404	+// if (object.editWindow == null)
	15405	+// new Exception().printStackTrace();
	15406	+// else
	15407	+ object.GetWindow().refreshContents(true);
14921	15408	break;
14922	15409	case '{':
14923	15410	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14980,7 +15467,7 @@
14980	15467	//mode = ROTATE;
14981	15468	if ((MODIFIERS & COMMAND) == 0) // VR??
14982	15469	{
14983		- SetMouseMode(modifiers);
	15470	+ SetMouseMode(0, modifiers);
14984	15471	}
14985	15472	}
14986	15473
..	..	@@ -15116,7 +15603,7 @@
15116	15603	{
15117	15604	//System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15118	15605	//if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15119		- if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
	15606	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
15120	15607	{
15121	15608	mouseMoved(e);
15122	15609	} else
..	..	@@ -15141,7 +15628,7 @@
15141	15628	}
15142	15629	*/
15143	15630
15144		- object.editWindow.EditSelection();
	15631	+ object.GetWindow().EditSelection(false);
15145	15632	}
15146	15633
15147	15634	void SelectParent()
..	..	@@ -15158,10 +15645,10 @@
15158	15645	{
15159	15646	//selectees.remove(i);
15160	15647	System.out.println("select parent of " + elem);
15161		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15648	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15162	15649	} else
15163	15650	{
15164		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15651	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15165	15652	}
15166	15653
15167	15654	first = false;
..	..	@@ -15203,12 +15690,12 @@
15203	15690	for (int j = 0; j < group.children.size(); j++)
15204	15691	{
15205	15692	elem = (Object3D) group.children.elementAt(j);
15206		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15693	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15207	15694	first = false;
15208	15695	}
15209	15696	} else
15210	15697	{
15211		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15698	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15212	15699	}
15213	15700
15214	15701	first = false;
..	..	@@ -15219,21 +15706,21 @@
15219	15706	{
15220	15707	//Composite group = (Composite) object;
15221	15708	Object3D group = object;
15222		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15709	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15223	15710	}
15224	15711
15225	15712	void ResetTransform(int mask)
15226	15713	{
15227	15714	//Composite group = (Composite) object;
15228	15715	Object3D group = object;
15229		- group.editWindow.ResetTransform(mask);
	15716	+ group.GetWindow().ResetTransform(mask);
15230	15717	}
15231	15718
15232	15719	void FlipTransform()
15233	15720	{
15234	15721	//Composite group = (Composite) object;
15235	15722	Object3D group = object;
15236		- group.editWindow.FlipTransform();
	15723	+ group.GetWindow().FlipTransform();
15237	15724	// group.editWindow.ReduceMesh(true);
15238	15725	}
15239	15726
..	..	@@ -15241,7 +15728,7 @@
15241	15728	{
15242	15729	//Composite group = (Composite) object;
15243	15730	Object3D group = object;
15244		- group.editWindow.PrintMemory();
	15731	+ group.GetWindow().PrintMemory();
15245	15732	// group.editWindow.ReduceMesh(true);
15246	15733	}
15247	15734
..	..	@@ -15249,7 +15736,7 @@
15249	15736	{
15250	15737	//Composite group = (Composite) object;
15251	15738	Object3D group = object;
15252		- group.editWindow.ResetCentroid();
	15739	+ group.GetWindow().ResetCentroid();
15253	15740	}
15254	15741
15255	15742	void IncDepth()
..	..	@@ -15335,7 +15822,9 @@
15335	15822	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15336	15823	//Image img = CreateImage(width, height);
15337	15824	//System.out.println("width = " + width + "; height = " + height + "\n");
	15825	+
15338	15826	Graphics gr = g; // img.getGraphics();
	15827	+
15339	15828	if (!hasMarquee)
15340	15829	{
15341	15830	if (Xmin < Xmax) // !locked)
..	..	@@ -15423,6 +15912,7 @@
15423	15912	info.bounds.y += (height - desired) / 2;
15424	15913	}
15425	15914	}
	15915	+
15426	15916	info.g = gr;
15427	15917	info.camera = renderCamera;
15428	15918	/*
..	..	@@ -15432,15 +15922,55 @@
15432	15922	*/
15433	15923	if (!isRenderer)
15434	15924	{
15435		- object.drawEditHandles(info, 0);
	15925	+ Grafreed.Assert(object != null);
	15926	+ Grafreed.Assert(object.selection != null);
	15927	+ if (object.selection.Size() > 0)
	15928	+ {
	15929	+ int hitSomething = object.selection.get(0).hitSomething;
	15930	+
	15931	+ info.DX = 0;
	15932	+ info.DY = 0;
	15933	+ info.W = 1;
	15934	+ if (hitSomething == Object3D.hitCenter)
	15935	+ {
	15936	+ info.DX = X;
	15937	+ if (X != 0)
	15938	+ info.DX -= info.bounds.width/2;
	15939	+
	15940	+ info.DY = Y;
	15941	+ if (Y != 0)
	15942	+ info.DY -= info.bounds.height/2;
	15943	+ }
	15944	+
	15945	+ object.drawEditHandles(info, 0);
	15946	+
	15947	+ if (drag && (X != 0 \|\| Y != 0))
	15948	+ {
	15949	+ switch (hitSomething)
	15950	+ {
	15951	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15952	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15953	+ break;
	15954	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15955	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15956	+ break;
	15957	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15958	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15959	+ break;
	15960	+ }
	15961	+
	15962	+ }
	15963	+ }
15436	15964	}
15437	15965	}
	15966	+
15438	15967	if (isRenderer)
15439	15968	{
15440	15969	//gr.setColor(Color.black);
15441	15970	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15442	15971	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15443	15972	}
	15973	+
15444	15974	if (hasMarquee)
15445	15975	{
15446	15976	gr.setXORMode(Color.white);
..	..	@@ -15553,6 +16083,7 @@
15553	16083	public boolean mouseDown(Event evt, int x, int y)
15554	16084	{
15555	16085	System.out.println("mouseDown: " + evt);
	16086	+ System.exit(0);
15556	16087	/*
15557	16088	locked = true;
15558	16089	drag = false;
..	..	@@ -15596,7 +16127,7 @@
15596	16127	{
15597	16128	keyPressed(0, modifiers);
15598	16129	}
15599		- clickStart(x, y, modifiers);
	16130	+ // clickStart(x, y, modifiers);
15600	16131	return true;
15601	16132	}
15602	16133
..	..	@@ -15714,7 +16245,7 @@
15714	16245	{
15715	16246	keyReleased(0, 0);
15716	16247	}
15717		- drag(x, y, modifiers);
	16248	+ drag(x, y, 0, modifiers);
15718	16249	return true;
15719	16250	}
15720	16251
..	..	@@ -15846,7 +16377,7 @@
15846	16377	Object3D object;
15847	16378	static Object3D trackedobject;
15848	16379	Camera renderCamera; // Light or Eye (or Occlusion)
15849		- /static/ Camera manipCamera; // Light or Eye
	16380	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15850	16381	/static/ Camera eyeCamera;
15851	16382	/static/ Camera lightCamera;
15852	16383	int cameracount;
..	..	@@ -16131,16 +16662,16 @@
16131	16662	cStatic.objectstack[materialdepth++] = checker;
16132	16663	//System.out.println("material " + material);
16133	16664	//Applet3D.tracein(this, selected);
16134		- vector2buffer = checker.projectedVertices;
	16665	+ //vector2buffer = checker.projectedVertices;
16135	16666
16136	16667	//checker.GetMaterial().Draw(this, false); // true);
16137		- DrawMaterial(checker.GetMaterial(), false); // true);
	16668	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16138	16669
16139	16670	materialdepth -= 1;
16140	16671	if (materialdepth > 0)
16141	16672	{
16142		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16143		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16673	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16674	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16144	16675	}
16145	16676	//checker.GetMaterial().opacity = 1f;
16146	16677	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16226,6 +16757,14 @@
16226	16757	}
16227	16758	}
16228	16759
	16760	+ private Object3D GetFolder()
	16761	+ {
	16762	+ Object3D folder = object.GetWindow().copy;
	16763	+ if (object.GetWindow().copy.selection.Size() > 0)
	16764	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16765	+ return folder;
	16766	+ }
	16767	+
16229	16768	class SelectBuffer implements GLEventListener
16230	16769	{
16231	16770
..	..	@@ -16305,6 +16844,17 @@
16305	16844
16306	16845	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16307	16846
	16847	+ if (PAINTMODE)
	16848	+ {
	16849	+ if (object.GetWindow().copy.selection.Size() > 0)
	16850	+ {
	16851	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16852	+
	16853	+ // Make what you paint not selectable.
	16854	+ paintobj.ResetSelectable();
	16855	+ }
	16856	+ }
	16857	+
16308	16858	//int tmp = selection_view;
16309	16859	//selection_view = -1;
16310	16860	int temp = DrawMode();
..	..	@@ -16316,6 +16866,17 @@
16316	16866	// temp = DEFAULT; // patch for selection debug
16317	16867	Globals.drawMode = temp; // WARNING
16318	16868
	16869	+ if (PAINTMODE)
	16870	+ {
	16871	+ if (object.GetWindow().copy.selection.Size() > 0)
	16872	+ {
	16873	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16874	+
	16875	+ // Revert.
	16876	+ paintobj.RestoreSelectable();
	16877	+ }
	16878	+ }
	16879	+
16319	16880	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16320	16881
16321	16882	// trying different ways of getting the depth info over
..	..	@@ -16363,6 +16924,8 @@
16363	16924	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16364	16925	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16365	16926	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	16927	+
	16928	+ CreateSelectedPoint();
16366	16929
16367	16930	// Will fit the mesh !!!
16368	16931	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16412,34 +16975,36 @@
16412	16975	System.out.println("; fromto " + sel + " " + Trunk(previousselectedpoint.toParent[3][0]) + " " + Trunk(previousselectedpoint.toParent[3][2]) + " " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][2]));
16413	16976	}
16414	16977
16415		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16978	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16416	16979	}
16417	16980	}
16418	16981
16419	16982	if (!movingcamera && !PAINTMODE)
16420		- object.editWindow.ScreenFitPoint(); // fev 2014
	16983	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16421	16984
16422		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16985	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16423	16986	{
16424		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16987	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16425	16988
16426		- Object3D group = new Object3D("inst" + paintcount++);
	16989	+ if (object.GetWindow().copy.selection.Size() > 0)
	16990	+ {
	16991	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16427	16992
16428		- group.CreateMaterial(); // use a void leaf to select instances
16429		-
16430		- group.add(paintobj); // link
16431		-
16432		- object.editWindow.SnapObject(group);
16433		-
16434		- Object3D folder = object.editWindow.copy;
16435		-
16436		- if (object.editWindow.copy.selection.Size() > 0)
16437		- folder = object.editWindow.copy.selection.elementAt(0);
16438		-
16439		- folder.add(group);
16440		-
16441		- object.editWindow.ResetModel();
16442		- object.editWindow.refreshContents();
	16993	+ Object3D inst = new Object3D("inst" + paintcount++);
	16994	+
	16995	+ inst.CreateMaterial(); // use a void leaf to select instances
	16996	+
	16997	+ inst.add(paintobj); // link
	16998	+
	16999	+ object.GetWindow().SnapObject(inst);
	17000	+
	17001	+ Object3D folder = paintFolder; // GetFolder();
	17002	+
	17003	+ folder.add(inst);
	17004	+
	17005	+ object.GetWindow().ResetModel();
	17006	+ object.GetWindow().refreshContents();
	17007	+ }
16443	17008	}
16444	17009	else
16445	17010	paintcount = 0;
..	..	@@ -16478,6 +17043,11 @@
16478	17043	//System.out.println("objects[color] = " + objects[color]);
16479	17044	//objects[color].Select();
16480	17045	indexcount = 0;
	17046	+ ObjEditor window = object.GetWindow();
	17047	+ if (window != null && deselect)
	17048	+ {
	17049	+ window.Select(null, deselect, true);
	17050	+ }
16481	17051	object.Select(color, deselect);
16482	17052	}
16483	17053
..	..	@@ -16577,7 +17147,7 @@
16577	17147	gl.glDisable(gl.GL_CULL_FACE);
16578	17148	}
16579	17149
16580		- if (!RENDERSHADOW)
	17150	+ if (!Globals.RENDERSHADOW)
16581	17151	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16582	17152
16583	17153	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16587,7 +17157,7 @@
16587	17157	//gl.glColorMask(false, false, false, false);
16588	17158
16589	17159	//render_scene_from_light_view(gl, drawable, 0, 0);
16590		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17160	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16591	17161	{
16592	17162	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16593	17163
..	..	@@ -17003,23 +17573,15 @@
17003	17573	int AAbuffersize = 0;
17004	17574
17005	17575	//double[] selectedpoint = new double[3];
17006		- static Superellipsoid selectedpoint = new Superellipsoid();
	17576	+ static Superellipsoid selectedpoint;
17007	17577	static Sphere previousselectedpoint = null;
17008		- static Sphere debugpointG = new Sphere();
17009		- static Sphere debugpointP = new Sphere();
17010		- static Sphere debugpointC = new Sphere();
17011		- static Sphere debugpointR = new Sphere();
	17578	+ static Sphere debugpointG;
	17579	+ static Sphere debugpointP;
	17580	+ static Sphere debugpointC;
	17581	+ static Sphere debugpointR;
17012	17582
17013	17583	static Sphere debugpoints[] = new Sphere[8];
17014	17584
17015		- static
17016		- {
17017		- for (int i=0; i<8; i++)
17018		- {
17019		- debugpoints[i] = new Sphere();
17020		- }
17021		- }
17022		-
17023	17585	static void InitPoints(float radius)
17024	17586	{
17025	17587	for (int i=0; i<8; i++)