~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -18,7 +18,10 @@
18	18	import javax.imageio.ImageIO;
19	19	import javax.imageio.ImageWriteParam;
20	20	import javax.imageio.ImageWriter;
	21	+import javax.imageio.ImageReadParam;
	22	+import javax.imageio.ImageReader;
21	23	import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
	24	+import javax.imageio.stream.ImageInputStream;
22	25	import javax.imageio.stream.ImageOutputStream;
23	26	import javax.imageio.ImageWriteParam;
24	27
..	..	@@ -30,6 +33,7 @@
30	33	import java.nio.*;
31	34
32	35	import gleem.linalg.Mat4f;
	36	+import javax.imageio.ImageTypeSpecifier;
33	37
34	38	class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	39	{
..	..	@@ -37,7 +41,6 @@
37	41	static boolean[] selectedstack = new boolean[65536];
38	42	static int materialdepth = 0;
39	43
40		- static boolean DEBUG = false;
41	44	static boolean FRUSTUM = false; // still bogus true; // frustum culling
42	45
43	46	// camera change fix
..	..	@@ -45,6 +48,39 @@
45	48	static boolean ABORTED = false;
46	49
47	50	static int STEP = 1;
	51	+
	52	+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
	53	+ {
	54	+ int[] pixels = new int[bytes.length/3];
	55	+ for (int i=pixels.length; --i>=0;)
	56	+ {
	57	+ int i3 = i*3;
	58	+ pixels[i] = 0xFF;
	59	+ pixels[i] <<= 8;
	60	+ pixels[i] \|= bytes[i3+2] & 0xFF;
	61	+ pixels[i] <<= 8;
	62	+ pixels[i] \|= bytes[i3+1] & 0xFF;
	63	+ pixels[i] <<= 8;
	64	+ pixels[i] \|= bytes[i3] & 0xFF;
	65	+ }
	66	+ /*
	67	+ int r=0,g=0,b=0,a=0;
	68	+ for (int i=0; i<width; i++)
	69	+ for (int j=0; j<height; j++)
	70	+ {
	71	+ int index = j*width+i;
	72	+ int p = pixels[index];
	73	+ a = ((p>>24) & 0xFF);
	74	+ r = ((p>>16) & 0xFF);
	75	+ g = ((p>>8) & 0xFF);
	76	+ b = (p & 0xFF);
	77	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	78	+ }
	79	+ /**/
	80	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	81	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	82	+ return rendImage;
	83	+ }
48	84
49	85	/static/ private boolean CULLFACE = false; // true;
50	86	/static/ boolean NEAREST = false; // true;
..	..	@@ -56,14 +92,12 @@
56	92	static int CURRENTANTIALIAS = 0; // 1;
57	93	/static/ boolean RENDERSHADOW = true;
58	94	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59		- static boolean ANIMATION = false;
60		- static String filename;
61	95
62	96	boolean DISPLAYTEXT = false;
63	97	//boolean REDUCETEXTURE = true;
64	98	boolean CACHETEXTURE = true;
65	99	boolean CLEANCACHE = false; // true;
66		- boolean MIPMAP = false; // true;
	100	+ boolean MIPMAP = false; // true; // never works...
67	101	boolean COMPRESSTEXTURE = false;
68	102	boolean KOMPACTTEXTURE = false; // true;
69	103	boolean RESIZETEXTURE = false;
..	..	@@ -86,7 +120,7 @@
86	120	static boolean FULLSCREEN = false;
87	121	static boolean SUPPORT = true;
88	122	static boolean INERTIA = true;
89		-static boolean FAST = true; // false;
	123	+static boolean FAST = false;
90	124	static boolean SLOWPOSE = false;
91	125	static boolean FOOTCONTACT = true;
92	126
..	..	@@ -108,7 +142,7 @@
108	142	static boolean OEIL = true;
109	143	static boolean OEILONCE = false; // do oeilon then oeiloff
110	144	static boolean LOOKAT = true;
111		-static boolean RANDOM = true; // false;
	145	+static boolean SWITCH = true; // false;
112	146	static boolean HANDLES = false; // selection doesn't work!!
113	147	static boolean PAINTMODE = false;
114	148
..	..	@@ -151,6 +185,8 @@
151	185	defaultcaps.setAccumBlueBits(16);
152	186	defaultcaps.setAccumAlphaBits(16);
153	187	}
	188	+
	189	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
154	190
155	191	void SetAsGLRenderer(boolean b)
156	192	{
..	..	@@ -327,7 +363,7 @@
327	363	cStatic.objectstack[materialdepth++] = obj;
328	364	//System.out.println("material " + material);
329	365	//Applet3D.tracein(this, selected);
330		- display.vector2buffer = obj.projectedVertices;
	366	+ //display.vector2buffer = obj.projectedVertices;
331	367	if (obj instanceof Camera)
332	368	{
333	369	display.options1[0] = material.shift;
..	..	@@ -336,14 +372,28 @@
336	372	display.options1[2] = material.shadowbias;
337	373	display.options1[3] = material.aniso;
338	374	display.options1[4] = material.anisoV;
	375	+// System.out.println("display.options1[0] " + display.options1[0]);
	376	+// System.out.println("display.options1[1] " + display.options1[1]);
	377	+// System.out.println("display.options1[2] " + display.options1[2]);
	378	+// System.out.println("display.options1[3] " + display.options1[3]);
	379	+// System.out.println("display.options1[4] " + display.options1[4]);
339	380	display.options2[0] = material.opacity;
340	381	display.options2[1] = material.diffuse;
341	382	display.options2[2] = material.factor;
	383	+// System.out.println("display.options2[0] " + display.options2[0]);
	384	+// System.out.println("display.options2[1] " + display.options2[1]);
	385	+// System.out.println("display.options2[2] " + display.options2[2]);
342	386
343	387	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	388	+// System.out.println("display.options3[0] " + display.options3[0]);
	389	+// System.out.println("display.options3[1] " + display.options3[1]);
	390	+// System.out.println("display.options3[2] " + display.options3[2]);
344	391	display.options4[0] = material.cameralight/0.2f;
345	392	display.options4[1] = material.subsurface;
346	393	display.options4[2] = material.sheen;
	394	+// System.out.println("display.options4[0] " + display.options4[0]);
	395	+// System.out.println("display.options4[1] " + display.options4[1]);
	396	+// System.out.println("display.options4[2] " + display.options4[2]);
347	397
348	398	// if (display.CURRENTANTIALIAS > 0)
349	399	// display.options3[3] /= 4;
..	..	@@ -359,7 +409,7 @@
359	409	/**/
360	410	} else
361	411	{
362		- DrawMaterial(material, selected);
	412	+ DrawMaterial(material, selected, obj.projectedVertices);
363	413	}
364	414	} else
365	415	{
..	..	@@ -383,8 +433,8 @@
383	433	cStatic.objectstack[materialdepth++] = obj;
384	434	//System.out.println("material " + material);
385	435	//Applet3D.tracein("selected ", selected);
386		- display.vector2buffer = obj.projectedVertices;
387		- display.DrawMaterial(material, selected);
	436	+ //display.vector2buffer = obj.projectedVertices;
	437	+ display.DrawMaterial(material, selected, obj.projectedVertices);
388	438	}
389	439	}
390	440
..	..	@@ -401,8 +451,8 @@
401	451	materialdepth -= 1;
402	452	if (materialdepth > 0)
403	453	{
404		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
405		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	454	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	455	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
406	456	}
407	457	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
408	458	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -422,8 +472,8 @@
422	472	materialdepth -= 1;
423	473	if (materialdepth > 0)
424	474	{
425		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
426		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	475	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	476	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
427	477	}
428	478	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
429	479	//else
..	..	@@ -464,10 +514,12 @@
464	514	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
465	515	{
466	516	//gl.glBegin(gl.GL_TRIANGLES);
467		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	517	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	518	+ // TEST LIVE NORMALS && !obj.dontselect
	519	+ ;
468	520	if (!hasnorm)
469	521	{
470		- // System.out.println("FUCK!!");
	522	+ // System.out.println("Mesh normal");
471	523	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
472	524	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
473	525	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1192,10 +1244,12 @@
1192	1244	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1193	1245	}
1194	1246	}
	1247	+
1195	1248	if (flipV)
1196	1249	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1197	1250	else
1198	1251	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1252	+
1199	1253	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1200	1254	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1201	1255
..	..	@@ -1215,10 +1269,12 @@
1215	1269	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1216	1270	}
1217	1271	}
	1272	+
1218	1273	if (flipV)
1219	1274	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1220	1275	else
1221	1276	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1277	+
1222	1278	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1223	1279	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1224	1280
..	..	@@ -1246,8 +1302,10 @@
1246	1302	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1247	1303	else
1248	1304	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1305	+
1249	1306	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1250	1307	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1308	+
1251	1309	count2 += 2;
1252	1310	count3 += 3;
1253	1311	}
..	..	@@ -1603,7 +1661,7 @@
1603	1661	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1604	1662	}
1605	1663
1606		- void DrawMaterial(cMaterial material, boolean selected)
	1664	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1607	1665	{
1608	1666	CameraPane display = this;
1609	1667	//new Exception().printStackTrace();
..	..	@@ -1630,7 +1688,7 @@
1630	1688
1631	1689	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1632	1690
1633		- float[] colorV = GrafreeD.colorV;
	1691	+ float[] colorV = Grafreed.colorV;
1634	1692
1635	1693	/**/
1636	1694	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1638,7 +1696,7 @@
1638	1696	colorV[0] = display.modelParams0[0] * material.diffuse;
1639	1697	colorV[1] = display.modelParams0[1] * material.diffuse;
1640	1698	colorV[2] = display.modelParams0[2] * material.diffuse;
1641		- colorV[3] = material.opacity;
	1699	+ colorV[3] = 1; // material.opacity;
1642	1700
1643	1701	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1644	1702	//System.out.println("Opacity = " + opacity);
..	..	@@ -1746,9 +1804,9 @@
1746	1804	display.modelParams7[2] = 0;
1747	1805	display.modelParams7[3] = 0;
1748	1806
1749		- display.modelParams6[0] = 100; // criss de bug de bump
	1807	+ //display.modelParams6[0] = 100; // criss de bug de bump
1750	1808
1751		- Object3D.cVector2[] extparams = display.vector2buffer;
	1809	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1752	1810	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1753	1811	{
1754	1812	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1890,7 +1948,7 @@
1890	1948	void PushMatrix(double[][] matrix)
1891	1949	{
1892	1950	// GrafreeD.tracein(matrix);
1893		- PushMatrix(matrix,1);
	1951	+ PushMatrix(matrix, 1);
1894	1952	}
1895	1953
1896	1954	void PushMatrix()
..	..	@@ -2044,7 +2102,7 @@
2044	2102	//System.err.println("Oeil on");
2045	2103	OEIL = true;
2046	2104	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2047		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2105	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2048	2106	//pingthread.StepToTarget(true);
2049	2107	}
2050	2108
..	..	@@ -2142,7 +2200,7 @@
2142	2200	System.err.println("LIVE = " + Globals.isLIVE());
2143	2201
2144	2202	if (!Globals.isLIVE()) // save sound
2145		- GrafreeD.savesound = true; // wav.save();
	2203	+ Grafreed.savesound = true; // wav.save();
2146	2204	// else
2147	2205	repaint(); // start loop // may 2013
2148	2206	}
..	..	@@ -2259,7 +2317,7 @@
2259	2317
2260	2318	void ToggleDebug()
2261	2319	{
2262		- DEBUG ^= true;
	2320	+ Globals.DEBUG ^= true;
2263	2321	}
2264	2322
2265	2323	void ToggleLookAt()
..	..	@@ -2267,9 +2325,9 @@
2267	2325	LOOKAT ^= true;
2268	2326	}
2269	2327
2270		- void ToggleRandom()
	2328	+ void ToggleSwitch()
2271	2329	{
2272		- RANDOM ^= true;
	2330	+ SWITCH ^= true;
2273	2331	}
2274	2332
2275	2333	void ToggleHandles()
..	..	@@ -2277,10 +2335,17 @@
2277	2335	HANDLES ^= true;
2278	2336	}
2279	2337
	2338	+ Object3D paintFolder;
	2339	+
2280	2340	void TogglePaint()
2281	2341	{
2282	2342	PAINTMODE ^= true;
2283	2343	paintcount = 0;
	2344	+
	2345	+ if (PAINTMODE)
	2346	+ {
	2347	+ paintFolder = GetFolder();
	2348	+ }
2284	2349	}
2285	2350
2286	2351	void SwapCamera(int a, int b)
..	..	@@ -2376,7 +2441,22 @@
2376	2441	{
2377	2442	return currentGL;
2378	2443	}
2379		-
	2444	+
	2445	+ static private BufferedImage CreateBim(TextureData texturedata)
	2446	+ {
	2447	+ Grafreed.Assert(texturedata != null);
	2448	+
	2449	+ int width = texturedata.getWidth();
	2450	+ int height = texturedata.getHeight();
	2451	+
	2452	+ Buffer buffer = texturedata.getBuffer();
	2453	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2454	+
	2455	+ byte[] bytes = bytebuf.array();
	2456	+
	2457	+ return CreateBim(bytes, width, height);
	2458	+ }
	2459	+
2380	2460	/**/
2381	2461	class CacheTexture
2382	2462	{
..	..	@@ -2385,28 +2465,31 @@
2385	2465
2386	2466	int resolution;
2387	2467
2388		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2468	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2389	2469	{
2390		- texture = tex;
	2470	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2471	+ texturedata = texdata;
2391	2472	resolution = res;
2392	2473	}
2393	2474	}
2394	2475	/**/
2395	2476
2396	2477	// TEXTURE static Texture texture;
2397		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2398		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2399		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2478	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2479	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2480	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2481	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2482	+
2400	2483	int pigmentdepth = 0;
2401	2484	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2402	2485	int bumpdepth = 0;
2403	2486	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2404	2487	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2405	2488	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2406		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2489	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2407	2490	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2408	2491
2409		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2492	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2410	2493	{
2411	2494	TextureData texturedata = null;
2412	2495
..	..	@@ -2425,13 +2508,34 @@
2425	2508	if (bump)
2426	2509	texturedata = ConvertBump(texturedata, false);
2427	2510
2428		- com.sun.opengl.util.texture.Texture texture =
2429		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2511	+// com.sun.opengl.util.texture.Texture texture =
	2512	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2430	2513
2431		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2432		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2514	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2515	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2433	2516
2434		- return texture;
	2517	+ return texturedata;
	2518	+ }
	2519	+
	2520	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2521	+ {
	2522	+ TextureData texturedata = null;
	2523	+
	2524	+ try
	2525	+ {
	2526	+ texturedata =
	2527	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2528	+ bim,
	2529	+ true);
	2530	+ } catch (Exception e)
	2531	+ {
	2532	+ throw new javax.media.opengl.GLException(e);
	2533	+ }
	2534	+
	2535	+ if (bump)
	2536	+ texturedata = ConvertBump(texturedata, false);
	2537	+
	2538	+ return texturedata;
2435	2539	}
2436	2540
2437	2541	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3504,6 +3608,8 @@
3504	3608
3505	3609	System.out.println("LOADING TEXTURE : " + name);
3506	3610
	3611	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3612	+
3507	3613	//
3508	3614	if (false) // compressbit > 0)
3509	3615	{
..	..	@@ -4208,6 +4314,7 @@
4208	4314
4209	4315	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
4210	4316	{
	4317	+ new Exception().printStackTrace();
4211	4318	System.exit(0);
4212	4319	com.sun.opengl.util.texture.Texture texture = null;
4213	4320
..	..	@@ -7901,7 +8008,7 @@
7901	8008	String pigment = Object3D.GetPigment(tex);
7902	8009	String bump = Object3D.GetBump(tex);
7903	8010
7904		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8011	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7905	8012	{
7906	8013	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7907	8014	// System.out.println("; bump = " + bump);
..	..	@@ -7916,11 +8023,69 @@
7916	8023	pigment = null;
7917	8024	}
7918	8025
7919		- ReleaseTexture(bump, true);
7920		- ReleaseTexture(pigment, false);
	8026	+ ReleaseTexture(tex, true);
	8027	+ ReleaseTexture(tex, false);
7921	8028	}
7922	8029
7923		- void ReleaseTexture(String tex, boolean bump)
	8030	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8031	+ {
	8032	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8033	+ {
	8034	+ return;
	8035	+ }
	8036	+
	8037	+ if (tex == null)
	8038	+ {
	8039	+ ReleaseTexture(null, false);
	8040	+ return;
	8041	+ }
	8042	+
	8043	+ String pigment = Object3D.GetPigment(tex);
	8044	+
	8045	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8046	+ {
	8047	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8048	+ // System.out.println("; bump = " + bump);
	8049	+ }
	8050	+
	8051	+ if (pigment.equals(""))
	8052	+ {
	8053	+ pigment = null;
	8054	+ }
	8055	+
	8056	+ ReleaseTexture(tex, false);
	8057	+ }
	8058	+
	8059	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8060	+ {
	8061	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8062	+ {
	8063	+ return;
	8064	+ }
	8065	+
	8066	+ if (tex == null)
	8067	+ {
	8068	+ ReleaseTexture(null, true);
	8069	+ return;
	8070	+ }
	8071	+
	8072	+ String bump = Object3D.GetBump(tex);
	8073	+
	8074	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8075	+ {
	8076	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8077	+ // System.out.println("; bump = " + bump);
	8078	+ }
	8079	+
	8080	+ if (bump.equals(""))
	8081	+ {
	8082	+ bump = null;
	8083	+ }
	8084	+
	8085	+ ReleaseTexture(tex, true);
	8086	+ }
	8087	+
	8088	+ void ReleaseTexture(cTexture tex, boolean bump)
7924	8089	{
7925	8090	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7926	8091	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7931,7 +8096,7 @@
7931	8096	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7932	8097
7933	8098	if (tex != null)
7934		- texture = textures.get(tex);
	8099	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7935	8100
7936	8101	// //assert( texture != null );
7937	8102	// if (texture == null)
..	..	@@ -8023,7 +8188,55 @@
8023	8188	}
8024	8189	}
8025	8190
8026		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8191	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	8192	+ {
	8193	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8194	+// ambientOcclusion ) // \|\| !textureon)
	8195	+// {
	8196	+// return; // false;
	8197	+// }
	8198	+//
	8199	+// if (tex == null)
	8200	+// {
	8201	+// BindTexture(null,false,resolution);
	8202	+// BindTexture(null,true,resolution);
	8203	+// return;
	8204	+// }
	8205	+//
	8206	+// String pigment = Object3D.GetPigment(tex);
	8207	+// String bump = Object3D.GetBump(tex);
	8208	+//
	8209	+// usedtextures.add(pigment);
	8210	+// usedtextures.add(bump);
	8211	+//
	8212	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8213	+// {
	8214	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8215	+// // System.out.println("; bump = " + bump);
	8216	+// }
	8217	+//
	8218	+// if (bump.equals(""))
	8219	+// {
	8220	+// bump = null;
	8221	+// }
	8222	+// if (pigment.equals(""))
	8223	+// {
	8224	+// pigment = null;
	8225	+// }
	8226	+//
	8227	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8228	+// BindTexture(pigment, false, resolution);
	8229	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8230	+// BindTexture(bump, true, resolution);
	8231	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8232	+//
	8233	+// return; // true;
	8234	+
	8235	+ BindPigmentTexture(tex, resolution);
	8236	+ BindBumpTexture(tex, resolution);
	8237	+ }
	8238	+
	8239	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8027	8240	{
8028	8241	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8029	8242	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8034,17 +8247,47 @@
8034	8247	if (tex == null)
8035	8248	{
8036	8249	BindTexture(null,false,resolution);
8037		- BindTexture(null,true,resolution);
8038	8250	return;
8039	8251	}
8040	8252
8041	8253	String pigment = Object3D.GetPigment(tex);
	8254	+
	8255	+ usedtextures.add(tex);
	8256	+
	8257	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8258	+ {
	8259	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8260	+ // System.out.println("; bump = " + bump);
	8261	+ }
	8262	+
	8263	+ if (pigment.equals(""))
	8264	+ {
	8265	+ pigment = null;
	8266	+ }
	8267	+
	8268	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8269	+ BindTexture(tex, false, resolution);
	8270	+ }
	8271	+
	8272	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8273	+ {
	8274	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8275	+ ambientOcclusion ) // \|\| !textureon)
	8276	+ {
	8277	+ return; // false;
	8278	+ }
	8279	+
	8280	+ if (tex == null)
	8281	+ {
	8282	+ BindTexture(null,true,resolution);
	8283	+ return;
	8284	+ }
	8285	+
8042	8286	String bump = Object3D.GetBump(tex);
8043	8287
8044		- usedtextures.put(pigment, pigment);
8045		- usedtextures.put(bump, bump);
	8288	+ usedtextures.add(tex);
8046	8289
8047		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8290	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8048	8291	{
8049	8292	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8050	8293	// System.out.println("; bump = " + bump);
..	..	@@ -8054,43 +8297,94 @@
8054	8297	{
8055	8298	bump = null;
8056	8299	}
8057		- if (pigment.equals(""))
8058		- {
8059		- pigment = null;
8060		- }
8061	8300
8062		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8063		- BindTexture(pigment, false, resolution);
8064	8301	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8065		- BindTexture(bump, true, resolution);
	8302	+ BindTexture(tex, true, resolution);
8066	8303	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8067		-
8068		- return; // true;
8069	8304	}
8070	8305
8071		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8306	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8307	+
	8308	+ private boolean FileExists(String tex)
8072	8309	{
8073		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8310	+ if (missingTextures.contains(tex))
	8311	+ {
	8312	+ return false;
	8313	+ }
	8314	+
	8315	+ boolean fileExists = new File(tex).exists();
	8316	+
	8317	+ if (!fileExists)
	8318	+ {
	8319	+ // If file exists, the "new File()" is not executed sgain
	8320	+ missingTextures.add(tex);
	8321	+ }
	8322	+
	8323	+ return fileExists;
	8324	+ }
	8325	+
	8326	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8327	+ {
	8328	+ CacheTexture texturecache = null;
8074	8329
8075	8330	if (tex != null)
8076	8331	{
8077		- String texname = tex;
	8332	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8333	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
8078	8334
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;
	8335	+ if (texname.equals("") && texdata == null)
	8336	+ {
	8337	+ return null;
	8338	+ }
	8339	+
	8340	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8341	+
	8342	+// String[] split = tex.split("Textures");
	8343	+// if (split.length > 1)
	8344	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8345	+// else
	8346	+// if (!texname.startsWith("/"))
	8347	+// texname = "/Users/nbriere/Textures/" + texname;
	8348	+ if (!FileExists(texname))
	8349	+ {
	8350	+ texname = fallbackTextureName;
	8351	+ }
8085	8352
8086	8353	if (CACHETEXTURE)
8087		- texture = textures.get(texname); // TEXTURE CACHE
8088		-
8089		- TextureData texturedata = null;
8090		-
8091		- if (texture == null \|\| texture.resolution < resolution)
8092	8354	{
8093		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8355	+ if (texdata == null)
	8356	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8357	+ else
	8358	+ texturecache = bimtextures.get(texdata);
	8359	+ }
	8360	+
	8361	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8362	+ {
	8363	+ TextureData texturedata = null;
	8364	+
	8365	+ if (texdata != null && textureon)
	8366	+ {
	8367	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8368	+
	8369	+ try
	8370	+ {
	8371	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8372	+ }
	8373	+ catch (Exception e)
	8374	+ {
	8375	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8376	+ }
	8377	+
	8378	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8379	+ bimtextures.put(texdata, texturecache);
	8380	+
	8381	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8382	+
	8383	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8384	+ //bim2 = bim;
	8385	+ }
	8386	+ else
	8387	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8094	8388	{
8095	8389	assert(!bump);
8096	8390	// if (bump)
..	..	@@ -8101,19 +8395,23 @@
8101	8395	// }
8102	8396	// else
8103	8397	// {
8104		- texture = textures.get(tex);
8105		- if (texture == null)
	8398	+ // texturecache = textures.get(texname); // suspicious
	8399	+ if (texturecache == null)
8106	8400	{
8107		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8401	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8108	8402	}
	8403	+ else
	8404	+ new Exception().printStackTrace();
8109	8405	// }
8110	8406	} else
8111		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8407	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8112	8408	{
8113	8409	assert(bump);
8114		- texture = textures.get(tex);
8115		- if (texture == null)
8116		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8410	+ // texturecache = textures.get(texname); // suspicious
	8411	+ if (texturecache == null)
	8412	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8413	+ else
	8414	+ new Exception().printStackTrace();
8117	8415	} else
8118	8416	{
8119	8417	//if (tex.equals("IMMORTAL"))
..	..	@@ -8121,11 +8419,13 @@
8121	8419	// texture = GetResourceTexture("default.png");
8122	8420	//} else
8123	8421	//{
8124		- if (tex.equals("WHITE_NOISE"))
	8422	+ if (texname.endsWith("WHITE_NOISE"))
8125	8423	{
8126		- texture = textures.get(tex);
8127		- if (texture == null)
8128		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8424	+ // texturecache = textures.get(texname); // suspicious
	8425	+ if (texturecache == null)
	8426	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8427	+ else
	8428	+ new Exception().printStackTrace();
8129	8429	} else
8130	8430	{
8131	8431	if (textureon)
..	..	@@ -8150,7 +8450,7 @@
8150	8450	}
8151	8451
8152	8452	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8153		- if (!new File(cachename).exists())
	8453	+ if (!FileExists(cachename))
8154	8454	cachename = texname;
8155	8455	else
8156	8456	processbump = false; // don't process bump map again
..	..	@@ -8172,7 +8472,7 @@
8172	8472	}
8173	8473
8174	8474	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8175		- if (!new File(cachename).exists())
	8475	+ if (!FileExists(cachename))
8176	8476	cachename = texname;
8177	8477	else
8178	8478	processbump = false; // don't process bump map again
..	..	@@ -8181,20 +8481,22 @@
8181	8481	texturedata = GetFileTexture(cachename, processbump, resolution);
8182	8482
8183	8483
8184		- if (texturedata != null)
8185		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8484	+ if (texturedata == null)
	8485	+ throw new Exception();
	8486	+
	8487	+ texturecache = new CacheTexture(texturedata,resolution);
8186	8488	//texture = GetTexture(tex, bump);
8187	8489	}
8188	8490	}
8189	8491	//}
8190	8492	}
8191	8493
8192		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8494	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8193	8495	{
8194	8496	//return false;
8195	8497
8196	8498	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8197		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8499	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8198	8500	{
8199	8501	// String ext = "_highres";
8200	8502	// if (REDUCETEXTURE)
..	..	@@ -8211,52 +8513,17 @@
8211	8513	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8212	8514	if (!cachefile.exists())
8213	8515	{
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))
	8516	+ //if (texturedata.getWidth() == texturedata.getHeight())
8223	8517	{
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);
	8518	+ BufferedImage rendImage = CreateBim(texturedata);
	8519	+
8254	8520	ImageWriter writer = null;
8255	8521	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8256	8522	if (iter.hasNext()) {
8257	8523	writer = (ImageWriter)iter.next();
8258	8524	}
8259		- float compressionQuality = 0.9f;
	8525	+
	8526	+ float compressionQuality = 0.85f;
8260	8527	try
8261	8528	{
8262	8529	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8273,18 +8540,20 @@
8273	8540	}
8274	8541	}
8275	8542	}
8276		-
	8543	+
	8544	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8545	+
8277	8546	//System.out.println("Texture = " + tex);
8278		- if (textures.containsKey(texname))
	8547	+ if (textures.containsKey(tex))
8279	8548	{
8280		- CacheTexture thetex = textures.get(texname);
	8549	+ CacheTexture thetex = textures.get(tex);
8281	8550	thetex.texture.disable();
8282	8551	thetex.texture.dispose();
8283		- textures.remove(texname);
	8552	+ textures.remove(tex);
8284	8553	}
8285	8554
8286		- texture.texturedata = texturedata;
8287		- textures.put(texname, texture);
	8555	+ //texture.texturedata = texturedata;
	8556	+ textures.put(tex, texturecache);
8288	8557
8289	8558	// newtex = true;
8290	8559	}
..	..	@@ -8300,10 +8569,44 @@
8300	8569	}
8301	8570	}
8302	8571
8303		- return texture;
	8572	+ return texturecache;
8304	8573	}
8305	8574
8306		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8575	+ static void EmbedTextures(cTexture tex)
	8576	+ {
	8577	+ if (tex.pigmentdata == null)
	8578	+ {
	8579	+ //String texname = Object3D.GetPigment(tex);
	8580	+
	8581	+ CacheTexture texturecache = texturepigment.get(tex);
	8582	+
	8583	+ if (texturecache != null)
	8584	+ {
	8585	+ tex.pw = texturecache.texturedata.getWidth();
	8586	+ tex.ph = texturecache.texturedata.getHeight();
	8587	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8588	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8589	+ ;
	8590	+ //, tex.pw, tex.ph), 0.5f);
	8591	+ }
	8592	+ }
	8593	+
	8594	+ if (tex.bumpdata == null)
	8595	+ {
	8596	+ //String texname = Object3D.GetBump(tex);
	8597	+
	8598	+ CacheTexture texturecache = texturebump.get(tex);
	8599	+
	8600	+ if (texturecache != null)
	8601	+ {
	8602	+ tex.bw = texturecache.texturedata.getWidth();
	8603	+ tex.bh = texturecache.texturedata.getHeight();
	8604	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8605	+ }
	8606	+ }
	8607	+ }
	8608	+
	8609	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8307	8610	{
8308	8611	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8309	8612
..	..	@@ -8321,21 +8624,21 @@
8321	8624	return texture!=null?texture.texture:null;
8322	8625	}
8323	8626
8324		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8627	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8325	8628	{
8326	8629	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8327	8630
8328	8631	return texture!=null?texture.texturedata:null;
8329	8632	}
8330	8633
8331		- boolean BindTexture(String tex, boolean bump, int resolution)
	8634	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8332	8635	{
8333	8636	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8334	8637	{
8335	8638	return false;
8336	8639	}
8337	8640
8338		- boolean newtex = false;
	8641	+ //boolean newtex = false;
8339	8642
8340	8643	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8341	8644
..	..	@@ -8367,9 +8670,75 @@
8367	8670	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8368	8671	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8369	8672
8370		- return newtex;
	8673	+ return true; // Warning: not used.
8371	8674	}
8372	8675
	8676	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8677	+ {
	8678	+ try
	8679	+ {
	8680	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8681	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8682	+ ImageWriter writer = writers.next();
	8683	+
	8684	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8685	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8686	+ param.setCompressionQuality(quality);
	8687	+
	8688	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8689	+ writer.setOutput(ios);
	8690	+ writer.write(null, new IIOImage(image, null, null), param);
	8691	+
	8692	+ byte[] data = baos.toByteArray();
	8693	+ writer.dispose();
	8694	+ return data;
	8695	+ }
	8696	+ catch (Exception e)
	8697	+ {
	8698	+ e.printStackTrace();
	8699	+ return null;
	8700	+ }
	8701	+ }
	8702	+
	8703	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8704	+ {
	8705	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8706	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8707	+ ImageReader reader = writers.next();
	8708	+
	8709	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8710	+
	8711	+ ImageReadParam param = reader.getDefaultReadParam();
	8712	+ param.setDestination(bim);
	8713	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8714	+
	8715	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8716	+ reader.setInput(ios);
	8717	+ BufferedImage bim2 = reader.read(0, param);
	8718	+ reader.dispose();
	8719	+
	8720	+// WritableRaster raster = bim2.getRaster();
	8721	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8722	+// byte[] bytes = data.getData();
	8723	+//
	8724	+// int[] pixels = new int[bytes.length/3];
	8725	+// for (int i=pixels.length; --i>=0;)
	8726	+// {
	8727	+// int i3 = i*3;
	8728	+// pixels[i] = 0xFF;
	8729	+// pixels[i] <<= 8;
	8730	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8731	+// pixels[i] <<= 8;
	8732	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8733	+// pixels[i] <<= 8;
	8734	+// pixels[i] \|= bytes[i3] & 0xFF;
	8735	+// }
	8736	+//
	8737	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8738	+
	8739	+ return bim;
	8740	+ }
	8741	+
8373	8742	ShadowBuffer shadowPBuf;
8374	8743	AntialiasBuffer antialiasPBuf;
8375	8744	int MAXSTACK;
..	..	@@ -9205,11 +9574,35 @@
9205	9574	jy8[3] = 0.5f;
9206	9575	}
9207	9576
9208		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9577	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9209	9578	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9210	9579	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9211	9580	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9212	9581
	9582	+ void ResetOptions()
	9583	+ {
	9584	+ options1[0] = 100;
	9585	+ options1[1] = 0.025f;
	9586	+ options1[2] = 0.01f;
	9587	+ options1[3] = 0;
	9588	+ options1[4] = 0;
	9589	+
	9590	+ options2[0] = 0;
	9591	+ options2[1] = 0.75f;
	9592	+ options2[2] = 0;
	9593	+ options2[3] = 0;
	9594	+
	9595	+ options3[0] = 1;
	9596	+ options3[1] = 1;
	9597	+ options3[2] = 1;
	9598	+ options3[3] = 0;
	9599	+
	9600	+ options4[0] = 1;
	9601	+ options4[1] = 0;
	9602	+ options4[2] = 1;
	9603	+ options4[3] = 0;
	9604	+ }
	9605	+
9213	9606	static int imagecount = 0; // movie generation
9214	9607
9215	9608	static int jitter = 0;
..	..	@@ -9305,8 +9698,8 @@
9305	9698	assert (parentcam != renderCamera);
9306	9699
9307	9700	if (renderCamera != lightCamera)
9308		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9309		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9701	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9702	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9310	9703
9311	9704	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9312	9705
..	..	@@ -9321,8 +9714,8 @@
9321	9714	LA.matCopy(renderCamera.fromScreen, matrix);
9322	9715
9323	9716	if (renderCamera != lightCamera)
9324		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9325		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9717	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9718	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9326	9719
9327	9720	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9328	9721
..	..	@@ -9394,7 +9787,7 @@
9394	9787	//gl.glFlush();
9395	9788	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9396	9789
9397		- if (ANIMATION && ABORTED)
	9790	+ if (Globals.ANIMATION && ABORTED)
9398	9791	{
9399	9792	System.err.println(" ABORTED FRAME");
9400	9793	break;
..	..	@@ -9424,7 +9817,7 @@
9424	9817	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9425	9818
9426	9819	// save image
9427		- if (ANIMATION && !ABORTED)
	9820	+ if (Globals.ANIMATION && !ABORTED)
9428	9821	{
9429	9822	VPwidth = viewport[2];
9430	9823	VPheight = viewport[3];
..	..	@@ -9535,11 +9928,11 @@
9535	9928
9536	9929	// imagecount++;
9537	9930
9538		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9931	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9539	9932
9540	9933	if (!BOXMODE)
9541	9934	{
9542		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9935	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9543	9936	}
9544	9937
9545	9938	if (!BOXMODE)
..	..	@@ -9577,7 +9970,7 @@
9577	9970	ABORTED = false;
9578	9971	}
9579	9972	else
9580		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9973	+ Grafreed.wav.cursor += 735 * ACSIZE;
9581	9974
9582	9975	if (false)
9583	9976	{
..	..	@@ -10240,11 +10633,11 @@
10240	10633
10241	10634	public void display(GLAutoDrawable drawable)
10242	10635	{
10243		- if (GrafreeD.savesound && GrafreeD.hassound)
	10636	+ if (Grafreed.savesound && Grafreed.hassound)
10244	10637	{
10245		- GrafreeD.wav.save();
10246		- GrafreeD.savesound = false;
10247		- GrafreeD.hassound = false;
	10638	+ Grafreed.wav.save();
	10639	+ Grafreed.savesound = false;
	10640	+ Grafreed.hassound = false;
10248	10641	}
10249	10642	// if (DEBUG_SELECTION)
10250	10643	// {
..	..	@@ -10320,6 +10713,7 @@
10320	10713	ANTIALIAS = 0;
10321	10714	//System.out.println("RESTART");
10322	10715	AAtimer.restart();
	10716	+ Globals.TIMERRUNNING = true;
10323	10717	}
10324	10718	}
10325	10719	}
..	..	@@ -10374,7 +10768,7 @@
10374	10768	Object3D theobject = object;
10375	10769	Object3D theparent = object.parent;
10376	10770	object.parent = null;
10377		- object = (Object3D)GrafreeD.clone(object);
	10771	+ object = (Object3D)Grafreed.clone(object);
10378	10772	object.Stripify();
10379	10773	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10380	10774	theobject.PreprocessOcclusion(this);
..	..	@@ -10387,13 +10781,14 @@
10387	10781	ambientOcclusion = false;
10388	10782	}
10389	10783
10390		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10784	+ if (//Globals.lighttouched &&
	10785	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10391	10786	{
10392	10787	//if (RENDERSHADOW) // ?
10393	10788	if (!IsFrozen())
10394	10789	{
10395	10790	// dec 2012
10396		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10791	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10397	10792	{
10398	10793	Globals.framecount++;
10399	10794	shadowbuffer.display();
..	..	@@ -10520,8 +10915,8 @@
10520	10915
10521	10916	// if (parentcam != renderCamera) // not a light
10522	10917	if (cam != lightCamera)
10523		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10524		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10918	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10919	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10525	10920
10526	10921	for (int j = 0; j < 4; j++)
10527	10922	{
..	..	@@ -10535,8 +10930,8 @@
10535	10930
10536	10931	// if (parentcam != renderCamera) // not a light
10537	10932	if (cam != lightCamera)
10538		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10539		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10933	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10934	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10540	10935
10541	10936	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10542	10937
..	..	@@ -10795,7 +11190,16 @@
10795	11190	// Bump noise
10796	11191	gl.glActiveTexture(GL.GL_TEXTURE6);
10797	11192	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10798		- BindTexture(NOISE_TEXTURE, false, 2);
	11193	+
	11194	+ try
	11195	+ {
	11196	+ BindTexture(NOISE_TEXTURE, false, 2);
	11197	+ }
	11198	+ catch (Exception e)
	11199	+ {
	11200	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11201	+ }
	11202	+
10799	11203
10800	11204	gl.glActiveTexture(GL.GL_TEXTURE0);
10801	11205	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10818,9 +11222,9 @@
10818	11222
10819	11223	gl.glMatrixMode(GL.GL_MODELVIEW);
10820	11224
10821		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10822		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10823		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11225	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11226	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11227	+gl.glEnable(gl.GL_MULTISAMPLE);
10824	11228	} else
10825	11229	{
10826	11230	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10831,7 +11235,7 @@
10831	11235	//System.out.println("BLENDING ON");
10832	11236	gl.glEnable(GL.GL_BLEND);
10833	11237	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10834		-
	11238	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10835	11239	gl.glMatrixMode(gl.GL_PROJECTION);
10836	11240	gl.glLoadIdentity();
10837	11241
..	..	@@ -10920,8 +11324,8 @@
10920	11324	System.err.println("parentcam != renderCamera");
10921	11325
10922	11326	// if (cam != lightCamera)
10923		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10924		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11327	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11328	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10925	11329	}
10926	11330
10927	11331	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10942,8 +11346,8 @@
10942	11346	if (true) // TODO
10943	11347	{
10944	11348	if (cam != lightCamera)
10945		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10946		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11349	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11350	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10947	11351	}
10948	11352
10949	11353	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11080,7 +11484,7 @@
11080	11484	}
11081	11485	}
11082	11486
11083		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11487	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11084	11488	{
11085	11489	//gl.glDepthFunc(GL.GL_LEQUAL);
11086	11490	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11088,24 +11492,21 @@
11088	11492
11089	11493	boolean texon = textureon;
11090	11494
11091		- if (RENDERPROGRAM > 0)
11092		- {
11093		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11094		- textureon = false;
11095		- }
	11495	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11496	+ textureon = false;
	11497	+
11096	11498	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11097	11499	//System.out.println("ALLO");
11098	11500	gl.glColorMask(false, false, false, false);
11099	11501	DrawObject(gl);
11100		- if (RENDERPROGRAM > 0)
11101		- {
11102		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11103		- textureon = texon;
11104		- }
	11502	+
	11503	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11504	+ textureon = texon;
	11505	+
11105	11506	gl.glColorMask(true, true, true, true);
11106	11507
11107	11508	gl.glDepthFunc(GL.GL_EQUAL);
11108		- //gl.glDepthMask(false);
	11509	+ gl.glDepthMask(false);
11109	11510	}
11110	11511
11111	11512	if (false) // DrawMode() == SHADOW)
..	..	@@ -11259,8 +11660,14 @@
11259	11660	{
11260	11661	renderpass++;
11261	11662	// System.out.println("Draw object... ");
	11663	+ STEP = 1;
11262	11664	if (FAST) // in case there is no script
11263		- STEP = 16;
	11665	+ STEP = 8;
	11666	+
	11667	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11668	+ {
	11669	+ STEP *= 4;
	11670	+ }
11264	11671
11265	11672	//object.FullInvariants();
11266	11673
..	..	@@ -11274,23 +11681,44 @@
11274	11681	e.printStackTrace();
11275	11682	}
11276	11683
11277		- if (GrafreeD.RENDERME > 0)
11278		- GrafreeD.RENDERME--; // mechante magouille
	11684	+ if (Grafreed.RENDERME > 0)
	11685	+ Grafreed.RENDERME--; // mechante magouille
11279	11686
11280	11687	Globals.ONESTEP = false;
11281	11688	}
11282	11689
11283	11690	static boolean zoomonce = false;
11284	11691
	11692	+ static void CreateSelectedPoint()
	11693	+ {
	11694	+ if (selectedpoint == null)
	11695	+ {
	11696	+ debugpointG = new Sphere();
	11697	+ debugpointP = new Sphere();
	11698	+ debugpointC = new Sphere();
	11699	+ debugpointR = new Sphere();
	11700	+
	11701	+ selectedpoint = new Superellipsoid();
	11702	+
	11703	+ for (int i=0; i<8; i++)
	11704	+ {
	11705	+ debugpoints[i] = new Sphere();
	11706	+ }
	11707	+ }
	11708	+ }
	11709	+
11285	11710	void DrawObject(GL gl, boolean draw)
11286	11711	{
	11712	+ // To clear camera values
	11713	+ ResetOptions();
	11714	+
11287	11715	//System.out.println("DRAW OBJECT " + mouseDown);
11288	11716	// DrawMode() = SELECTION;
11289	11717	//GL gl = getGL();
11290	11718	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11291	11719	{
11292	11720	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11293		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11721	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11294	11722	pingthread.StepToTarget(true); // true);
11295	11723	// zoomonce = false;
11296	11724	}
..	..	@@ -11345,7 +11773,14 @@
11345	11773
11346	11774	usedtextures.clear();
11347	11775
11348		- BindTextures(DEFAULT_TEXTURES, 2);
	11776	+ try
	11777	+ {
	11778	+ BindTextures(DEFAULT_TEXTURES, 2);
	11779	+ }
	11780	+ catch (Exception e)
	11781	+ {
	11782	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11783	+ }
11349	11784	}
11350	11785	//System.out.println("--> " + stackdepth);
11351	11786	// GrafreeD.traceon();
..	..	@@ -11355,8 +11790,9 @@
11355	11790
11356	11791	if (DrawMode() == DEFAULT)
11357	11792	{
11358		- if (DEBUG)
	11793	+ if (Globals.DEBUG)
11359	11794	{
	11795	+ CreateSelectedPoint();
11360	11796	float radius = 0.05f;
11361	11797	if (selectedpoint.radius != radius)
11362	11798	{
..	..	@@ -11410,20 +11846,32 @@
11410	11846	ReleaseTextures(DEFAULT_TEXTURES);
11411	11847
11412	11848	if (CLEANCACHE)
11413		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11849	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11414	11850	{
11415		- String tex = e.nextElement();
	11851	+ cTexture tex = e.nextElement();
11416	11852
11417	11853	// System.out.println("Texture --------- " + tex);
11418	11854
11419		- if (tex.equals("WHITE_NOISE"))
	11855	+ if (tex.equals("WHITE_NOISE:"))
11420	11856	continue;
11421	11857
11422		- if (!usedtextures.containsKey(tex))
	11858	+ if (!usedtextures.contains(tex))
11423	11859	{
	11860	+ CacheTexture gettex = texturepigment.get(tex);
11424	11861	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11425		- textures.get(tex).texture.dispose();
11426		- textures.remove(tex);
	11862	+ if (gettex != null)
	11863	+ {
	11864	+ gettex.texture.dispose();
	11865	+ texturepigment.remove(tex);
	11866	+ }
	11867	+
	11868	+ gettex = texturebump.get(tex);
	11869	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11870	+ if (gettex != null)
	11871	+ {
	11872	+ gettex.texture.dispose();
	11873	+ texturebump.remove(tex);
	11874	+ }
11427	11875	}
11428	11876	}
11429	11877	}
..	..	@@ -11436,7 +11884,14 @@
11436	11884	if (checker != null && DrawMode() == DEFAULT)
11437	11885	{
11438	11886	//BindTexture(IMMORTAL_TEXTURE);
11439		- BindTextures(checker.GetTextures(), checker.texres);
	11887	+ try
	11888	+ {
	11889	+ BindTextures(checker.GetTextures(), checker.texres);
	11890	+ }
	11891	+ catch (Exception e)
	11892	+ {
	11893	+ System.err.println("FAILED: " + checker.GetTextures());
	11894	+ }
11440	11895	// NEAREST
11441	11896	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11442	11897	DrawChecker(gl);
..	..	@@ -11518,7 +11973,7 @@
11518	11973	return;
11519	11974	}
11520	11975
11521		- String string = obj.GetToolTip();
	11976	+ String string = obj.toString(); //.GetToolTip();
11522	11977
11523	11978	GL gl = GetGL();
11524	11979
..	..	@@ -11835,8 +12290,8 @@
11835	12290	//obj.TransformToWorld(light, light);
11836	12291	for (int i = tp.size(); --i >= 0;)
11837	12292	{
11838		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11839		- LA.xformPos(light, tp.get(i).toParent, light);
	12293	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12294	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11840	12295	}
11841	12296
11842	12297
..	..	@@ -11853,8 +12308,8 @@
11853	12308	parentcam = cameras[0];
11854	12309	}
11855	12310
11856		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11857		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12311	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12312	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11858	12313
11859	12314	LA.xformPos(light, renderCamera.toScreen, light);
11860	12315
..	..	@@ -11945,7 +12400,52 @@
11945	12400	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11946	12401
11947	12402	String program =
	12403	+ // Min shader
11948	12404	"!!ARBfp1.0\n" +
	12405	+ "PARAM zero123 = { 0.0, 1.0, 2.0, 1.25 };" +
	12406	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12407	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12408	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12409	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12410	+ "TEMP temp;" +
	12411	+ "TEMP light;" +
	12412	+ "TEMP ndotl;" +
	12413	+ "TEMP normal;" +
	12414	+ "TEMP depth;" +
	12415	+
	12416	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12417	+
	12418	+ "MOV light, state.light[0].position;" +
	12419	+ "DP3 ndotl.x, light, normal;" +
	12420	+
	12421	+ // shadow
	12422	+ "MOV temp, fragment.texcoord[1];" +
	12423	+ TextureFetch("depth", "temp", "1") +
	12424	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12425	+ "SLT temp.x, fragment.texcoord[1].z, depth.z;" +
	12426	+
	12427	+
	12428	+ // No shadow when out of frustum
	12429	+ //"SGE temp.y, depth.z, zero123.y;" +
	12430	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12431	+
	12432	+ "MUL ndotl.x, ndotl.x, temp.x;" +
	12433	+ "MAX ndotl.x, ndotl.x, pow2.y;" +
	12434	+
	12435	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12436	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12437	+ "MUL temp, temp, ndotl.x;" +
	12438	+
	12439	+ "MUL temp, temp, zero123.z;" +
	12440	+
	12441	+ "MOV temp.w, zero123.y;" + // reset alpha
	12442	+
	12443	+ "MOV result.color, temp;" +
	12444	+ "END";
	12445	+
	12446	+ String program2 =
	12447	+ "!!ARBfp1.0\n" +
	12448	+
11949	12449	//"OPTION ARB_fragment_program_shadow;" +
11950	12450	"PARAM light2cam0 = program.env[10];" +
11951	12451	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12060,8 +12560,7 @@
12060	12560	"TEMP shininess;" +
12061	12561	"\n" +
12062	12562	"MOV texSamp, one;" +
12063		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12064		-
	12563	+
12065	12564	"MOV mapgrid.x, one2048th.x;" +
12066	12565	"MOV temp, fragment.texcoord[1];" +
12067	12566	/*
..	..	@@ -12466,10 +12965,10 @@
12466	12965	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12467	12966	"") +
12468	12967
12469		- // display shadow only (bump == 0)
	12968	+ // display shadow only (fakedepth == 0)
12470	12969	"SUB temp.x, half.x, shadow.x;" +
12471		- "MOV temp.y, -params6.x;" +
12472		- "SLT temp.z, temp.y, zero.x;" +
	12970	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12971	+ "SLT temp.z, temp.y, -one2048th.x;" +
12473	12972	"SUB temp.y, one.x, temp.z;" +
12474	12973	"MUL temp.x, temp.x, temp.y;" +
12475	12974	"KIL temp.x;" +
..	..	@@ -12598,8 +13097,10 @@
12598	13097	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12599	13098
12600	13099	"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
	13100	+ // Tuning for default skin
	13101	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	13102	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	13103	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12603	13104	"MUL temp.x, temp.x, temp.y;" +
12604	13105
12605	13106	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12747,7 +13248,7 @@
12747	13248	"MUL final.y, fragment.texcoord[0].x, c256;" +
12748	13249	"FLR final.x, final.y;" +
12749	13250	"SUB final.y, final.y, final.x;" +
12750		- //"MUL final.x, final.x, c256i;" +
	13251	+ "MUL final.x, final.x, c256i;" +
12751	13252	"MOV final.z, zero.x;" +
12752	13253	"MOV final.a, one.w;":""
12753	13254	) +
..	..	@@ -12755,7 +13256,7 @@
12755	13256	"MUL final.y, fragment.texcoord[0].y, c256;" +
12756	13257	"FLR final.x, final.y;" +
12757	13258	"SUB final.y, final.y, final.x;" +
12758		- //"MUL final.x, final.x, c256i;" +
	13259	+ "MUL final.x, final.x, c256i;" +
12759	13260	"MOV final.z, zero.x;" +
12760	13261	"MOV final.a, one.w;":""
12761	13262	) +
..	..	@@ -12798,7 +13299,7 @@
12798	13299	//once = true;
12799	13300	}
12800	13301
12801		- System.out.print("Program #" + mode + "; length = " + program.length());
	13302	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12802	13303	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12803	13304	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12804	13305
..	..	@@ -12896,20 +13397,20 @@
12896	13397	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12897	13398	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12898	13399	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13400	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13401	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12899	13402	"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;" +
	13403	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13404	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12904	13405	//"SWZ buffer, temp, w,w,w,w;";
12905		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13406	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12906	13407	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12907	13408	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12908	13409	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12909		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13410	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12910	13411
12911		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12912		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13412	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13413	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12913	13414	}
12914	13415
12915	13416	String Shadow(String depth, String shadow)
..	..	@@ -12931,12 +13432,16 @@
12931	13432
12932	13433	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12933	13434	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13435	+
	13436	+ // Compare fragment depth in light space with shadowmap.
12934	13437	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12935	13438	"SGE temp.y, temp.x, zero.x;" +
12936		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13439	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13440	+
	13441	+ // Reverse comparison
12937	13442	"SUB temp.x, one.x, temp.x;" +
12938	13443	"MUL " + shadow + ".x, temp.x, temp.y;" +
12939		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13444	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12940	13445	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12941	13446
12942	13447	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12950,6 +13455,10 @@
12950	13455	// No shadow for backface
12951	13456	"DP3 temp.x, normal, lightd;" +
12952	13457	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13458	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13459	+
	13460	+ // No shadow when out of frustum
	13461	+ "SGE temp.x, " + depth + ".z, one.z;" +
12953	13462	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12954	13463	"";
12955	13464	}
..	..	@@ -13096,7 +13605,8 @@
13096	13605	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13097	13606	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13098	13607	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13099		- Object3D.cVector2[] vector2buffer;
	13608	+
	13609	+ //Object3D.cVector2[] vector2buffer;
13100	13610
13101	13611	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13102	13612	// OUT : diff, spec
..	..	@@ -13112,9 +13622,10 @@
13112	13622	"DP3 " + dest + ".z," + "normals," + "eye;" +
13113	13623	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13114	13624	//"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;" +
	13625	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13626	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13627	+
	13628	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13118	13629	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13119	13630	"RCP " + dest + ".w," + dest + ".w;" +
13120	13631	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13508,7 +14019,7 @@
13508	14019	public void mousePressed(MouseEvent e)
13509	14020	{
13510	14021	//System.out.println("mousePressed: " + e);
13511		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14022	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13512	14023	}
13513	14024
13514	14025	static long prevtime = 0;
..	..	@@ -13584,8 +14095,8 @@
13584	14095	// mode \|= META;
13585	14096	//}
13586	14097
13587		- SetMouseMode(WHEEL \| e.getModifiersEx());
13588		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14098	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14099	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13589	14100	anchorX = ax;
13590	14101	anchorY = ay;
13591	14102	prevX = px;
..	..	@@ -13619,6 +14130,7 @@
13619	14130	else
13620	14131	if (evt.getSource() == AAtimer)
13621	14132	{
	14133	+ Globals.TIMERRUNNING = false;
13622	14134	if (mouseDown)
13623	14135	{
13624	14136	//new Exception().printStackTrace();
..	..	@@ -13644,6 +14156,10 @@
13644	14156	// LIVE = waslive;
13645	14157	// wasliveok = true;
13646	14158	// waslive = false;
	14159	+
	14160	+ // May 2019 Forget it:
	14161	+ if (true)
	14162	+ return;
13647	14163
13648	14164	// source == timer
13649	14165	if (mouseDown)
..	..	@@ -13674,7 +14190,7 @@
13674	14190
13675	14191	// fev 2014???
13676	14192	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13677		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14193	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13678	14194	pingthread.StepToTarget(true); // true);
13679	14195	}
13680	14196	// if (!LIVE)
..	..	@@ -13683,12 +14199,13 @@
13683	14199
13684	14200	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13685	14201
13686		- void clickStart(int x, int y, int modifiers)
	14202	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13687	14203	{
13688	14204	if (!wasliveok)
13689	14205	return;
13690	14206
13691	14207	AAtimer.restart(); //
	14208	+ Globals.TIMERRUNNING = true;
13692	14209
13693	14210	// waslive = LIVE;
13694	14211	// LIVE = false;
..	..	@@ -13700,7 +14217,7 @@
13700	14217	// touched = true; // main DL
13701	14218	if (isRenderer)
13702	14219	{
13703		- SetMouseMode(modifiers);
	14220	+ SetMouseMode(modifiers, modifiersex);
13704	14221	}
13705	14222
13706	14223	selectX = anchorX = x;
..	..	@@ -13713,7 +14230,7 @@
13713	14230	clicked = true;
13714	14231	hold = false;
13715	14232
13716		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14233	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13717	14234	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13718	14235	{
13719	14236	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13738,14 +14255,15 @@
13738	14255	drag = false;
13739	14256	//System.out.println("Mouse DOWN");
13740	14257	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);
	14258	+ //ClickInfo info = new ClickInfo();
	14259	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14260	+ object.clickInfo.pane = this;
	14261	+ object.clickInfo.camera = renderCamera;
	14262	+ object.clickInfo.x = x;
	14263	+ object.clickInfo.y = y;
	14264	+ object.clickInfo.modifiers = modifiersex;
	14265	+ editObj = object.doEditClick(//info,
	14266	+ 0);
13749	14267	if (!editObj)
13750	14268	{
13751	14269	hasMarquee = true;
..	..	@@ -13761,9 +14279,12 @@
13761	14279
13762	14280	public void mouseDragged(MouseEvent e)
13763	14281	{
	14282	+ Globals.MOUSEDRAGGED = true;
	14283	+
13764	14284	//System.out.println("mouseDragged: " + e);
13765	14285	if (isRenderer)
13766	14286	movingcamera = true;
	14287	+
13767	14288	//if (drawing)
13768	14289	//return;
13769	14290	if ((e.getModifiersEx() & CTRL) != 0
..	..	@@ -13773,7 +14294,7 @@
13773	14294	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13774	14295	}
13775	14296	else
13776		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14297	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13777	14298
13778	14299	//try { Thread.sleep(1); } catch (Exception ex) {}
13779	14300	}
..	..	@@ -13946,6 +14467,7 @@
13946	14467
13947	14468	public void run()
13948	14469	{
	14470	+ new Exception().printStackTrace();
13949	14471	System.exit(0);
13950	14472	for (;;)
13951	14473	{
..	..	@@ -14009,7 +14531,7 @@
14009	14531	{
14010	14532	Globals.lighttouched = true;
14011	14533	}
14012		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14534	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14013	14535	}
14014	14536	//else
14015	14537	}
..	..	@@ -14023,12 +14545,12 @@
14023	14545	void GoDown(int mod)
14024	14546	{
14025	14547	MODIFIERS \|= COMMAND;
14026		- /*
	14548	+ /**/
14027	14549	if((mod&SHIFT) == SHIFT)
14028	14550	manipCamera.RotatePosition(0, -speed);
14029	14551	else
14030		- manipCamera.BackForth(0, -speed*delta, getWidth());
14031		- */
	14552	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14553	+ /**/
14032	14554	if ((mod & SHIFT) == SHIFT)
14033	14555	{
14034	14556	mouseMode = mouseMode; // VR??
..	..	@@ -14044,12 +14566,12 @@
14044	14566	void GoUp(int mod)
14045	14567	{
14046	14568	MODIFIERS \|= COMMAND;
14047		- /*
	14569	+ /**/
14048	14570	if((mod&SHIFT) == SHIFT)
14049	14571	manipCamera.RotatePosition(0, speed);
14050	14572	else
14051		- manipCamera.BackForth(0, speed*delta, getWidth());
14052		- */
	14573	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14574	+ /**/
14053	14575	if ((mod & SHIFT) == SHIFT)
14054	14576	{
14055	14577	mouseMode = mouseMode;
..	..	@@ -14065,12 +14587,12 @@
14065	14587	void GoLeft(int mod)
14066	14588	{
14067	14589	MODIFIERS \|= COMMAND;
14068		- /*
	14590	+ /**/
14069	14591	if((mod&SHIFT) == SHIFT)
14070		- manipCamera.RotatePosition(speed, 0);
14071		- else
14072	14592	manipCamera.Translate(speed*delta, 0, getWidth());
14073		- */
	14593	+ else
	14594	+ manipCamera.RotatePosition(speed, 0);
	14595	+ /**/
14074	14596	if ((mod & SHIFT) == SHIFT)
14075	14597	{
14076	14598	mouseMode = mouseMode;
..	..	@@ -14086,12 +14608,12 @@
14086	14608	void GoRight(int mod)
14087	14609	{
14088	14610	MODIFIERS \|= COMMAND;
14089		- /*
	14611	+ /**/
14090	14612	if((mod&SHIFT) == SHIFT)
14091		- manipCamera.RotatePosition(-speed, 0);
14092		- else
14093	14613	manipCamera.Translate(-speed*delta, 0, getWidth());
14094		- */
	14614	+ else
	14615	+ manipCamera.RotatePosition(-speed, 0);
	14616	+ /**/
14095	14617	if ((mod & SHIFT) == SHIFT)
14096	14618	{
14097	14619	mouseMode = mouseMode;
..	..	@@ -14109,7 +14631,7 @@
14109	14631	int X, Y;
14110	14632	boolean SX, SY;
14111	14633
14112		- void drag(int x, int y, int modifiers)
	14634	+ void drag(int x, int y, int modifiers, int modifiersex)
14113	14635	{
14114	14636	if (IsFrozen())
14115	14637	{
..	..	@@ -14118,17 +14640,17 @@
14118	14640
14119	14641	drag = true; // NEW
14120	14642
14121		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14643	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14122	14644
14123	14645	X = x;
14124	14646	Y = y;
14125	14647	// floating state for animation
14126		- MODIFIERS = modifiers;
14127		- modifiers &= ~1024;
	14648	+ MODIFIERS = modifiersex;
	14649	+ modifiersex &= ~1024;
14128	14650	if (false) // modifiers != 0)
14129	14651	{
14130	14652	//new Exception().printStackTrace();
14131		- System.out.println("mouseDragged: " + modifiers);
	14653	+ System.out.println("mouseDragged: " + modifiersex);
14132	14654	System.out.println("SHIFT = " + SHIFT);
14133	14655	System.out.println("CONTROL = " + COMMAND);
14134	14656	System.out.println("META = " + META);
..	..	@@ -14141,14 +14663,16 @@
14141	14663	if (editObj)
14142	14664	{
14143	14665	drag = true;
14144		- ClickInfo info = new ClickInfo();
14145		- info.bounds.setBounds(0, 0,
	14666	+ //ClickInfo info = new ClickInfo();
	14667	+ object.clickInfo.bounds.setBounds(0, 0,
14146	14668	(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);
	14669	+ object.clickInfo.pane = this;
	14670	+ object.clickInfo.camera = renderCamera;
	14671	+ object.clickInfo.x = x;
	14672	+ object.clickInfo.y = y;
	14673	+ object //.GetWindow().copy
	14674	+ .doEditDrag(//info,
	14675	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14152	14676	} else
14153	14677	{
14154	14678	if (x < startX)
..	..	@@ -14297,22 +14821,27 @@
14297	14821	}
14298	14822	}
14299	14823
	14824	+// ClickInfo clickInfo = new ClickInfo();
	14825	+
14300	14826	public void mouseMoved(MouseEvent e)
14301	14827	{
14302	14828	//System.out.println("mouseMoved: " + e);
14303	14829	if (isRenderer)
14304	14830	return;
14305	14831
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;
	14832	+ // Mouse cursor feedback
	14833	+ object.clickInfo.x = e.getX();
	14834	+ object.clickInfo.y = e.getY();
	14835	+ object.clickInfo.modifiers = e.getModifiersEx();
	14836	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14837	+ object.clickInfo.pane = this;
	14838	+ object.clickInfo.camera = renderCamera;
14313	14839	if (!isRenderer)
14314	14840	{
14315		- if (object.editWindow.copy.doEditClick(ci, 0))
	14841	+ //ObjEditor editWindow = object.editWindow;
	14842	+ //Object3D copy = editWindow.copy;
	14843	+ if (object.doEditClick(//clickInfo,
	14844	+ 0))
14316	14845	{
14317	14846	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14318	14847	} else
..	..	@@ -14324,7 +14853,11 @@
14324	14853
14325	14854	public void mouseReleased(MouseEvent e)
14326	14855	{
	14856	+ Globals.MOUSEDRAGGED = false;
	14857	+
14327	14858	movingcamera = false;
	14859	+ X = 0; // getBounds().width/2;
	14860	+ Y = 0; // getBounds().height/2;
14328	14861	//System.out.println("mouseReleased: " + e);
14329	14862	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14330	14863	}
..	..	@@ -14347,9 +14880,9 @@
14347	14880	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14348	14881	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14349	14882
14350		- if (control \|\| command \|\| IsFrozen())
	14883	+// No delay if (control \|\| command \|\| IsFrozen())
14351	14884	timeout = true;
14352		- else
	14885	+// ?? May 2019 else
14353	14886	// timer.setDelay((modifiers & 128) != 0?0:350);
14354	14887	mouseDown = false;
14355	14888	if (!control && !command) // june 2013
..	..	@@ -14459,7 +14992,7 @@
14459	14992	System.out.println("keyReleased: " + e);
14460	14993	}
14461	14994
14462		- void SetMouseMode(int modifiers)
	14995	+ void SetMouseMode(int modifiers, int modifiersex)
14463	14996	{
14464	14997	//System.out.println("SetMouseMode = " + modifiers);
14465	14998	//modifiers &= ~1024;
..	..	@@ -14471,25 +15004,25 @@
14471	15004	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14472	15005	// return;
14473	15006	//System.out.println("SetMode = " + modifiers);
14474		- if ((modifiers & WHEEL) == WHEEL)
	15007	+ if ((modifiersex & WHEEL) == WHEEL)
14475	15008	{
14476	15009	mouseMode \|= ZOOM;
14477	15010	}
14478	15011
14479	15012	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14480		- if (capsLocked \|\| (modifiers & META) == META)
	15013	+ if (capsLocked) // \|\| (modifiers & META) == META)
14481	15014	{
14482	15015	mouseMode \|= VR; // BACKFORTH;
14483	15016	}
14484		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	15017	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14485	15018	{
14486	15019	mouseMode \|= SELECT;
14487	15020	}
14488		- if ((modifiers & COMMAND) == COMMAND)
	15021	+ if ((modifiersex & COMMAND) == COMMAND)
14489	15022	{
14490	15023	mouseMode \|= SELECT;
14491	15024	}
14492		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15025	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14493	15026	{
14494	15027	mouseMode &= ~VR;
14495	15028	mouseMode \|= TRANSLATE;
..	..	@@ -14518,7 +15051,7 @@
14518	15051
14519	15052	if (isRenderer) //
14520	15053	{
14521		- SetMouseMode(modifiers);
	15054	+ SetMouseMode(0, modifiers);
14522	15055	}
14523	15056
14524	15057	Globals.theRenderer.keyPressed(key);
..	..	@@ -14580,7 +15113,8 @@
14580	15113	// break;
14581	15114	case 'T':
14582	15115	CACHETEXTURE ^= true;
14583		- textures.clear();
	15116	+ texturepigment.clear();
	15117	+ texturebump.clear();
14584	15118	// repaint();
14585	15119	break;
14586	15120	case 'Y':
..	..	@@ -14665,7 +15199,9 @@
14665	15199	case 'E' : COMPACT ^= true;
14666	15200	repaint();
14667	15201	break;
14668		- case 'W' : DEBUGHSB ^= true;
	15202	+ case 'W' : // Wide Window (fullscreen)
	15203	+ //DEBUGHSB ^= true;
	15204	+ ObjEditor.theFrame.ToggleFullScreen();
14669	15205	repaint();
14670	15206	break;
14671	15207	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14690,8 +15226,8 @@
14690	15226	RevertCamera();
14691	15227	repaint();
14692	15228	break;
14693		- case 'L':
14694	15229	case 'l':
	15230	+ //case 'L':
14695	15231	if (lightMode)
14696	15232	{
14697	15233	lightMode = false;
..	..	@@ -14834,9 +15370,9 @@
14834	15370	case '_':
14835	15371	kompactbit = 5;
14836	15372	break;
14837		- case '+':
14838		- kompactbit = 6;
14839		- break;
	15373	+// case '+':
	15374	+// kompactbit = 6;
	15375	+// break;
14840	15376	case ' ':
14841	15377	lightMode ^= true;
14842	15378	Globals.lighttouched = true;
..	..	@@ -14848,13 +15384,14 @@
14848	15384	case ESC:
14849	15385	RENDERPROGRAM += 1;
14850	15386	RENDERPROGRAM %= 3;
	15387	+
14851	15388	repaint();
14852	15389	break;
14853	15390	case 'Z':
14854	15391	//RESIZETEXTURE ^= true;
14855	15392	//break;
14856	15393	case 'z':
14857		- RENDERSHADOW ^= true;
	15394	+ Globals.RENDERSHADOW ^= true;
14858	15395	Globals.lighttouched = true;
14859	15396	repaint();
14860	15397	break;
..	..	@@ -14887,8 +15424,9 @@
14887	15424	case DELETE:
14888	15425	ClearSelection();
14889	15426	break;
14890		- /*
14891	15427	case '+':
	15428	+
	15429	+ /*
14892	15430	//fontsize += 1;
14893	15431	bbzoom *= 2;
14894	15432	repaint();
..	..	@@ -14905,17 +15443,17 @@
14905	15443	case '=':
14906	15444	IncDepth();
14907	15445	//fontsize += 1;
14908		- object.editWindow.refreshContents(true);
	15446	+ object.GetWindow().refreshContents(true);
14909	15447	maskbit = 6;
14910	15448	break;
14911	15449	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14912	15450	DecDepth();
14913	15451	maskbit = 5;
14914	15452	//if(fontsize > 1) fontsize -= 1;
14915		- if (object.editWindow == null)
14916		- new Exception().printStackTrace();
14917		- else
14918		- object.editWindow.refreshContents(true);
	15453	+// if (object.editWindow == null)
	15454	+// new Exception().printStackTrace();
	15455	+// else
	15456	+ object.GetWindow().refreshContents(true);
14919	15457	break;
14920	15458	case '{':
14921	15459	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14978,7 +15516,7 @@
14978	15516	//mode = ROTATE;
14979	15517	if ((MODIFIERS & COMMAND) == 0) // VR??
14980	15518	{
14981		- SetMouseMode(modifiers);
	15519	+ SetMouseMode(0, modifiers);
14982	15520	}
14983	15521	}
14984	15522
..	..	@@ -15114,7 +15652,7 @@
15114	15652	{
15115	15653	//System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15116	15654	//if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15117		- if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
	15655	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
15118	15656	{
15119	15657	mouseMoved(e);
15120	15658	} else
..	..	@@ -15139,11 +15677,12 @@
15139	15677	}
15140	15678	*/
15141	15679
15142		- object.editWindow.EditSelection();
	15680	+ object.GetWindow().EditSelection(false);
15143	15681	}
15144	15682
15145	15683	void SelectParent()
15146	15684	{
	15685	+ new Exception().printStackTrace();
15147	15686	System.exit(0);
15148	15687	Composite group = (Composite) object;
15149	15688	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -15155,10 +15694,10 @@
15155	15694	{
15156	15695	//selectees.remove(i);
15157	15696	System.out.println("select parent of " + elem);
15158		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15697	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15159	15698	} else
15160	15699	{
15161		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15700	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15162	15701	}
15163	15702
15164	15703	first = false;
..	..	@@ -15167,6 +15706,7 @@
15167	15706
15168	15707	void SelectChildren()
15169	15708	{
	15709	+ new Exception().printStackTrace();
15170	15710	System.exit(0);
15171	15711	/*
15172	15712	Composite group = (Composite) object;
..	..	@@ -15199,12 +15739,12 @@
15199	15739	for (int j = 0; j < group.children.size(); j++)
15200	15740	{
15201	15741	elem = (Object3D) group.children.elementAt(j);
15202		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15742	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15203	15743	first = false;
15204	15744	}
15205	15745	} else
15206	15746	{
15207		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15747	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15208	15748	}
15209	15749
15210	15750	first = false;
..	..	@@ -15215,21 +15755,21 @@
15215	15755	{
15216	15756	//Composite group = (Composite) object;
15217	15757	Object3D group = object;
15218		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15758	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15219	15759	}
15220	15760
15221	15761	void ResetTransform(int mask)
15222	15762	{
15223	15763	//Composite group = (Composite) object;
15224	15764	Object3D group = object;
15225		- group.editWindow.ResetTransform(mask);
	15765	+ group.GetWindow().ResetTransform(mask);
15226	15766	}
15227	15767
15228	15768	void FlipTransform()
15229	15769	{
15230	15770	//Composite group = (Composite) object;
15231	15771	Object3D group = object;
15232		- group.editWindow.FlipTransform();
	15772	+ group.GetWindow().FlipTransform();
15233	15773	// group.editWindow.ReduceMesh(true);
15234	15774	}
15235	15775
..	..	@@ -15237,7 +15777,7 @@
15237	15777	{
15238	15778	//Composite group = (Composite) object;
15239	15779	Object3D group = object;
15240		- group.editWindow.PrintMemory();
	15780	+ group.GetWindow().PrintMemory();
15241	15781	// group.editWindow.ReduceMesh(true);
15242	15782	}
15243	15783
..	..	@@ -15245,7 +15785,7 @@
15245	15785	{
15246	15786	//Composite group = (Composite) object;
15247	15787	Object3D group = object;
15248		- group.editWindow.ResetCentroid();
	15788	+ group.GetWindow().ResetCentroid();
15249	15789	}
15250	15790
15251	15791	void IncDepth()
..	..	@@ -15327,11 +15867,11 @@
15327	15867
15328	15868	int width = getBounds().width;
15329	15869	int height = getBounds().height;
15330		- ClickInfo info = new ClickInfo();
15331		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15332	15870	//Image img = CreateImage(width, height);
15333	15871	//System.out.println("width = " + width + "; height = " + height + "\n");
	15872	+
15334	15873	Graphics gr = g; // img.getGraphics();
	15874	+
15335	15875	if (!hasMarquee)
15336	15876	{
15337	15877	if (Xmin < Xmax) // !locked)
..	..	@@ -15403,40 +15943,88 @@
15403	15943	}
15404	15944	if (object != null && !hasMarquee)
15405	15945	{
	15946	+ if (object.clickInfo == null)
	15947	+ object.clickInfo = new ClickInfo();
	15948	+ ClickInfo info = object.clickInfo;
	15949	+ //ClickInfo info = new ClickInfo();
	15950	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	15951	+
15406	15952	if (isRenderer)
15407	15953	{
15408		- info.flags++;
	15954	+ object.clickInfo.flags++;
15409	15955	double frameAspect = (double) width / (double) height;
15410	15956	if (frameAspect > renderCamera.aspect)
15411	15957	{
15412	15958	int desired = (int) ((double) height * renderCamera.aspect);
15413		- info.bounds.width -= width - desired;
15414		- info.bounds.x += (width - desired) / 2;
	15959	+ object.clickInfo.bounds.width -= width - desired;
	15960	+ object.clickInfo.bounds.x += (width - desired) / 2;
15415	15961	} else
15416	15962	{
15417	15963	int desired = (int) ((double) width / renderCamera.aspect);
15418		- info.bounds.height -= height - desired;
15419		- info.bounds.y += (height - desired) / 2;
	15964	+ object.clickInfo.bounds.height -= height - desired;
	15965	+ object.clickInfo.bounds.y += (height - desired) / 2;
15420	15966	}
15421	15967	}
15422		- info.g = gr;
15423		- info.camera = renderCamera;
	15968	+
	15969	+ object.clickInfo.g = gr;
	15970	+ object.clickInfo.camera = renderCamera;
15424	15971	/*
15425	15972	// Memory intensive (brep.verticescopy)
15426	15973	if (!(object instanceof Composite))
15427	15974	object.draw(info, 0, false); // SLOW :
15428	15975	*/
15429		- if (!isRenderer)
	15976	+ if (!isRenderer) // && drag)
15430	15977	{
15431		- object.drawEditHandles(info, 0);
	15978	+ Grafreed.Assert(object != null);
	15979	+ Grafreed.Assert(object.selection != null);
	15980	+ if (object.selection.Size() > 0)
	15981	+ {
	15982	+ int hitSomething = object.selection.get(0).hitSomething;
	15983	+
	15984	+ object.clickInfo.DX = 0;
	15985	+ object.clickInfo.DY = 0;
	15986	+ object.clickInfo.W = 1;
	15987	+ if (hitSomething == Object3D.hitCenter)
	15988	+ {
	15989	+ info.DX = X;
	15990	+ if (X != 0)
	15991	+ info.DX -= info.bounds.width/2;
	15992	+
	15993	+ info.DY = Y;
	15994	+ if (Y != 0)
	15995	+ info.DY -= info.bounds.height/2;
	15996	+ }
	15997	+
	15998	+ object.drawEditHandles(//info,
	15999	+ 0);
	16000	+
	16001	+ if (drag && (X != 0 \|\| Y != 0))
	16002	+ {
	16003	+ switch (hitSomething)
	16004	+ {
	16005	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16006	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16007	+ break;
	16008	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16009	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16010	+ break;
	16011	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16012	+ gr.drawLine(X, Y, 0, 0);
	16013	+ break;
	16014	+ }
	16015	+
	16016	+ }
	16017	+ }
15432	16018	}
15433	16019	}
	16020	+
15434	16021	if (isRenderer)
15435	16022	{
15436	16023	//gr.setColor(Color.black);
15437	16024	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15438	16025	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15439	16026	}
	16027	+
15440	16028	if (hasMarquee)
15441	16029	{
15442	16030	gr.setXORMode(Color.white);
..	..	@@ -15549,6 +16137,7 @@
15549	16137	public boolean mouseDown(Event evt, int x, int y)
15550	16138	{
15551	16139	System.out.println("mouseDown: " + evt);
	16140	+ System.exit(0);
15552	16141	/*
15553	16142	locked = true;
15554	16143	drag = false;
..	..	@@ -15592,7 +16181,7 @@
15592	16181	{
15593	16182	keyPressed(0, modifiers);
15594	16183	}
15595		- clickStart(x, y, modifiers);
	16184	+ // clickStart(x, y, modifiers);
15596	16185	return true;
15597	16186	}
15598	16187
..	..	@@ -15710,7 +16299,7 @@
15710	16299	{
15711	16300	keyReleased(0, 0);
15712	16301	}
15713		- drag(x, y, modifiers);
	16302	+ drag(x, y, 0, modifiers);
15714	16303	return true;
15715	16304	}
15716	16305
..	..	@@ -15842,7 +16431,7 @@
15842	16431	Object3D object;
15843	16432	static Object3D trackedobject;
15844	16433	Camera renderCamera; // Light or Eye (or Occlusion)
15845		- /static/ Camera manipCamera; // Light or Eye
	16434	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15846	16435	/static/ Camera eyeCamera;
15847	16436	/static/ Camera lightCamera;
15848	16437	int cameracount;
..	..	@@ -16127,16 +16716,16 @@
16127	16716	cStatic.objectstack[materialdepth++] = checker;
16128	16717	//System.out.println("material " + material);
16129	16718	//Applet3D.tracein(this, selected);
16130		- vector2buffer = checker.projectedVertices;
	16719	+ //vector2buffer = checker.projectedVertices;
16131	16720
16132	16721	//checker.GetMaterial().Draw(this, false); // true);
16133		- DrawMaterial(checker.GetMaterial(), false); // true);
	16722	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16134	16723
16135	16724	materialdepth -= 1;
16136	16725	if (materialdepth > 0)
16137	16726	{
16138		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16139		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16727	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16728	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16140	16729	}
16141	16730	//checker.GetMaterial().opacity = 1f;
16142	16731	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16222,6 +16811,14 @@
16222	16811	}
16223	16812	}
16224	16813
	16814	+ private Object3D GetFolder()
	16815	+ {
	16816	+ Object3D folder = object.GetWindow().copy;
	16817	+ if (object.GetWindow().copy.selection.Size() > 0)
	16818	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16819	+ return folder;
	16820	+ }
	16821	+
16225	16822	class SelectBuffer implements GLEventListener
16226	16823	{
16227	16824
..	..	@@ -16280,6 +16877,7 @@
16280	16877	{
16281	16878	if (!selection)
16282	16879	{
	16880	+ new Exception().printStackTrace();
16283	16881	System.exit(0);
16284	16882	return;
16285	16883	}
..	..	@@ -16300,6 +16898,17 @@
16300	16898
16301	16899	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16302	16900
	16901	+ if (PAINTMODE)
	16902	+ {
	16903	+ if (object.GetWindow().copy.selection.Size() > 0)
	16904	+ {
	16905	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16906	+
	16907	+ // Make what you paint not selectable.
	16908	+ paintobj.ResetSelectable();
	16909	+ }
	16910	+ }
	16911	+
16303	16912	//int tmp = selection_view;
16304	16913	//selection_view = -1;
16305	16914	int temp = DrawMode();
..	..	@@ -16311,6 +16920,17 @@
16311	16920	// temp = DEFAULT; // patch for selection debug
16312	16921	Globals.drawMode = temp; // WARNING
16313	16922
	16923	+ if (PAINTMODE)
	16924	+ {
	16925	+ if (object.GetWindow().copy.selection.Size() > 0)
	16926	+ {
	16927	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16928	+
	16929	+ // Revert.
	16930	+ paintobj.RestoreSelectable();
	16931	+ }
	16932	+ }
	16933	+
16314	16934	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16315	16935
16316	16936	// trying different ways of getting the depth info over
..	..	@@ -16358,6 +16978,8 @@
16358	16978	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16359	16979	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16360	16980	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	16981	+
	16982	+ CreateSelectedPoint();
16361	16983
16362	16984	// Will fit the mesh !!!
16363	16985	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16407,34 +17029,36 @@
16407	17029	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	17030	}
16409	17031
16410		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	17032	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16411	17033	}
16412	17034	}
16413	17035
16414	17036	if (!movingcamera && !PAINTMODE)
16415		- object.editWindow.ScreenFitPoint(); // fev 2014
	17037	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16416	17038
16417		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17039	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16418	17040	{
16419		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17041	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16420	17042
16421		- Object3D group = new Object3D("inst" + paintcount++);
	17043	+ if (object.GetWindow().copy.selection.Size() > 0)
	17044	+ {
	17045	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16422	17046
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();
	17047	+ Object3D inst = new Object3D("inst" + paintcount++);
	17048	+
	17049	+ inst.CreateMaterial(); // use a void leaf to select instances
	17050	+
	17051	+ inst.add(paintobj); // link
	17052	+
	17053	+ object.GetWindow().SnapObject(inst);
	17054	+
	17055	+ Object3D folder = paintFolder; // GetFolder();
	17056	+
	17057	+ folder.add(inst);
	17058	+
	17059	+ object.GetWindow().ResetModel();
	17060	+ object.GetWindow().refreshContents();
	17061	+ }
16438	17062	}
16439	17063	else
16440	17064	paintcount = 0;
..	..	@@ -16473,6 +17097,11 @@
16473	17097	//System.out.println("objects[color] = " + objects[color]);
16474	17098	//objects[color].Select();
16475	17099	indexcount = 0;
	17100	+ ObjEditor window = object.GetWindow();
	17101	+ if (window != null && deselect)
	17102	+ {
	17103	+ window.Select(null, deselect, true);
	17104	+ }
16476	17105	object.Select(color, deselect);
16477	17106	}
16478	17107
..	..	@@ -16572,7 +17201,7 @@
16572	17201	gl.glDisable(gl.GL_CULL_FACE);
16573	17202	}
16574	17203
16575		- if (!RENDERSHADOW)
	17204	+ if (!Globals.RENDERSHADOW)
16576	17205	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16577	17206
16578	17207	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16582,7 +17211,7 @@
16582	17211	//gl.glColorMask(false, false, false, false);
16583	17212
16584	17213	//render_scene_from_light_view(gl, drawable, 0, 0);
16585		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17214	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16586	17215	{
16587	17216	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16588	17217
..	..	@@ -16998,23 +17627,15 @@
16998	17627	int AAbuffersize = 0;
16999	17628
17000	17629	//double[] selectedpoint = new double[3];
17001		- static Superellipsoid selectedpoint = new Superellipsoid();
	17630	+ static Superellipsoid selectedpoint;
17002	17631	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();
	17632	+ static Sphere debugpointG;
	17633	+ static Sphere debugpointP;
	17634	+ static Sphere debugpointC;
	17635	+ static Sphere debugpointR;
17007	17636
17008	17637	static Sphere debugpoints[] = new Sphere[8];
17009	17638
17010		- static
17011		- {
17012		- for (int i=0; i<8; i++)
17013		- {
17014		- debugpoints[i] = new Sphere();
17015		- }
17016		- }
17017		-
17018	17639	static void InitPoints(float radius)
17019	17640	{
17020	17641	for (int i=0; i<8; i++)