~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
..	..	@@ -152,6 +186,8 @@
152	186	defaultcaps.setAccumAlphaBits(16);
153	187	}
154	188
	189	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	190	+
155	191	void SetAsGLRenderer(boolean b)
156	192	{
157	193	isRenderer = b;
..	..	@@ -170,7 +206,8 @@
170	206
171	207	SetCamera(cam);
172	208
173		- SetLight(new Camera(new cVector(10, 10, -20)));
	209	+ // Warning: not used.
	210	+ SetLight(new Camera(new cVector(15, 10, -20)));
174	211
175	212	object = o;
176	213
..	..	@@ -327,7 +364,7 @@
327	364	cStatic.objectstack[materialdepth++] = obj;
328	365	//System.out.println("material " + material);
329	366	//Applet3D.tracein(this, selected);
330		- display.vector2buffer = obj.projectedVertices;
	367	+ //display.vector2buffer = obj.projectedVertices;
331	368	if (obj instanceof Camera)
332	369	{
333	370	display.options1[0] = material.shift;
..	..	@@ -336,14 +373,28 @@
336	373	display.options1[2] = material.shadowbias;
337	374	display.options1[3] = material.aniso;
338	375	display.options1[4] = material.anisoV;
	376	+// System.out.println("display.options1[0] " + display.options1[0]);
	377	+// System.out.println("display.options1[1] " + display.options1[1]);
	378	+// System.out.println("display.options1[2] " + display.options1[2]);
	379	+// System.out.println("display.options1[3] " + display.options1[3]);
	380	+// System.out.println("display.options1[4] " + display.options1[4]);
339	381	display.options2[0] = material.opacity;
340	382	display.options2[1] = material.diffuse;
341	383	display.options2[2] = material.factor;
	384	+// System.out.println("display.options2[0] " + display.options2[0]);
	385	+// System.out.println("display.options2[1] " + display.options2[1]);
	386	+// System.out.println("display.options2[2] " + display.options2[2]);
342	387
343	388	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	389	+// System.out.println("display.options3[0] " + display.options3[0]);
	390	+// System.out.println("display.options3[1] " + display.options3[1]);
	391	+// System.out.println("display.options3[2] " + display.options3[2]);
344	392	display.options4[0] = material.cameralight/0.2f;
345	393	display.options4[1] = material.subsurface;
346	394	display.options4[2] = material.sheen;
	395	+// System.out.println("display.options4[0] " + display.options4[0]);
	396	+// System.out.println("display.options4[1] " + display.options4[1]);
	397	+// System.out.println("display.options4[2] " + display.options4[2]);
347	398
348	399	// if (display.CURRENTANTIALIAS > 0)
349	400	// display.options3[3] /= 4;
..	..	@@ -359,7 +410,7 @@
359	410	/**/
360	411	} else
361	412	{
362		- DrawMaterial(material, selected);
	413	+ DrawMaterial(material, selected, obj.projectedVertices);
363	414	}
364	415	} else
365	416	{
..	..	@@ -383,8 +434,8 @@
383	434	cStatic.objectstack[materialdepth++] = obj;
384	435	//System.out.println("material " + material);
385	436	//Applet3D.tracein("selected ", selected);
386		- display.vector2buffer = obj.projectedVertices;
387		- display.DrawMaterial(material, selected);
	437	+ //display.vector2buffer = obj.projectedVertices;
	438	+ display.DrawMaterial(material, selected, obj.projectedVertices);
388	439	}
389	440	}
390	441
..	..	@@ -401,8 +452,8 @@
401	452	materialdepth -= 1;
402	453	if (materialdepth > 0)
403	454	{
404		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
405		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	455	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	456	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
406	457	}
407	458	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
408	459	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -422,8 +473,8 @@
422	473	materialdepth -= 1;
423	474	if (materialdepth > 0)
424	475	{
425		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
426		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	476	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	477	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
427	478	}
428	479	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
429	480	//else
..	..	@@ -464,10 +515,12 @@
464	515	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
465	516	{
466	517	//gl.glBegin(gl.GL_TRIANGLES);
467		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	518	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	519	+ // TEST LIVE NORMALS && !obj.dontselect
	520	+ ;
468	521	if (!hasnorm)
469	522	{
470		- // System.out.println("FUCK!!");
	523	+ // System.out.println("Mesh normal");
471	524	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
472	525	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
473	526	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1192,10 +1245,12 @@
1192	1245	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1193	1246	}
1194	1247	}
	1248	+
1195	1249	if (flipV)
1196	1250	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1197	1251	else
1198	1252	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1253	+
1199	1254	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1200	1255	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1201	1256
..	..	@@ -1215,10 +1270,12 @@
1215	1270	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1216	1271	}
1217	1272	}
	1273	+
1218	1274	if (flipV)
1219	1275	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1220	1276	else
1221	1277	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1278	+
1222	1279	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1223	1280	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1224	1281
..	..	@@ -1246,8 +1303,10 @@
1246	1303	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1247	1304	else
1248	1305	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1306	+
1249	1307	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1250	1308	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1309	+
1251	1310	count2 += 2;
1252	1311	count3 += 3;
1253	1312	}
..	..	@@ -1603,7 +1662,7 @@
1603	1662	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1604	1663	}
1605	1664
1606		- void DrawMaterial(cMaterial material, boolean selected)
	1665	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1607	1666	{
1608	1667	CameraPane display = this;
1609	1668	//new Exception().printStackTrace();
..	..	@@ -1630,7 +1689,7 @@
1630	1689
1631	1690	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1632	1691
1633		- float[] colorV = GrafreeD.colorV;
	1692	+ float[] colorV = Grafreed.colorV;
1634	1693
1635	1694	/**/
1636	1695	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1638,7 +1697,7 @@
1638	1697	colorV[0] = display.modelParams0[0] * material.diffuse;
1639	1698	colorV[1] = display.modelParams0[1] * material.diffuse;
1640	1699	colorV[2] = display.modelParams0[2] * material.diffuse;
1641		- colorV[3] = material.opacity;
	1700	+ colorV[3] = 1; // material.opacity;
1642	1701
1643	1702	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1644	1703	//System.out.println("Opacity = " + opacity);
..	..	@@ -1746,9 +1805,9 @@
1746	1805	display.modelParams7[2] = 0;
1747	1806	display.modelParams7[3] = 0;
1748	1807
1749		- display.modelParams6[0] = 100; // criss de bug de bump
	1808	+ //display.modelParams6[0] = 100; // criss de bug de bump
1750	1809
1751		- Object3D.cVector2[] extparams = display.vector2buffer;
	1810	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1752	1811	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1753	1812	{
1754	1813	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1890,7 +1949,7 @@
1890	1949	void PushMatrix(double[][] matrix)
1891	1950	{
1892	1951	// GrafreeD.tracein(matrix);
1893		- PushMatrix(matrix,1);
	1952	+ PushMatrix(matrix, 1);
1894	1953	}
1895	1954
1896	1955	void PushMatrix()
..	..	@@ -2044,7 +2103,7 @@
2044	2103	//System.err.println("Oeil on");
2045	2104	OEIL = true;
2046	2105	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2047		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2106	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2048	2107	//pingthread.StepToTarget(true);
2049	2108	}
2050	2109
..	..	@@ -2142,7 +2201,7 @@
2142	2201	System.err.println("LIVE = " + Globals.isLIVE());
2143	2202
2144	2203	if (!Globals.isLIVE()) // save sound
2145		- GrafreeD.savesound = true; // wav.save();
	2204	+ Grafreed.savesound = true; // wav.save();
2146	2205	// else
2147	2206	repaint(); // start loop // may 2013
2148	2207	}
..	..	@@ -2259,7 +2318,7 @@
2259	2318
2260	2319	void ToggleDebug()
2261	2320	{
2262		- DEBUG ^= true;
	2321	+ Globals.DEBUG ^= true;
2263	2322	}
2264	2323
2265	2324	void ToggleLookAt()
..	..	@@ -2267,9 +2326,9 @@
2267	2326	LOOKAT ^= true;
2268	2327	}
2269	2328
2270		- void ToggleRandom()
	2329	+ void ToggleSwitch()
2271	2330	{
2272		- RANDOM ^= true;
	2331	+ SWITCH ^= true;
2273	2332	}
2274	2333
2275	2334	void ToggleHandles()
..	..	@@ -2277,10 +2336,17 @@
2277	2336	HANDLES ^= true;
2278	2337	}
2279	2338
	2339	+ Object3D paintFolder;
	2340	+
2280	2341	void TogglePaint()
2281	2342	{
2282	2343	PAINTMODE ^= true;
2283	2344	paintcount = 0;
	2345	+
	2346	+ if (PAINTMODE)
	2347	+ {
	2348	+ paintFolder = GetFolder();
	2349	+ }
2284	2350	}
2285	2351
2286	2352	void SwapCamera(int a, int b)
..	..	@@ -2376,7 +2442,22 @@
2376	2442	{
2377	2443	return currentGL;
2378	2444	}
2379		-
	2445	+
	2446	+ static private BufferedImage CreateBim(TextureData texturedata)
	2447	+ {
	2448	+ Grafreed.Assert(texturedata != null);
	2449	+
	2450	+ int width = texturedata.getWidth();
	2451	+ int height = texturedata.getHeight();
	2452	+
	2453	+ Buffer buffer = texturedata.getBuffer();
	2454	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2455	+
	2456	+ byte[] bytes = bytebuf.array();
	2457	+
	2458	+ return CreateBim(bytes, width, height);
	2459	+ }
	2460	+
2380	2461	/**/
2381	2462	class CacheTexture
2382	2463	{
..	..	@@ -2385,28 +2466,31 @@
2385	2466
2386	2467	int resolution;
2387	2468
2388		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2469	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2389	2470	{
2390		- texture = tex;
	2471	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2472	+ texturedata = texdata;
2391	2473	resolution = res;
2392	2474	}
2393	2475	}
2394	2476	/**/
2395	2477
2396	2478	// 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>();
	2479	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2480	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2481	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2482	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2483	+
2400	2484	int pigmentdepth = 0;
2401	2485	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2402	2486	int bumpdepth = 0;
2403	2487	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2404	2488	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2405	2489	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2406		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2490	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2407	2491	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2408	2492
2409		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2493	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2410	2494	{
2411	2495	TextureData texturedata = null;
2412	2496
..	..	@@ -2425,13 +2509,34 @@
2425	2509	if (bump)
2426	2510	texturedata = ConvertBump(texturedata, false);
2427	2511
2428		- com.sun.opengl.util.texture.Texture texture =
2429		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2512	+// com.sun.opengl.util.texture.Texture texture =
	2513	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2430	2514
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);
	2515	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2516	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2433	2517
2434		- return texture;
	2518	+ return texturedata;
	2519	+ }
	2520	+
	2521	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2522	+ {
	2523	+ TextureData texturedata = null;
	2524	+
	2525	+ try
	2526	+ {
	2527	+ texturedata =
	2528	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2529	+ bim,
	2530	+ true);
	2531	+ } catch (Exception e)
	2532	+ {
	2533	+ throw new javax.media.opengl.GLException(e);
	2534	+ }
	2535	+
	2536	+ if (bump)
	2537	+ texturedata = ConvertBump(texturedata, false);
	2538	+
	2539	+ return texturedata;
2435	2540	}
2436	2541
2437	2542	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3504,6 +3609,8 @@
3504	3609
3505	3610	System.out.println("LOADING TEXTURE : " + name);
3506	3611
	3612	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3613	+
3507	3614	//
3508	3615	if (false) // compressbit > 0)
3509	3616	{
..	..	@@ -4208,6 +4315,7 @@
4208	4315
4209	4316	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
4210	4317	{
	4318	+ new Exception().printStackTrace();
4211	4319	System.exit(0);
4212	4320	com.sun.opengl.util.texture.Texture texture = null;
4213	4321
..	..	@@ -7901,7 +8009,7 @@
7901	8009	String pigment = Object3D.GetPigment(tex);
7902	8010	String bump = Object3D.GetBump(tex);
7903	8011
7904		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8012	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7905	8013	{
7906	8014	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7907	8015	// System.out.println("; bump = " + bump);
..	..	@@ -7916,11 +8024,69 @@
7916	8024	pigment = null;
7917	8025	}
7918	8026
7919		- ReleaseTexture(bump, true);
7920		- ReleaseTexture(pigment, false);
	8027	+ ReleaseTexture(tex, true);
	8028	+ ReleaseTexture(tex, false);
7921	8029	}
7922	8030
7923		- void ReleaseTexture(String tex, boolean bump)
	8031	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8032	+ {
	8033	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8034	+ {
	8035	+ return;
	8036	+ }
	8037	+
	8038	+ if (tex == null)
	8039	+ {
	8040	+ ReleaseTexture(null, false);
	8041	+ return;
	8042	+ }
	8043	+
	8044	+ String pigment = Object3D.GetPigment(tex);
	8045	+
	8046	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8047	+ {
	8048	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8049	+ // System.out.println("; bump = " + bump);
	8050	+ }
	8051	+
	8052	+ if (pigment.equals(""))
	8053	+ {
	8054	+ pigment = null;
	8055	+ }
	8056	+
	8057	+ ReleaseTexture(tex, false);
	8058	+ }
	8059	+
	8060	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8061	+ {
	8062	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8063	+ {
	8064	+ return;
	8065	+ }
	8066	+
	8067	+ if (tex == null)
	8068	+ {
	8069	+ ReleaseTexture(null, true);
	8070	+ return;
	8071	+ }
	8072	+
	8073	+ String bump = Object3D.GetBump(tex);
	8074	+
	8075	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8076	+ {
	8077	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8078	+ // System.out.println("; bump = " + bump);
	8079	+ }
	8080	+
	8081	+ if (bump.equals(""))
	8082	+ {
	8083	+ bump = null;
	8084	+ }
	8085	+
	8086	+ ReleaseTexture(tex, true);
	8087	+ }
	8088	+
	8089	+ void ReleaseTexture(cTexture tex, boolean bump)
7924	8090	{
7925	8091	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7926	8092	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7931,7 +8097,7 @@
7931	8097	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7932	8098
7933	8099	if (tex != null)
7934		- texture = textures.get(tex);
	8100	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7935	8101
7936	8102	// //assert( texture != null );
7937	8103	// if (texture == null)
..	..	@@ -8023,7 +8189,55 @@
8023	8189	}
8024	8190	}
8025	8191
8026		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8192	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	8193	+ {
	8194	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8195	+// ambientOcclusion ) // \|\| !textureon)
	8196	+// {
	8197	+// return; // false;
	8198	+// }
	8199	+//
	8200	+// if (tex == null)
	8201	+// {
	8202	+// BindTexture(null,false,resolution);
	8203	+// BindTexture(null,true,resolution);
	8204	+// return;
	8205	+// }
	8206	+//
	8207	+// String pigment = Object3D.GetPigment(tex);
	8208	+// String bump = Object3D.GetBump(tex);
	8209	+//
	8210	+// usedtextures.add(pigment);
	8211	+// usedtextures.add(bump);
	8212	+//
	8213	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8214	+// {
	8215	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8216	+// // System.out.println("; bump = " + bump);
	8217	+// }
	8218	+//
	8219	+// if (bump.equals(""))
	8220	+// {
	8221	+// bump = null;
	8222	+// }
	8223	+// if (pigment.equals(""))
	8224	+// {
	8225	+// pigment = null;
	8226	+// }
	8227	+//
	8228	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8229	+// BindTexture(pigment, false, resolution);
	8230	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8231	+// BindTexture(bump, true, resolution);
	8232	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8233	+//
	8234	+// return; // true;
	8235	+
	8236	+ BindPigmentTexture(tex, resolution);
	8237	+ BindBumpTexture(tex, resolution);
	8238	+ }
	8239	+
	8240	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8027	8241	{
8028	8242	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8029	8243	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8034,17 +8248,47 @@
8034	8248	if (tex == null)
8035	8249	{
8036	8250	BindTexture(null,false,resolution);
8037		- BindTexture(null,true,resolution);
8038	8251	return;
8039	8252	}
8040	8253
8041	8254	String pigment = Object3D.GetPigment(tex);
	8255	+
	8256	+ usedtextures.add(tex);
	8257	+
	8258	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8259	+ {
	8260	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8261	+ // System.out.println("; bump = " + bump);
	8262	+ }
	8263	+
	8264	+ if (pigment.equals(""))
	8265	+ {
	8266	+ pigment = null;
	8267	+ }
	8268	+
	8269	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8270	+ BindTexture(tex, false, resolution);
	8271	+ }
	8272	+
	8273	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8274	+ {
	8275	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8276	+ ambientOcclusion ) // \|\| !textureon)
	8277	+ {
	8278	+ return; // false;
	8279	+ }
	8280	+
	8281	+ if (tex == null)
	8282	+ {
	8283	+ BindTexture(null,true,resolution);
	8284	+ return;
	8285	+ }
	8286	+
8042	8287	String bump = Object3D.GetBump(tex);
8043	8288
8044		- usedtextures.put(pigment, pigment);
8045		- usedtextures.put(bump, bump);
	8289	+ usedtextures.add(tex);
8046	8290
8047		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8291	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8048	8292	{
8049	8293	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8050	8294	// System.out.println("; bump = " + bump);
..	..	@@ -8054,43 +8298,94 @@
8054	8298	{
8055	8299	bump = null;
8056	8300	}
8057		- if (pigment.equals(""))
8058		- {
8059		- pigment = null;
8060		- }
8061	8301
8062		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8063		- BindTexture(pigment, false, resolution);
8064	8302	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8065		- BindTexture(bump, true, resolution);
	8303	+ BindTexture(tex, true, resolution);
8066	8304	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8067		-
8068		- return; // true;
8069	8305	}
8070	8306
8071		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8307	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8308	+
	8309	+ private boolean FileExists(String tex)
8072	8310	{
8073		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8311	+ if (missingTextures.contains(tex))
	8312	+ {
	8313	+ return false;
	8314	+ }
	8315	+
	8316	+ boolean fileExists = new File(tex).exists();
	8317	+
	8318	+ if (!fileExists)
	8319	+ {
	8320	+ // If file exists, the "new File()" is not executed sgain
	8321	+ missingTextures.add(tex);
	8322	+ }
	8323	+
	8324	+ return fileExists;
	8325	+ }
	8326	+
	8327	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8328	+ {
	8329	+ CacheTexture texturecache = null;
8074	8330
8075	8331	if (tex != null)
8076	8332	{
8077		- String texname = tex;
	8333	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8334	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
8078	8335
8079		- String[] split = tex.split("Textures");
8080		- if (split.length > 1)
8081		- texname = "/Users/nbriere/Textures" + split[split.length-1];
8082		- else
8083		- if (!texname.startsWith("/"))
8084		- texname = "/Users/nbriere/Textures/" + texname;
	8336	+ if (texname.equals("") && texdata == null)
	8337	+ {
	8338	+ return null;
	8339	+ }
	8340	+
	8341	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8342	+
	8343	+// String[] split = tex.split("Textures");
	8344	+// if (split.length > 1)
	8345	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8346	+// else
	8347	+// if (!texname.startsWith("/"))
	8348	+// texname = "/Users/nbriere/Textures/" + texname;
	8349	+ if (!FileExists(texname))
	8350	+ {
	8351	+ texname = fallbackTextureName;
	8352	+ }
8085	8353
8086	8354	if (CACHETEXTURE)
8087		- texture = textures.get(texname); // TEXTURE CACHE
8088		-
8089		- TextureData texturedata = null;
8090		-
8091		- if (texture == null \|\| texture.resolution < resolution)
8092	8355	{
8093		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8356	+ if (texdata == null)
	8357	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8358	+ else
	8359	+ texturecache = bimtextures.get(texdata);
	8360	+ }
	8361	+
	8362	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8363	+ {
	8364	+ TextureData texturedata = null;
	8365	+
	8366	+ if (texdata != null && textureon)
	8367	+ {
	8368	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8369	+
	8370	+ try
	8371	+ {
	8372	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8373	+ }
	8374	+ catch (Exception e)
	8375	+ {
	8376	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8377	+ }
	8378	+
	8379	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8380	+ bimtextures.put(texdata, texturecache);
	8381	+
	8382	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8383	+
	8384	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8385	+ //bim2 = bim;
	8386	+ }
	8387	+ else
	8388	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8094	8389	{
8095	8390	assert(!bump);
8096	8391	// if (bump)
..	..	@@ -8101,19 +8396,23 @@
8101	8396	// }
8102	8397	// else
8103	8398	// {
8104		- texture = textures.get(tex);
8105		- if (texture == null)
	8399	+ // texturecache = textures.get(texname); // suspicious
	8400	+ if (texturecache == null)
8106	8401	{
8107		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8402	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8108	8403	}
	8404	+ else
	8405	+ new Exception().printStackTrace();
8109	8406	// }
8110	8407	} else
8111		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8408	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8112	8409	{
8113	8410	assert(bump);
8114		- texture = textures.get(tex);
8115		- if (texture == null)
8116		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8411	+ // texturecache = textures.get(texname); // suspicious
	8412	+ if (texturecache == null)
	8413	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8414	+ else
	8415	+ new Exception().printStackTrace();
8117	8416	} else
8118	8417	{
8119	8418	//if (tex.equals("IMMORTAL"))
..	..	@@ -8121,11 +8420,13 @@
8121	8420	// texture = GetResourceTexture("default.png");
8122	8421	//} else
8123	8422	//{
8124		- if (tex.equals("WHITE_NOISE"))
	8423	+ if (texname.endsWith("WHITE_NOISE"))
8125	8424	{
8126		- texture = textures.get(tex);
8127		- if (texture == null)
8128		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8425	+ // texturecache = textures.get(texname); // suspicious
	8426	+ if (texturecache == null)
	8427	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8428	+ else
	8429	+ new Exception().printStackTrace();
8129	8430	} else
8130	8431	{
8131	8432	if (textureon)
..	..	@@ -8150,7 +8451,7 @@
8150	8451	}
8151	8452
8152	8453	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8153		- if (!new File(cachename).exists())
	8454	+ if (!FileExists(cachename))
8154	8455	cachename = texname;
8155	8456	else
8156	8457	processbump = false; // don't process bump map again
..	..	@@ -8172,7 +8473,7 @@
8172	8473	}
8173	8474
8174	8475	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8175		- if (!new File(cachename).exists())
	8476	+ if (!FileExists(cachename))
8176	8477	cachename = texname;
8177	8478	else
8178	8479	processbump = false; // don't process bump map again
..	..	@@ -8181,20 +8482,22 @@
8181	8482	texturedata = GetFileTexture(cachename, processbump, resolution);
8182	8483
8183	8484
8184		- if (texturedata != null)
8185		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8485	+ if (texturedata == null)
	8486	+ throw new Exception();
	8487	+
	8488	+ texturecache = new CacheTexture(texturedata,resolution);
8186	8489	//texture = GetTexture(tex, bump);
8187	8490	}
8188	8491	}
8189	8492	//}
8190	8493	}
8191	8494
8192		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8495	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8193	8496	{
8194	8497	//return false;
8195	8498
8196	8499	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8197		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8500	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8198	8501	{
8199	8502	// String ext = "_highres";
8200	8503	// if (REDUCETEXTURE)
..	..	@@ -8211,52 +8514,17 @@
8211	8514	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8212	8515	if (!cachefile.exists())
8213	8516	{
8214		- // cache to disk
8215		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8216		- //buffers[0].
8217		-
8218		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8219		- int[] pixels = new int[bytebuf.capacity()/3];
8220		-
8221		- // squared size heuristic...
8222		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8517	+ //if (texturedata.getWidth() == texturedata.getHeight())
8223	8518	{
8224		- for (int i=pixels.length; --i>=0;)
8225		- {
8226		- int i3 = i*3;
8227		- pixels[i] = 0xFF;
8228		- pixels[i] <<= 8;
8229		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8230		- pixels[i] <<= 8;
8231		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8232		- pixels[i] <<= 8;
8233		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8234		- }
8235		-
8236		- /*
8237		- int r=0,g=0,b=0,a=0;
8238		- for (int i=0; i<width; i++)
8239		- for (int j=0; j<height; j++)
8240		- {
8241		- int index = j*width+i;
8242		- int p = pixels[index];
8243		- a = ((p>>24) & 0xFF);
8244		- r = ((p>>16) & 0xFF);
8245		- g = ((p>>8) & 0xFF);
8246		- b = (p & 0xFF);
8247		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8248		- }
8249		- /**/
8250		- int width = (int)Math.sqrt(pixels.length); // squared
8251		- int height = width;
8252		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8253		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8519	+ BufferedImage rendImage = CreateBim(texturedata);
	8520	+
8254	8521	ImageWriter writer = null;
8255	8522	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8256	8523	if (iter.hasNext()) {
8257	8524	writer = (ImageWriter)iter.next();
8258	8525	}
8259		- float compressionQuality = 0.9f;
	8526	+
	8527	+ float compressionQuality = 0.85f;
8260	8528	try
8261	8529	{
8262	8530	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8273,18 +8541,20 @@
8273	8541	}
8274	8542	}
8275	8543	}
8276		-
	8544	+
	8545	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8546	+
8277	8547	//System.out.println("Texture = " + tex);
8278		- if (textures.containsKey(texname))
	8548	+ if (textures.containsKey(tex))
8279	8549	{
8280		- CacheTexture thetex = textures.get(texname);
	8550	+ CacheTexture thetex = textures.get(tex);
8281	8551	thetex.texture.disable();
8282	8552	thetex.texture.dispose();
8283		- textures.remove(texname);
	8553	+ textures.remove(tex);
8284	8554	}
8285	8555
8286		- texture.texturedata = texturedata;
8287		- textures.put(texname, texture);
	8556	+ //texture.texturedata = texturedata;
	8557	+ textures.put(tex, texturecache);
8288	8558
8289	8559	// newtex = true;
8290	8560	}
..	..	@@ -8300,10 +8570,44 @@
8300	8570	}
8301	8571	}
8302	8572
8303		- return texture;
	8573	+ return texturecache;
8304	8574	}
8305	8575
8306		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8576	+ static void EmbedTextures(cTexture tex)
	8577	+ {
	8578	+ if (tex.pigmentdata == null)
	8579	+ {
	8580	+ //String texname = Object3D.GetPigment(tex);
	8581	+
	8582	+ CacheTexture texturecache = texturepigment.get(tex);
	8583	+
	8584	+ if (texturecache != null)
	8585	+ {
	8586	+ tex.pw = texturecache.texturedata.getWidth();
	8587	+ tex.ph = texturecache.texturedata.getHeight();
	8588	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8589	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8590	+ ;
	8591	+ //, tex.pw, tex.ph), 0.5f);
	8592	+ }
	8593	+ }
	8594	+
	8595	+ if (tex.bumpdata == null)
	8596	+ {
	8597	+ //String texname = Object3D.GetBump(tex);
	8598	+
	8599	+ CacheTexture texturecache = texturebump.get(tex);
	8600	+
	8601	+ if (texturecache != null)
	8602	+ {
	8603	+ tex.bw = texturecache.texturedata.getWidth();
	8604	+ tex.bh = texturecache.texturedata.getHeight();
	8605	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8606	+ }
	8607	+ }
	8608	+ }
	8609	+
	8610	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8307	8611	{
8308	8612	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8309	8613
..	..	@@ -8321,21 +8625,21 @@
8321	8625	return texture!=null?texture.texture:null;
8322	8626	}
8323	8627
8324		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8628	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8325	8629	{
8326	8630	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8327	8631
8328	8632	return texture!=null?texture.texturedata:null;
8329	8633	}
8330	8634
8331		- boolean BindTexture(String tex, boolean bump, int resolution)
	8635	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8332	8636	{
8333	8637	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8334	8638	{
8335	8639	return false;
8336	8640	}
8337	8641
8338		- boolean newtex = false;
	8642	+ //boolean newtex = false;
8339	8643
8340	8644	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8341	8645
..	..	@@ -8367,9 +8671,75 @@
8367	8671	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8368	8672	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8369	8673
8370		- return newtex;
	8674	+ return true; // Warning: not used.
8371	8675	}
8372	8676
	8677	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8678	+ {
	8679	+ try
	8680	+ {
	8681	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8682	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8683	+ ImageWriter writer = writers.next();
	8684	+
	8685	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8686	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8687	+ param.setCompressionQuality(quality);
	8688	+
	8689	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8690	+ writer.setOutput(ios);
	8691	+ writer.write(null, new IIOImage(image, null, null), param);
	8692	+
	8693	+ byte[] data = baos.toByteArray();
	8694	+ writer.dispose();
	8695	+ return data;
	8696	+ }
	8697	+ catch (Exception e)
	8698	+ {
	8699	+ e.printStackTrace();
	8700	+ return null;
	8701	+ }
	8702	+ }
	8703	+
	8704	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8705	+ {
	8706	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8707	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8708	+ ImageReader reader = writers.next();
	8709	+
	8710	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8711	+
	8712	+ ImageReadParam param = reader.getDefaultReadParam();
	8713	+ param.setDestination(bim);
	8714	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8715	+
	8716	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8717	+ reader.setInput(ios);
	8718	+ BufferedImage bim2 = reader.read(0, param);
	8719	+ reader.dispose();
	8720	+
	8721	+// WritableRaster raster = bim2.getRaster();
	8722	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8723	+// byte[] bytes = data.getData();
	8724	+//
	8725	+// int[] pixels = new int[bytes.length/3];
	8726	+// for (int i=pixels.length; --i>=0;)
	8727	+// {
	8728	+// int i3 = i*3;
	8729	+// pixels[i] = 0xFF;
	8730	+// pixels[i] <<= 8;
	8731	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8732	+// pixels[i] <<= 8;
	8733	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8734	+// pixels[i] <<= 8;
	8735	+// pixels[i] \|= bytes[i3] & 0xFF;
	8736	+// }
	8737	+//
	8738	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8739	+
	8740	+ return bim;
	8741	+ }
	8742	+
8373	8743	ShadowBuffer shadowPBuf;
8374	8744	AntialiasBuffer antialiasPBuf;
8375	8745	int MAXSTACK;
..	..	@@ -9205,11 +9575,35 @@
9205	9575	jy8[3] = 0.5f;
9206	9576	}
9207	9577
9208		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9578	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9209	9579	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9210	9580	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9211	9581	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9212	9582
	9583	+ void ResetOptions()
	9584	+ {
	9585	+ options1[0] = 100;
	9586	+ options1[1] = 0.025f;
	9587	+ options1[2] = 0.01f;
	9588	+ options1[3] = 0;
	9589	+ options1[4] = 0;
	9590	+
	9591	+ options2[0] = 0;
	9592	+ options2[1] = 0.75f;
	9593	+ options2[2] = 0;
	9594	+ options2[3] = 0;
	9595	+
	9596	+ options3[0] = 1;
	9597	+ options3[1] = 1;
	9598	+ options3[2] = 1;
	9599	+ options3[3] = 0;
	9600	+
	9601	+ options4[0] = 1;
	9602	+ options4[1] = 0;
	9603	+ options4[2] = 1;
	9604	+ options4[3] = 0;
	9605	+ }
	9606	+
9213	9607	static int imagecount = 0; // movie generation
9214	9608
9215	9609	static int jitter = 0;
..	..	@@ -9305,8 +9699,8 @@
9305	9699	assert (parentcam != renderCamera);
9306	9700
9307	9701	if (renderCamera != lightCamera)
9308		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9309		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9702	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9703	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9310	9704
9311	9705	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9312	9706
..	..	@@ -9321,8 +9715,8 @@
9321	9715	LA.matCopy(renderCamera.fromScreen, matrix);
9322	9716
9323	9717	if (renderCamera != lightCamera)
9324		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9325		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9718	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9719	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9326	9720
9327	9721	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9328	9722
..	..	@@ -9394,7 +9788,7 @@
9394	9788	//gl.glFlush();
9395	9789	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9396	9790
9397		- if (ANIMATION && ABORTED)
	9791	+ if (Globals.ANIMATION && ABORTED)
9398	9792	{
9399	9793	System.err.println(" ABORTED FRAME");
9400	9794	break;
..	..	@@ -9424,7 +9818,7 @@
9424	9818	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9425	9819
9426	9820	// save image
9427		- if (ANIMATION && !ABORTED)
	9821	+ if (Globals.ANIMATION && !ABORTED)
9428	9822	{
9429	9823	VPwidth = viewport[2];
9430	9824	VPheight = viewport[3];
..	..	@@ -9535,11 +9929,11 @@
9535	9929
9536	9930	// imagecount++;
9537	9931
9538		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9932	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9539	9933
9540	9934	if (!BOXMODE)
9541	9935	{
9542		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9936	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9543	9937	}
9544	9938
9545	9939	if (!BOXMODE)
..	..	@@ -9577,7 +9971,7 @@
9577	9971	ABORTED = false;
9578	9972	}
9579	9973	else
9580		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9974	+ Grafreed.wav.cursor += 735 * ACSIZE;
9581	9975
9582	9976	if (false)
9583	9977	{
..	..	@@ -10240,11 +10634,11 @@
10240	10634
10241	10635	public void display(GLAutoDrawable drawable)
10242	10636	{
10243		- if (GrafreeD.savesound && GrafreeD.hassound)
	10637	+ if (Grafreed.savesound && Grafreed.hassound)
10244	10638	{
10245		- GrafreeD.wav.save();
10246		- GrafreeD.savesound = false;
10247		- GrafreeD.hassound = false;
	10639	+ Grafreed.wav.save();
	10640	+ Grafreed.savesound = false;
	10641	+ Grafreed.hassound = false;
10248	10642	}
10249	10643	// if (DEBUG_SELECTION)
10250	10644	// {
..	..	@@ -10320,6 +10714,7 @@
10320	10714	ANTIALIAS = 0;
10321	10715	//System.out.println("RESTART");
10322	10716	AAtimer.restart();
	10717	+ Globals.TIMERRUNNING = true;
10323	10718	}
10324	10719	}
10325	10720	}
..	..	@@ -10374,7 +10769,7 @@
10374	10769	Object3D theobject = object;
10375	10770	Object3D theparent = object.parent;
10376	10771	object.parent = null;
10377		- object = (Object3D)GrafreeD.clone(object);
	10772	+ object = (Object3D)Grafreed.clone(object);
10378	10773	object.Stripify();
10379	10774	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10380	10775	theobject.PreprocessOcclusion(this);
..	..	@@ -10387,13 +10782,14 @@
10387	10782	ambientOcclusion = false;
10388	10783	}
10389	10784
10390		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10785	+ if (//Globals.lighttouched &&
	10786	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10391	10787	{
10392	10788	//if (RENDERSHADOW) // ?
10393	10789	if (!IsFrozen())
10394	10790	{
10395	10791	// dec 2012
10396		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10792	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10397	10793	{
10398	10794	Globals.framecount++;
10399	10795	shadowbuffer.display();
..	..	@@ -10520,8 +10916,8 @@
10520	10916
10521	10917	// if (parentcam != renderCamera) // not a light
10522	10918	if (cam != lightCamera)
10523		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10524		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10919	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10920	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10525	10921
10526	10922	for (int j = 0; j < 4; j++)
10527	10923	{
..	..	@@ -10535,8 +10931,8 @@
10535	10931
10536	10932	// if (parentcam != renderCamera) // not a light
10537	10933	if (cam != lightCamera)
10538		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10539		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10934	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10935	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10540	10936
10541	10937	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10542	10938
..	..	@@ -10795,7 +11191,16 @@
10795	11191	// Bump noise
10796	11192	gl.glActiveTexture(GL.GL_TEXTURE6);
10797	11193	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10798		- BindTexture(NOISE_TEXTURE, false, 2);
	11194	+
	11195	+ try
	11196	+ {
	11197	+ BindTexture(NOISE_TEXTURE, false, 2);
	11198	+ }
	11199	+ catch (Exception e)
	11200	+ {
	11201	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11202	+ }
	11203	+
10799	11204
10800	11205	gl.glActiveTexture(GL.GL_TEXTURE0);
10801	11206	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10818,9 +11223,9 @@
10818	11223
10819	11224	gl.glMatrixMode(GL.GL_MODELVIEW);
10820	11225
10821		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10822		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10823		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11226	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11227	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11228	+gl.glEnable(gl.GL_MULTISAMPLE);
10824	11229	} else
10825	11230	{
10826	11231	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10831,7 +11236,7 @@
10831	11236	//System.out.println("BLENDING ON");
10832	11237	gl.glEnable(GL.GL_BLEND);
10833	11238	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10834		-
	11239	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10835	11240	gl.glMatrixMode(gl.GL_PROJECTION);
10836	11241	gl.glLoadIdentity();
10837	11242
..	..	@@ -10920,8 +11325,8 @@
10920	11325	System.err.println("parentcam != renderCamera");
10921	11326
10922	11327	// if (cam != lightCamera)
10923		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10924		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11328	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11329	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10925	11330	}
10926	11331
10927	11332	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10942,8 +11347,8 @@
10942	11347	if (true) // TODO
10943	11348	{
10944	11349	if (cam != lightCamera)
10945		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10946		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11350	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11351	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10947	11352	}
10948	11353
10949	11354	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11080,7 +11485,7 @@
11080	11485	}
11081	11486	}
11082	11487
11083		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11488	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11084	11489	{
11085	11490	//gl.glDepthFunc(GL.GL_LEQUAL);
11086	11491	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11088,24 +11493,21 @@
11088	11493
11089	11494	boolean texon = textureon;
11090	11495
11091		- if (RENDERPROGRAM > 0)
11092		- {
11093		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11094		- textureon = false;
11095		- }
	11496	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11497	+ textureon = false;
	11498	+
11096	11499	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11097	11500	//System.out.println("ALLO");
11098	11501	gl.glColorMask(false, false, false, false);
11099	11502	DrawObject(gl);
11100		- if (RENDERPROGRAM > 0)
11101		- {
11102		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11103		- textureon = texon;
11104		- }
	11503	+
	11504	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11505	+ textureon = texon;
	11506	+
11105	11507	gl.glColorMask(true, true, true, true);
11106	11508
11107	11509	gl.glDepthFunc(GL.GL_EQUAL);
11108		- //gl.glDepthMask(false);
	11510	+ gl.glDepthMask(false);
11109	11511	}
11110	11512
11111	11513	if (false) // DrawMode() == SHADOW)
..	..	@@ -11259,8 +11661,14 @@
11259	11661	{
11260	11662	renderpass++;
11261	11663	// System.out.println("Draw object... ");
	11664	+ STEP = 1;
11262	11665	if (FAST) // in case there is no script
11263		- STEP = 16;
	11666	+ STEP = 8;
	11667	+
	11668	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11669	+ {
	11670	+ STEP *= 4;
	11671	+ }
11264	11672
11265	11673	//object.FullInvariants();
11266	11674
..	..	@@ -11274,23 +11682,44 @@
11274	11682	e.printStackTrace();
11275	11683	}
11276	11684
11277		- if (GrafreeD.RENDERME > 0)
11278		- GrafreeD.RENDERME--; // mechante magouille
	11685	+ if (Grafreed.RENDERME > 0)
	11686	+ Grafreed.RENDERME--; // mechante magouille
11279	11687
11280	11688	Globals.ONESTEP = false;
11281	11689	}
11282	11690
11283	11691	static boolean zoomonce = false;
11284	11692
	11693	+ static void CreateSelectedPoint()
	11694	+ {
	11695	+ if (selectedpoint == null)
	11696	+ {
	11697	+ debugpointG = new Sphere();
	11698	+ debugpointP = new Sphere();
	11699	+ debugpointC = new Sphere();
	11700	+ debugpointR = new Sphere();
	11701	+
	11702	+ selectedpoint = new Superellipsoid();
	11703	+
	11704	+ for (int i=0; i<8; i++)
	11705	+ {
	11706	+ debugpoints[i] = new Sphere();
	11707	+ }
	11708	+ }
	11709	+ }
	11710	+
11285	11711	void DrawObject(GL gl, boolean draw)
11286	11712	{
	11713	+ // To clear camera values
	11714	+ ResetOptions();
	11715	+
11287	11716	//System.out.println("DRAW OBJECT " + mouseDown);
11288	11717	// DrawMode() = SELECTION;
11289	11718	//GL gl = getGL();
11290	11719	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11291	11720	{
11292	11721	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11293		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11722	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11294	11723	pingthread.StepToTarget(true); // true);
11295	11724	// zoomonce = false;
11296	11725	}
..	..	@@ -11345,7 +11774,14 @@
11345	11774
11346	11775	usedtextures.clear();
11347	11776
11348		- BindTextures(DEFAULT_TEXTURES, 2);
	11777	+ try
	11778	+ {
	11779	+ BindTextures(DEFAULT_TEXTURES, 2);
	11780	+ }
	11781	+ catch (Exception e)
	11782	+ {
	11783	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11784	+ }
11349	11785	}
11350	11786	//System.out.println("--> " + stackdepth);
11351	11787	// GrafreeD.traceon();
..	..	@@ -11355,8 +11791,9 @@
11355	11791
11356	11792	if (DrawMode() == DEFAULT)
11357	11793	{
11358		- if (DEBUG)
	11794	+ if (Globals.DEBUG)
11359	11795	{
	11796	+ CreateSelectedPoint();
11360	11797	float radius = 0.05f;
11361	11798	if (selectedpoint.radius != radius)
11362	11799	{
..	..	@@ -11410,20 +11847,32 @@
11410	11847	ReleaseTextures(DEFAULT_TEXTURES);
11411	11848
11412	11849	if (CLEANCACHE)
11413		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11850	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11414	11851	{
11415		- String tex = e.nextElement();
	11852	+ cTexture tex = e.nextElement();
11416	11853
11417	11854	// System.out.println("Texture --------- " + tex);
11418	11855
11419		- if (tex.equals("WHITE_NOISE"))
	11856	+ if (tex.equals("WHITE_NOISE:"))
11420	11857	continue;
11421	11858
11422		- if (!usedtextures.containsKey(tex))
	11859	+ if (!usedtextures.contains(tex))
11423	11860	{
	11861	+ CacheTexture gettex = texturepigment.get(tex);
11424	11862	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11425		- textures.get(tex).texture.dispose();
11426		- textures.remove(tex);
	11863	+ if (gettex != null)
	11864	+ {
	11865	+ gettex.texture.dispose();
	11866	+ texturepigment.remove(tex);
	11867	+ }
	11868	+
	11869	+ gettex = texturebump.get(tex);
	11870	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11871	+ if (gettex != null)
	11872	+ {
	11873	+ gettex.texture.dispose();
	11874	+ texturebump.remove(tex);
	11875	+ }
11427	11876	}
11428	11877	}
11429	11878	}
..	..	@@ -11436,7 +11885,14 @@
11436	11885	if (checker != null && DrawMode() == DEFAULT)
11437	11886	{
11438	11887	//BindTexture(IMMORTAL_TEXTURE);
11439		- BindTextures(checker.GetTextures(), checker.texres);
	11888	+ try
	11889	+ {
	11890	+ BindTextures(checker.GetTextures(), checker.texres);
	11891	+ }
	11892	+ catch (Exception e)
	11893	+ {
	11894	+ System.err.println("FAILED: " + checker.GetTextures());
	11895	+ }
11440	11896	// NEAREST
11441	11897	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11442	11898	DrawChecker(gl);
..	..	@@ -11518,7 +11974,7 @@
11518	11974	return;
11519	11975	}
11520	11976
11521		- String string = obj.GetToolTip();
	11977	+ String string = obj.toString(); //.GetToolTip();
11522	11978
11523	11979	GL gl = GetGL();
11524	11980
..	..	@@ -11835,8 +12291,8 @@
11835	12291	//obj.TransformToWorld(light, light);
11836	12292	for (int i = tp.size(); --i >= 0;)
11837	12293	{
11838		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11839		- LA.xformPos(light, tp.get(i).toParent, light);
	12294	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12295	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11840	12296	}
11841	12297
11842	12298
..	..	@@ -11853,8 +12309,8 @@
11853	12309	parentcam = cameras[0];
11854	12310	}
11855	12311
11856		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11857		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12312	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12313	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11858	12314
11859	12315	LA.xformPos(light, renderCamera.toScreen, light);
11860	12316
..	..	@@ -11945,7 +12401,74 @@
11945	12401	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11946	12402
11947	12403	String program =
	12404	+ // Min shader
11948	12405	"!!ARBfp1.0\n" +
	12406	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12407	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12408	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12409	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12410	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12411	+ "PARAM light2cam0 = program.env[10];" +
	12412	+ "PARAM light2cam1 = program.env[11];" +
	12413	+ "PARAM light2cam2 = program.env[12];" +
	12414	+ "TEMP temp;" +
	12415	+ "TEMP light;" +
	12416	+ "TEMP ndotl;" +
	12417	+ "TEMP normal;" +
	12418	+ "TEMP depth;" +
	12419	+ "TEMP eye;" +
	12420	+ "TEMP pos;" +
	12421	+
	12422	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12423	+ Normalize("normal") +
	12424	+ "MOV light, state.light[0].position;" +
	12425	+ "DP3 ndotl.x, light, normal;" +
	12426	+
	12427	+ // shadow
	12428	+ "MOV pos, fragment.texcoord[1];" +
	12429	+ "MOV temp, pos;" +
	12430	+ ShadowTextureFetch("depth", "temp", "1") +
	12431	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12432	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12433	+
	12434	+ // No shadow when out of frustum
	12435	+ //"SGE temp.y, depth.z, zero123.y;" +
	12436	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12437	+
	12438	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12439	+
	12440	+ // Backlit
	12441	+ "MOV pos.w, zero123.y;" +
	12442	+ "DP4 eye.x, pos, light2cam0;" +
	12443	+ "DP4 eye.y, pos, light2cam1;" +
	12444	+ "DP4 eye.z, pos, light2cam2;" +
	12445	+ Normalize("eye") +
	12446	+
	12447	+ "DP3 ndotl.y, -eye, normal;" +
	12448	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12449	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12450	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12451	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12452	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12453	+
	12454	+ "MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12455	+
	12456	+ // Pigment
	12457	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12458	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12459	+ "MUL temp, temp, ndotl.x;" +
	12460	+
	12461	+ "MUL temp, temp, zero123.z;" +
	12462	+
	12463	+ //"MUL temp, temp, ndotl.y;" +
	12464	+
	12465	+ "MOV temp.w, zero123.y;" + // reset alpha
	12466	+ "MOV result.color, temp;" +
	12467	+ "END";
	12468	+
	12469	+ String program2 =
	12470	+ "!!ARBfp1.0\n" +
	12471	+
11949	12472	//"OPTION ARB_fragment_program_shadow;" +
11950	12473	"PARAM light2cam0 = program.env[10];" +
11951	12474	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12060,8 +12583,7 @@
12060	12583	"TEMP shininess;" +
12061	12584	"\n" +
12062	12585	"MOV texSamp, one;" +
12063		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12064		-
	12586	+
12065	12587	"MOV mapgrid.x, one2048th.x;" +
12066	12588	"MOV temp, fragment.texcoord[1];" +
12067	12589	/*
..	..	@@ -12082,20 +12604,20 @@
12082	12604	"MUL temp, floor, mapgrid.x;" +
12083	12605	//"TEX depth0, temp, texture[1], 2D;" +
12084	12606	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12085		- TextureFetch("depth0", "temp", "1") +
	12607	+ ShadowTextureFetch("depth0", "temp", "1") +
12086	12608	"") +
12087	12609	"ADD temp.x, temp.x, mapgrid.x;" +
12088	12610	//"TEX depth1, temp, texture[1], 2D;" +
12089	12611	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12090		- TextureFetch("depth1", "temp", "1") +
	12612	+ ShadowTextureFetch("depth1", "temp", "1") +
12091	12613	"") +
12092	12614	"ADD temp.y, temp.y, mapgrid.x;" +
12093	12615	//"TEX depth2, temp, texture[1], 2D;" +
12094		- TextureFetch("depth2", "temp", "1") +
	12616	+ ShadowTextureFetch("depth2", "temp", "1") +
12095	12617	"SUB temp.x, temp.x, mapgrid.x;" +
12096	12618	//"TEX depth3, temp, texture[1], 2D;" +
12097	12619	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12098		- TextureFetch("depth3", "temp", "1") +
	12620	+ ShadowTextureFetch("depth3", "temp", "1") +
12099	12621	"") +
12100	12622	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12101	12623	//"MOV params, material;" +
..	..	@@ -12466,10 +12988,10 @@
12466	12988	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12467	12989	"") +
12468	12990
12469		- // display shadow only (bump == 0)
	12991	+ // display shadow only (fakedepth == 0)
12470	12992	"SUB temp.x, half.x, shadow.x;" +
12471		- "MOV temp.y, -params6.x;" +
12472		- "SLT temp.z, temp.y, zero.x;" +
	12993	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12994	+ "SLT temp.z, temp.y, -one2048th.x;" +
12473	12995	"SUB temp.y, one.x, temp.z;" +
12474	12996	"MUL temp.x, temp.x, temp.y;" +
12475	12997	"KIL temp.x;" +
..	..	@@ -12598,8 +13120,10 @@
12598	13120	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12599	13121
12600	13122	"SUB temp.x, one.x, ndotl.x;" +
12601		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
12602		- "ADD temp.y, one.y, options2.y;" + // sursurface
	13123	+ // Tuning for default skin
	13124	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	13125	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	13126	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12603	13127	"MUL temp.x, temp.x, temp.y;" +
12604	13128
12605	13129	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12747,7 +13271,7 @@
12747	13271	"MUL final.y, fragment.texcoord[0].x, c256;" +
12748	13272	"FLR final.x, final.y;" +
12749	13273	"SUB final.y, final.y, final.x;" +
12750		- //"MUL final.x, final.x, c256i;" +
	13274	+ "MUL final.x, final.x, c256i;" +
12751	13275	"MOV final.z, zero.x;" +
12752	13276	"MOV final.a, one.w;":""
12753	13277	) +
..	..	@@ -12755,7 +13279,7 @@
12755	13279	"MUL final.y, fragment.texcoord[0].y, c256;" +
12756	13280	"FLR final.x, final.y;" +
12757	13281	"SUB final.y, final.y, final.x;" +
12758		- //"MUL final.x, final.x, c256i;" +
	13282	+ "MUL final.x, final.x, c256i;" +
12759	13283	"MOV final.z, zero.x;" +
12760	13284	"MOV final.a, one.w;":""
12761	13285	) +
..	..	@@ -12798,7 +13322,7 @@
12798	13322	//once = true;
12799	13323	}
12800	13324
12801		- System.out.print("Program #" + mode + "; length = " + program.length());
	13325	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12802	13326	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12803	13327	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12804	13328
..	..	@@ -12891,25 +13415,26 @@
12891	13415	return out;
12892	13416	}
12893	13417
12894		- String TextureFetch(String dest, String src, String unit)
	13418	+ // Also does frustum culling
	13419	+ String ShadowTextureFetch(String dest, String src, String unit)
12895	13420	{
12896	13421	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12897	13422	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12898	13423	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13424	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13425	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12899	13426	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12900		- "SLT " + src + ".z, " + src + ".x, one.x;" +
12901		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12902		- "SLT " + src + ".z, " + src + ".y, one.x;" +
12903		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13427	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13428	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12904	13429	//"SWZ buffer, temp, w,w,w,w;";
12905		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13430	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12906	13431	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12907	13432	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12908	13433	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12909		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13434	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12910	13435
12911		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12912		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13436	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13437	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12913	13438	}
12914	13439
12915	13440	String Shadow(String depth, String shadow)
..	..	@@ -12931,12 +13456,16 @@
12931	13456
12932	13457	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12933	13458	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13459	+
	13460	+ // Compare fragment depth in light space with shadowmap.
12934	13461	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12935	13462	"SGE temp.y, temp.x, zero.x;" +
12936		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13463	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13464	+
	13465	+ // Reverse comparison
12937	13466	"SUB temp.x, one.x, temp.x;" +
12938	13467	"MUL " + shadow + ".x, temp.x, temp.y;" +
12939		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13468	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12940	13469	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12941	13470
12942	13471	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12950,6 +13479,10 @@
12950	13479	// No shadow for backface
12951	13480	"DP3 temp.x, normal, lightd;" +
12952	13481	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13482	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13483	+
	13484	+ // No shadow when out of frustum
	13485	+ "SGE temp.x, " + depth + ".z, one.z;" +
12953	13486	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12954	13487	"";
12955	13488	}
..	..	@@ -13096,7 +13629,8 @@
13096	13629	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13097	13630	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13098	13631	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13099		- Object3D.cVector2[] vector2buffer;
	13632	+
	13633	+ //Object3D.cVector2[] vector2buffer;
13100	13634
13101	13635	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13102	13636	// OUT : diff, spec
..	..	@@ -13112,9 +13646,10 @@
13112	13646	"DP3 " + dest + ".z," + "normals," + "eye;" +
13113	13647	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13114	13648	//"MOV " + dest + ".w," + "normal.z;" +
13115		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13116		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13117		- //"MOV " + dest + ".z," + "params2.w;" +
	13649	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13650	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13651	+
	13652	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13118	13653	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13119	13654	"RCP " + dest + ".w," + dest + ".w;" +
13120	13655	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13508,7 +14043,7 @@
13508	14043	public void mousePressed(MouseEvent e)
13509	14044	{
13510	14045	//System.out.println("mousePressed: " + e);
13511		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14046	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13512	14047	}
13513	14048
13514	14049	static long prevtime = 0;
..	..	@@ -13584,8 +14119,8 @@
13584	14119	// mode \|= META;
13585	14120	//}
13586	14121
13587		- SetMouseMode(WHEEL \| e.getModifiersEx());
13588		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14122	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14123	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13589	14124	anchorX = ax;
13590	14125	anchorY = ay;
13591	14126	prevX = px;
..	..	@@ -13619,6 +14154,7 @@
13619	14154	else
13620	14155	if (evt.getSource() == AAtimer)
13621	14156	{
	14157	+ Globals.TIMERRUNNING = false;
13622	14158	if (mouseDown)
13623	14159	{
13624	14160	//new Exception().printStackTrace();
..	..	@@ -13644,6 +14180,10 @@
13644	14180	// LIVE = waslive;
13645	14181	// wasliveok = true;
13646	14182	// waslive = false;
	14183	+
	14184	+ // May 2019 Forget it:
	14185	+ if (true)
	14186	+ return;
13647	14187
13648	14188	// source == timer
13649	14189	if (mouseDown)
..	..	@@ -13674,7 +14214,7 @@
13674	14214
13675	14215	// fev 2014???
13676	14216	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13677		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14217	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13678	14218	pingthread.StepToTarget(true); // true);
13679	14219	}
13680	14220	// if (!LIVE)
..	..	@@ -13683,12 +14223,13 @@
13683	14223
13684	14224	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13685	14225
13686		- void clickStart(int x, int y, int modifiers)
	14226	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13687	14227	{
13688	14228	if (!wasliveok)
13689	14229	return;
13690	14230
13691	14231	AAtimer.restart(); //
	14232	+ Globals.TIMERRUNNING = true;
13692	14233
13693	14234	// waslive = LIVE;
13694	14235	// LIVE = false;
..	..	@@ -13700,7 +14241,7 @@
13700	14241	// touched = true; // main DL
13701	14242	if (isRenderer)
13702	14243	{
13703		- SetMouseMode(modifiers);
	14244	+ SetMouseMode(modifiers, modifiersex);
13704	14245	}
13705	14246
13706	14247	selectX = anchorX = x;
..	..	@@ -13713,7 +14254,7 @@
13713	14254	clicked = true;
13714	14255	hold = false;
13715	14256
13716		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14257	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13717	14258	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13718	14259	{
13719	14260	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13738,14 +14279,15 @@
13738	14279	drag = false;
13739	14280	//System.out.println("Mouse DOWN");
13740	14281	editObj = false;
13741		- ClickInfo info = new ClickInfo();
13742		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13743		- info.pane = this;
13744		- info.camera = renderCamera;
13745		- info.x = x;
13746		- info.y = y;
13747		- info.modifiers = modifiers;
13748		- editObj = object.doEditClick(info, 0);
	14282	+ //ClickInfo info = new ClickInfo();
	14283	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14284	+ object.clickInfo.pane = this;
	14285	+ object.clickInfo.camera = renderCamera;
	14286	+ object.clickInfo.x = x;
	14287	+ object.clickInfo.y = y;
	14288	+ object.clickInfo.modifiers = modifiersex;
	14289	+ editObj = object.doEditClick(//info,
	14290	+ 0);
13749	14291	if (!editObj)
13750	14292	{
13751	14293	hasMarquee = true;
..	..	@@ -13761,9 +14303,12 @@
13761	14303
13762	14304	public void mouseDragged(MouseEvent e)
13763	14305	{
	14306	+ Globals.MOUSEDRAGGED = true;
	14307	+
13764	14308	//System.out.println("mouseDragged: " + e);
13765	14309	if (isRenderer)
13766	14310	movingcamera = true;
	14311	+
13767	14312	//if (drawing)
13768	14313	//return;
13769	14314	if ((e.getModifiersEx() & CTRL) != 0
..	..	@@ -13773,7 +14318,7 @@
13773	14318	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13774	14319	}
13775	14320	else
13776		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14321	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13777	14322
13778	14323	//try { Thread.sleep(1); } catch (Exception ex) {}
13779	14324	}
..	..	@@ -13946,6 +14491,7 @@
13946	14491
13947	14492	public void run()
13948	14493	{
	14494	+ new Exception().printStackTrace();
13949	14495	System.exit(0);
13950	14496	for (;;)
13951	14497	{
..	..	@@ -14009,7 +14555,7 @@
14009	14555	{
14010	14556	Globals.lighttouched = true;
14011	14557	}
14012		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14558	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14013	14559	}
14014	14560	//else
14015	14561	}
..	..	@@ -14023,12 +14569,12 @@
14023	14569	void GoDown(int mod)
14024	14570	{
14025	14571	MODIFIERS \|= COMMAND;
14026		- /*
	14572	+ /**/
14027	14573	if((mod&SHIFT) == SHIFT)
14028	14574	manipCamera.RotatePosition(0, -speed);
14029	14575	else
14030		- manipCamera.BackForth(0, -speed*delta, getWidth());
14031		- */
	14576	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14577	+ /**/
14032	14578	if ((mod & SHIFT) == SHIFT)
14033	14579	{
14034	14580	mouseMode = mouseMode; // VR??
..	..	@@ -14044,12 +14590,12 @@
14044	14590	void GoUp(int mod)
14045	14591	{
14046	14592	MODIFIERS \|= COMMAND;
14047		- /*
	14593	+ /**/
14048	14594	if((mod&SHIFT) == SHIFT)
14049	14595	manipCamera.RotatePosition(0, speed);
14050	14596	else
14051		- manipCamera.BackForth(0, speed*delta, getWidth());
14052		- */
	14597	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14598	+ /**/
14053	14599	if ((mod & SHIFT) == SHIFT)
14054	14600	{
14055	14601	mouseMode = mouseMode;
..	..	@@ -14065,12 +14611,12 @@
14065	14611	void GoLeft(int mod)
14066	14612	{
14067	14613	MODIFIERS \|= COMMAND;
14068		- /*
	14614	+ /**/
14069	14615	if((mod&SHIFT) == SHIFT)
14070		- manipCamera.RotatePosition(speed, 0);
14071		- else
14072	14616	manipCamera.Translate(speed*delta, 0, getWidth());
14073		- */
	14617	+ else
	14618	+ manipCamera.RotatePosition(speed, 0);
	14619	+ /**/
14074	14620	if ((mod & SHIFT) == SHIFT)
14075	14621	{
14076	14622	mouseMode = mouseMode;
..	..	@@ -14086,12 +14632,12 @@
14086	14632	void GoRight(int mod)
14087	14633	{
14088	14634	MODIFIERS \|= COMMAND;
14089		- /*
	14635	+ /**/
14090	14636	if((mod&SHIFT) == SHIFT)
14091		- manipCamera.RotatePosition(-speed, 0);
14092		- else
14093	14637	manipCamera.Translate(-speed*delta, 0, getWidth());
14094		- */
	14638	+ else
	14639	+ manipCamera.RotatePosition(-speed, 0);
	14640	+ /**/
14095	14641	if ((mod & SHIFT) == SHIFT)
14096	14642	{
14097	14643	mouseMode = mouseMode;
..	..	@@ -14109,7 +14655,7 @@
14109	14655	int X, Y;
14110	14656	boolean SX, SY;
14111	14657
14112		- void drag(int x, int y, int modifiers)
	14658	+ void drag(int x, int y, int modifiers, int modifiersex)
14113	14659	{
14114	14660	if (IsFrozen())
14115	14661	{
..	..	@@ -14118,17 +14664,17 @@
14118	14664
14119	14665	drag = true; // NEW
14120	14666
14121		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14667	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14122	14668
14123	14669	X = x;
14124	14670	Y = y;
14125	14671	// floating state for animation
14126		- MODIFIERS = modifiers;
14127		- modifiers &= ~1024;
	14672	+ MODIFIERS = modifiersex;
	14673	+ modifiersex &= ~1024;
14128	14674	if (false) // modifiers != 0)
14129	14675	{
14130	14676	//new Exception().printStackTrace();
14131		- System.out.println("mouseDragged: " + modifiers);
	14677	+ System.out.println("mouseDragged: " + modifiersex);
14132	14678	System.out.println("SHIFT = " + SHIFT);
14133	14679	System.out.println("CONTROL = " + COMMAND);
14134	14680	System.out.println("META = " + META);
..	..	@@ -14141,14 +14687,16 @@
14141	14687	if (editObj)
14142	14688	{
14143	14689	drag = true;
14144		- ClickInfo info = new ClickInfo();
14145		- info.bounds.setBounds(0, 0,
	14690	+ //ClickInfo info = new ClickInfo();
	14691	+ object.clickInfo.bounds.setBounds(0, 0,
14146	14692	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14147		- info.pane = this;
14148		- info.camera = renderCamera;
14149		- info.x = x;
14150		- info.y = y;
14151		- object.editWindow.copy.doEditDrag(info);
	14693	+ object.clickInfo.pane = this;
	14694	+ object.clickInfo.camera = renderCamera;
	14695	+ object.clickInfo.x = x;
	14696	+ object.clickInfo.y = y;
	14697	+ object //.GetWindow().copy
	14698	+ .doEditDrag(//info,
	14699	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14152	14700	} else
14153	14701	{
14154	14702	if (x < startX)
..	..	@@ -14297,22 +14845,27 @@
14297	14845	}
14298	14846	}
14299	14847
	14848	+// ClickInfo clickInfo = new ClickInfo();
	14849	+
14300	14850	public void mouseMoved(MouseEvent e)
14301	14851	{
14302	14852	//System.out.println("mouseMoved: " + e);
14303	14853	if (isRenderer)
14304	14854	return;
14305	14855
14306		- ClickInfo ci = new ClickInfo();
14307		- ci.x = e.getX();
14308		- ci.y = e.getY();
14309		- ci.modifiers = e.getModifiersEx();
14310		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14311		- ci.pane = this;
14312		- ci.camera = renderCamera;
	14856	+ // Mouse cursor feedback
	14857	+ object.clickInfo.x = e.getX();
	14858	+ object.clickInfo.y = e.getY();
	14859	+ object.clickInfo.modifiers = e.getModifiersEx();
	14860	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14861	+ object.clickInfo.pane = this;
	14862	+ object.clickInfo.camera = renderCamera;
14313	14863	if (!isRenderer)
14314	14864	{
14315		- if (object.editWindow.copy.doEditClick(ci, 0))
	14865	+ //ObjEditor editWindow = object.editWindow;
	14866	+ //Object3D copy = editWindow.copy;
	14867	+ if (object.doEditClick(//clickInfo,
	14868	+ 0))
14316	14869	{
14317	14870	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14318	14871	} else
..	..	@@ -14324,7 +14877,11 @@
14324	14877
14325	14878	public void mouseReleased(MouseEvent e)
14326	14879	{
	14880	+ Globals.MOUSEDRAGGED = false;
	14881	+
14327	14882	movingcamera = false;
	14883	+ X = 0; // getBounds().width/2;
	14884	+ Y = 0; // getBounds().height/2;
14328	14885	//System.out.println("mouseReleased: " + e);
14329	14886	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14330	14887	}
..	..	@@ -14347,9 +14904,9 @@
14347	14904	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14348	14905	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14349	14906
14350		- if (control \|\| command \|\| IsFrozen())
	14907	+// No delay if (control \|\| command \|\| IsFrozen())
14351	14908	timeout = true;
14352		- else
	14909	+// ?? May 2019 else
14353	14910	// timer.setDelay((modifiers & 128) != 0?0:350);
14354	14911	mouseDown = false;
14355	14912	if (!control && !command) // june 2013
..	..	@@ -14459,7 +15016,7 @@
14459	15016	System.out.println("keyReleased: " + e);
14460	15017	}
14461	15018
14462		- void SetMouseMode(int modifiers)
	15019	+ void SetMouseMode(int modifiers, int modifiersex)
14463	15020	{
14464	15021	//System.out.println("SetMouseMode = " + modifiers);
14465	15022	//modifiers &= ~1024;
..	..	@@ -14471,25 +15028,25 @@
14471	15028	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14472	15029	// return;
14473	15030	//System.out.println("SetMode = " + modifiers);
14474		- if ((modifiers & WHEEL) == WHEEL)
	15031	+ if ((modifiersex & WHEEL) == WHEEL)
14475	15032	{
14476	15033	mouseMode \|= ZOOM;
14477	15034	}
14478	15035
14479	15036	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14480		- if (capsLocked \|\| (modifiers & META) == META)
	15037	+ if (capsLocked) // \|\| (modifiers & META) == META)
14481	15038	{
14482	15039	mouseMode \|= VR; // BACKFORTH;
14483	15040	}
14484		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	15041	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14485	15042	{
14486	15043	mouseMode \|= SELECT;
14487	15044	}
14488		- if ((modifiers & COMMAND) == COMMAND)
	15045	+ if ((modifiersex & COMMAND) == COMMAND)
14489	15046	{
14490	15047	mouseMode \|= SELECT;
14491	15048	}
14492		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15049	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14493	15050	{
14494	15051	mouseMode &= ~VR;
14495	15052	mouseMode \|= TRANSLATE;
..	..	@@ -14518,7 +15075,7 @@
14518	15075
14519	15076	if (isRenderer) //
14520	15077	{
14521		- SetMouseMode(modifiers);
	15078	+ SetMouseMode(0, modifiers);
14522	15079	}
14523	15080
14524	15081	Globals.theRenderer.keyPressed(key);
..	..	@@ -14580,7 +15137,8 @@
14580	15137	// break;
14581	15138	case 'T':
14582	15139	CACHETEXTURE ^= true;
14583		- textures.clear();
	15140	+ texturepigment.clear();
	15141	+ texturebump.clear();
14584	15142	// repaint();
14585	15143	break;
14586	15144	case 'Y':
..	..	@@ -14665,7 +15223,9 @@
14665	15223	case 'E' : COMPACT ^= true;
14666	15224	repaint();
14667	15225	break;
14668		- case 'W' : DEBUGHSB ^= true;
	15226	+ case 'W' : // Wide Window (fullscreen)
	15227	+ //DEBUGHSB ^= true;
	15228	+ ObjEditor.theFrame.ToggleFullScreen();
14669	15229	repaint();
14670	15230	break;
14671	15231	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14690,8 +15250,8 @@
14690	15250	RevertCamera();
14691	15251	repaint();
14692	15252	break;
14693		- case 'L':
14694	15253	case 'l':
	15254	+ //case 'L':
14695	15255	if (lightMode)
14696	15256	{
14697	15257	lightMode = false;
..	..	@@ -14834,9 +15394,9 @@
14834	15394	case '_':
14835	15395	kompactbit = 5;
14836	15396	break;
14837		- case '+':
14838		- kompactbit = 6;
14839		- break;
	15397	+// case '+':
	15398	+// kompactbit = 6;
	15399	+// break;
14840	15400	case ' ':
14841	15401	lightMode ^= true;
14842	15402	Globals.lighttouched = true;
..	..	@@ -14848,13 +15408,14 @@
14848	15408	case ESC:
14849	15409	RENDERPROGRAM += 1;
14850	15410	RENDERPROGRAM %= 3;
	15411	+
14851	15412	repaint();
14852	15413	break;
14853	15414	case 'Z':
14854	15415	//RESIZETEXTURE ^= true;
14855	15416	//break;
14856	15417	case 'z':
14857		- RENDERSHADOW ^= true;
	15418	+ Globals.RENDERSHADOW ^= true;
14858	15419	Globals.lighttouched = true;
14859	15420	repaint();
14860	15421	break;
..	..	@@ -14887,8 +15448,9 @@
14887	15448	case DELETE:
14888	15449	ClearSelection();
14889	15450	break;
14890		- /*
14891	15451	case '+':
	15452	+
	15453	+ /*
14892	15454	//fontsize += 1;
14893	15455	bbzoom *= 2;
14894	15456	repaint();
..	..	@@ -14905,17 +15467,17 @@
14905	15467	case '=':
14906	15468	IncDepth();
14907	15469	//fontsize += 1;
14908		- object.editWindow.refreshContents(true);
	15470	+ object.GetWindow().refreshContents(true);
14909	15471	maskbit = 6;
14910	15472	break;
14911	15473	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14912	15474	DecDepth();
14913	15475	maskbit = 5;
14914	15476	//if(fontsize > 1) fontsize -= 1;
14915		- if (object.editWindow == null)
14916		- new Exception().printStackTrace();
14917		- else
14918		- object.editWindow.refreshContents(true);
	15477	+// if (object.editWindow == null)
	15478	+// new Exception().printStackTrace();
	15479	+// else
	15480	+ object.GetWindow().refreshContents(true);
14919	15481	break;
14920	15482	case '{':
14921	15483	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14978,7 +15540,7 @@
14978	15540	//mode = ROTATE;
14979	15541	if ((MODIFIERS & COMMAND) == 0) // VR??
14980	15542	{
14981		- SetMouseMode(modifiers);
	15543	+ SetMouseMode(0, modifiers);
14982	15544	}
14983	15545	}
14984	15546
..	..	@@ -15114,7 +15676,7 @@
15114	15676	{
15115	15677	//System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15116	15678	//if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15117		- if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
	15679	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
15118	15680	{
15119	15681	mouseMoved(e);
15120	15682	} else
..	..	@@ -15139,11 +15701,12 @@
15139	15701	}
15140	15702	*/
15141	15703
15142		- object.editWindow.EditSelection();
	15704	+ object.GetWindow().EditSelection(false);
15143	15705	}
15144	15706
15145	15707	void SelectParent()
15146	15708	{
	15709	+ new Exception().printStackTrace();
15147	15710	System.exit(0);
15148	15711	Composite group = (Composite) object;
15149	15712	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -15155,10 +15718,10 @@
15155	15718	{
15156	15719	//selectees.remove(i);
15157	15720	System.out.println("select parent of " + elem);
15158		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15721	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15159	15722	} else
15160	15723	{
15161		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15724	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15162	15725	}
15163	15726
15164	15727	first = false;
..	..	@@ -15167,6 +15730,7 @@
15167	15730
15168	15731	void SelectChildren()
15169	15732	{
	15733	+ new Exception().printStackTrace();
15170	15734	System.exit(0);
15171	15735	/*
15172	15736	Composite group = (Composite) object;
..	..	@@ -15199,12 +15763,12 @@
15199	15763	for (int j = 0; j < group.children.size(); j++)
15200	15764	{
15201	15765	elem = (Object3D) group.children.elementAt(j);
15202		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15766	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15203	15767	first = false;
15204	15768	}
15205	15769	} else
15206	15770	{
15207		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15771	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15208	15772	}
15209	15773
15210	15774	first = false;
..	..	@@ -15215,21 +15779,21 @@
15215	15779	{
15216	15780	//Composite group = (Composite) object;
15217	15781	Object3D group = object;
15218		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15782	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15219	15783	}
15220	15784
15221	15785	void ResetTransform(int mask)
15222	15786	{
15223	15787	//Composite group = (Composite) object;
15224	15788	Object3D group = object;
15225		- group.editWindow.ResetTransform(mask);
	15789	+ group.GetWindow().ResetTransform(mask);
15226	15790	}
15227	15791
15228	15792	void FlipTransform()
15229	15793	{
15230	15794	//Composite group = (Composite) object;
15231	15795	Object3D group = object;
15232		- group.editWindow.FlipTransform();
	15796	+ group.GetWindow().FlipTransform();
15233	15797	// group.editWindow.ReduceMesh(true);
15234	15798	}
15235	15799
..	..	@@ -15237,7 +15801,7 @@
15237	15801	{
15238	15802	//Composite group = (Composite) object;
15239	15803	Object3D group = object;
15240		- group.editWindow.PrintMemory();
	15804	+ group.GetWindow().PrintMemory();
15241	15805	// group.editWindow.ReduceMesh(true);
15242	15806	}
15243	15807
..	..	@@ -15245,7 +15809,7 @@
15245	15809	{
15246	15810	//Composite group = (Composite) object;
15247	15811	Object3D group = object;
15248		- group.editWindow.ResetCentroid();
	15812	+ group.GetWindow().ResetCentroid();
15249	15813	}
15250	15814
15251	15815	void IncDepth()
..	..	@@ -15327,11 +15891,11 @@
15327	15891
15328	15892	int width = getBounds().width;
15329	15893	int height = getBounds().height;
15330		- ClickInfo info = new ClickInfo();
15331		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15332	15894	//Image img = CreateImage(width, height);
15333	15895	//System.out.println("width = " + width + "; height = " + height + "\n");
	15896	+
15334	15897	Graphics gr = g; // img.getGraphics();
	15898	+
15335	15899	if (!hasMarquee)
15336	15900	{
15337	15901	if (Xmin < Xmax) // !locked)
..	..	@@ -15403,40 +15967,88 @@
15403	15967	}
15404	15968	if (object != null && !hasMarquee)
15405	15969	{
	15970	+ if (object.clickInfo == null)
	15971	+ object.clickInfo = new ClickInfo();
	15972	+ ClickInfo info = object.clickInfo;
	15973	+ //ClickInfo info = new ClickInfo();
	15974	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	15975	+
15406	15976	if (isRenderer)
15407	15977	{
15408		- info.flags++;
	15978	+ object.clickInfo.flags++;
15409	15979	double frameAspect = (double) width / (double) height;
15410	15980	if (frameAspect > renderCamera.aspect)
15411	15981	{
15412	15982	int desired = (int) ((double) height * renderCamera.aspect);
15413		- info.bounds.width -= width - desired;
15414		- info.bounds.x += (width - desired) / 2;
	15983	+ object.clickInfo.bounds.width -= width - desired;
	15984	+ object.clickInfo.bounds.x += (width - desired) / 2;
15415	15985	} else
15416	15986	{
15417	15987	int desired = (int) ((double) width / renderCamera.aspect);
15418		- info.bounds.height -= height - desired;
15419		- info.bounds.y += (height - desired) / 2;
	15988	+ object.clickInfo.bounds.height -= height - desired;
	15989	+ object.clickInfo.bounds.y += (height - desired) / 2;
15420	15990	}
15421	15991	}
15422		- info.g = gr;
15423		- info.camera = renderCamera;
	15992	+
	15993	+ object.clickInfo.g = gr;
	15994	+ object.clickInfo.camera = renderCamera;
15424	15995	/*
15425	15996	// Memory intensive (brep.verticescopy)
15426	15997	if (!(object instanceof Composite))
15427	15998	object.draw(info, 0, false); // SLOW :
15428	15999	*/
15429		- if (!isRenderer)
	16000	+ if (!isRenderer) // && drag)
15430	16001	{
15431		- object.drawEditHandles(info, 0);
	16002	+ Grafreed.Assert(object != null);
	16003	+ Grafreed.Assert(object.selection != null);
	16004	+ if (object.selection.Size() > 0)
	16005	+ {
	16006	+ int hitSomething = object.selection.get(0).hitSomething;
	16007	+
	16008	+ object.clickInfo.DX = 0;
	16009	+ object.clickInfo.DY = 0;
	16010	+ object.clickInfo.W = 1;
	16011	+ if (hitSomething == Object3D.hitCenter)
	16012	+ {
	16013	+ info.DX = X;
	16014	+ if (X != 0)
	16015	+ info.DX -= info.bounds.width/2;
	16016	+
	16017	+ info.DY = Y;
	16018	+ if (Y != 0)
	16019	+ info.DY -= info.bounds.height/2;
	16020	+ }
	16021	+
	16022	+ object.drawEditHandles(//info,
	16023	+ 0);
	16024	+
	16025	+ if (drag && (X != 0 \|\| Y != 0))
	16026	+ {
	16027	+ switch (hitSomething)
	16028	+ {
	16029	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16030	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16031	+ break;
	16032	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16033	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16034	+ break;
	16035	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16036	+ gr.drawLine(X, Y, 0, 0);
	16037	+ break;
	16038	+ }
	16039	+
	16040	+ }
	16041	+ }
15432	16042	}
15433	16043	}
	16044	+
15434	16045	if (isRenderer)
15435	16046	{
15436	16047	//gr.setColor(Color.black);
15437	16048	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15438	16049	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15439	16050	}
	16051	+
15440	16052	if (hasMarquee)
15441	16053	{
15442	16054	gr.setXORMode(Color.white);
..	..	@@ -15549,6 +16161,7 @@
15549	16161	public boolean mouseDown(Event evt, int x, int y)
15550	16162	{
15551	16163	System.out.println("mouseDown: " + evt);
	16164	+ System.exit(0);
15552	16165	/*
15553	16166	locked = true;
15554	16167	drag = false;
..	..	@@ -15592,7 +16205,7 @@
15592	16205	{
15593	16206	keyPressed(0, modifiers);
15594	16207	}
15595		- clickStart(x, y, modifiers);
	16208	+ // clickStart(x, y, modifiers);
15596	16209	return true;
15597	16210	}
15598	16211
..	..	@@ -15710,7 +16323,7 @@
15710	16323	{
15711	16324	keyReleased(0, 0);
15712	16325	}
15713		- drag(x, y, modifiers);
	16326	+ drag(x, y, 0, modifiers);
15714	16327	return true;
15715	16328	}
15716	16329
..	..	@@ -15842,7 +16455,7 @@
15842	16455	Object3D object;
15843	16456	static Object3D trackedobject;
15844	16457	Camera renderCamera; // Light or Eye (or Occlusion)
15845		- /static/ Camera manipCamera; // Light or Eye
	16458	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15846	16459	/static/ Camera eyeCamera;
15847	16460	/static/ Camera lightCamera;
15848	16461	int cameracount;
..	..	@@ -16127,16 +16740,16 @@
16127	16740	cStatic.objectstack[materialdepth++] = checker;
16128	16741	//System.out.println("material " + material);
16129	16742	//Applet3D.tracein(this, selected);
16130		- vector2buffer = checker.projectedVertices;
	16743	+ //vector2buffer = checker.projectedVertices;
16131	16744
16132	16745	//checker.GetMaterial().Draw(this, false); // true);
16133		- DrawMaterial(checker.GetMaterial(), false); // true);
	16746	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16134	16747
16135	16748	materialdepth -= 1;
16136	16749	if (materialdepth > 0)
16137	16750	{
16138		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16139		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16751	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16752	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16140	16753	}
16141	16754	//checker.GetMaterial().opacity = 1f;
16142	16755	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16222,6 +16835,14 @@
16222	16835	}
16223	16836	}
16224	16837
	16838	+ private Object3D GetFolder()
	16839	+ {
	16840	+ Object3D folder = object.GetWindow().copy;
	16841	+ if (object.GetWindow().copy.selection.Size() > 0)
	16842	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16843	+ return folder;
	16844	+ }
	16845	+
16225	16846	class SelectBuffer implements GLEventListener
16226	16847	{
16227	16848
..	..	@@ -16280,6 +16901,7 @@
16280	16901	{
16281	16902	if (!selection)
16282	16903	{
	16904	+ new Exception().printStackTrace();
16283	16905	System.exit(0);
16284	16906	return;
16285	16907	}
..	..	@@ -16300,6 +16922,17 @@
16300	16922
16301	16923	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16302	16924
	16925	+ if (PAINTMODE)
	16926	+ {
	16927	+ if (object.GetWindow().copy.selection.Size() > 0)
	16928	+ {
	16929	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16930	+
	16931	+ // Make what you paint not selectable.
	16932	+ paintobj.ResetSelectable();
	16933	+ }
	16934	+ }
	16935	+
16303	16936	//int tmp = selection_view;
16304	16937	//selection_view = -1;
16305	16938	int temp = DrawMode();
..	..	@@ -16311,6 +16944,17 @@
16311	16944	// temp = DEFAULT; // patch for selection debug
16312	16945	Globals.drawMode = temp; // WARNING
16313	16946
	16947	+ if (PAINTMODE)
	16948	+ {
	16949	+ if (object.GetWindow().copy.selection.Size() > 0)
	16950	+ {
	16951	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16952	+
	16953	+ // Revert.
	16954	+ paintobj.RestoreSelectable();
	16955	+ }
	16956	+ }
	16957	+
16314	16958	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16315	16959
16316	16960	// trying different ways of getting the depth info over
..	..	@@ -16358,6 +17002,8 @@
16358	17002	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16359	17003	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16360	17004	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17005	+
	17006	+ CreateSelectedPoint();
16361	17007
16362	17008	// Will fit the mesh !!!
16363	17009	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16407,34 +17053,36 @@
16407	17053	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]));
16408	17054	}
16409	17055
16410		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	17056	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16411	17057	}
16412	17058	}
16413	17059
16414	17060	if (!movingcamera && !PAINTMODE)
16415		- object.editWindow.ScreenFitPoint(); // fev 2014
	17061	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16416	17062
16417		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17063	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16418	17064	{
16419		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17065	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16420	17066
16421		- Object3D group = new Object3D("inst" + paintcount++);
	17067	+ if (object.GetWindow().copy.selection.Size() > 0)
	17068	+ {
	17069	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16422	17070
16423		- group.CreateMaterial(); // use a void leaf to select instances
16424		-
16425		- group.add(paintobj); // link
16426		-
16427		- object.editWindow.SnapObject(group);
16428		-
16429		- Object3D folder = object.editWindow.copy;
16430		-
16431		- if (object.editWindow.copy.selection.Size() > 0)
16432		- folder = object.editWindow.copy.selection.elementAt(0);
16433		-
16434		- folder.add(group);
16435		-
16436		- object.editWindow.ResetModel();
16437		- object.editWindow.refreshContents();
	17071	+ Object3D inst = new Object3D("inst" + paintcount++);
	17072	+
	17073	+ inst.CreateMaterial(); // use a void leaf to select instances
	17074	+
	17075	+ inst.add(paintobj); // link
	17076	+
	17077	+ object.GetWindow().SnapObject(inst);
	17078	+
	17079	+ Object3D folder = paintFolder; // GetFolder();
	17080	+
	17081	+ folder.add(inst);
	17082	+
	17083	+ object.GetWindow().ResetModel();
	17084	+ object.GetWindow().refreshContents();
	17085	+ }
16438	17086	}
16439	17087	else
16440	17088	paintcount = 0;
..	..	@@ -16473,6 +17121,11 @@
16473	17121	//System.out.println("objects[color] = " + objects[color]);
16474	17122	//objects[color].Select();
16475	17123	indexcount = 0;
	17124	+ ObjEditor window = object.GetWindow();
	17125	+ if (window != null && deselect)
	17126	+ {
	17127	+ window.Select(null, deselect, true);
	17128	+ }
16476	17129	object.Select(color, deselect);
16477	17130	}
16478	17131
..	..	@@ -16572,7 +17225,7 @@
16572	17225	gl.glDisable(gl.GL_CULL_FACE);
16573	17226	}
16574	17227
16575		- if (!RENDERSHADOW)
	17228	+ if (!Globals.RENDERSHADOW)
16576	17229	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16577	17230
16578	17231	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16582,7 +17235,7 @@
16582	17235	//gl.glColorMask(false, false, false, false);
16583	17236
16584	17237	//render_scene_from_light_view(gl, drawable, 0, 0);
16585		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17238	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16586	17239	{
16587	17240	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16588	17241
..	..	@@ -16998,23 +17651,15 @@
16998	17651	int AAbuffersize = 0;
16999	17652
17000	17653	//double[] selectedpoint = new double[3];
17001		- static Superellipsoid selectedpoint = new Superellipsoid();
	17654	+ static Superellipsoid selectedpoint;
17002	17655	static Sphere previousselectedpoint = null;
17003		- static Sphere debugpointG = new Sphere();
17004		- static Sphere debugpointP = new Sphere();
17005		- static Sphere debugpointC = new Sphere();
17006		- static Sphere debugpointR = new Sphere();
	17656	+ static Sphere debugpointG;
	17657	+ static Sphere debugpointP;
	17658	+ static Sphere debugpointC;
	17659	+ static Sphere debugpointR;
17007	17660
17008	17661	static Sphere debugpoints[] = new Sphere[8];
17009	17662
17010		- static
17011		- {
17012		- for (int i=0; i<8; i++)
17013		- {
17014		- debugpoints[i] = new Sphere();
17015		- }
17016		- }
17017		-
17018	17663	static void InitPoints(float radius)
17019	17664	{
17020	17665	for (int i=0; i<8; i++)